diff --git a/dependencies.gradle b/dependencies.gradle index 6f7890507..53b8822f7 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -49,7 +49,7 @@ configurations { } dependencies { - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.30") + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.91") compileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:1.0.7") { transitive = false } @@ -57,11 +57,11 @@ dependencies { annotationProcessor("org.projectlombok:lombok:1.18.34") // Use modern models+textures to inject QuadProviders - devOnlyNonPublishable('com.github.GTNewHorizons:TX-Loader:1.8.2:dev') + devOnlyNonPublishable('com.github.GTNewHorizons:TX-Loader:1.8.5:dev') // Iris Shaders compileOnly('org.jetbrains:annotations:26.0.2') - api("com.github.GTNewHorizons:GTNHLib:0.6.20:dev") + api("com.github.GTNewHorizons:GTNHLib:0.6.37:dev") shadowImplementation("org.anarres:jcpp:1.4.14") // Apache 2.0 shadowImplementation("org.taumc:glsl-transformation-lib:0.2.0-4.g6b42bca") { exclude module: "antlr4" // we only want to shadow the runtime module @@ -70,20 +70,20 @@ dependencies { compileOnly "org.apache.ant:ant:1.8.2" // Because who doesn't want NEI - devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.29-GTNH:dev') - devOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenCore:1.4.1:dev') + devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.64-GTNH:dev') + devOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenCore:1.4.3:dev') // Notfine Deps compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") - devOnlyNonPublishable("com.github.GTNewHorizons:Baubles-Expanded:2.1.7-GTNH:dev") - compileOnly("com.github.GTNewHorizons:twilightforest:2.7.5:dev") { transitive = false } + devOnlyNonPublishable("com.github.GTNewHorizons:Baubles-Expanded:2.1.9-GTNH:dev") + compileOnly("com.github.GTNewHorizons:twilightforest:2.7.8:dev") { transitive = false } compileOnly(rfg.deobf('curse.maven:witchery-69673:2234410')) - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.10-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Natura:2.8.2:dev") + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.40-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Natura:2.8.8:dev") - compileOnly("com.github.GTNewHorizons:ThaumicHorizons:1.7.1:dev") + compileOnly("com.github.GTNewHorizons:ThaumicHorizons:1.7.5:dev") - compileOnly("com.github.GTNewHorizons:Battlegear2:1.4.2:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Battlegear2:1.4.3:dev") { transitive = false } compileOnly("com.falsepattern:chunkapi-mc1.7.10:0.5.1:api") { transitive = false } compileOnly("com.falsepattern:endlessids-mc1.7.10:1.5-beta0003:dev") { transitive = false } @@ -93,7 +93,7 @@ dependencies { compileOnly("curse.maven:minefactory-reloaded-66672:2277486") - compileOnly("com.github.GTNewHorizons:NotEnoughIds:2.1.6:dev") // Mixin Version + compileOnly("com.github.GTNewHorizons:NotEnoughIds:2.1.10:dev") // Mixin Version compileOnly("com.github.GTNewHorizons:NotEnoughIds-Legacy:1.4.7:dev") // ASM Version compileOnly(rfg.deobf("curse.maven:campfirebackport-387444:4611675")) diff --git a/gradle.properties b/gradle.properties index e5b012671..af0df2adf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ modId = angelica modGroup = com.gtnewhorizons.angelica # Whether to use modGroup as the maven publishing group. -# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods. +# When false, com.github.GTNewHorizons is used. useModGroupForPublishing = false # Updates your build.gradle and settings.gradle automatically whenever an update is available. @@ -151,7 +151,7 @@ modrinthProjectId = angelica # type can be one of [project, version], # and the name is the Modrinth project or version slug/id of the other mod. # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech -# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true +# Note: UniMixins is automatically set as a required dependency if usesMixins = true. modrinthRelations = required-project\:gtnhlib # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens. diff --git a/settings.gradle b/settings.gradle index 45f943cab..4acbbd32e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,5 +16,5 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.37' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.41' } diff --git a/src/main/java/com/gtnewhorizons/angelica/AngelicaLateMixins.java b/src/main/java/com/gtnewhorizons/angelica/AngelicaLateMixins.java index 5635a12c7..ed24d021d 100644 --- a/src/main/java/com/gtnewhorizons/angelica/AngelicaLateMixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/AngelicaLateMixins.java @@ -2,6 +2,7 @@ package com.gtnewhorizons.angelica; import com.gtnewhorizon.gtnhmixins.ILateMixinLoader; import com.gtnewhorizon.gtnhmixins.LateMixin; +import com.gtnewhorizon.gtnhmixins.builders.IMixins; import com.gtnewhorizons.angelica.mixins.Mixins; import java.util.List; @@ -9,6 +10,7 @@ import java.util.Set; @LateMixin public class AngelicaLateMixins implements ILateMixinLoader { + @Override public String getMixinConfig() { return "mixins.angelica.late.json"; @@ -16,7 +18,6 @@ public class AngelicaLateMixins implements ILateMixinLoader { @Override public List getMixins(Set loadedMods) { - return Mixins.getLateMixins(loadedMods); + return IMixins.getLateMixins(Mixins.class, loadedMods); } - } diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java b/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java index 600e7c46a..573608251 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java @@ -4,10 +4,11 @@ import com.gtnewhorizon.gtnhlib.asm.ASMUtil; 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.mixins.Mixins; -import com.gtnewhorizons.angelica.mixins.TargetedMod; import com.gtnewhorizons.angelica.transform.compat.GenericCompatTransformer; import com.gtnewhorizons.angelica.transform.compat.handlers.CompatHandler; import com.gtnewhorizons.angelica.transform.compat.handlers.CompatHandlers; @@ -15,6 +16,7 @@ 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 org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -25,7 +27,7 @@ import org.spongepowered.asm.launch.GlobalProperties; import org.spongepowered.asm.service.mojang.MixinServiceLaunchWrapper; import java.util.ArrayList; -import java.util.HashSet; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Set; @@ -95,7 +97,7 @@ public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader { transformers.add(GenericCompatTransformer.class.getName()); // Add NotFine transformers - final List notFineTransformers = AsmTransformers.getTransformers(); + final List notFineTransformers = Arrays.asList(ITransformers.getTransformers(AsmTransformers.class)); if (!notFineTransformers.isEmpty()) Namer.initNames(); transformers.addAll(notFineTransformers); @@ -131,7 +133,12 @@ public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader { @Override public List getMixins(Set loadedCoreMods) { - return Mixins.getEarlyMixins(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); } public static boolean DUMP_CLASSES() { @@ -151,6 +158,4 @@ public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader { ASMUtil.saveAsRawClassFile(transformedBytes, className + "_POST", transformer); } } - - public static final Set coreMods = new HashSet<>(); } diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 067fb37ba..a439dff2d 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -1,216 +1,248 @@ package com.gtnewhorizons.angelica.mixins; +import com.gtnewhorizon.gtnhmixins.builders.IMixins; +import com.gtnewhorizon.gtnhmixins.builders.MixinBuilder; import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.config.AngelicaConfig; import com.gtnewhorizons.angelica.config.CompatConfig; -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; -import cpw.mods.fml.relauncher.FMLLaunchHandler; import jss.notfine.config.MCPatcherForgeConfig; import jss.notfine.config.NotFineConfig; +import lombok.Getter; +import lombok.RequiredArgsConstructor; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.List; -import java.util.Set; -import java.util.function.Supplier; -import java.util.stream.Collectors; -public enum Mixins { - ANGELICA_STARTUP(new Builder("Angelica Startup").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).addMixinClasses( - "angelica.startup.MixinInitGLStateManager" +@Getter +@RequiredArgsConstructor +public enum Mixins implements IMixins { + + ANGELICA_STARTUP(new MixinBuilder() + .setPhase(Phase.EARLY) + .addClientMixins( + "angelica.startup.MixinInitGLStateManager" ) ), - ANGELICA(new Builder("Angelica").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).addMixinClasses( - "angelica.MixinActiveRenderInfo" - ,"angelica.MixinEntityRenderer" - ,"angelica.MixinGameSettings" - ,"angelica.MixinMinecraft" - ,"angelica.MixinMinecraftServer" - ,"angelica.optimizations.MixinRendererLivingEntity" - ,"angelica.MixinFMLClientHandler" - ,"angelica.bugfixes.MixinRenderGlobal_DestroyBlock" + ANGELICA(new MixinBuilder() + .setPhase(Phase.EARLY) + .addClientMixins( + "angelica.MixinActiveRenderInfo" + , "angelica.MixinEntityRenderer" + , "angelica.MixinGameSettings" + , "angelica.MixinMinecraft" + , "angelica.MixinMinecraftServer" + , "angelica.optimizations.MixinRendererLivingEntity" + , "angelica.MixinFMLClientHandler" + , "angelica.bugfixes.MixinRenderGlobal_DestroyBlock" ) ), ANGELICA_VBO( - new Builder("Angelica VBO").addTargetedMod(TargetedMod.VANILLA).setApplyIf(() -> AngelicaConfig.enableVBO).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).addMixinClasses( - "angelica.vbo.MixinGLAllocation" - ,"angelica.vbo.MixinModelRenderer" - ,"angelica.vbo.MixinRenderGlobal" - ,"angelica.vbo.MixinWavefrontObject" - ) + new MixinBuilder() + .setApplyIf(() -> AngelicaConfig.enableVBO) + .setPhase(Phase.EARLY) + .addClientMixins( + "angelica.vbo.MixinGLAllocation" + , "angelica.vbo.MixinModelRenderer" + , "angelica.vbo.MixinRenderGlobal" + , "angelica.vbo.MixinWavefrontObject" + ) ), - ANGELICA_FONT_RENDERER(new Builder("Angelica Font Renderer").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableFontRenderer).addMixinClasses( - "angelica.fontrenderer.MixinGuiIngameForge" - ,"angelica.fontrenderer.MixinFontRenderer" + ANGELICA_FONT_RENDERER(new MixinBuilder() + .setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.enableFontRenderer) + .addClientMixins( + "angelica.fontrenderer.MixinGuiIngameForge" + , "angelica.fontrenderer.MixinFontRenderer" ) ), - ANGELICA_ENABLE_DEBUG(new Builder("Angelica Debug").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaMod.lwjglDebug).addMixinClasses( - "angelica.debug.MixinProfiler" - ,"angelica.debug.MixinSplashProgress" - ,"angelica.debug.MixinTextureManager" + ANGELICA_ENABLE_DEBUG(new MixinBuilder() + .setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaMod.lwjglDebug) + .addClientMixins( + "angelica.debug.MixinProfiler" + , "angelica.debug.MixinSplashProgress" + , "angelica.debug.MixinTextureManager" ) ), - ANGELICA_DYNAMIC_LIGHTS(new Builder("Angelica Dynamic Lights").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableDynamicLights).addMixinClasses( + ANGELICA_DYNAMIC_LIGHTS(new MixinBuilder() + .setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.enableDynamicLights) + .addClientMixins( "angelica.dynamiclights.MixinEntityRenderer" - ,"angelica.dynamiclights.MixinEntity" - ,"angelica.dynamiclights.MixinWorld" - ,"angelica.dynamiclights.MixinItemRenderer" + , "angelica.dynamiclights.MixinEntity" + , "angelica.dynamiclights.MixinWorld" + , "angelica.dynamiclights.MixinItemRenderer" ) ), ANGELICA_FIX_FLUID_RENDERER_CHECKING_BLOCK_AGAIN( - new Builder("Fix RenderBlockFluid reading the block type from the world access multiple times") - .setPhase(Phase.EARLY).addMixinClasses("angelica.bugfixes.MixinRenderBlockFluid").setSide(Side.BOTH) - .setApplyIf(() -> AngelicaConfig.fixFluidRendererCheckingBlockAgain) - .addTargetedMod(TargetedMod.VANILLA)), + new MixinBuilder("Fix RenderBlockFluid reading the block type from the world access multiple times") + .setPhase(Phase.EARLY) + .addClientMixins("angelica.bugfixes.MixinRenderBlockFluid") + .setApplyIf(() -> AngelicaConfig.fixFluidRendererCheckingBlockAgain)), - ANGELICA_LIMIT_DROPPED_ITEM_ENTITIES(new Builder("Dynamically modifies the render distance of dropped items entities to preserve performance") - .setPhase(Phase.EARLY).addMixinClasses("angelica.optimizations.MixinRenderGlobal_ItemRenderDist").setSide(Side.CLIENT) - .setApplyIf(() -> AngelicaConfig.dynamicItemRenderDistance) - .addTargetedMod(TargetedMod.VANILLA)), + ANGELICA_LIMIT_DROPPED_ITEM_ENTITIES(new MixinBuilder() + .setPhase(Phase.EARLY) + .addClientMixins("angelica.optimizations.MixinRenderGlobal_ItemRenderDist") + .setApplyIf(() -> AngelicaConfig.dynamicItemRenderDistance)), - ANGELICA_ITEM_DISPLAY_LIST_OPTIMIZATION(new Builder("Optimized item rendering by wrapping them with display lists") - .setPhase(Phase.EARLY).addMixinClasses("angelica.itemrenderer.MixinItemRenderer").setSide(Side.CLIENT) - .setApplyIf(() -> AngelicaConfig.optimizeInWorldItemRendering_WIP) - .addTargetedMod(TargetedMod.VANILLA)), + ANGELICA_ITEM_DISPLAY_LIST_OPTIMIZATION(new MixinBuilder("Optimized item rendering by wrapping them with display lists") + .setPhase(Phase.EARLY) + .addClientMixins("angelica.itemrenderer.MixinItemRenderer") + .setApplyIf(() -> AngelicaConfig.optimizeInWorldItemRendering_WIP)), // Not compatible with the lwjgl debug callbacks, so disable if that's enabled - ARCHAIC_SPLASH(new Builder("ArchaicFix Splash").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.showSplashMemoryBar && !AngelicaMod.lwjglDebug).addMixinClasses( - "angelica.archaic.MixinSplashProgress$3" - ,"angelica.archaic.AccessorSplashProgress" + ARCHAIC_SPLASH(new MixinBuilder() + .setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.showSplashMemoryBar && !AngelicaMod.lwjglDebug) + .addClientMixins( + "angelica.archaic.MixinSplashProgress$3", + "angelica.archaic.AccessorSplashProgress" ) ), - ARCHAIC_CORE(new Builder("Archaic Core").addTargetedMod(TargetedMod.VANILLA).addExcludedMod(TargetedMod.ARCHAICFIX) - .setSide(Side.CLIENT).setPhase(Phase.EARLY).addMixinClasses( - "angelica.archaic.MixinBlockFence" - ,"angelica.archaic.MixinFMLClientHandler" - ,"angelica.archaic.MixinGuiIngameForge" - ,"angelica.archaic.MixinNetHandlerPlayClient" - ,"angelica.archaic.MixinThreadDownloadImageData" + ARCHAIC_CORE(new MixinBuilder() + .addExcludedMod(TargetedMod.ARCHAICFIX) + .setPhase(Phase.EARLY) + .addClientMixins( + "angelica.archaic.MixinBlockFence" + , "angelica.archaic.MixinFMLClientHandler" + , "angelica.archaic.MixinGuiIngameForge" + , "angelica.archaic.MixinNetHandlerPlayClient" + , "angelica.archaic.MixinThreadDownloadImageData" ) ), - IRIS_STARTUP(new Builder("Start Iris").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableIris).addMixinClasses( - "shaders.startup.MixinGameSettings" - ,"shaders.startup.MixinMinecraft" - ,"shaders.startup.MixinInitRenderer" - ,"shaders.startup.MixinAbstractTexture" - ,"shaders.startup.MixinTextureAtlasSprite" - ,"shaders.startup.MixinTextureMap" + IRIS_STARTUP(new MixinBuilder() + .setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.enableIris) + .addClientMixins( + "shaders.startup.MixinGameSettings" + , "shaders.startup.MixinMinecraft" + , "shaders.startup.MixinInitRenderer" + , "shaders.startup.MixinAbstractTexture" + , "shaders.startup.MixinTextureAtlasSprite" + , "shaders.startup.MixinTextureMap" ) ), - SODIUM(new Builder("Sodium").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableSodium).addMixinClasses( - "sodium.MixinBlock" - ,"sodium.MixinBlockFluidBase" - ,"sodium.AccessorBiomeColorEvent" - ,"sodium.MixinBiomeGenBase" - ,"sodium.MixinChunk" - ,"sodium.MixinChunkProviderServer" - ,"sodium.MixinClientRegistry" - ,"sodium.MixinEntity_RenderDist" - ,"sodium.MixinEntityItem_RenderDist" - ,"sodium.MixinRenderManager" - ,"sodium.MixinEntityRenderer" - ,"sodium.MixinFMLClientHandler" - ,"sodium.MixinForgeHooksClient" - ,"sodium.MixinGameSettings" - ,"sodium.MixinFrustrum" - ,"sodium.MixinMinecraft" - ,"sodium.MixinRenderBlocks" - ,"sodium.MixinRenderGlobal" - ,"sodium.MixinWorldClient" - ,"sodium.MixinTileEntity" - ,"sodium.MixinTileEntityMobSpawner" - ,"sodium.MixinEffectRenderer" - ,"sodium.MixinTileEntityRendererDispatcher" - ,"sodium.MixinLongHashMap" - ,"sodium.MixinRenderingRegistry" - ,"sodium.MixinPlayerManager" + SODIUM(new MixinBuilder() + .setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.enableSodium) + .addClientMixins( + "sodium.MixinBlock" + , "sodium.MixinBlockFluidBase" + , "sodium.AccessorBiomeColorEvent" + , "sodium.MixinBiomeGenBase" + , "sodium.MixinChunk" + , "sodium.MixinChunkProviderServer" + , "sodium.MixinClientRegistry" + , "sodium.MixinEntity_RenderDist" + , "sodium.MixinEntityItem_RenderDist" + , "sodium.MixinRenderManager" + , "sodium.MixinEntityRenderer" + , "sodium.MixinFMLClientHandler" + , "sodium.MixinForgeHooksClient" + , "sodium.MixinGameSettings" + , "sodium.MixinFrustrum" + , "sodium.MixinMinecraft" + , "sodium.MixinRenderBlocks" + , "sodium.MixinRenderGlobal" + , "sodium.MixinWorldClient" + , "sodium.MixinTileEntity" + , "sodium.MixinTileEntityMobSpawner" + , "sodium.MixinEffectRenderer" + , "sodium.MixinTileEntityRendererDispatcher" + , "sodium.MixinLongHashMap" + , "sodium.MixinRenderingRegistry" + , "sodium.MixinPlayerManager" ) ), - IRIS_RENDERING(new Builder("Iris Shaders").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableIris).addMixinClasses( - "shaders.MixinEntityRenderer" - ,"shaders.MixinGuiIngameForge" - ,"shaders.MixinFramebuffer" - ,"shaders.MixinItem" - ,"shaders.MixinLocale" - ,"shaders.MixinOpenGlHelper" - ,"shaders.MixinRender" - ,"shaders.MixinRendererLivingEntity" - ,"shaders.MixinRenderGlobal" - ,"shaders.MixinTileEntityBeaconRenderer" + IRIS_SHADERS(new MixinBuilder() + .setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.enableIris) + .addClientMixins( + "shaders.MixinEntityRenderer" + , "shaders.MixinGuiIngameForge" + , "shaders.MixinFramebuffer" + , "shaders.MixinItem" + , "shaders.MixinLocale" + , "shaders.MixinOpenGlHelper" + , "shaders.MixinRender" + , "shaders.MixinRendererLivingEntity" + , "shaders.MixinRenderGlobal" + , "shaders.MixinTileEntityBeaconRenderer" ) ), - IRIS_RENDERING_NOBACKHAND(new Builder("Iris Hand Shaders").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableIris).addExcludedMod(TargetedMod.BACKHAND).addMixinClasses( + IRIS_RENDERING_NOBACKHAND(new MixinBuilder("Iris Hand Shaders") + .setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.enableIris) + .addExcludedMod(TargetedMod.BACKHAND) + .addClientMixins( "shaders.MixinItemRenderer" ) ), - IRIS_RENDERING_BACKHAND(new Builder("Iris Hand Shaders (Backhand)").addTargetedMod(TargetedMod.VANILLA) - .addTargetedMod(TargetedMod.BACKHAND).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableIris).addMixinClasses( + IRIS_RENDERING_BACKHAND(new MixinBuilder("Iris Hand Shaders (Backhand)") + .addRequiredMod(TargetedMod.BACKHAND) + .setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.enableIris) + .addClientMixins( "shaders.MixinItemRendererBackhand" ) ), - IRIS_ACCESSORS(new Builder("Iris Accessors").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableIris).addMixinClasses("shaders.accessors.MixinEntityRenderer") + IRIS_ACCESSORS(new MixinBuilder() + .setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.enableIris) + .addClientMixins("shaders.accessors.MixinEntityRenderer") ), - ANGELICA_TEXTURE(new Builder("Textures").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableIris || AngelicaConfig.enableSodium).addMixinClasses( - "angelica.textures.MixinTextureAtlasSprite" - ,"angelica.textures.MixinTextureUtil" + ANGELICA_TEXTURE(new MixinBuilder() + .setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.enableIris || AngelicaConfig.enableSodium) + .addClientMixins( + "angelica.textures.MixinTextureAtlasSprite" + , "angelica.textures.MixinTextureUtil" )), - ANGELICA_ZOOM(new Builder("Zoom").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableZoom) - .addMixinClasses( + ANGELICA_ZOOM(new MixinBuilder() + .setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.enableZoom) + .addClientMixins( "angelica.zoom.MixinEntityRenderer_Zoom", "angelica.zoom.MixinMinecraft_Zoom", "angelica.zoom.MixinMouseFilter" )), - HUD_CACHING(new Builder("Renders the HUD elements 20 times per second maximum to improve performance") - .addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT).setPhase(Phase.EARLY) - .setApplyIf(() -> AngelicaConfig.enableHudCaching).addMixinClasses( - "angelica.hudcaching.MixinGuiIngame", - "angelica.hudcaching.MixinGuiIngameForge", + HUD_CACHING(new MixinBuilder() + .setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.enableHudCaching) + .addClientMixins( + "angelica.hudcaching.MixinGuiIngame", + "angelica.hudcaching.MixinGuiIngameForge", "angelica.hudcaching.MixinRenderGameOverlayEvent", "angelica.hudcaching.MixinEntityRenderer_HUDCaching", "angelica.hudcaching.MixinFramebuffer_HUDCaching", "angelica.hudcaching.MixinGuiIngame_HUDCaching", "angelica.hudcaching.MixinGuiIngameForge_HUDCaching", "angelica.hudcaching.MixinRenderItem") - ), - OPTIMIZE_WORLD_UPDATE_LIGHT(new Builder("Optimize world updateLightByType method").setPhase(Phase.EARLY) - .setSide(Side.BOTH).addTargetedMod(TargetedMod.VANILLA).addExcludedMod(TargetedMod.ARCHAICFIX).setApplyIf(() -> AngelicaConfig.optimizeWorldUpdateLight) - .addMixinClasses("angelica.lighting.MixinWorld_FixLightUpdateLag")), + OPTIMIZE_WORLD_UPDATE_LIGHT(new MixinBuilder() + .setPhase(Phase.EARLY) + .addExcludedMod(TargetedMod.ARCHAICFIX) + .setApplyIf(() -> AngelicaConfig.optimizeWorldUpdateLight) + .addCommonMixins("angelica.lighting.MixinWorld_FixLightUpdateLag")), - - SPEEDUP_VANILLA_ANIMATIONS(new Builder("Speedup Vanilla Animations").setPhase(Phase.EARLY) - .setApplyIf(() -> AngelicaConfig.speedupAnimations).setSide(Side.CLIENT).addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses( + SPEEDUP_VANILLA_ANIMATIONS(new MixinBuilder() + .setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.speedupAnimations) + .addClientMixins( "angelica.animation.MixinTextureAtlasSprite", "angelica.animation.MixinTextureMap", "angelica.animation.MixinBlockFire", @@ -221,51 +253,57 @@ public enum Mixins { "angelica.animation.MixinWorldRenderer", "angelica.animation.MixinRenderItem")), - SCALED_RESOUTION_UNICODE_FIX(new Builder("Removes unicode languages gui scaling being forced to even values").setPhase(Phase.EARLY) - .setSide(Side.CLIENT).addTargetedMod(TargetedMod.VANILLA) + SCALED_RESOUTION_UNICODE_FIX(new MixinBuilder("Removes unicode languages gui scaling being forced to even values") + .setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.removeUnicodeEvenScaling) - .addMixinClasses("angelica.bugfixes.MixinScaledResolution_UnicodeFix")), + .addClientMixins("angelica.bugfixes.MixinScaledResolution_UnicodeFix")), - SECURITYCRAFT_COMPAT(new Builder("Fix reflection in SecurityCraft for compat with Angelica").setPhase(Phase.LATE) - .addTargetedMod(TargetedMod.SECURITYCRAFT).setSide(Side.CLIENT) + SECURITYCRAFT_COMPAT(new MixinBuilder("Fix reflection in SecurityCraft for compat with Angelica") + .setPhase(Phase.LATE) + .addRequiredMod(TargetedMod.SECURITYCRAFT) .setApplyIf(() -> CompatConfig.fixSecurityCraft) - .addMixinClasses( + .addClientMixins( "client.securitycraft.MixinBlockReinforcedFenceGate", "client.securitycraft.MixinBlockReinforcedIronBars" )), - EXTRA_UTILITIES_THREAD_SAFETY(new Builder("Enable thread safety fixes in Extra Utilities").setPhase(Phase.LATE) - .addTargetedMod(TargetedMod.EXTRAUTILS).setSide(Side.CLIENT) + EXTRA_UTILITIES_THREAD_SAFETY(new MixinBuilder("Enable thread safety fixes in Extra Utilities") + .setPhase(Phase.LATE) + .addRequiredMod(TargetedMod.EXTRAUTILS) .setApplyIf(() -> CompatConfig.fixExtraUtils) - .addMixinClasses( + .addClientMixins( "client.extrautils.MixinRenderBlockConnectedTextures", "client.extrautils.MixinRenderBlockConnectedTexturesEthereal", "client.extrautils.MixinIconConnectedTexture")), - MFR_THREAD_SAFETY(new Builder("Enable thread safety fixes for MineFactory Reloaded").setPhase(Phase.LATE) - .addTargetedMod(TargetedMod.MINEFACTORY_RELOADED).setSide(Side.CLIENT) - .setApplyIf(() -> CompatConfig.fixMinefactoryReloaded) - .addMixinClasses("client.minefactoryreloaded.MixinRedNetCableRenderer")), + MFR_THREAD_SAFETY(new MixinBuilder("Enable thread safety fixes for MineFactory Reloaded") + .setPhase(Phase.LATE) + .addRequiredMod(TargetedMod.MINEFACTORY_RELOADED) + .setApplyIf(() -> CompatConfig.fixMinefactoryReloaded) + .addClientMixins("client.minefactoryreloaded.MixinRedNetCableRenderer")), - SPEEDUP_CAMPFIRE_BACKPORT_ANIMATIONS(new Builder("Add animation speedup support to Campfire Backport").setPhase(Phase.LATE) - .addTargetedMod(TargetedMod.CAMPFIRE_BACKPORT).setSide(Side.CLIENT) - .setApplyIf(() -> AngelicaConfig.speedupAnimations) - .addMixinClasses("client.campfirebackport.MixinRenderBlockCampfire")), + SPEEDUP_CAMPFIRE_BACKPORT_ANIMATIONS(new MixinBuilder("Add animation speedup support to Campfire Backport") + .setPhase(Phase.LATE) + .addRequiredMod(TargetedMod.CAMPFIRE_BACKPORT) + .setApplyIf(() -> AngelicaConfig.speedupAnimations) + .addClientMixins("client.campfirebackport.MixinRenderBlockCampfire")), - IC2_FLUID_RENDER_FIX(new Builder("IC2 Fluid Render Fix").setPhase(Phase.EARLY).setSide(Side.CLIENT) - .addTargetedMod(TargetedMod.IC2).setApplyIf(() -> AngelicaConfig.speedupAnimations) - .addMixinClasses("angelica.textures.ic2.MixinRenderLiquidCell")), + IC2_FLUID_RENDER_FIX(new MixinBuilder() + .setPhase(Phase.EARLY) + .addRequiredMod(TargetedMod.IC2) + .setApplyIf(() -> AngelicaConfig.speedupAnimations) + .addClientMixins("angelica.textures.ic2.MixinRenderLiquidCell")), - OPTIMIZE_TEXTURE_LOADING(new Builder("Optimize Texture Loading").setPhase(Phase.EARLY) - .addMixinClasses("angelica.textures.MixinTextureUtil_OptimizeMipmap").addTargetedMod(TargetedMod.VANILLA) - .setApplyIf(() -> AngelicaConfig.optimizeTextureLoading).setSide(Side.CLIENT)), + OPTIMIZE_TEXTURE_LOADING(new MixinBuilder() + .setPhase(Phase.EARLY) + .addClientMixins("angelica.textures.MixinTextureUtil_OptimizeMipmap") + .setApplyIf(() -> AngelicaConfig.optimizeTextureLoading)), //From NotFine - NOTFINE_BASE_MOD(new Builder("NotFine") - .setSide(Side.CLIENT).setPhase(Phase.EARLY) + NOTFINE_BASE_MOD(new MixinBuilder() + .setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableNotFineFeatures) - .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses(addPrefix("notfine.", + .addClientMixins(addPrefix("notfine.", "clouds.MixinEntityRenderer", "clouds.MixinGameSettings", //"clouds.MixinRenderGlobal", @@ -297,11 +335,10 @@ public enum Mixins { "interpolatedtexturemap.MixinTextureMap" )) ), - BETTER_FACE_CULLING(new Builder("Better face culling") - .setSide(Side.CLIENT).setPhase(Phase.EARLY) + BETTER_FACE_CULLING(new MixinBuilder() + .setPhase(Phase.EARLY) .setApplyIf(() -> NotFineConfig.betterBlockFaceCulling) - .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses(addPrefix("notfine.faceculling.", + .addClientMixins(addPrefix("notfine.faceculling.", "MixinBlock", "MixinBlockCactus", "MixinBlockCarpet", @@ -313,103 +350,94 @@ public enum Mixins { "MixinRenderBlocks" )) ), - NOTFINE_NO_DYNAMIC_SURROUNDINGS(new Builder("NotFine no Dynamic Surroundings") - .setSide(Side.CLIENT).setPhase(Phase.EARLY) - .setApplyIf(() -> true) - .addTargetedMod(TargetedMod.VANILLA) + NOTFINE_NO_DYNAMIC_SURROUNDINGS(new MixinBuilder() + .setPhase(Phase.EARLY) .addExcludedMod(TargetedMod.DYNAMIC_SURROUNDINGS_MIST) .addExcludedMod(TargetedMod.DYNAMIC_SURROUNDINGS_ORIGINAL) - .addMixinClasses("notfine.toggle.MixinEntityRenderer$RenderRainSnow") + .addClientMixins("notfine.toggle.MixinEntityRenderer$RenderRainSnow") ), - NOTFINE_NO_CUSTOM_ITEM_TEXTURES(new Builder("NotFine no Custom Item Textures") - .setSide(Side.CLIENT).setPhase(Phase.EARLY) + NOTFINE_NO_CUSTOM_ITEM_TEXTURES(new MixinBuilder() + .setPhase(Phase.EARLY) .setApplyIf(() -> !AngelicaConfig.enableMCPatcherForgeFeatures || !MCPatcherForgeConfig.CustomItemTextures.enabled) - .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses(addPrefix("notfine.glint.", + .addClientMixins(addPrefix("notfine.glint.", "MixinItemRenderer", "MixinRenderItem" )) ), - NOTFINE_NATURA(new Builder("NotFine Natura compat") - .setSide(Side.CLIENT).setPhase(Phase.LATE) + NOTFINE_NATURA_COMPAT(new MixinBuilder() + .setPhase(Phase.LATE) .setApplyIf(() -> AngelicaConfig.enableNotFineFeatures) - .addTargetedMod(TargetedMod.NATURA) - .addMixinClasses(addPrefix("notfine.leaves.natura.", + .addRequiredMod(TargetedMod.NATURA) + .addClientMixins(addPrefix("notfine.leaves.natura.", "MixinBerryBush", "MixinNetherBerryBush" )) ), - NOTFINE_THAUMCRAFT(new Builder("NotFine Thaumcraft compat") - .setSide(Side.CLIENT).setPhase(Phase.LATE) + NOTFINE_THAUMCRAFT_COMPAT(new MixinBuilder() + .setPhase(Phase.LATE) .setApplyIf(() -> AngelicaConfig.enableNotFineFeatures) - .addTargetedMod(TargetedMod.THAUMCRAFT) - .addMixinClasses("notfine.leaves.thaumcraft.MixinBlockMagicalLeaves") + .addRequiredMod(TargetedMod.THAUMCRAFT) + .addClientMixins("notfine.leaves.thaumcraft.MixinBlockMagicalLeaves") ), - THAUMCRAFT_BETTER_FACE_CULLING(new Builder("Better face culling Thaumcraft compat") - .setSide(Side.CLIENT).setPhase(Phase.LATE) + THAUMCRAFT_BETTER_FACE_CULLING(new MixinBuilder() + .setPhase(Phase.LATE) .setApplyIf(() -> NotFineConfig.betterBlockFaceCulling) - .addTargetedMod(TargetedMod.THAUMCRAFT) - .addMixinClasses(addPrefix("notfine.faceculling.thaumcraft.", + .addRequiredMod(TargetedMod.THAUMCRAFT) + .addClientMixins(addPrefix("notfine.faceculling.thaumcraft.", "MixinBlockWoodenDevice", "MixinBlockStoneDevice", "MixinBlockTable" )) ), - NOTFINE_TINKERS_CONSTRUCT(new Builder("NotFine Tinker's Construct compat") - .setSide(Side.CLIENT).setPhase(Phase.LATE) + NOTFINE_TINKERS_CONSTRUCT_COMPAT(new MixinBuilder() + .setPhase(Phase.LATE) .setApplyIf(() -> AngelicaConfig.enableNotFineFeatures) - .addTargetedMod(TargetedMod.TINKERS_CONSTRUCT) - .addMixinClasses("notfine.leaves.tconstruct.MixinOreberryBush") + .addRequiredMod(TargetedMod.TINKERS_CONSTRUCT) + .addClientMixins("notfine.leaves.tconstruct.MixinOreberryBush") ), - NOTFINE_WITCHERY(new Builder("NotFine Witchery compat") - .setSide(Side.CLIENT).setPhase(Phase.LATE) + NOTFINE_WITCHERY_COMPAT(new MixinBuilder() + .setPhase(Phase.LATE) .setApplyIf(() -> AngelicaConfig.enableNotFineFeatures) - .addTargetedMod(TargetedMod.WITCHERY) - .addMixinClasses("notfine.leaves.witchery.MixinBlockWitchLeaves") + .addRequiredMod(TargetedMod.WITCHERY) + .addClientMixins("notfine.leaves.witchery.MixinBlockWitchLeaves") ), - NOTFINE_TWILIGHT_FOREST(new Builder("NotFine Twilight Forest compat") - .setSide(Side.CLIENT).setPhase(Phase.LATE) + NOTFINE_TWILIGHT_FOREST_COMPAT(new MixinBuilder() + .setPhase(Phase.LATE) .setApplyIf(() -> AngelicaConfig.enableNotFineFeatures) - .addTargetedMod(TargetedMod.TWILIGHT_FOREST) - .addMixinClasses(addPrefix("notfine.leaves.twilightforest.", + .addRequiredMod(TargetedMod.TWILIGHT_FOREST) + .addClientMixins(addPrefix("notfine.leaves.twilightforest.", "MixinBlockTFLeaves", "MixinBlockTFLeaves3", // TODO: Verify 2.3.8.18 or later to support non NH builds? "MixinBlockTFMagicLeaves" )) ), - MCPATCHER_FORGE(new Builder("MCPatcher Forge") - .setSide(Side.CLIENT).setPhase(Phase.EARLY) + MCPATCHER_FORGE(new MixinBuilder() + .setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures) - .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses(addPrefix("mcpatcherforge.", + .addClientMixins(addPrefix("mcpatcherforge.", "base.MixinBlockGrass", "base.MixinBlockMycelium", - "base.MixinAbstractTexture", "base.MixinTextureAtlasSprite", - "base.MixinSimpleReloadableResourceManager", - "base.MixinMinecraft" )) ), - MCPATCHER_FORGE_RENDERPASS(new Builder("MCPatcher Forge Renderpass") + MCPATCHER_FORGE_RENDERPASS(new MixinBuilder() .setPhase(Phase.EARLY) .setApplyIf(() -> NotFineConfig.renderPass) - .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses(addPrefix("mcpatcherforge.", + .addClientMixins(addPrefix("mcpatcherforge.", "renderpass.MixinEntityRenderer", "renderpass.MixinRenderBlocks", "renderpass.MixinRenderGlobal", "renderpass.MixinWorldRenderer" )) ), - MCPATCHER_FORGE_CUSTOM_COLORS(new Builder("MCP:F Custom Colors") - .setSide(Mixins.Side.CLIENT).setPhase(Phase.EARLY) + MCPATCHER_FORGE_CUSTOM_COLORS(new MixinBuilder() + .setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.CustomColors.enabled) - .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses(addPrefix("mcpatcherforge.cc.", + .addClientMixins(addPrefix("mcpatcherforge.cc.", "block.material.MixinMapColor", "block.MixinBlock", @@ -461,11 +489,10 @@ public enum Mixins { "world.MixinWorldProviderHell" )) ), - MCPATCHER_FORGE_CUSTOM_ITEM_TEXTURES(new Builder("MCP:F Custom Item Textures") - .setSide(Side.CLIENT).setPhase(Phase.EARLY) + MCPATCHER_FORGE_CUSTOM_ITEM_TEXTURES(new MixinBuilder() + .setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.CustomItemTextures.enabled) - .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses(addPrefix("mcpatcherforge.cit.", + .addClientMixins(addPrefix("mcpatcherforge.cit.", "client.renderer.entity.MixinRenderBiped", "client.renderer.entity.MixinRenderEntityLiving", "client.renderer.entity.MixinRenderItem", @@ -480,34 +507,30 @@ public enum Mixins { "world.MixinWorld" )) ), - MCPATCHER_FORGE_CONNECTED_TEXTURES(new Builder("MCP:F Connected Textures") - .setSide(Side.CLIENT).setPhase(Phase.EARLY) + MCPATCHER_FORGE_CONNECTED_TEXTURES(new MixinBuilder() + .setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.ConnectedTextures.enabled) - .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses("mcpatcherforge.ctm.MixinRenderBlocks") + .addClientMixins("mcpatcherforge.ctm.MixinRenderBlocks") ), - MCPATCHER_FORGE_EXTENDED_HD(new Builder("MCP:F Extended hd") - .setSide(Side.CLIENT).setPhase(Phase.EARLY) + MCPATCHER_FORGE_EXTENDED_HD(new MixinBuilder() + .setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.ExtendedHD.enabled) - .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses(addPrefix("mcpatcherforge.hd.", + .addClientMixins(addPrefix("mcpatcherforge.hd.", "MixinTextureClock", "MixinTextureCompass", "MixinTextureManager" )) ), - MCPATCHER_FORGE_EXTENDED_HD_FONT(new Builder("MCP:F Extended HD Font") - .setSide(Side.CLIENT).setPhase(Phase.EARLY) + MCPATCHER_FORGE_EXTENDED_HD_FONT(new MixinBuilder() + .setPhase(Phase.EARLY) .setApplyIf(() -> (AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.ExtendedHD.enabled && MCPatcherForgeConfig.ExtendedHD.hdFont)) - .addTargetedMod(TargetedMod.VANILLA) .addExcludedMod(TargetedMod.COFHCORE) - .addMixinClasses("mcpatcherforge.hd.MixinFontRenderer") + .addClientMixins("mcpatcherforge.hd.MixinFontRenderer") ), - MCPATCHER_FORGE_RANDOM_MOBS(new Builder("MCP:F Random Mobs") - .setSide(Side.CLIENT).setPhase(Phase.EARLY) + MCPATCHER_FORGE_RANDOM_MOBS(new MixinBuilder() + .setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.RandomMobs.enabled) - .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses(addPrefix("mcpatcherforge.mob.", + .addClientMixins(addPrefix("mcpatcherforge.mob.", "MixinRender", "MixinRenderEnderman", "MixinRenderFish", @@ -520,220 +543,59 @@ public enum Mixins { "MixinEntityLivingBase" )) ), - MCPATCHER_FORGE_SKY(new Builder("MCP:F Sky") - .setSide(Side.CLIENT).setPhase(Phase.EARLY) + MCPATCHER_FORGE_SKY(new MixinBuilder() + .setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.BetterSkies.enabled) - .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses(addPrefix("mcpatcherforge.sky.", + .addClientMixins(addPrefix("mcpatcherforge.sky.", "MixinEffectRenderer", "MixinRenderGlobal" )) ), - MCPATCHER_FORGE_CC_NO_CTM(new Builder("MCP:F Custom Colors, no Connected Textures") - .setSide(Side.CLIENT).setPhase(Phase.EARLY) + MCPATCHER_FORGE_CC_NO_CTM(new MixinBuilder("MCP:F Custom Colors, no Connected Textures") + .setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures - && !MCPatcherForgeConfig.ConnectedTextures.enabled - && MCPatcherForgeConfig.CustomColors.enabled) - .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses("mcpatcherforge.ctm_cc.MixinRenderBlocksNoCTM") + && !MCPatcherForgeConfig.ConnectedTextures.enabled + && MCPatcherForgeConfig.CustomColors.enabled) + .addClientMixins("mcpatcherforge.ctm_cc.MixinRenderBlocksNoCTM") ), - MCPATCHER_FORGE_CTM_NO_CC(new Builder("MCP:F Connected Textures, no Custom Colours") - .setSide(Side.CLIENT).setPhase(Phase.EARLY) + MCPATCHER_FORGE_CTM_NO_CC(new MixinBuilder("MCP:F Connected Textures, no Custom Colours") + .setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures - && MCPatcherForgeConfig.ConnectedTextures.enabled - && !MCPatcherForgeConfig.CustomColors.enabled) - .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses("mcpatcherforge.ctm_cc.MixinRenderBlocksNoCC") + && MCPatcherForgeConfig.ConnectedTextures.enabled + && !MCPatcherForgeConfig.CustomColors.enabled) + .addClientMixins("mcpatcherforge.ctm_cc.MixinRenderBlocksNoCC") ), - MCPATCHER_FORGE_CTM_AND_CC(new Builder("MCP:F Connected Textures and Custom Colors") - .setSide(Side.CLIENT).setPhase(Phase.EARLY) + MCPATCHER_FORGE_CTM_AND_CC(new MixinBuilder("MCP:F Connected Textures and Custom Colors") + .setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures - && MCPatcherForgeConfig.ConnectedTextures.enabled - && MCPatcherForgeConfig.CustomColors.enabled) - .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses("mcpatcherforge.ctm_cc.MixinRenderBlocks") + && MCPatcherForgeConfig.ConnectedTextures.enabled + && MCPatcherForgeConfig.CustomColors.enabled) + .addClientMixins("mcpatcherforge.ctm_cc.MixinRenderBlocks") ), - MCPATCHER_FORGE_CTM_OR_CC(new Builder("MCP:F Connected Textures or Custom Colors") - .setSide(Side.CLIENT).setPhase(Phase.EARLY) + MCPATCHER_FORGE_CTM_OR_CC(new MixinBuilder("MCP:F Connected Textures or Custom Colors") + .setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures - && MCPatcherForgeConfig.ConnectedTextures.enabled - || MCPatcherForgeConfig.CustomColors.enabled) - .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses("mcpatcherforge.ctm_cc.MixinTextureMap") + && MCPatcherForgeConfig.ConnectedTextures.enabled + || MCPatcherForgeConfig.CustomColors.enabled) + .addClientMixins("mcpatcherforge.ctm_cc.MixinTextureMap") ), //End from NotFine - QPR(new Builder("Adds a QuadProvider field to blocks without populating it") - .setSide(Side.CLIENT) + QPR(new MixinBuilder("Adds a QuadProvider field to blocks without populating it") .setPhase(Phase.EARLY) - .setApplyIf(() -> true) - .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses( + .addClientMixins( "angelica.models.MixinBlock", "angelica.models.MixinBlockOldLeaf")), ; - private final List mixinClasses; - private final Supplier applyIf; - private final Phase phase; - private final Side side; - private final List targetedMods; - private final List excludedMods; + private final MixinBuilder builder; - Mixins(Builder builder) { - this.mixinClasses = builder.mixinClasses; - this.applyIf = builder.applyIf; - this.side = builder.side; - this.targetedMods = builder.targetedMods; - this.excludedMods = builder.excludedMods; - this.phase = builder.phase; - if (this.targetedMods.isEmpty()) { - throw new RuntimeException("No targeted mods specified for " + this.name()); - } - if (this.applyIf == null) { - throw new RuntimeException("No ApplyIf function specified for " + this.name()); - } - } - - public static List getEarlyMixins(Set loadedCoreMods) { - NotFineConfig.loadSettings(); - //This may be possible to handle differently or fix. - if(loadedCoreMods.contains("cofh.asm.LoadingPlugin")) { - MCPatcherForgeConfig.ExtendedHD.hdFont = false; - } - final List mixins = new ArrayList<>(); - final List notLoading = new ArrayList<>(); - for (Mixins mixin : Mixins.values()) { - if (mixin.phase == Mixins.Phase.EARLY) { - if (mixin.shouldLoad(loadedCoreMods, Collections.emptySet())) { - mixins.addAll(mixin.mixinClasses); - } else { - notLoading.addAll(mixin.mixinClasses); - } - } - } - AngelicaTweaker.LOGGER.info("Not loading the following EARLY mixins: {}", notLoading); - return mixins; - } - - public static List getLateMixins(Set loadedMods) { - final List mixins = new ArrayList<>(); - final List notLoading = new ArrayList<>(); - for (Mixins mixin : Mixins.values()) { - if (mixin.phase == Mixins.Phase.LATE) { - if (mixin.shouldLoad(Collections.emptySet(), loadedMods)) { - mixins.addAll(mixin.mixinClasses); - } else { - notLoading.addAll(mixin.mixinClasses); - } - } - } - AngelicaTweaker.LOGGER.info("Not loading the following LATE mixins: {}", notLoading.toString()); - return mixins; - } - - private boolean shouldLoadSide() { - return side == Side.BOTH || (side == Side.SERVER && FMLLaunchHandler.side().isServer()) - || (side == Side.CLIENT && FMLLaunchHandler.side().isClient()); - } - - private boolean allModsLoaded(List targetedMods, Set loadedCoreMods, Set loadedMods) { - if (targetedMods.isEmpty()) return false; - - for (TargetedMod target : targetedMods) { - if (target == TargetedMod.VANILLA) continue; - - // Check coremod first - if (!loadedCoreMods.isEmpty() && target.coreModClass != null - && !loadedCoreMods.contains(target.coreModClass)) - return false; - else if (!loadedMods.isEmpty() && target.modId != null && !loadedMods.contains(target.modId)) return false; - } - - return true; - } - - private boolean noModsLoaded(List targetedMods, Set loadedCoreMods, Set loadedMods) { - if (targetedMods.isEmpty()) return true; - - for (TargetedMod target : targetedMods) { - if (target == TargetedMod.VANILLA) continue; - - // Check coremod first - if (!loadedCoreMods.isEmpty() && target.coreModClass != null - && loadedCoreMods.contains(target.coreModClass)) - return false; - else if (!loadedMods.isEmpty() && target.modId != null && loadedMods.contains(target.modId)) return false; - } - - return true; - } - - private boolean shouldLoad(Set loadedCoreMods, Set loadedMods) { - return (shouldLoadSide() && applyIf.get() - && allModsLoaded(targetedMods, loadedCoreMods, loadedMods) - && noModsLoaded(excludedMods, loadedCoreMods, loadedMods)); - } - - private static class Builder { - - private final List mixinClasses = new ArrayList<>(); - private Supplier applyIf = () -> true; - private Side side = Side.BOTH; - private Phase phase = Phase.LATE; - private final List targetedMods = new ArrayList<>(); - private final List excludedMods = new ArrayList<>(); - - public Builder(@SuppressWarnings("unused") String description) {} - - public Builder addMixinClasses(String... mixinClasses) { - this.mixinClasses.addAll(Arrays.asList(mixinClasses)); - return this; - } - - public Builder setPhase(Phase phase) { - this.phase = phase; - return this; - } - - public Builder setSide(Side side) { - this.side = side; - return this; - } - - public Builder setApplyIf(Supplier applyIf) { - this.applyIf = applyIf; - return this; - } - - public Builder addTargetedMod(TargetedMod mod) { - this.targetedMods.add(mod); - return this; - } - - public Builder addExcludedMod(TargetedMod mod) { - this.excludedMods.add(mod); - return this; - } - } - - @SuppressWarnings("SimplifyStreamApiCallChains") private static String[] addPrefix(String prefix, String... values) { - return Arrays.stream(values) - .map(s -> prefix + s) - .collect(Collectors.toList()) - .toArray(new String[values.length]); - } - - private enum Side { - BOTH, - CLIENT, - SERVER - } - - private enum Phase { - EARLY, - LATE, + List list = new ArrayList<>(values.length); + for (String s : values) { + list.add(prefix + s); + } + return list.toArray(new String[values.length]); } } diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java b/src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java index f0a535843..e7196eebb 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java @@ -1,61 +1,31 @@ package com.gtnewhorizons.angelica.mixins; +import com.gtnewhorizon.gtnhmixins.builders.ITargetMod; +import com.gtnewhorizon.gtnhmixins.builders.TargetModBuilder; import lombok.Getter; -public enum TargetedMod { +@Getter +public enum TargetedMod implements ITargetMod { - VANILLA("Minecraft", null) - , FASTCRAFT("FastCraft", "fastcraft.Tweaker") - , OPTIFINE("Optifine", "optifine.OptiFineForgeTweaker", "Optifine") - , ARCHAICFIX("ArchaicFix", "org.embeddedt.archaicfix.ArchaicCore", "archaicfix") - , BACKHAND("Backhand","xonin.backhand.coremod.BackhandLoadingPlugin", "backhand") - , BOTANIA("Botania", null, "Botania") - , CAMPFIRE_BACKPORT("CampfireBackport", null, "campfirebackport") - , CHICKENCHUNKS("ChickenChunks", null, "ChickenChunks") - , COFHCORE("CoFHCore", "cofh.asm.LoadingPlugin", "CoFHCore") - , DYNAMIC_SURROUNDINGS_MIST("Dynamic Surroundings", "org.blockartistry.mod.DynSurround.mixinplugin.DynamicSurroundingsEarlyMixins", "dsurround") - , DYNAMIC_SURROUNDINGS_ORIGINAL("Dynamic Surroundings", "org.blockartistry.mod.DynSurround.asm.TransformLoader", "dsurround") - , EXTRAUTILS("ExtraUtilities", null, "ExtraUtilities") - , MINEFACTORY_RELOADED("MineFactory Reloaded", null, "MineFactoryReloaded") - , GTNHLIB("GTNHLib", "com.gtnewhorizon.gtnhlib.core.GTNHLibCore", "gtnhlib") - , IC2("IC2", "ic2.core.coremod.IC2core", "IC2") - , JABBA("JABBA", null, "JABBA") - , JOURNEYMAP("JourneyMap", null, "journeymap") - , LWJGL3IFY("lwjgl3ify", "me.eigenraven.lwjgl3ify.core.Lwjgl3ifyCoremod", "lwjgl3ify") - , MRTJPCORE("MrTJPCore", null, "MrTJPCoreMod") - , NATURA("Natura", null, "Natura") - , PROJECTRED_ILLUMINATION("ProjectRed Illumination", null, "ProjRed|Illumination") - , SECURITYCRAFT("SecurityCraft", null, "securitycraft") - , SMART_RENDER("Smart Render", null, "SmartRender") - , THAUMCRAFT("Thaumcraft", null, "Thaumcraft") - , TINKERS_CONSTRUCT("Tinker's Construct", null, "TConstruct") - , TWILIGHT_FOREST("TwilightForest", null, "TwilightForest") - , WITCHERY("Witchery", null, "witchery") - ; + ARCHAICFIX("org.embeddedt.archaicfix.ArchaicCore", "archaicfix"), + BACKHAND("xonin.backhand.coremod.BackhandLoadingPlugin", "backhand"), + CAMPFIRE_BACKPORT(null, "campfirebackport"), + COFHCORE( "cofh.asm.LoadingPlugin", "CoFHCore"), + DYNAMIC_SURROUNDINGS_MIST("org.blockartistry.mod.DynSurround.mixinplugin.DynamicSurroundingsEarlyMixins", "dsurround"), + DYNAMIC_SURROUNDINGS_ORIGINAL("org.blockartistry.mod.DynSurround.asm.TransformLoader", "dsurround"), + EXTRAUTILS(null, "ExtraUtilities"), + MINEFACTORY_RELOADED(null, "MineFactoryReloaded"), + IC2("ic2.core.coremod.IC2core", "IC2"), + NATURA(null, "Natura"), + SECURITYCRAFT(null, "securitycraft"), + THAUMCRAFT(null, "Thaumcraft"), + TINKERS_CONSTRUCT(null, "TConstruct"), + TWILIGHT_FOREST(null, "TwilightForest"), + WITCHERY(null, "witchery"); + private final TargetModBuilder builder; - /** The "name" in the @Mod annotation */ - @Getter - public final String modName; - /** Class that implements the IFMLLoadingPlugin interface */ - @Getter - public final String coreModClass; - /** The "modid" in the @Mod annotation */ - @Getter - public final String modId; - - TargetedMod(String modName, String coreModClass) { - this(modName, coreModClass, null); - } - - TargetedMod(String modName, String coreModClass, String modId) { - this.modName = modName; - this.coreModClass = coreModClass; - this.modId = modId; - } - - @Override - public String toString() { - return "TargetedMod{modName='" + modName + "', coreModClass='" + coreModClass + "', modId='" + modId + "'}"; + TargetedMod(String coreModClass, String modId) { + this.builder = new TargetModBuilder().setCoreModClass(coreModClass).setModId(modId); } } diff --git a/src/main/java/jss/notfine/asm/AsmTransformers.java b/src/main/java/jss/notfine/asm/AsmTransformers.java index 794689f20..978e2627f 100644 --- a/src/main/java/jss/notfine/asm/AsmTransformers.java +++ b/src/main/java/jss/notfine/asm/AsmTransformers.java @@ -1,66 +1,33 @@ package jss.notfine.asm; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.function.Supplier; - +import com.gtnewhorizon.gtnhmixins.builders.ITransformers; +import com.gtnewhorizon.gtnhmixins.builders.TransformerBuilder; import com.gtnewhorizons.angelica.config.AngelicaConfig; -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; - -import cpw.mods.fml.relauncher.FMLLaunchHandler; import jss.notfine.config.MCPatcherForgeConfig; import jss.notfine.config.NotFineConfig; +import org.jetbrains.annotations.NotNull; -/** - * Adapted from Hodgepodge - */ -public enum AsmTransformers { +import java.util.function.Supplier; - RENDERBLOCKS("RenderBlocks transformer", () -> AngelicaConfig.enableMCPatcherForgeFeatures - && MCPatcherForgeConfig.CustomColors.enabled, - Side.CLIENT, "jss.notfine.asm.RenderBlocksTransformer"), - WORLDRENDERER("WorldRenderer transformer", () -> NotFineConfig.renderPass, Side.CLIENT, - "jss.notfine.asm.WorldRendererTransformer"); +public enum AsmTransformers implements ITransformers { - private final Supplier applyIf; - private final Side side; - private final String[] transformerClasses; + RENDERBLOCKS( + () -> AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.CustomColors.enabled, + "jss.notfine.asm.RenderBlocksTransformer"), + WORLDRENDERER( + () -> NotFineConfig.renderPass, + "jss.notfine.asm.WorldRendererTransformer"); - AsmTransformers(@SuppressWarnings("unused") String description, Supplier applyIf, Side side, - String... transformers) { - this.applyIf = applyIf; - this.side = side; - this.transformerClasses = transformers; + private final TransformerBuilder builder; + + AsmTransformers(Supplier applyIf, String transformer) { + this.builder = new TransformerBuilder().setApplyIf(applyIf).addClientTransformers(transformer); } - private boolean shouldBeLoaded() { - return applyIf.get() && shouldLoadSide(); + @NotNull + @Override + public TransformerBuilder getBuilder() { + return builder; } - private boolean shouldLoadSide() { - return side == Side.BOTH || (side == Side.SERVER && FMLLaunchHandler.side() - .isServer()) - || (side == Side.CLIENT && FMLLaunchHandler.side() - .isClient()); - } - - public static List getTransformers() { - final List list = new ArrayList<>(); - for (AsmTransformers transformer : values()) { - if (transformer.shouldBeLoaded()) { - AngelicaTweaker.LOGGER.info("Loading transformer {}", (Object[]) transformer.transformerClasses); - list.addAll(Arrays.asList(transformer.transformerClasses)); - } else { - AngelicaTweaker.LOGGER.info("Not loading transformer {}", (Object[]) transformer.transformerClasses); - } - } - return list; - } - - private enum Side { - BOTH, - CLIENT, - SERVER - } }