diff --git a/build.gradle b/build.gradle index 2f9d74438..151273403 100644 --- a/build.gradle +++ b/build.gradle @@ -395,7 +395,9 @@ subprojects { p -> git_main_commit : git_main_commit, git_core_commit : git_core_commit, - git_main_branch : git_main_branch + git_main_branch : git_main_branch, + + fabric_incompatibility_list : fabric_incompatibility_list, ] // The left side is what gets replaced in the mod info and the right side is where to get it from in the gradle.properties diff --git a/common/src/main/java/com/seibel/distanthorizons/common/LodCommonMain.java b/common/src/main/java/com/seibel/distanthorizons/common/LodCommonMain.java index 11e4ac676..502dc3301 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/LodCommonMain.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/LodCommonMain.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/forge/LodForgeMethodCaller.java b/common/src/main/java/com/seibel/distanthorizons/common/forge/LodForgeMethodCaller.java index 4bda7c1aa..0d9b8da4a 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/forge/LodForgeMethodCaller.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/forge/LodForgeMethodCaller.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/rendering/SeamlessOverdraw.java b/common/src/main/java/com/seibel/distanthorizons/common/rendering/SeamlessOverdraw.java index c2aaf49d4..264dc636a 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/rendering/SeamlessOverdraw.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/rendering/SeamlessOverdraw.java @@ -1,3 +1,22 @@ +/* + * This file is part of the Distant Horizons mod + * licensed under the GNU LGPL v3 License. + * + * Copyright (C) 2020-2023 James Seibel + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.seibel.distanthorizons.common.rendering; #if PRE_MC_1_19_4 diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java index 0b8f7791a..364f1a066 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetupDoneCheck.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetupDoneCheck.java index 271abd82d..cf1835753 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetupDoneCheck.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetupDoneCheck.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/McObjectConverter.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/McObjectConverter.java index c4409ffb4..c11e57c77 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/McObjectConverter.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/McObjectConverter.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java index 3c25fa0e4..643a23f25 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/WrapperFactory.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/WrapperFactory.java index 1f33cb6ee..625ff23bd 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/WrapperFactory.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/WrapperFactory.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java index 7c9bb534e..65910fb34 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java index 6fdc4bbc5..b5c41d5fe 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java @@ -1,3 +1,22 @@ +/* + * This file is part of the Distant Horizons mod + * licensed under the GNU LGPL v3 License. + * + * Copyright (C) 2020-2023 James Seibel + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.seibel.distanthorizons.common.wrappers.block; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; @@ -46,7 +65,8 @@ public class BlockStateWrapper implements IBlockStateWrapper public static final String AIR_STRING = "AIR"; public static final BlockStateWrapper AIR = new BlockStateWrapper(null, null); - public static final String[] RENDERER_IGNORED_BLOCKS_RESOURCE_LOCATIONS = { AIR_STRING, "minecraft:barrier", "minecraft:structure_void", "minecraft:light" }; + // TODO: Make this changeable through the config + public static final String[] RENDERER_IGNORED_BLOCKS_RESOURCE_LOCATIONS = { AIR_STRING, "minecraft:barrier", "minecraft:structure_void", "minecraft:light", "minecraft:tripwire" }; public static HashSet rendererIgnoredBlocks = null; @@ -208,7 +228,7 @@ public class BlockStateWrapper implements IBlockStateWrapper } #if PRE_MC_1_20_1 - return this.blockState.getMaterial().isLiquid(); + return this.blockState.getMaterial().isLiquid() || !this.blockState.getFluidState().isEmpty(); #else return !this.blockState.getFluidState().isEmpty(); #endif diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TextureAtlasSpriteWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TextureAtlasSpriteWrapper.java index 1be216135..b5334f956 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TextureAtlasSpriteWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TextureAtlasSpriteWrapper.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideFast.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideFast.java index 434d5a3c5..7a8a92e6e 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideFast.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideFast.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideSmooth.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideSmooth.java index a078107b0..94015d4de 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideSmooth.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideSmooth.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelOverrider.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelOverrider.java index 6a098e593..4f35469ea 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelOverrider.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelOverrider.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelSmoothOverrider.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelSmoothOverrider.java index 6bbce5bab..c4f4d4438 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelSmoothOverrider.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelSmoothOverrider.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockDetailMap.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockDetailMap.java index 209073efb..e078d6685 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockDetailMap.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockDetailMap.java @@ -1,3 +1,22 @@ +/* + * This file is part of the Distant Horizons mod + * licensed under the GNU LGPL v3 License. + * + * Copyright (C) 2020-2023 James Seibel + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.seibel.distanthorizons.common.wrappers.block.cache; import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockStateCache.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockStateCache.java index 235b196a8..c5b5b349a 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockStateCache.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockStateCache.java @@ -1,3 +1,22 @@ +/* + * This file is part of the Distant Horizons mod + * licensed under the GNU LGPL v3 License. + * + * Copyright (C) 2020-2023 James Seibel + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.seibel.distanthorizons.common.wrappers.block.cache; import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockDetailMap.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockDetailMap.java index d7d3a2646..453761f53 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockDetailMap.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockDetailMap.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockStateCache.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockStateCache.java index 55b7beb36..3cd54a49c 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockStateCache.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockStateCache.java @@ -1,3 +1,22 @@ +/* + * This file is part of the Distant Horizons mod + * licensed under the GNU LGPL v3 License. + * + * Copyright (C) 2020-2023 James Seibel + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.seibel.distanthorizons.common.wrappers.block.cache; import com.seibel.distanthorizons.common.wrappers.McObjectConverter; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java index b9d335944..657e15ea6 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java index ca0f10490..0d4846e20 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java @@ -257,7 +257,13 @@ public class ClassicConfigGUI // Some textuary stuff 0, new ResourceLocation(ModInfo.ID, "textures/gui/changelog.png"), 20, 20, // Create the button and tell it where to go - (buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(new ChangelogScreen(this)), + (buttonWidget) -> { + ChangelogScreen changelogScreen = new ChangelogScreen(this); + if (changelogScreen.usable) + Objects.requireNonNull(minecraft).setScreen(changelogScreen); + else + LOGGER.warn("Changelog was not able to open"); + }, // Add a title to the button Translatable(ModInfo.ID + ".updater.title") )); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/TexturedButtonWidget.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/TexturedButtonWidget.java index 17b04b6dd..950a68e50 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/TexturedButtonWidget.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/TexturedButtonWidget.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java index df2cc3dc2..6d9c37cdb 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java @@ -44,16 +44,32 @@ public class ChangelogScreen extends DhScreen private List changelog; private TextArea changelogArea; + public boolean usable = false; + public ChangelogScreen(Screen parent) { this(parent, null); if (!ModrinthGetter.initted) // Make sure the modrinth stuff is initted ModrinthGetter.init(); - if (!ModrinthGetter.initted) // If its not initted the just close the screen - onClose(); + if (!ModrinthGetter.initted) // If its not initted, then this isnt usable + return; - setupChangelog(ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion())); + if (!ModrinthGetter.mcVersions.contains(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion())) + return; + + String versionID = ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()); + if (versionID == null) + return; + try + { + setupChangelog(versionID); + usable = true; + } + catch (Exception e) + { + e.printStackTrace(); + } } public ChangelogScreen(Screen parent, String versionID) @@ -62,8 +78,18 @@ public class ChangelogScreen extends DhScreen this.parent = parent; this.versionID = versionID; - if (versionID != null) + + if (versionID == null) + return; + try + { setupChangelog(versionID); + usable = true; + } + catch (Exception e) + { + e.printStackTrace(); + } } private void setupChangelog(String versionID) @@ -97,6 +123,8 @@ public class ChangelogScreen extends DhScreen protected void init() { super.init(); + if (!usable) + return; this.addBtn( // Close @@ -123,6 +151,8 @@ public class ChangelogScreen extends DhScreen #endif { this.renderBackground(matrices); // Render background + if (!usable) + return; // Set the scroll position to the mouse height relative to the screen // This is a bit of a hack as we cannot scroll on this area diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java index a212ca583..1b9aa8c1a 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java @@ -27,7 +27,7 @@ import java.util.*; * * @author coolGi */ -// TODO: After finishing the config, rewrite this in openGL as well +// TODO: After finishing the config, rewrite this in Java Swing as well // and also maybe add this suggestion https://discord.com/channels/881614130614767666/1035863487110467625/1035949054485594192 public class UpdateModScreen extends DhScreen { diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java index 9e3345e9b..66f901834 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java index 1a10e6ef2..6d433402f 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -111,9 +111,13 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper } @Override - public boolean playerHasBlindnessEffect() + public boolean playerHasBlindingEffect() { - return MC.player.getActiveEffectsMap().get(MobEffects.BLINDNESS) != null; + return MC.player.getActiveEffectsMap().get(MobEffects.BLINDNESS) != null + #if POST_AND_MC_1_19_2 + || MC.player.getActiveEffectsMap().get(MobEffects.DARKNESS) != null // Deep dark effect + #endif + ; } @Override diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/ProfilerWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/ProfilerWrapper.java index ec8118437..66f236fd3 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/ProfilerWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/ProfilerWrapper.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java index b49026bf2..568b87188 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/DimensionTypeWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/DimensionTypeWrapper.java index 6ddcfe38c..9f7dd1ccc 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/DimensionTypeWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/DimensionTypeWrapper.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java index 18dbc08f0..5d354a21c 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java index e54490bbb..9909e74d2 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java @@ -1,9 +1,9 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * * Copyright (C) 2021 Tom Lee (TomTheFurry) - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GenerationEvent.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GenerationEvent.java index 3fa8d05b8..7d2521f62 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GenerationEvent.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GenerationEvent.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GlobalParameters.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GlobalParameters.java index 6c87d14b3..aafc01bb3 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GlobalParameters.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GlobalParameters.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/Rolling.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/Rolling.java index b142e6350..0c50289f6 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/Rolling.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/Rolling.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/ThreadedParameters.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/ThreadedParameters.java index 7f98e03d2..d5e391be5 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/ThreadedParameters.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/ThreadedParameters.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java index ee6727344..dda02fa40 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU GPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhLitWorldGenRegion.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhLitWorldGenRegion.java index 7270c2523..838bca76f 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhLitWorldGenRegion.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhLitWorldGenRegion.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DummyLightEngine.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DummyLightEngine.java index cd8fa5e0c..106af9f4a 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DummyLightEngine.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DummyLightEngine.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/LightGetterAdaptor.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/LightGetterAdaptor.java index af0770f5a..b18b8f41b 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/LightGetterAdaptor.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/LightGetterAdaptor.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/WorldGenStructFeatManager.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/WorldGenStructFeatManager.java index 2b75c805c..b2e8ff623 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/WorldGenStructFeatManager.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/WorldGenStructFeatManager.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java index 09147d424..0ea6286a2 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java index a0981e08d..8f2b94fb8 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java index 25e3b2c7f..f2670d97a 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java index dd2fb24b7..35a5a7b71 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java index 3a4ebf636..0cf652f66 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java index c05c03a4b..39c4a6e8d 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/coreSubProjects b/coreSubProjects index 415f16507..1e1ddd505 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 415f16507ba605f09522f5bed6e349cc99593849 +Subproject commit 1e1ddd505bcec2b4fc263407c9251cb32284e052 diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java index 16c8187b7..9d0cfe32e 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java index 3f2040444..67d090a68 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinClientLevel.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinClientLevel.java index df83765e8..7f7836bd1 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinClientLevel.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinClientLevel.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java index fc44537cf..b498e5785 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -20,6 +20,8 @@ package com.seibel.distanthorizons.fabric.mixins.client; import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -66,6 +68,7 @@ public class MixinFogRenderer Entity entity = camera.getEntity(); boolean isSpecialFog = (entity instanceof LivingEntity) && ((LivingEntity) entity).hasEffect(MobEffects.BLINDNESS); if (!isSpecialFog && cameraNotInFluid && fogMode == FogMode.FOG_TERRAIN + && !SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class).playerHasBlindingEffect() && Config.Client.Advanced.Graphics.Fog.disableVanillaFog.get()) { #if PRE_MC_1_17_1 diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java index 698359389..f67a8a1f3 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java index a39a6066c..570c147f7 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java @@ -23,15 +23,23 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Minecraft.class) public class MixinMinecraft { + #if PRE_MC_1_20_1 @Redirect( method = "(Lnet/minecraft/client/main/GameConfig;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;setScreen(Lnet/minecraft/client/gui/screens/Screen;)V") ) public void onOpenScreen(Minecraft instance, Screen guiScreen) { - if (!Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get()) + #else + @Redirect( + method = "Lnet/minecraft/client/Minecraft;setInitialScreen(Lcom/mojang/realmsclient/client/RealmsClient;Lnet/minecraft/server/packs/resources/ReloadInstance;Lnet/minecraft/client/main/GameConfig$QuickPlayData;)V", + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;setScreen(Lnet/minecraft/client/gui/screens/Screen;)V") + ) + public void onOpenScreen(Minecraft instance, Screen guiScreen) + { + #endif + if (!Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get()) // Don't do anything if the user doesn't want it { - // Don't do anything if the user doesn't want it instance.setScreen(guiScreen); // Sets the screen back to the vanilla screen as if nothing ever happened return; } diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinOptionsScreen.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinOptionsScreen.java index 275ad9642..7fbb823a1 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinOptionsScreen.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinOptionsScreen.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/events/MixinBlockUpdate.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/events/MixinBlockUpdate.java index 0c063a6ce..070cc7807 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/events/MixinBlockUpdate.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/events/MixinBlockUpdate.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/events/MixinServerLevel.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/events/MixinServerLevel.java index 5247c4df5..a475b61a6 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/events/MixinServerLevel.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/events/MixinServerLevel.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinChunkGenerator.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinChunkGenerator.java index fee2cb5f2..e0d28ec86 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinChunkGenerator.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinChunkGenerator.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinChunkMap.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinChunkMap.java index 6ac075501..d74c74bdb 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinChunkMap.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinChunkMap.java @@ -32,8 +32,8 @@ public class MixinChunkMap private void onChunkSave(ChunkAccess chunk, CallbackInfoReturnable ci) { // corrupt/incomplete chunk validation - #if MC_1_18_2 - // MC 1.18.2 has the tendency to try saving incomplete or corrupted chunks (which show up as empty or black chunks) + #if MC_1_18_2 || MC_1_19_2 || MC_1_19_4 || MC_1_20_1 + // MC has a tendency to try saving incomplete or corrupted chunks (which show up as empty or black chunks) // this should prevent that from happening if (chunk.isUnsaved() || chunk.isUpgrading() || !chunk.isLightCorrect()) { diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinUtilBackgroundThread.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinUtilBackgroundThread.java index 1302a7568..6e58f36af 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinUtilBackgroundThread.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinUtilBackgroundThread.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/unsafe/MixinThreadingDetector.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/unsafe/MixinThreadingDetector.java index b5417464f..b6027388f 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/unsafe/MixinThreadingDetector.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/unsafe/MixinThreadingDetector.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/FabricDependencySetup.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/FabricDependencySetup.java index 378aa57dd..13eb0b7eb 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/FabricDependencySetup.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/FabricDependencySetup.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/config/ModMenuIntegration.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/config/ModMenuIntegration.java index b68352015..2d809c45d 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/config/ModMenuIntegration.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/config/ModMenuIntegration.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/ModChecker.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/ModChecker.java index 5b205c5fb..1e4d15622 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/ModChecker.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/ModChecker.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/OptifineAccessor.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/OptifineAccessor.java index 38aa2f669..1134dab26 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/OptifineAccessor.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/OptifineAccessor.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java index aa14661b1..72289277a 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/StarlightAccessor.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/StarlightAccessor.java index c10ff9685..9bf619833 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/StarlightAccessor.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/StarlightAccessor.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 9a1e3fab2..f311a65bd 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -54,5 +54,7 @@ "suggests": { "blendium": "*" - } + }, + + "breaks": $fabric_incompatibility_list } diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java index 8beb6456f..8732fbcdb 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java index baa785c26..5f76cf7cb 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinFogRenderer.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinFogRenderer.java index 115cdef8d..5e1d20f92 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinFogRenderer.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinFogRenderer.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -20,6 +20,8 @@ package com.seibel.distanthorizons.forge.mixins.client; import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -66,6 +68,7 @@ public class MixinFogRenderer Entity entity = camera.getEntity(); boolean isSpecialFog = (entity instanceof LivingEntity) && ((LivingEntity) entity).hasEffect(MobEffects.BLINDNESS); if (!isSpecialFog && cameraNotInFluid && fogMode == FogMode.FOG_TERRAIN + && !SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class).playerHasBlindingEffect() && Config.Client.Advanced.Graphics.Fog.disableVanillaFog.get()) { #if PRE_MC_1_17_1 diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java index fa7f92fed..fb2f176e0 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java index debe53f16..91c270201 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java @@ -23,15 +23,23 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Minecraft.class) public class MixinMinecraft { + #if PRE_MC_1_20 @Redirect( method = "(Lnet/minecraft/client/main/GameConfig;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;setScreen(Lnet/minecraft/client/gui/screens/Screen;)V") ) public void onOpenScreen(Minecraft instance, Screen guiScreen) { - if (!Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get()) + #else + @Redirect( + method = "Lnet/minecraft/client/Minecraft;setInitialScreen(Lcom/mojang/realmsclient/client/RealmsClient;Lnet/minecraft/server/packs/resources/ReloadInstance;Lnet/minecraft/client/main/GameConfig$QuickPlayData;)V", + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;setScreen(Lnet/minecraft/client/gui/screens/Screen;)V") + ) + public void onOpenScreen(Minecraft instance, Screen guiScreen) + { + #endif + if (!Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get()) // Don't do anything if the user doesn't want it { - // Don't do anything if the user doesn't want it instance.setScreen(guiScreen); // Sets the screen back to the vanilla screen as if nothing ever happened return; } diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinOptionsScreen.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinOptionsScreen.java index 01624f94f..af33b5db0 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinOptionsScreen.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinOptionsScreen.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinChunkGenerator.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinChunkGenerator.java index 62c96bd93..5b15692ce 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinChunkGenerator.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinChunkGenerator.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinUtilBackgroundThread.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinUtilBackgroundThread.java index 168e156ad..59904ca04 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinUtilBackgroundThread.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinUtilBackgroundThread.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/unsafe/MixinThreadingDetector.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/unsafe/MixinThreadingDetector.java index 196a56b38..d692a4c49 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/unsafe/MixinThreadingDetector.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/unsafe/MixinThreadingDetector.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/ForgeDependencySetup.java b/forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/ForgeDependencySetup.java index ffa1066d4..5008ee6c0 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/ForgeDependencySetup.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/ForgeDependencySetup.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/ModChecker.java b/forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/ModChecker.java index c987db43d..4475c6900 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/ModChecker.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/ModChecker.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/OptifineAccessor.java b/forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/OptifineAccessor.java index 89aed2fa1..13b6688be 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/OptifineAccessor.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/OptifineAccessor.java @@ -1,8 +1,8 @@ /* - * This file is part of the Distant Horizons mod (formerly the LOD Mod), + * This file is part of the Distant Horizons mod * licensed under the GNU LGPL v3 License. * - * Copyright (C) 2020-2022 James Seibel + * Copyright (C) 2020-2023 James Seibel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/license_header.txt b/license_header.txt index ef1aaa7ee..a66b66e6d 100644 Binary files a/license_header.txt and b/license_header.txt differ diff --git a/versionProperties/1.16.5.properties b/versionProperties/1.16.5.properties index 662db3e66..c3683be84 100644 --- a/versionProperties/1.16.5.properties +++ b/versionProperties/1.16.5.properties @@ -20,6 +20,8 @@ fabric_api_version=0.42.0+1.16 immersive_portals_version= canvas_version= + fabric_incompatibility_list={ } + # Fabric mod run # 0 = Don't enable and don't run # 1 = Can be referenced in code but doesn't run diff --git a/versionProperties/1.17.1.properties b/versionProperties/1.17.1.properties index 42f12deae..80aab1901 100644 --- a/versionProperties/1.17.1.properties +++ b/versionProperties/1.17.1.properties @@ -20,6 +20,8 @@ fabric_api_version=0.46.1+1.17 immersive_portals_version= canvas_version= + fabric_incompatibility_list={ } + # Fabric mod run # 0 = Don't enable and don't run # 1 = Can be referenced in code but doesn't run diff --git a/versionProperties/1.18.2.properties b/versionProperties/1.18.2.properties index 4392118ae..62c33f7aa 100644 --- a/versionProperties/1.18.2.properties +++ b/versionProperties/1.18.2.properties @@ -21,6 +21,8 @@ fabric_api_version=0.76.0+1.18.2 immersive_portals_version=v1.4.11-1.18 canvas_version=mc118:1.0.2616 + fabric_incompatibility_list={ } + # Fabric mod run # 0 = Don't enable and don't run # 1 = Can be referenced in code but doesn't run diff --git a/versionProperties/1.19.2.properties b/versionProperties/1.19.2.properties index 8807dcf7a..cdde6a134 100644 --- a/versionProperties/1.19.2.properties +++ b/versionProperties/1.19.2.properties @@ -20,6 +20,8 @@ fabric_api_version=0.76.0+1.19.2 immersive_portals_version= canvas_version=mc119-1.0.2480 + fabric_incompatibility_list={ } + # Fabric mod run # 0 = Don't enable and don't run # 1 = Can be referenced in code but doesn't run diff --git a/versionProperties/1.19.4.properties b/versionProperties/1.19.4.properties index 7ecad56ea..2783daeab 100644 --- a/versionProperties/1.19.4.properties +++ b/versionProperties/1.19.4.properties @@ -19,6 +19,8 @@ fabric_api_version=0.83.0+1.19.4 bclib_version=2.3.3 immersive_portals_version= canvas_version= + + fabric_incompatibility_list={ } # Fabric mod run # 0 = Don't enable and don't run diff --git a/versionProperties/1.20.1.properties b/versionProperties/1.20.1.properties index caf958bab..828da4203 100644 --- a/versionProperties/1.20.1.properties +++ b/versionProperties/1.20.1.properties @@ -19,7 +19,9 @@ fabric_api_version=0.85.0+1.20.1 bclib_version=3.0.12 immersive_portals_version= canvas_version= - + + fabric_incompatibility_list={ "sodium": "<0.5.0" } + # Fabric mod run # 0 = Don't enable and don't run # 1 = Can be referenced in code but doesn't run