diff --git a/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java b/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java index f47df7dfb..2a4cbb360 100644 --- a/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java +++ b/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java @@ -1,17 +1,11 @@ package com.gtnewhorizons.angelica; -import com.gtnewhorizons.angelica.common.BlockError; -import com.gtnewhorizons.angelica.compat.ModStatus; -import com.gtnewhorizons.angelica.config.ConfigMigrator; import com.gtnewhorizons.angelica.proxy.CommonProxy; -import com.gtnewhorizons.angelica.utils.AnimationMode; -import com.gtnewhorizons.angelica.utils.ManagedEnum; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -32,32 +26,19 @@ import static com.gtnewhorizons.angelica.AngelicaMod.MOD_ID; acceptableRemoteVersions = "*", guiFactory = "com.gtnewhorizons.angelica.config.AngelicaGuiConfigFactory") public class AngelicaMod { + public static final String MOD_ID = "angelica"; public static final Logger LOGGER = LogManager.getLogger("Angelica"); + public static final boolean lwjglDebug = Boolean.getBoolean("org.lwjgl.util.Debug"); - private static SodiumGameOptions CONFIG; - - public static SodiumGameOptions options() { - if (CONFIG == null) { - CONFIG = SodiumGameOptions.load(ConfigMigrator.handleConfigMigration("angelica-options.json")); - } - return CONFIG; - } - - @SidedProxy(clientSide = "com.gtnewhorizons.angelica.proxy.ClientProxy", serverSide = "com.gtnewhorizons.angelica.proxy.CommonProxy") + @SidedProxy( + clientSide = "com.gtnewhorizons.angelica.proxy.ClientProxy", + serverSide = "com.gtnewhorizons.angelica.proxy.CommonProxy") public static CommonProxy proxy; - public static final boolean lwjglDebug = Boolean.parseBoolean(System.getProperty("org.lwjgl.util.Debug", "false")); - - public static final ManagedEnum animationsMode = new ManagedEnum<>(AnimationMode.VISIBLE_ONLY); - - public static BlockError blockError; - @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { - ModStatus.preInit(); proxy.preInit(event); - blockError = new BlockError(); } @Mod.EventHandler diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/bettercrashes/BetterCrashesCompat.java b/src/main/java/com/gtnewhorizons/angelica/compat/bettercrashes/BetterCrashesCompat.java index a5e5cec00..c47fbf87b 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/bettercrashes/BetterCrashesCompat.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/bettercrashes/BetterCrashesCompat.java @@ -1,34 +1,33 @@ package com.gtnewhorizons.angelica.compat.bettercrashes; +import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.mixins.interfaces.IRenderGlobalExt; import cpw.mods.fml.common.Optional; import net.minecraft.client.Minecraft; import vfyjxf.bettercrashes.utils.StateManager; -import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER; - @Optional.Interface(modid = "angelica", iface = "vfyjxf.bettercrashes.utils.StateManager.IResettable") public class BetterCrashesCompat implements StateManager.IResettable { + private static BetterCrashesCompat INSTANCE; + public BetterCrashesCompat() { + AngelicaMod.LOGGER.info("BetterCrashesCompat initialized"); + this.register(); + } + public static void init() { if (INSTANCE == null) { INSTANCE = new BetterCrashesCompat(); } } - - public BetterCrashesCompat() { - LOGGER.info("BetterCrashesCompat initialized"); - this.register(); - } - @Override public void resetState() { - LOGGER.info("Reloading SodiumRenderer"); + AngelicaMod.LOGGER.info("Reloading SodiumRenderer"); ((IRenderGlobalExt) Minecraft.getMinecraft().renderGlobal).angelica$reload(); - LOGGER.info("Resetting GLStateManager"); + AngelicaMod.LOGGER.info("Resetting GLStateManager"); GLStateManager.reset(); } } diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaClientTweaker.java b/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaClientTweaker.java new file mode 100644 index 000000000..289d29184 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaClientTweaker.java @@ -0,0 +1,226 @@ +package com.gtnewhorizons.angelica.loading; + +import com.gtnewhorizon.gtnhlib.config.ConfigException; +import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; +import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader; +import com.gtnewhorizon.gtnhmixins.builders.IMixins; +import com.gtnewhorizon.gtnhmixins.builders.ITransformers; +import com.gtnewhorizons.angelica.config.AngelicaConfig; +import com.gtnewhorizons.angelica.config.CompatConfig; +import com.gtnewhorizons.angelica.config.FontConfig; +import com.gtnewhorizons.angelica.loading.fml.compat.CompatHandlers; +import com.gtnewhorizons.angelica.mixins.Mixins; +import com.gtnewhorizons.retrofuturabootstrap.SharedConfig; +import cpw.mods.fml.relauncher.FMLLaunchHandler; +import cpw.mods.fml.relauncher.IFMLLoadingPlugin; +import jss.notfine.asm.AsmTransformers; +import jss.notfine.asm.mappings.Namer; +import jss.notfine.config.MCPatcherForgeConfig; +import jss.notfine.config.NotFineConfig; +import net.minecraft.launchwrapper.Launch; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.LoggerContext; +import org.apache.logging.log4j.core.config.Configuration; +import org.apache.logging.log4j.core.config.LoggerConfig; +import org.spongepowered.asm.launch.GlobalProperties; +import org.spongepowered.asm.service.mojang.MixinServiceLaunchWrapper; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Set; + +// this is not the real IFMLLoadingPlugin, if you put any annotations +// here it won't do anything, that's why we register transformer +// exclusions manually in the constructor +public final class AngelicaClientTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader { + + public static final Logger LOGGER = LogManager.getLogger("Angelica"); + private static Boolean OBF_ENV; + private String[] transformerClasses; + + public AngelicaClientTweaker() { + Launch.classLoader.addTransformerExclusion("jss.notfine.asm"); + Launch.classLoader.addTransformerExclusion("com.gtnewhorizons.angelica.loading"); + Launch.classLoader.addTransformerExclusion("com.gtnewhorizons.angelica.glsm.GLStateManager"); + + if (Launch.blackboard.getOrDefault("angelica.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE) { + addLwjgl3ifyExclusions(); + } + + try { + // Angelica Config + ConfigurationManager.registerConfig(AngelicaConfig.class); + ConfigurationManager.registerConfig(CompatConfig.class); + ConfigurationManager.registerConfig(FontConfig.class); + MCPatcherForgeConfig.registerConfig(); + final LoggerContext ctx = (LoggerContext) LogManager.getContext(false); + final Configuration config = ctx.getConfiguration(); + final LoggerConfig loggerConfig = config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME); + if (AngelicaConfig.enableDebugLogging) { + loggerConfig.setLevel(Level.DEBUG); + } + ctx.updateLoggers(); + + // Debug features + AngelicaConfig.enableTestBlocks = Boolean.getBoolean("angelica.enableTestBlocks"); + + } catch (ConfigException e) { + throw new RuntimeException(e); + } + verifyDependencies(); + + // Register a scoped redirector early so classes prematurely loaded by other coremods during discovery/injectData + // (e.g. Mycelium using HookLoader.class.getName()) still get GL calls redirected to GLSM. Only targets specific mod + // packages to avoid interfering with mixin delegation on game classes. AngelicaLateTweaker removes this registration once + // mixins are setup. + if (FMLLaunchHandler.side().isClient()) { + final boolean rfbLoaded = Launch.blackboard.getOrDefault("angelica.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE; + if (!rfbLoaded) { + Launch.classLoader.registerTransformer("com.gtnewhorizons.angelica.loading.fml.transformers.EarlyRedirectorTransformer"); + } + } + } + + private static void addLwjgl3ifyExclusions() { + final var handle = SharedConfig.getRfbTransformers().stream() + .filter(transformer -> transformer.id().equals("lwjgl3ify:redirect")) + .findFirst() + .orElse(null); + if (handle != null) { + handle.exclusions().add("org.embeddedt.embeddium"); + handle.exclusions().add("org.taumc.celeritas"); + handle.exclusions().add("com.mitchej123.lwjgl.lwjgl3"); + handle.exclusions().add("com.mitchej123.glsm"); + handle.exclusions().add("com.gtnewhorizons.angelica.lwjgl3"); + handle.exclusions().add("com.gtnewhorizons.angelica.vulkan"); + } + } + + private static void verifyDependencies() { + // Check for fastutil (bundled with GTNHLib since 0.2.1) + if (AngelicaTweaker.class.getResource("/it/unimi/dsi/fastutil/ints/Int2ObjectMap.class") == null) { + throw new RuntimeException("Missing dependency: Angelica requires GTNHLib! Download: https://modrinth.com/mod/gtnhlib"); + } + + // Check for PrimitiveExtractor/cel.model classes (added in GTNHLib 0.8.21) + if (AngelicaTweaker.class.getResource("/com/gtnewhorizon/gtnhlib/client/renderer/PrimitiveExtractor.class") == null) { + throw new RuntimeException("GTNHLib is outdated: Angelica requires GTNHLib 0.8.21 or newer! Download: https://modrinth.com/mod/gtnhlib"); + } + + // Check for jvmdowngrader stubs (bundled with GTNHLib since 0.9.0) + if (AngelicaTweaker.class.getResource("/xyz/wagyourtail/jvmdg/exc/MissingStubError.class") == null) { + throw new RuntimeException("GTNHLib is outdated: Angelica requires GTNHLib 0.9.0 or newer! Download: https://modrinth.com/mod/gtnhlib"); + } + } + + @Override + public String[] getASMTransformerClass() { + if (transformerClasses == null) { + final List transformers = new ArrayList<>(); + transformers.addAll(CompatHandlers.getTransformers()); + // Add NotFine transformers + final List notFineTransformers = Arrays.asList(ITransformers.getTransformers(AsmTransformers.class)); + if (!notFineTransformers.isEmpty()) Namer.initNames(); + transformers.addAll(notFineTransformers); + transformerClasses = transformers.toArray(new String[0]); + } + return transformerClasses; + } + + @Override + public String getModContainerClass() { + return null; + } + + @Override + public String getSetupClass() { + return null; + } + + @Override + public void injectData(Map data) { + OBF_ENV = (Boolean) data.get("runtimeDeobfuscationEnabled"); + // Directly add this to the MixinServiceLaunchWrapper tweaker's list of Tweak Classes + final List tweaks = GlobalProperties.get(MixinServiceLaunchWrapper.BLACKBOARD_KEY_TWEAKCLASSES); + if (tweaks != null) { + // Bridge transformer compat config to blackboard for AngelicaLateTweaker + narrowTransformerConfig("DragonAPI", AngelicaConfig.transformerCompat.narrowDragonAPI); + narrowTransformerConfig("Xaeros", AngelicaConfig.transformerCompat.narrowXaeros); + narrowTransformerConfig("AdvancedLightsabers", AngelicaConfig.transformerCompat.narrowAdvancedLightsabers); + narrowTransformerConfig("Alfheim", AngelicaConfig.transformerCompat.narrowAlfheim); + + tweaks.add("com.gtnewhorizons.angelica.loading.fml.tweakers.IncompatibleModsDisablerTweaker"); + if (AngelicaConfig.enableHudCaching) { + tweaks.add("com.gtnewhorizons.angelica.loading.fml.tweakers.XaerosTransformerDisablerTweaker"); + } + if (FMLLaunchHandler.side().isClient()) { + // We register ITweakers that will run last in order to register + // specific IClassTransformers that will run last in the transformer chain. + // If we were to register them normally in getASMTransformerClass(), + // they would be sorted at index 0 which we do not want. + final boolean rfbLoaded = Launch.blackboard.getOrDefault("angelica.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE; + if (!rfbLoaded) { + tweaks.add("com.gtnewhorizons.angelica.loading.fml.tweakers.AngelicaLateTweaker"); + if (AngelicaConfig.enableCeleritas) { + tweaks.add("com.gtnewhorizons.angelica.loading.fml.tweakers.CeleritasLateTweaker"); + } + } + } + } + } + + /** Publish a transformer-narrowing toggle to the blackboard; read by AngelicaLateTweaker.narrowEnabled(). */ + private static void narrowTransformerConfig(String mod, boolean enabled) { + Launch.blackboard.put("angelica.narrow." + mod, enabled); + } + + @Override + public String getAccessTransformerClass() { + return null; + } + + @Override + public String getMixinConfig() { + final int v = Runtime.version().feature(); + if (v >= 21) return "mixins.angelica.early.j21.json"; + if (v >= 17) return "mixins.angelica.early.j17.json"; + return "mixins.angelica.early.json"; + } + + @Override + public List getMixins(Set loadedCoreMods) { + NotFineConfig.loadSettings(); + //This may be possible to handle differently or fix. + if (loadedCoreMods.contains("cofh.asm.LoadingPlugin")) { + MCPatcherForgeConfig.ExtendedHD.hdFont = false; + } + return IMixins.getEarlyMixins(Mixins.class, loadedCoreMods); + } + + /** + * Returns true if we are in an obfuscated environment, returns false in dev environment. + */ + public static boolean isObfEnv() { + if (OBF_ENV == null) { + throw new IllegalStateException("Obfuscation state has been accessed too early!"); + } + return OBF_ENV; + } + + /** + * Returns the appropriate name according to current environment's obfuscation + */ + public static String obf(String deobf, String obf) { + if (OBF_ENV == null) { + throw new IllegalStateException("Obfuscation state has been accessed too early!"); + } + if (OBF_ENV) { + return obf; + } + return deobf; + } +} diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java b/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java index 5b8811c56..9c2d0033a 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java @@ -1,34 +1,12 @@ package com.gtnewhorizons.angelica.loading; -import com.gtnewhorizon.gtnhlib.config.ConfigException; -import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader; -import com.gtnewhorizon.gtnhmixins.builders.IMixins; -import com.gtnewhorizon.gtnhmixins.builders.ITransformers; -import com.gtnewhorizons.angelica.config.AngelicaConfig; -import com.gtnewhorizons.angelica.config.CompatConfig; -import com.gtnewhorizons.angelica.config.FontConfig; -import com.gtnewhorizons.angelica.mixins.Mixins; -import com.gtnewhorizons.angelica.loading.fml.compat.CompatHandlers; import cpw.mods.fml.relauncher.FMLLaunchHandler; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; -import jss.notfine.asm.AsmTransformers; -import jss.notfine.asm.mappings.Namer; -import jss.notfine.config.MCPatcherForgeConfig; -import jss.notfine.config.NotFineConfig; -import com.gtnewhorizons.retrofuturabootstrap.SharedConfig; -import net.minecraft.launchwrapper.Launch; -import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.LoggerContext; -import org.apache.logging.log4j.core.config.Configuration; -import org.apache.logging.log4j.core.config.LoggerConfig; -import org.spongepowered.asm.launch.GlobalProperties; -import org.spongepowered.asm.service.mojang.MixinServiceLaunchWrapper; -import java.util.ArrayList; -import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; @@ -41,195 +19,76 @@ import java.util.Set; // They will instead use default index 0 which means they will see // obfuscated mappings and not SRG mappings when running outside of dev env. // =============================================== -//@IFMLLoadingPlugin.SortingIndex(Integer.MAX_VALUE - 5) @IFMLLoadingPlugin.MCVersion("1.7.10") -@IFMLLoadingPlugin.TransformerExclusions({ - "jss.notfine.asm", - "com.gtnewhorizons.angelica.loading", - "com.gtnewhorizons.angelica.glsm.GLStateManager" -}) public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader { - private static Boolean OBF_ENV; - public static final Logger LOGGER = LogManager.getLogger("Angelica"); - - private String[] transformerClasses; + private final IFMLLoadingPlugin loadingPlugin; + private final IEarlyMixinLoader mixinLoader; public AngelicaTweaker() { - if (Launch.blackboard.getOrDefault("angelica.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE) { - addLwjgl3ifyExclusions(); - } - - try { - // Angelica Config - ConfigurationManager.registerConfig(AngelicaConfig.class); - ConfigurationManager.registerConfig(CompatConfig.class); - ConfigurationManager.registerConfig(FontConfig.class); - MCPatcherForgeConfig.registerConfig(); - final LoggerContext ctx = (LoggerContext) LogManager.getContext(false); - final Configuration config = ctx.getConfiguration(); - final LoggerConfig loggerConfig = config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME); - if (AngelicaConfig.enableDebugLogging) { - loggerConfig.setLevel(Level.DEBUG); - } - ctx.updateLoggers(); - - // Debug features - AngelicaConfig.enableTestBlocks = Boolean.getBoolean("angelica.enableTestBlocks"); - - } catch (ConfigException e) { - throw new RuntimeException(e); - } - verifyDependencies(); - - // Register a scoped redirector early so classes prematurely loaded by other coremods during discovery/injectData - // (e.g. Mycelium using HookLoader.class.getName()) still get GL calls redirected to GLSM. Only targets specific mod - // packages to avoid interfering with mixin delegation on game classes. AngelicaLateTweaker removes this registration once - // mixins are setup. if (FMLLaunchHandler.side().isClient()) { - final boolean rfbLoaded = Launch.blackboard.getOrDefault("angelica.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE; - if (!rfbLoaded) { - Launch.classLoader.registerTransformer("com.gtnewhorizons.angelica.loading.fml.transformers.EarlyRedirectorTransformer"); - } - } - } - - private static void verifyDependencies() { - // Check for fastutil (bundled with GTNHLib since 0.2.1) - if (AngelicaTweaker.class.getResource("/it/unimi/dsi/fastutil/ints/Int2ObjectMap.class") == null) { - throw new RuntimeException("Missing dependency: Angelica requires GTNHLib! Download: https://modrinth.com/mod/gtnhlib"); - } - - // Check for PrimitiveExtractor/cel.model classes (added in GTNHLib 0.8.21) - if (AngelicaTweaker.class.getResource("/com/gtnewhorizon/gtnhlib/client/renderer/PrimitiveExtractor.class") == null) { - throw new RuntimeException("GTNHLib is outdated: Angelica requires GTNHLib 0.8.21 or newer! Download: https://modrinth.com/mod/gtnhlib"); - } - - // Check for jvmdowngrader stubs (bundled with GTNHLib since 0.9.0) - if (AngelicaTweaker.class.getResource("/xyz/wagyourtail/jvmdg/exc/MissingStubError.class") == null) { - throw new RuntimeException("GTNHLib is outdated: Angelica requires GTNHLib 0.9.0 or newer! Download: https://modrinth.com/mod/gtnhlib"); + final AngelicaClientTweaker clientTweaker = new AngelicaClientTweaker(); + loadingPlugin = clientTweaker; + mixinLoader = clientTweaker; + } else { + loadingPlugin = null; + mixinLoader = null; + LogManager.getLogger("Angelica").info("Trying to get more FPS on your server ? :kekw:"); } } @Override public String[] getASMTransformerClass() { - if (transformerClasses == null) { - final List transformers = new ArrayList<>(); - transformers.addAll(CompatHandlers.getTransformers()); - // Add NotFine transformers - final List notFineTransformers = Arrays.asList(ITransformers.getTransformers(AsmTransformers.class)); - if (!notFineTransformers.isEmpty()) Namer.initNames(); - transformers.addAll(notFineTransformers); - transformerClasses = transformers.toArray(new String[0]); + if (this.loadingPlugin != null) { + return this.loadingPlugin.getASMTransformerClass(); } - return transformerClasses; + return null; } @Override public String getModContainerClass() { + if (this.loadingPlugin != null) { + return this.loadingPlugin.getModContainerClass(); + } return null; } @Override public String getSetupClass() { + if (this.loadingPlugin != null) { + return this.loadingPlugin.getSetupClass(); + } return null; } - /** Publish a transformer-narrowing toggle to the blackboard; read by AngelicaLateTweaker.narrowEnabled(). */ - private static void narrowTransformerConfig(String mod, boolean enabled) { - Launch.blackboard.put("angelica.narrow." + mod, enabled); - } - @Override public void injectData(Map data) { - OBF_ENV = (Boolean) data.get("runtimeDeobfuscationEnabled"); - // Directly add this to the MixinServiceLaunchWrapper tweaker's list of Tweak Classes - final List tweaks = GlobalProperties.get(MixinServiceLaunchWrapper.BLACKBOARD_KEY_TWEAKCLASSES); - if (tweaks != null) { - // Bridge transformer compat config to blackboard for AngelicaLateTweaker - narrowTransformerConfig("DragonAPI", AngelicaConfig.transformerCompat.narrowDragonAPI); - narrowTransformerConfig("Xaeros", AngelicaConfig.transformerCompat.narrowXaeros); - narrowTransformerConfig("AdvancedLightsabers", AngelicaConfig.transformerCompat.narrowAdvancedLightsabers); - narrowTransformerConfig("Alfheim", AngelicaConfig.transformerCompat.narrowAlfheim); - - tweaks.add("com.gtnewhorizons.angelica.loading.fml.tweakers.IncompatibleModsDisablerTweaker"); - if (AngelicaConfig.enableHudCaching) { - tweaks.add("com.gtnewhorizons.angelica.loading.fml.tweakers.XaerosTransformerDisablerTweaker"); - } - if (FMLLaunchHandler.side().isClient()) { - // We register ITweakers that will run last in order to register - // specific IClassTransformers that will run last in the transformer chain. - // If we were to register them normally in getASMTransformerClass(), - // they would be sorted at index 0 which we do not want. - final boolean rfbLoaded = Launch.blackboard.getOrDefault("angelica.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE; - if (!rfbLoaded) { - tweaks.add("com.gtnewhorizons.angelica.loading.fml.tweakers.AngelicaLateTweaker"); - if (AngelicaConfig.enableCeleritas) { - tweaks.add("com.gtnewhorizons.angelica.loading.fml.tweakers.CeleritasLateTweaker"); - } - } - } + if (this.loadingPlugin != null) { + this.loadingPlugin.injectData(data); } } @Override public String getAccessTransformerClass() { + if (this.loadingPlugin != null) { + return this.loadingPlugin.getAccessTransformerClass(); + } return null; } @Override public String getMixinConfig() { - final int v = Runtime.version().feature(); - if (v >= 21) return "mixins.angelica.early.j21.json"; - if (v >= 17) return "mixins.angelica.early.j17.json"; - return "mixins.angelica.early.json"; + if (this.mixinLoader != null) { + return this.mixinLoader.getMixinConfig(); + } + return "mixins.angelica.server.json"; } @Override public List getMixins(Set loadedCoreMods) { - NotFineConfig.loadSettings(); - //This may be possible to handle differently or fix. - if (loadedCoreMods.contains("cofh.asm.LoadingPlugin")) { - MCPatcherForgeConfig.ExtendedHD.hdFont = false; + if (this.mixinLoader != null) { + return this.mixinLoader.getMixins(loadedCoreMods); } - return IMixins.getEarlyMixins(Mixins.class, loadedCoreMods); - } - - private static void addLwjgl3ifyExclusions() { - final var handle = SharedConfig.getRfbTransformers().stream() - .filter(transformer -> transformer.id().equals("lwjgl3ify:redirect")) - .findFirst() - .orElse(null); - if (handle != null) { - handle.exclusions().add("org.embeddedt.embeddium"); - handle.exclusions().add("org.taumc.celeritas"); - handle.exclusions().add("com.mitchej123.lwjgl.lwjgl3"); - handle.exclusions().add("com.mitchej123.glsm"); - handle.exclusions().add("com.gtnewhorizons.angelica.lwjgl3"); - handle.exclusions().add("com.gtnewhorizons.angelica.vulkan"); - } - } - - /** - * Returns true if we are in an obfuscated environment, returns false in dev environment. - */ - public static boolean isObfEnv() { - if (OBF_ENV == null) { - throw new IllegalStateException("Obfuscation state has been accessed too early!"); - } - return OBF_ENV; - } - - /** - * Returns the appropriate name according to current environment's obfuscation - */ - public static String obf(String deobf, String obf) { - if (OBF_ENV == null) { - throw new IllegalStateException("Obfuscation state has been accessed too early!"); - } - if (OBF_ENV) { - return obf; - } - return deobf; + return Collections.emptyList(); } } diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/FieldLevelTessellatorTransformer.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/FieldLevelTessellatorTransformer.java index a5f976e11..e77aae824 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/FieldLevelTessellatorTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/FieldLevelTessellatorTransformer.java @@ -1,6 +1,6 @@ package com.gtnewhorizons.angelica.loading.fml.compat.transformers.generic; -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; +import com.gtnewhorizons.angelica.loading.AngelicaClientTweaker; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.tree.AbstractInsnNode; import org.spongepowered.asm.lib.tree.ClassNode; @@ -62,7 +62,7 @@ public class FieldLevelTessellatorTransformer { new FieldInsnNode( Opcodes.GETSTATIC, "net/minecraft/client/renderer/Tessellator", - AngelicaTweaker.obf("instance", "field_78398_a"), + AngelicaClientTweaker.obf("instance", "field_78398_a"), "Lnet/minecraft/client/renderer/Tessellator;")); list.add(new VarInsnNode(Opcodes.ASTORE, localIndex)); mn.instructions.insert(list); diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/HUDCachingEarlyReturnTransformer.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/HUDCachingEarlyReturnTransformer.java index 5ec9930f1..8d76ca630 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/HUDCachingEarlyReturnTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/HUDCachingEarlyReturnTransformer.java @@ -1,6 +1,6 @@ package com.gtnewhorizons.angelica.loading.fml.compat.transformers.generic; -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; +import com.gtnewhorizons.angelica.loading.AngelicaClientTweaker; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.lib.tree.InsnList; @@ -29,7 +29,7 @@ public class HUDCachingEarlyReturnTransformer { } else if (method.desc.endsWith("V")) { list.add(new InsnNode(Opcodes.RETURN)); } else { - AngelicaTweaker.LOGGER.warn( + AngelicaClientTweaker.LOGGER.warn( "HUDCaching Conditional Return - Unknown return type: {}#{}:{}", cn.name, method.name, method.desc ); return; diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/TileEntityNullGuardTransformer.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/TileEntityNullGuardTransformer.java index 25ae7f95d..699b0ade1 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/TileEntityNullGuardTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/TileEntityNullGuardTransformer.java @@ -1,6 +1,6 @@ package com.gtnewhorizons.angelica.loading.fml.compat.transformers.generic; -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; +import com.gtnewhorizons.angelica.loading.AngelicaClientTweaker; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.tree.AbstractInsnNode; import org.spongepowered.asm.lib.tree.ClassNode; @@ -59,7 +59,7 @@ public class TileEntityNullGuardTransformer { AbstractInsnNode in = mn.instructions.get(i); if (in instanceof MethodInsnNode min) { if (min.getOpcode() == Opcodes.INVOKEINTERFACE - && min.name.equals(AngelicaTweaker.obf("getTileEntity", "func_147438_o")) + && min.name.equals(AngelicaClientTweaker.obf("getTileEntity", "func_147438_o")) && min.owner.equals("net/minecraft/world/IBlockAccess")) { AbstractInsnNode castNodeAbstract = min.getNext(); if (castNodeAbstract instanceof TypeInsnNode castNodeType) { @@ -77,7 +77,7 @@ public class TileEntityNullGuardTransformer { } else if (mn.desc.endsWith("V")) { list.add(new InsnNode(Opcodes.RETURN)); } else { - AngelicaTweaker.LOGGER.warn("TileEntityNullGuard - Unknown Return Type: {}:{}", mn.name, mn.desc); + AngelicaClientTweaker.LOGGER.warn("TileEntityNullGuard - Unknown Return Type: {}:{}", mn.name, mn.desc); return; } list.add(exit); diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/specific/ImmersiveEngineeringTransformer.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/specific/ImmersiveEngineeringTransformer.java index 2cb99ec2b..2863df80d 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/specific/ImmersiveEngineeringTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/specific/ImmersiveEngineeringTransformer.java @@ -1,6 +1,6 @@ package com.gtnewhorizons.angelica.loading.fml.compat.transformers.specific; -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; +import com.gtnewhorizons.angelica.loading.AngelicaClientTweaker; import com.gtnewhorizons.angelica.loading.shared.AngelicaClassDump; import net.minecraft.launchwrapper.IClassTransformer; import org.spongepowered.asm.lib.ClassReader; @@ -60,7 +60,7 @@ public class ImmersiveEngineeringTransformer implements IClassTransformer { MixinClassWriter cw = new MixinClassWriter(MixinClassWriter.COMPUTE_FRAMES); cn.accept(cw); final byte[] bytes = cw.toByteArray(); - AngelicaTweaker.LOGGER.info("[AngelicaCompat]Extra Transformers: Applied ImmersiveEngineeringTransformer"); + AngelicaClientTweaker.LOGGER.info("[AngelicaCompat]Extra Transformers: Applied ImmersiveEngineeringTransformer"); AngelicaClassDump.dumpClass(transformedName, basicClass, bytes, this); return bytes; } diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/specific/StacksOnStacksTransformer.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/specific/StacksOnStacksTransformer.java index 8a2d62121..2cd18b000 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/specific/StacksOnStacksTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/specific/StacksOnStacksTransformer.java @@ -1,7 +1,7 @@ package com.gtnewhorizons.angelica.loading.fml.compat.transformers.specific; import com.google.common.collect.ImmutableList; -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; +import com.gtnewhorizons.angelica.loading.AngelicaClientTweaker; import com.gtnewhorizons.angelica.loading.shared.AngelicaClassDump; import net.minecraft.launchwrapper.IClassTransformer; import org.spongepowered.asm.lib.ClassReader; @@ -47,7 +47,7 @@ public class StacksOnStacksTransformer implements IClassTransformer { ClassWriter cw = new ClassWriter(0); cn.accept(cw); final byte[] bytes = cw.toByteArray(); - AngelicaTweaker.LOGGER.info("[AngelicaCompat]Extra Transformers: Applied StacksOnStacksTransformer"); + AngelicaClientTweaker.LOGGER.info("[AngelicaCompat]Extra Transformers: Applied StacksOnStacksTransformer"); AngelicaClassDump.dumpClass(transformedName, basicClass, bytes, this); return bytes; } diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/fml/transformers/CeleritasBlockTransformer.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/transformers/CeleritasBlockTransformer.java index 84845fc41..38c0e0e66 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/fml/transformers/CeleritasBlockTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/transformers/CeleritasBlockTransformer.java @@ -1,6 +1,6 @@ package com.gtnewhorizons.angelica.loading.fml.transformers; -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; +import com.gtnewhorizons.angelica.loading.AngelicaClientTweaker; import com.gtnewhorizons.angelica.loading.shared.AngelicaClassDump; import com.gtnewhorizons.angelica.loading.shared.transformers.CeleritasBlockTransform; import net.minecraft.launchwrapper.IClassTransformer; @@ -14,7 +14,7 @@ public class CeleritasBlockTransformer implements IClassTransformer { private final String[] exclusions; public CeleritasBlockTransformer() { - this.inner = new CeleritasBlockTransform(AngelicaTweaker.isObfEnv()); + this.inner = new CeleritasBlockTransform(AngelicaClientTweaker.isObfEnv()); this.exclusions = inner.getTransformerExclusions(); this.inner.setCeleritasSetting(); } diff --git a/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java b/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java index 1d7d7f8f7..f8c33b874 100644 --- a/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java +++ b/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java @@ -4,10 +4,12 @@ import com.google.common.base.Objects; import com.gtnewhorizon.gtnhlib.client.model.loading.ModelRegistry; import com.gtnewhorizon.gtnhlib.client.renderer.vao.VAOManager; import com.gtnewhorizons.angelica.commands.AngelicaCommand; +import com.gtnewhorizons.angelica.common.BlockError; import com.gtnewhorizons.angelica.compat.ModStatus; import com.gtnewhorizons.angelica.compat.bettercrashes.BetterCrashesCompat; import com.gtnewhorizons.angelica.config.AngelicaConfig; import com.gtnewhorizons.angelica.config.CompatConfig; +import com.gtnewhorizons.angelica.config.ConfigMigrator; import com.gtnewhorizons.angelica.debug.F3Direction; import com.gtnewhorizons.angelica.debug.FrametimeGraph; import com.gtnewhorizons.angelica.debug.TPSGraph; @@ -16,7 +18,7 @@ import com.gtnewhorizons.angelica.dynamiclights.config.EntityLightConfig; import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.hudcaching.HUDCaching; import com.gtnewhorizons.angelica.iris.IrisGLSMBridge; -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; +import com.gtnewhorizons.angelica.loading.AngelicaClientTweaker; import com.gtnewhorizons.angelica.mixins.interfaces.IGameSettingsExt; import com.gtnewhorizons.angelica.render.CloudRenderer; import com.gtnewhorizons.angelica.rendering.AngelicaBlockSafetyRegistry; @@ -25,6 +27,8 @@ import com.gtnewhorizons.angelica.rendering.celeritas.CeleritasSetup; import com.gtnewhorizons.angelica.rendering.celeritas.threading.ChunkTaskRegistry; import com.gtnewhorizons.angelica.rendering.celeritas.threading.DefaultChunkTaskProvider; import com.gtnewhorizons.angelica.rendering.celeritas.threading.ThreadedChunkTaskProvider; +import com.gtnewhorizons.angelica.utils.AnimationMode; +import com.gtnewhorizons.angelica.utils.ManagedEnum; import com.gtnewhorizons.angelica.zoom.Zoom; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -39,17 +43,15 @@ import jss.notfine.core.Settings; import jss.notfine.gui.GuiCustomMenu; import jss.notfine.gui.NotFineGameOptionPages; import me.flashyreese.mods.reeses_sodium_options.client.gui.ReeseSodiumVideoOptionsScreen; +import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions; import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI; import net.coderbot.iris.Iris; import net.coderbot.iris.client.IrisDebugScreenHandler; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiMainMenu; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiVideoSettings; -import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.server.integrated.IntegratedServer; import net.minecraft.util.Direction; @@ -65,29 +67,40 @@ import net.minecraftforge.client.event.GuiScreenEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.WorldEvent; -import org.lwjgl.input.Keyboard; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.lang.management.ManagementFactory; import java.util.Locale; import java.util.concurrent.ConcurrentHashMap; import static com.gtnewhorizons.angelica.AngelicaMod.MOD_ID; -import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER; -public class ClientProxy extends CommonProxy { +public final class ClientProxy extends CommonProxy { - final Minecraft mc = Minecraft.getMinecraft(); - final FrametimeGraph frametimeGraph = new FrametimeGraph(); - final TPSGraph tpsGraph = new TPSGraph(); + public static BlockError blockError; + public static final ManagedEnum animationsMode = new ManagedEnum<>(AnimationMode.VISIBLE_ONLY); + private static final Logger LOGGER = LogManager.getLogger("Angelica"); + private static SodiumGameOptions CONFIG; + private final Minecraft mc = Minecraft.getMinecraft(); + private final FrametimeGraph frametimeGraph = new FrametimeGraph(); + private final TPSGraph tpsGraph = new TPSGraph(); + + public static SodiumGameOptions options() { + if (CONFIG == null) { + CONFIG = SodiumGameOptions.load(ConfigMigrator.handleConfigMigration("angelica-options.json")); + } + return CONFIG; + } @Override public void preInit(FMLPreInitializationEvent event) { + ModStatus.preInit(); super.preInit(event); - FMLCommonHandler.instance().bus().register(this); MinecraftForge.EVENT_BUS.register(this); - ModelRegistry.registerModid(MOD_ID); + blockError = new BlockError(); } @SubscribeEvent @@ -138,7 +151,6 @@ public class ClientProxy extends CommonProxy { FMLCommonHandler.instance().bus().register(this); MinecraftForge.EVENT_BUS.register(this); - if (ModStatus.isBetterCrashesLoaded) { BetterCrashesCompat.init(); } @@ -150,7 +162,7 @@ public class ClientProxy extends CommonProxy { } // Register debug commands in dev environment only - if (!AngelicaTweaker.isObfEnv()) { + if (!AngelicaClientTweaker.isObfEnv()) { ClientCommandHandler.instance.registerCommand(new AngelicaCommand()); } } diff --git a/src/main/java/com/gtnewhorizons/angelica/proxy/CommonProxy.java b/src/main/java/com/gtnewhorizons/angelica/proxy/CommonProxy.java index 26ffe4dd8..b0a78e119 100644 --- a/src/main/java/com/gtnewhorizons/angelica/proxy/CommonProxy.java +++ b/src/main/java/com/gtnewhorizons/angelica/proxy/CommonProxy.java @@ -10,8 +10,7 @@ import cpw.mods.fml.common.registry.GameRegistry; public class CommonProxy { public void preInit(FMLPreInitializationEvent event) { - - if (AngelicaConfig.enableTestBlocks){ + if (AngelicaConfig.enableTestBlocks) { GameRegistry.registerBlock(new BlockTest(), "test_block"); } } diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuildContext.java b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuildContext.java index e988ead3e..fb05992a6 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuildContext.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuildContext.java @@ -1,11 +1,11 @@ package com.gtnewhorizons.angelica.rendering.celeritas; -import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.api.ExtQuadLightData; import com.gtnewhorizons.angelica.api.TintComputer; import com.gtnewhorizons.angelica.api.TintRegistry; import com.gtnewhorizons.angelica.dynamiclights.DynamicLights; import com.gtnewhorizons.angelica.dynamiclights.IDynamicLightSource; +import com.gtnewhorizons.angelica.proxy.ClientProxy; import com.gtnewhorizons.angelica.rendering.StateAwareTessellator; import com.gtnewhorizons.angelica.rendering.celeritas.iris.BlockRenderContext; import com.gtnewhorizons.angelica.rendering.celeritas.iris.IrisExtendedChunkVertexEncoder; @@ -99,7 +99,7 @@ public class AngelicaChunkBuildContext extends ChunkBuildContext { private Material selectMaterial(Material material, TextureAtlasSprite sprite, boolean isShaderPackOverride) { // Don't apply transparency-based optimization when shader pack explicitly overrides the material - if (!AngelicaMod.options().performance.useRenderPassOptimization || isShaderPackOverride) { + if (!ClientProxy.options().performance.useRenderPassOptimization || isShaderPackOverride) { return material; } if (sprite != null && sprite.getClass() == TextureAtlasSprite.class && !sprite.hasAnimationMetadata()) { @@ -129,7 +129,7 @@ public class AngelicaChunkBuildContext extends ChunkBuildContext { final boolean hasDynamicLights = chunkLightSources != null && !chunkLightSources.isEmpty(); final boolean separateAo = BlockRenderingSettings.INSTANCE.shouldUseSeparateAo(); - final boolean celeritasSmoothLighting = AngelicaMod.options().quality.useCeleritasSmoothLighting; + final boolean celeritasSmoothLighting = ClientProxy.options().quality.useCeleritasSmoothLighting; final boolean shaderActive = IrisApi.getInstance().isShaderPackInUse(); final boolean useAoCalculation = lightPipelineReady && (separateAo || celeritasSmoothLighting || shaderActive); final boolean shouldApplyDiffuse = !BlockRenderingSettings.INSTANCE.shouldDisableDirectionalShading(); diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkRenderer.java b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkRenderer.java index 7d4606124..9920a37a2 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkRenderer.java @@ -2,6 +2,7 @@ package com.gtnewhorizons.angelica.rendering.celeritas; import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.glsm.GLStateManager; +import com.gtnewhorizons.angelica.proxy.ClientProxy; import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProvider; import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProviderHolder; import me.jellysquid.mods.sodium.client.gui.options.named.MultiDrawMode; @@ -30,7 +31,7 @@ class AngelicaChunkRenderer extends DefaultChunkRenderer { } private static MultiDrawEmitter createEmitter() { - MultiDrawMode mode = AngelicaMod.options().advanced.multiDrawMode; + MultiDrawMode mode = ClientProxy.options().advanced.multiDrawMode; if (mode == MultiDrawMode.INDIRECT) { boolean supported = GLStateManager.capabilities != null && (GLStateManager.capabilities.OpenGL43 || GLStateManager.capabilities.GL_ARB_multi_draw_indirect); diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaRenderSectionManager.java b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaRenderSectionManager.java index dcd98f00f..5171d6794 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaRenderSectionManager.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaRenderSectionManager.java @@ -1,7 +1,7 @@ package com.gtnewhorizons.angelica.rendering.celeritas; -import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.mixins.interfaces.RenderSectionManagerAccessor; +import com.gtnewhorizons.angelica.proxy.ClientProxy; import com.gtnewhorizons.angelica.rendering.AngelicaRenderQueue; import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProviderHolder; import com.gtnewhorizons.angelica.rendering.celeritas.threading.ChunkTaskProvider; @@ -87,7 +87,7 @@ public class AngelicaRenderSectionManager extends RenderSectionManager { @Override protected AsyncOcclusionMode getAsyncOcclusionMode() { - return AngelicaMod.options().performance.asyncOcclusionMode; + return ClientProxy.options().performance.asyncOcclusionMode; } @Override @@ -97,7 +97,7 @@ public class AngelicaRenderSectionManager extends RenderSectionManager { @Override protected boolean useFogOcclusion() { - return AngelicaMod.options().performance.useFogOcclusion && !IrisShaderProviderHolder.isActive(); + return ClientProxy.options().performance.useFogOcclusion && !IrisShaderProviderHolder.isActive(); } @Override @@ -113,7 +113,7 @@ public class AngelicaRenderSectionManager extends RenderSectionManager { return false; } } - return AngelicaMod.options().performance.useOcclusionCulling; + return ClientProxy.options().performance.useOcclusionCulling; } @Override @@ -152,7 +152,7 @@ public class AngelicaRenderSectionManager extends RenderSectionManager { @Override protected boolean allowImportantRebuilds() { - return !AngelicaMod.options().performance.alwaysDeferChunkUpdates; + return !ClientProxy.options().performance.alwaysDeferChunkUpdates; } @Override diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/CeleritasSetup.java b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/CeleritasSetup.java index 3ce7a4374..ac05fd4e4 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/CeleritasSetup.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/CeleritasSetup.java @@ -2,9 +2,9 @@ package com.gtnewhorizons.angelica.rendering.celeritas; import com.gtnewhorizons.angelica.config.AngelicaConfig; import com.gtnewhorizons.angelica.glsm.GLStateManager; +import com.gtnewhorizons.angelica.loading.AngelicaClientTweaker; import org.embeddedt.embeddium.impl.gl.device.GLRenderDevice; import org.lwjgl.opengl.GL15; -import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER; public class CeleritasSetup { private static boolean initialized = false; @@ -12,7 +12,7 @@ public class CeleritasSetup { public static void ensureInitialized() { if (!initialized && AngelicaConfig.enableCeleritas) { GLRenderDevice.VANILLA_STATE_RESETTER = () -> GLStateManager.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0); - LOGGER.debug("Celeritas init"); + AngelicaClientTweaker.LOGGER.debug("Celeritas init"); initialized = true; } } diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/CeleritasWorldRenderer.java b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/CeleritasWorldRenderer.java index 4ed94a67d..a58ac63b7 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/CeleritasWorldRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/CeleritasWorldRenderer.java @@ -1,10 +1,10 @@ package com.gtnewhorizons.angelica.rendering.celeritas; -import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.dynamiclights.DynamicLights; import com.gtnewhorizons.angelica.dynamiclights.IDynamicLightWorldRenderer; import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.mixins.interfaces.ITileEntityBoundingBoxCache; +import com.gtnewhorizons.angelica.proxy.ClientProxy; import com.gtnewhorizons.angelica.rendering.RenderingState; import com.gtnewhorizons.angelica.rendering.TileEntityRenderBoundsRegistry; import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProvider; @@ -127,7 +127,7 @@ public class CeleritasWorldRenderer extends SimpleWorldRenderer { - AngelicaTweaker.LOGGER.warn("Unchecked node found: " + node1.getClass()); + AngelicaClientTweaker.LOGGER.warn("Unchecked node found: " + node1.getClass()); yield node1.toString() .equals(node2.toString()); } diff --git a/src/main/java/jss/notfine/asm/mappings/Namer.java b/src/main/java/jss/notfine/asm/mappings/Namer.java index 0e1f62196..b200f7f3e 100644 --- a/src/main/java/jss/notfine/asm/mappings/Namer.java +++ b/src/main/java/jss/notfine/asm/mappings/Namer.java @@ -1,10 +1,10 @@ package jss.notfine.asm.mappings; -import java.util.ArrayList; - -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; +import com.gtnewhorizons.angelica.loading.AngelicaClientTweaker; import net.minecraft.launchwrapper.Launch; +import java.util.ArrayList; + /** * This class und inherited classes are adapted from * { private final SodiumGameOptions options; public SodiumOptionsStorage() { - this.options = AngelicaMod.options(); + this.options = ClientProxy.options(); } @Override diff --git a/src/main/java/net/coderbot/iris/Iris.java b/src/main/java/net/coderbot/iris/Iris.java index a5405a803..2fc16447c 100644 --- a/src/main/java/net/coderbot/iris/Iris.java +++ b/src/main/java/net/coderbot/iris/Iris.java @@ -3,32 +3,30 @@ package net.coderbot.iris; import com.google.common.base.Throwables; import com.gtnewhorizon.gtnhlib.client.renderer.CapturingTessellator; import com.gtnewhorizon.gtnhlib.client.renderer.TessellatorManager; -import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.Tags; import com.gtnewhorizons.angelica.config.AngelicaConfig; +import com.gtnewhorizons.angelica.proxy.ClientProxy; +import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProviderHolder; import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent; import it.unimi.dsi.fastutil.ints.Int2IntMap; -import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Reference2ObjectMap; import lombok.Getter; +import net.coderbot.iris.block_context.BlockContextHolder; import net.coderbot.iris.block_rendering.BlockRenderingSettings; -import com.gtnewhorizons.angelica.config.AngelicaConfig; import net.coderbot.iris.celeritas.IrisCeleritasShaderProvider; -import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProviderHolder; import net.coderbot.iris.compat.dh.DHCompat; import net.coderbot.iris.config.IrisConfig; +import net.coderbot.iris.gbuffer_overrides.matching.InputAvailability; import net.coderbot.iris.gl.shader.StandardMacros; import net.coderbot.iris.gui.screen.ShaderPackScreen; import net.coderbot.iris.pipeline.DeferredWorldRenderingPipeline; -import net.coderbot.iris.pipeline.transform.ShaderTransformer; -import net.coderbot.iris.pipeline.transform.TransformPatcher; -import net.coderbot.iris.gbuffer_overrides.matching.InputAvailability; import net.coderbot.iris.pipeline.FixedFunctionWorldRenderingPipeline; import net.coderbot.iris.pipeline.PipelineManager; import net.coderbot.iris.pipeline.WorldRenderingPipeline; +import net.coderbot.iris.pipeline.transform.ShaderTransformer; +import net.coderbot.iris.pipeline.transform.TransformPatcher; import net.coderbot.iris.shaderpack.OptionalBoolean; import net.coderbot.iris.shaderpack.ProgramSet; import net.coderbot.iris.shaderpack.ShaderPack; @@ -37,7 +35,6 @@ import net.coderbot.iris.shaderpack.option.OptionSet; import net.coderbot.iris.shaderpack.option.Profile; import net.coderbot.iris.shaderpack.option.values.MutableOptionValues; import net.coderbot.iris.shaderpack.option.values.OptionValues; -import net.coderbot.iris.block_context.BlockContextHolder; import net.coderbot.iris.texture.pbr.PBRTextureManager; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -66,7 +63,6 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.Properties; -import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -74,6 +70,7 @@ import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ForkJoinWorkerThread; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; import java.util.stream.Stream; import java.util.zip.ZipError; @@ -357,7 +354,7 @@ public class Iris { final boolean released = !Keyboard.getEventKeyState(); if (Minecraft.getMinecraft().gameSettings.showDebugInfo && GuiScreen.isShiftKeyDown() && GuiScreen.isCtrlKeyDown() && released) { if (key == Keyboard.KEY_N) { - AngelicaMod.animationsMode.next(); + ClientProxy.animationsMode.next(); } } } @@ -482,11 +479,9 @@ public class Iris { // Attempt to load an external shaderpack if it is available final Optional externalName = irisConfig.getShaderPackName(); - if (!externalName.isPresent()) { + if (externalName.isEmpty()) { logger.info("Shaders are disabled because no valid shaderpack is selected"); - setShadersDisabled(); - return; } diff --git a/src/main/java/net/coderbot/iris/client/IrisDebugScreenHandler.java b/src/main/java/net/coderbot/iris/client/IrisDebugScreenHandler.java index de6e1b72c..b1ae1ed1d 100644 --- a/src/main/java/net/coderbot/iris/client/IrisDebugScreenHandler.java +++ b/src/main/java/net/coderbot/iris/client/IrisDebugScreenHandler.java @@ -1,7 +1,7 @@ package net.coderbot.iris.client; -import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.config.AngelicaConfig; +import com.gtnewhorizons.angelica.proxy.ClientProxy; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.coderbot.iris.Iris; @@ -47,7 +47,7 @@ public class IrisDebugScreenHandler { event.right.add("[" + Iris.MODNAME + "] Shaders are disabled"); } if (AngelicaConfig.speedupAnimations) { - event.right.add(Math.min(event.right.size(), 9), "animationsMode: " + AngelicaMod.animationsMode); + event.right.add(Math.min(event.right.size(), 9), "animationsMode: " + ClientProxy.animationsMode); } Iris.getPipelineManager().getPipeline().ifPresent(pipeline -> pipeline.addDebugText(event.left)); diff --git a/src/main/java/net/coderbot/iris/gui/screen/ShaderPackScreen.java b/src/main/java/net/coderbot/iris/gui/screen/ShaderPackScreen.java index e53ae6383..3c71b305f 100644 --- a/src/main/java/net/coderbot/iris/gui/screen/ShaderPackScreen.java +++ b/src/main/java/net/coderbot/iris/gui/screen/ShaderPackScreen.java @@ -1,7 +1,7 @@ package net.coderbot.iris.gui.screen; +import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.glsm.GLStateManager; -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; import net.coderbot.iris.Iris; import net.coderbot.iris.gui.GuiUtil; import net.coderbot.iris.gui.NavigationController; @@ -460,7 +460,7 @@ public class ShaderPackScreen extends GuiScreen implements HudHideable { } if (openViaSystemClass) { - AngelicaTweaker.LOGGER.debug("Opening via system class!"); + AngelicaMod.LOGGER.debug("Opening via system class!"); Sys.openURL("file://" + uri); } } diff --git a/src/main/resources/mixins.angelica.server.json b/src/main/resources/mixins.angelica.server.json new file mode 100644 index 000000000..e213fcc68 --- /dev/null +++ b/src/main/resources/mixins.angelica.server.json @@ -0,0 +1,8 @@ +{ + "required": true, + "minVersion": "0.8.3-GTNH", + "refmap": "mixins.angelica.refmap.json", + "target": "@env(DEFAULT)", + "compatibilityLevel": "JAVA_8" +} + diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinMinecraft.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinMinecraft.java index 833f08466..e73c7ba3b 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinMinecraft.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinMinecraft.java @@ -3,6 +3,7 @@ package com.gtnewhorizons.angelica.mixins.early.angelica; import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.client.rendering.TessellatorStreamingDrawer; import com.gtnewhorizons.angelica.mixins.interfaces.IGameSettingsExt; +import com.gtnewhorizons.angelica.proxy.ClientProxy; import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import net.minecraft.client.Minecraft; import net.minecraft.client.settings.GameSettings; @@ -108,7 +109,7 @@ public abstract class MixinMinecraft { @Inject(method = "runTick", at = @At("HEAD")) private void celeritas$renderAheadStartFrame(CallbackInfo ci) { - final int limit = AngelicaMod.options().performance.cpuRenderAheadLimit; + final int limit = ClientProxy.options().performance.cpuRenderAheadLimit; if (limit > 0) { celeritas$renderAheadManager.startFrame(limit); } @@ -116,7 +117,7 @@ public abstract class MixinMinecraft { @Inject(method = "runTick", at = @At("RETURN")) private void celeritas$renderAheadEndFrame(CallbackInfo ci) { - if (AngelicaMod.options().performance.cpuRenderAheadLimit > 0) { + if (ClientProxy.options().performance.cpuRenderAheadLimit > 0) { celeritas$renderAheadManager.endFrame(); } } diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/animation/MixinTextureMap.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/animation/MixinTextureMap.java index e2da8d2f3..ef60dc78c 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/animation/MixinTextureMap.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/animation/MixinTextureMap.java @@ -1,8 +1,8 @@ package com.gtnewhorizons.angelica.mixins.early.angelica.animation; -import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.mixins.interfaces.IPatchedTextureAtlasSprite; +import com.gtnewhorizons.angelica.proxy.ClientProxy; import com.gtnewhorizons.angelica.utils.AnimationMode; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.AbstractTexture; @@ -13,7 +13,6 @@ import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.Unique; import java.util.List; @@ -25,19 +24,16 @@ public abstract class MixinTextureMap extends AbstractTexture { @Final private List listAnimatedSprites; - @Unique - private static final Minecraft mc = Minecraft.getMinecraft(); - /** * @author laetansky, jss2a98aj * @reason Only update visible animations; use UV auto-marking via IPatchedTextureAtlasSprite */ @Overwrite public void updateAnimations() { - final boolean renderAll = AngelicaMod.animationsMode.is(AnimationMode.ALL); - final boolean renderVisible = AngelicaMod.animationsMode.is(AnimationMode.VISIBLE_ONLY); + final boolean renderAll = ClientProxy.animationsMode.is(AnimationMode.ALL); + final boolean renderVisible = ClientProxy.animationsMode.is(AnimationMode.VISIBLE_ONLY); - mc.mcProfiler.startSection("updateAnimations"); + Minecraft.getMinecraft().mcProfiler.startSection("updateAnimations"); GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, this.getGlTextureId()); final int size = listAnimatedSprites.size(); @@ -53,6 +49,6 @@ public abstract class MixinTextureMap extends AbstractTexture { patched.updateAnimationsDryRun(); } } - mc.mcProfiler.endSection(); + Minecraft.getMinecraft().mcProfiler.endSection(); } } diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/bugfixes/MixinRenderBlocks_CrackFix.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/bugfixes/MixinRenderBlocks_CrackFix.java index f2a3aec64..3cd159917 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/bugfixes/MixinRenderBlocks_CrackFix.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/bugfixes/MixinRenderBlocks_CrackFix.java @@ -5,7 +5,7 @@ * All Rights Reserved * * Modifications by Angelica in accordance with LGPL v3.0 - * + * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. * @@ -25,7 +25,7 @@ package com.gtnewhorizons.angelica.mixins.early.angelica.bugfixes; import com.gtnewhorizons.angelica.config.AngelicaConfig; -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; +import com.gtnewhorizons.angelica.loading.AngelicaClientTweaker; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -45,7 +45,7 @@ import java.util.Objects; @Mixin(RenderBlocks.class) public class MixinRenderBlocks_CrackFix { - + @Unique private static String[] angelica$currentCrackFixBlacklistArr; @Unique @@ -72,7 +72,7 @@ public class MixinRenderBlocks_CrackFix { private boolean angelica$disableCrackFix; @Unique private boolean angelica$bypassRenderPassCheck; - + @ModifyExpressionValue(method = "renderFaceXNeg", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/RenderBlocks;renderMinX:D", @@ -149,24 +149,24 @@ public class MixinRenderBlocks_CrackFix { angelica$bounds[3] = renderMaxX; angelica$bounds[4] = renderMaxY; angelica$bounds[5] = renderMaxZ; - + if (ForgeHooksClient.getWorldRenderPass() != 0 && !angelica$bypassRenderPassCheck) { return; } - + if (renderMinX != 0 || renderMinY != 0 || renderMinZ != 0 || renderMaxX != 1 || renderMaxY != 1 || renderMaxZ != 1) { return; } - + double EPSILON = AngelicaConfig.blockCrackFixEpsilon; - + renderMinX -= EPSILON; renderMinY -= EPSILON; renderMinZ -= EPSILON; renderMaxX += EPSILON; renderMaxY += EPSILON; renderMaxZ += EPSILON; - + switch (skipDir) { case WEST: renderMinX = angelica$bounds[0]; break; case DOWN: renderMinY = angelica$bounds[1]; break; @@ -199,7 +199,7 @@ public class MixinRenderBlocks_CrackFix { angelica$disableCrackFix = angelica$isListed(block.getClass(), false); angelica$bypassRenderPassCheck = angelica$isListed(block.getClass(), true); } - + @Inject(method = "renderBlockByRenderType", at = @At("RETURN"), require = 1) @@ -207,7 +207,7 @@ public class MixinRenderBlocks_CrackFix { angelica$disableCrackFix = false; angelica$bypassRenderPassCheck = false; } - + @Unique private static boolean angelica$isListed(Class clazz, boolean whitelist) { Class[] list = whitelist ? angelica$getCrackFixRenderPassWhitelist() : angelica$getCrackFixBlacklist(); @@ -221,7 +221,7 @@ public class MixinRenderBlocks_CrackFix { } return false; } - + @Unique private static Class[] angelica$getCrackFixBlacklist() { if (angelica$currentCrackFixBlacklistArr != AngelicaConfig.blockCrackFixBlacklist) { @@ -230,7 +230,7 @@ public class MixinRenderBlocks_CrackFix { try { return Class.forName(name); } catch (ClassNotFoundException e) { - AngelicaTweaker.LOGGER.debug("Could not find class " + name + " for crack fix blacklist!"); + AngelicaClientTweaker.LOGGER.debug("Could not find class " + name + " for crack fix blacklist!"); return null; } }).filter(Objects::nonNull).toArray(Class[]::new); @@ -245,7 +245,7 @@ public class MixinRenderBlocks_CrackFix { try { return Class.forName(name); } catch (ClassNotFoundException e) { - AngelicaTweaker.LOGGER.debug("Could not find class " + name + " for crack fix whitelist!"); + AngelicaClientTweaker.LOGGER.debug("Could not find class " + name + " for crack fix whitelist!"); return null; } }).filter(Objects::nonNull).toArray(Class[]::new); diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/debug/MixinSplashProgress.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/debug/MixinSplashProgress.java index 0d4cf03b2..9cd0b6440 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/debug/MixinSplashProgress.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/debug/MixinSplashProgress.java @@ -1,6 +1,6 @@ package com.gtnewhorizons.angelica.mixins.early.angelica.debug; -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; +import com.gtnewhorizons.angelica.loading.AngelicaClientTweaker; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import cpw.mods.fml.client.SplashProgress; @@ -19,8 +19,8 @@ import org.spongepowered.asm.mixin.injection.At; public class MixinSplashProgress { @WrapOperation(method="Lcpw/mods/fml/client/SplashProgress;start()V", at=@At(value="INVOKE", target="Lcpw/mods/fml/client/SplashProgress;getBool(Ljava/lang/String;Z)Z")) private static boolean angelica$disableSplashProgress(String name, boolean def, Operation original) { - if(name.equals("enabled")) { - AngelicaTweaker.LOGGER.info("Disabling splash screen due to LWJGL debug mode"); + if (name.equals("enabled")) { + AngelicaClientTweaker.LOGGER.info("Disabling splash screen due to LWJGL debug mode"); return false; } return original.call(name, def); diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/particles/MixinEffectRenderer_DeferredBatch.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/particles/MixinEffectRenderer_DeferredBatch.java index d60710dca..53bb8c30c 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/particles/MixinEffectRenderer_DeferredBatch.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/particles/MixinEffectRenderer_DeferredBatch.java @@ -1,7 +1,7 @@ package com.gtnewhorizons.angelica.mixins.early.angelica.particles; -import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.client.rendering.DeferredDrawBatcher; +import com.gtnewhorizons.angelica.proxy.ClientProxy; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.entity.Entity; import org.spongepowered.asm.mixin.Mixin; @@ -20,7 +20,7 @@ public class MixinEffectRenderer_DeferredBatch { target = "Lnet/minecraft/client/renderer/Tessellator;startDrawingQuads()V", shift = At.Shift.AFTER)) private void angelica$enterDeferredMode(Entity player, float partialTickTime, CallbackInfo ci) { - if (AngelicaMod.options() != null && AngelicaMod.options().advanced.enableDeferredBatching) { + if (ClientProxy.options() != null && ClientProxy.options().advanced.enableDeferredBatching) { DeferredDrawBatcher.enter(); } } diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/startup/MixinInitGLStateManager.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/startup/MixinInitGLStateManager.java index a870217ec..fe51ab4e9 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/startup/MixinInitGLStateManager.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/startup/MixinInitGLStateManager.java @@ -7,6 +7,7 @@ import com.gtnewhorizons.angelica.compat.DriverCompatabilityCheck; import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.glsm.hooks.GLSMHooks; import com.gtnewhorizons.angelica.glsm.hooks.GLSMInitConfig; +import com.gtnewhorizons.angelica.proxy.ClientProxy; import com.gtnewhorizons.angelica.render.SelectionBoxRenderer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; @@ -27,7 +28,7 @@ public class MixinInitGLStateManager { GLStateManager.initialize(GLSMInitConfig.builder() .displaySize(mc.displayWidth, mc.displayHeight) .lwjglDebug(AngelicaMod.lwjglDebug) - .streamingUploadStrategy(AngelicaMod.options().advanced.streamingUploadStrategy) + .streamingUploadStrategy(ClientProxy.options().advanced.streamingUploadStrategy) .framebufferSupported(OpenGlHelper.framebufferSupported) .fboEnabled(mc.gameSettings.fboEnable) .directDrawer(TessellatorStreamingDrawer::drawDirect) diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/celeritas/features/culling/MixinEffectRenderer.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/celeritas/features/culling/MixinEffectRenderer.java index cb7016799..42abd4a95 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/celeritas/features/culling/MixinEffectRenderer.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/celeritas/features/culling/MixinEffectRenderer.java @@ -1,6 +1,6 @@ package com.gtnewhorizons.angelica.mixins.early.celeritas.features.culling; -import com.gtnewhorizons.angelica.AngelicaMod; +import com.gtnewhorizons.angelica.proxy.ClientProxy; import com.gtnewhorizons.angelica.rendering.celeritas.CeleritasWorldRenderer; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.particle.EntityFX; @@ -27,7 +27,7 @@ public class MixinEffectRenderer { @Unique private void setupCullingViewport() { - final boolean useCulling = AngelicaMod.options().advanced.useParticleCulling; + final boolean useCulling = ClientProxy.options().advanced.useParticleCulling; if(useCulling) { this.cullingViewport = CeleritasWorldRenderer.getInstance().getLastViewport(); } else { diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinRenderBlocks.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinRenderBlocks.java index c7d5f39c3..5ae623cce 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinRenderBlocks.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinRenderBlocks.java @@ -1,8 +1,8 @@ package com.gtnewhorizons.angelica.mixins.early.rendering; -import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.common.BlockError; -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; +import com.gtnewhorizons.angelica.loading.AngelicaClientTweaker; +import com.gtnewhorizons.angelica.proxy.ClientProxy; import com.gtnewhorizons.angelica.rendering.StateAwareTessellator; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.llamalad7.mixinextras.sugar.Local; @@ -16,7 +16,6 @@ import net.minecraft.block.BlockGrass; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import org.objectweb.asm.Opcodes; @@ -104,7 +103,7 @@ public abstract class MixinRenderBlocks { */ @Inject(method = { "renderStandardBlockWithAmbientOcclusion", "renderStandardBlockWithAmbientOcclusionPartial" }, at = @At("HEAD"), cancellable = true) private void handleCeleritasAo(Block block, int x, int y, int z, float r, float g, float b, CallbackInfoReturnable cir) { - if ((this.isRenderingByType && Minecraft.isAmbientOcclusionEnabled() && AngelicaMod.options().quality.useCeleritasSmoothLighting) || + if ((this.isRenderingByType && Minecraft.isAmbientOcclusionEnabled() && ClientProxy.options().quality.useCeleritasSmoothLighting) || (Iris.enabled && BlockRenderingSettings.INSTANCE.shouldUseSeparateAo())) { this.applyingCeleritasAO = true; try { @@ -151,13 +150,13 @@ public abstract class MixinRenderBlocks { // Render Error Block int meta = exceptionErrorBlockMap.getOrDefault(e.getClass(), 0); rb.overrideBlockTexture = BlockError.icons[exceptionErrorBlockMap.getOrDefault(e.getClass(), 0)]; - rb.renderStandardBlock(AngelicaMod.blockError, x, y, z); + rb.renderStandardBlock(ClientProxy.blockError, x, y, z); rb.overrideBlockTexture = null; // Check if we've already caught the exception for this block and log it if we haven't String key = block.getUnlocalizedName() + ":" + meta; if (isbrhExceptionCache.add(key)) { - AngelicaTweaker.LOGGER.warn("Caught an exception during ISBRH rendering for {} at position {}, {}, {} with renderer ID {}", block.getUnlocalizedName(), x, y, z, modelId, e); + AngelicaClientTweaker.LOGGER.warn("Caught an exception during ISBRH rendering for {} at position {}, {}, {} with renderer ID {}", block.getUnlocalizedName(), x, y, z, modelId, e); } } return false; diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/startup/MixinInitRenderer.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/startup/MixinInitRenderer.java index ea667fb1f..faf164039 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/startup/MixinInitRenderer.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/startup/MixinInitRenderer.java @@ -1,7 +1,7 @@ package com.gtnewhorizons.angelica.mixins.early.shaders.startup; import com.gtnewhorizons.angelica.glsm.GLStateManager; -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; +import com.gtnewhorizons.angelica.loading.AngelicaClientTweaker; import net.coderbot.iris.Iris; import net.minecraft.client.renderer.OpenGlHelper; import org.spongepowered.asm.mixin.Mixin; @@ -14,7 +14,7 @@ public class MixinInitRenderer { @Inject(method = "initializeTextures", at = @At("RETURN")) private static void angelica$initializeRenderer(CallbackInfo ci) { if (Thread.currentThread() != GLStateManager.getMainThread()) { - AngelicaTweaker.LOGGER.warn("Renderer initialization called from non-main thread!"); + AngelicaClientTweaker.LOGGER.warn("Renderer initialization called from non-main thread!"); return; }