From 9af71ac0ea1e46c7cd18f812f91aa05943ec53c0 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 6 Apr 2024 10:06:09 -0500 Subject: [PATCH] Fix API enums missing "DhApi" prefix and remove unused Enums/code --- .../common/wrappers/gui/ClassicConfigGUI.java | 4 ++-- .../common/wrappers/gui/updater/UpdateModScreen.java | 8 ++------ .../common/wrappers/minecraft/MinecraftClientWrapper.java | 4 ++-- coreSubProjects | 2 +- .../fabric/mixins/client/MixinMinecraft.java | 5 ++--- .../forge/mixins/client/MixinMinecraft.java | 5 ++--- .../neoforge/mixins/client/MixinMinecraft.java | 4 ++-- 7 files changed, 13 insertions(+), 19 deletions(-) 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 7577120fb..5ee0bab21 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 @@ -16,7 +16,7 @@ import java.util.regex.Pattern; // Logger (for debug stuff) import com.seibel.distanthorizons.api.enums.config.DisallowSelectingViaConfigGui; -import com.seibel.distanthorizons.api.enums.config.EUpdateBranch; +import com.seibel.distanthorizons.api.enums.config.EDhApiUpdateBranch; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.config.ConfigBase; import com.seibel.distanthorizons.core.config.types.*; @@ -244,7 +244,7 @@ public class ClassicConfigGUI } // Changelog button - if (Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get() && Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE) + if (Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get() && Config.Client.Advanced.AutoUpdater.updateBranch.get() == EDhApiUpdateBranch.STABLE) { this.addBtn(new TexturedButtonWidget( // Where the button is on the screen 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 1662849bd..0af31a6a1 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 @@ -1,23 +1,19 @@ package com.seibel.distanthorizons.common.wrappers.gui.updater; -import com.mojang.blaze3d.platform.NativeImage; -import com.seibel.distanthorizons.api.enums.config.EUpdateBranch; +import com.seibel.distanthorizons.api.enums.config.EDhApiUpdateBranch; import com.seibel.distanthorizons.common.wrappers.gui.DhScreen; import com.seibel.distanthorizons.common.wrappers.gui.TexturedButtonWidget; import com.seibel.distanthorizons.core.jar.ModJarInfo; import com.seibel.distanthorizons.coreapi.ModInfo; import com.seibel.distanthorizons.core.config.Config; -import com.seibel.distanthorizons.core.jar.JarUtils; import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter; import com.seibel.distanthorizons.core.jar.updater.SelfUpdater; -import net.minecraft.client.Minecraft; #if MC_VER >= MC_1_20_1 import net.minecraft.client.gui.GuiGraphics; #else import com.mojang.blaze3d.vertex.PoseStack; #endif import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.renderer.texture.DynamicTexture; import net.minecraft.resources.ResourceLocation; import static com.seibel.distanthorizons.common.wrappers.gui.GuiHelper.*; @@ -92,7 +88,7 @@ public class UpdateModScreen extends DhScreen e.printStackTrace(); } - if (Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE) + if (Config.Client.Advanced.AutoUpdater.updateBranch.get() == EDhApiUpdateBranch.STABLE) { this.addBtn(new TexturedButtonWidget( // Where the button is on the screen 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 ba52253ae..e7df9f1bc 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 @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.UUID; import com.mojang.blaze3d.platform.NativeImage; -import com.seibel.distanthorizons.api.enums.config.ELodShading; +import com.seibel.distanthorizons.api.enums.config.EDhApiLodShading; import com.seibel.distanthorizons.common.wrappers.McObjectConverter; import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper; import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper; @@ -113,7 +113,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra @Override public float getShade(EDhDirection lodDirection) { - ELodShading lodShading = Config.Client.Advanced.Graphics.AdvancedGraphics.lodShading.get(); + EDhApiLodShading lodShading = Config.Client.Advanced.Graphics.AdvancedGraphics.lodShading.get(); switch (lodShading) { default: diff --git a/coreSubProjects b/coreSubProjects index f09818e56..b4b7738aa 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit f09818e564da8d17cb858172469949af9a4356e9 +Subproject commit b4b7738aa64e23a0282994a3c9e7558766a8b40e 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 3e7e1c12b..388c0f201 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 @@ -1,6 +1,6 @@ package com.seibel.distanthorizons.fabric.mixins.client; -import com.seibel.distanthorizons.api.enums.config.EUpdateBranch; +import com.seibel.distanthorizons.api.enums.config.EDhApiUpdateBranch; import com.seibel.distanthorizons.common.wrappers.gui.updater.UpdateModScreen; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; @@ -9,7 +9,6 @@ import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter; import com.seibel.distanthorizons.core.jar.updater.SelfUpdater; import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.TitleScreen; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -77,7 +76,7 @@ public class MixinMinecraft Minecraft.getInstance().setScreen(new UpdateModScreen( // TODO: Change to runnable, instead of tittle screen new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons - (Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()) : GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha")) + (Config.Client.Advanced.AutoUpdater.updateBranch.get() == EDhApiUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()) : GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha")) )); }; } 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 b8c25e6e1..bcf833e3e 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 @@ -1,6 +1,6 @@ package com.seibel.distanthorizons.forge.mixins.client; -import com.seibel.distanthorizons.api.enums.config.EUpdateBranch; +import com.seibel.distanthorizons.api.enums.config.EDhApiUpdateBranch; import com.seibel.distanthorizons.common.wrappers.gui.updater.UpdateModScreen; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; @@ -9,7 +9,6 @@ import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter; import com.seibel.distanthorizons.core.jar.updater.SelfUpdater; import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.TitleScreen; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -77,7 +76,7 @@ public class MixinMinecraft Minecraft.getInstance().setScreen(new UpdateModScreen( // TODO: Change to runnable, instead of tittle screen new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons - (Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()) : GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha")) + (Config.Client.Advanced.AutoUpdater.updateBranch.get() == EDhApiUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()) : GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha")) )); }; } diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinMinecraft.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinMinecraft.java index 9ad50c0dd..b9a266764 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinMinecraft.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinMinecraft.java @@ -1,6 +1,6 @@ package com.seibel.distanthorizons.neoforge.mixins.client; -import com.seibel.distanthorizons.api.enums.config.EUpdateBranch; +import com.seibel.distanthorizons.api.enums.config.EDhApiUpdateBranch; import com.seibel.distanthorizons.common.wrappers.gui.updater.UpdateModScreen; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; @@ -76,7 +76,7 @@ public class MixinMinecraft Minecraft.getInstance().setScreen(new UpdateModScreen( // TODO: Change to runnable, instead of tittle screen new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons - (Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()) : GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha")) + (Config.Client.Advanced.AutoUpdater.updateBranch.get() == EDhApiUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()) : GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha")) )); }; }