diff --git a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java index 84209c5d8..0aeef0f8a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -65,7 +65,6 @@ public final class DebugHandler { if(Screen.hasControlDown() && Screen.hasShiftDown()) { event.getLeft().add(PREFIX + "Config Context"); event.getLeft().add(" shaders.enabled: " + ConfigHandler.CLIENT.useShaders.get()); - event.getLeft().add(" shaders.secondaryUnit: " + ConfigHandler.CLIENT.glSecondaryTextureUnit.get()); GLCapabilities caps = GL.getCapabilities(); event.getLeft().add(PREFIX + "OpenGL Context"); diff --git a/src/main/java/vazkii/botania/client/core/handler/SplashHandler.java b/src/main/java/vazkii/botania/client/core/handler/SplashHandler.java index 37b02d9bd..ec5742866 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SplashHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SplashHandler.java @@ -16,6 +16,7 @@ import net.minecraft.client.util.Splashes; import net.minecraft.profiler.IProfiler; import net.minecraft.resources.IResourceManager; import net.minecraft.resources.SimpleReloadableResourceManager; +import net.minecraft.util.Unit; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.ParticleFactoryRegisterEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -25,7 +26,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.Collections; import java.util.List; @Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) @@ -38,15 +38,15 @@ public class SplashHandler { ((SimpleReloadableResourceManager) Minecraft.getInstance().getResourceManager()).addReloadListener(new SplashResourceListener()); } - private static class SplashResourceListener extends ReloadListener> { + private static class SplashResourceListener extends ReloadListener { @Override @Nonnull - protected List prepare(IResourceManager resourceManagerIn, IProfiler profilerIn) { - return Collections.emptyList(); + protected Unit prepare(@Nonnull IResourceManager resourceManager, @Nonnull IProfiler profiler) { + return Unit.INSTANCE; } @Override - protected void apply(List list, IResourceManager resourceManagerIn, IProfiler profilerIn) { + protected void apply(@Nonnull Unit unused, @Nonnull IResourceManager resourceManager, @Nonnull IProfiler profiler) { if (!ConfigHandler.CLIENT.splashesEnabled.get()) return; diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 00f70bb3f..9867d92ee 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -32,7 +32,6 @@ public final class ConfigHandler { public final ForgeConfigSpec.BooleanValue enableFancySkyboxInNormalWorlds; public final ForgeConfigSpec.IntValue manaBarHeight; - public final ForgeConfigSpec.IntValue glSecondaryTextureUnit; public final ForgeConfigSpec.BooleanValue staticFloaters; public final ForgeConfigSpec.BooleanValue debugInfo; @@ -85,9 +84,6 @@ public final class ConfigHandler { manaBarHeight = builder .comment("The height of the mana display bar in above the XP bar. You can change this if you have a mod that changes where the XP bar is.") .defineInRange("hud.mana_bar.height", 29, 0, Integer.MAX_VALUE); - glSecondaryTextureUnit = builder - .comment("The GL Texture Unit to use for the secondary sampler passed in to the Lexica Botania's category button shader. DO NOT TOUCH THIS IF YOU DON'T KNOW WHAT YOU'RE DOING") - .defineInRange("shaders.secondary_unit", 7, 0, Integer.MAX_VALUE); staticFloaters = builder .comment("Set this to true if you use lots of floating flowers and are experiencing rendering lag. Will disable the floating flowers' animations and render them statically for a major performance boost. Hit F3+A in-world after toggling this.") .define("static_floaters", false);