diff --git a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java index 97861b024..782664903 100644 --- a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java +++ b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java @@ -9,6 +9,10 @@ public class AngelicaConfig { @Config.RequiresMcRestart public static boolean enableSodium; + @Config.Comment("Enable NotFine Options") + @Config.DefaultBoolean(false) + public static boolean enableNotFineOptions; + @Config.Comment("Enable Reese's Sodium Options") @Config.DefaultBoolean(true) public static boolean enableReesesSodiumOptions; @@ -40,11 +44,6 @@ public class AngelicaConfig { @Config.Ignore() public static boolean enableMCPatcherForgeFeatures; - @Config.Comment("Enable NotFine optimizations") - @Config.DefaultBoolean(true) - @Config.RequiresMcRestart - public static boolean enableNotFineOptimizations; - @Config.Comment("Replace some vanilla render paths with more optimized versions. Disable if you encounter mixin conflicts.") @Config.DefaultBoolean(true) @Config.RequiresMcRestart diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java b/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java index 617088317..dc21bf1cb 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java @@ -8,8 +8,8 @@ import com.gtnewhorizons.angelica.config.AngelicaConfig; import com.gtnewhorizons.angelica.mixins.Mixins; import com.gtnewhorizons.angelica.mixins.TargetedMod; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; -import mist475.mcpatcherforge.asm.AsmTransformers; -import mist475.mcpatcherforge.asm.mappings.Namer; +import jss.notfine.asm.AsmTransformers; +import jss.notfine.asm.mappings.Namer; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 47844b9de..ca8ff5c9a 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -4,7 +4,8 @@ import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.config.AngelicaConfig; import com.gtnewhorizons.angelica.loading.AngelicaTweaker; import cpw.mods.fml.relauncher.FMLLaunchHandler; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; +import jss.notfine.config.MCPatcherForgeConfig; +import jss.notfine.config.NotFineConfig; import java.util.ArrayList; import java.util.Arrays; @@ -107,23 +108,14 @@ public enum Mixins { ,"sodium.MixinWorldClient" ,"sodium.MixinTessellator" ,"sodium.MixinTileEntity" - ,"sodium.MixinGuiIngameForge" ,"sodium.MixinEffectRenderer" ,"sodium.MixinTileEntityRendererDispatcher" ,"sodium.MixinLongHashMap" - ,"sodium.MixinRender" ,"sodium.MixinRenderingRegistry" ,"sodium.MixinPlayerManager" ) ), - SODIUM_DYN_SURROUND(new Builder("Sodium without Dynamic Surroundings").addTargetedMod(TargetedMod.VANILLA) - .addExcludedMod(TargetedMod.DYNAMIC_SURROUNDINGS_MIST).addExcludedMod(TargetedMod.DYNAMIC_SURROUNDINGS_ORIGINAL).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableSodium).addMixinClasses( - "sodium.MixinEntityRenderer$WeatherQuality" - ) - ), - // Required for Sodium's FluidRenderer, so it treats vanilla liquids as IFluidBlocks SODIUM_WISHLIST(new Builder("Sodiumer").addTargetedMod(TargetedMod.VANILLA).setSide(Side.BOTH) .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableSodiumFluidRendering).addMixinClasses( @@ -204,108 +196,134 @@ public enum Mixins { .addMixinClasses("angelica.textures.MixinTextureUtil_OptimizeMipmap").addTargetedMod(TargetedMod.VANILLA) .setApplyIf(() -> AngelicaConfig.optimizeTextureLoading).setSide(Side.CLIENT)), - NOTFINE_OPTIMIZATION(new Builder("NotFine Optimizations").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableNotFineOptimizations).addMixinClasses( - "notfine.faceculling.MixinBlock" - ,"notfine.faceculling.MixinBlockSlab" - ,"notfine.faceculling.MixinBlockSnow" - ,"notfine.faceculling.MixinBlockStairs" - )), + //From NotFine + NOTFINE_BASE_MOD(new Builder("NotFine") + .setSide(Side.CLIENT).setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.enableNotFineFeatures) + .addTargetedMod(TargetedMod.VANILLA) + .addMixinClasses(addPrefix("notfine.", + "clouds.MixinEntityRenderer", + "clouds.MixinGameSettings", + //"clouds.MixinRenderGlobal", + "clouds.MixinWorldType", - NOTFINE_FEATURES(new Builder("NotFine Features").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableNotFineFeatures).addMixinClasses( - //"notfine.clouds.MixinEntityRenderer" - //,"notfine.clouds.MixinGameSettings" - //,"notfine.clouds.MixinRenderGlobal" - //,"notfine.clouds.MixinWorldType" - "notfine.fix.MixinRenderItem" - ,"notfine.glint.MixinRenderBiped" - ,"notfine.glint.MixinRenderPlayer" - ,"notfine.gui.MixinGuiSlot" - ,"notfine.leaves.MixinBlockLeaves" - ,"notfine.leaves.MixinBlockLeavesBase" - //,"notfine.particles.MixinBlockEnchantmentTable" - //,"notfine.particles.MixinEffectRenderer" - //,"notfine.particles.MixinWorldClient" - //,"notfine.particles.MixinWorldProvider" - ,"notfine.renderer.MixinRenderGlobal" - //,"notfine.toggle.MixinGuiIngame" - //,"notfine.toggle.MixinEntityRenderer" - //,"notfine.toggle.MixinRender" --> No Sodium below - //,"notfine.toggle.MixinRenderItem" - )), + "fix.MixinRenderItem", - NOTFINE_FEATURES_NO_SODIUM(new Builder("NotFine Features").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableNotFineFeatures && !AngelicaConfig.enableSodium).addMixinClasses( - "notfine.toggle.MixinRender" - )), + "gui.MixinGuiSlot", - NOTFINE_FEATURES_NO_MCPF_CIT(new Builder("NotFine Features which clash with mcpf cit (compat handled in MCPF_NF mixin)").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableNotFineFeatures && - !(AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.instance().customItemTexturesEnabled) - ).addMixinClasses( - "notfine.glint.MixinItemRenderer" - ,"notfine.glint.MixinRenderItem" - )), + "glint.MixinRenderBiped", + "glint.MixinRenderPlayer", - NOTFINE_LATE_TWILIGHT_FOREST_LEAVES(new Builder("NotFine Mod Leaves").addTargetedMod(TargetedMod.TWILIGHT_FOREST).setSide(Side.CLIENT) - .setPhase(Phase.LATE).setApplyIf(() -> AngelicaConfig.enableNotFineFeatures).addMixinClasses( - "notfine.leaves.twilightforest.MixinBlockTFLeaves" - ,"notfine.leaves.twilightforest.MixinBlockTFLeaves3" + "optimization.MixinRenderItemFrame", + + "leaves.MixinBlockLeaves", + "leaves.MixinBlockLeavesBase", + + "particles.MixinBlockEnchantmentTable", + "particles.MixinEffectRenderer", + "particles.MixinWorldClient", + + "renderer.MixinRenderGlobal", + + "toggle.MixinEntityRenderer", + "toggle.MixinGuiIngame", + "toggle.MixinRender", + "toggle.MixinRenderItem" + )) + ), + BETTER_FACE_CULLING(new Builder("Better face culling") + .setSide(Side.CLIENT).setPhase(Phase.EARLY) + .setApplyIf(() -> NotFineConfig.betterBlockFaceCulling) + .addTargetedMod(TargetedMod.VANILLA) + .addMixinClasses(addPrefix("notfine.faceculling.", + "MixinBlock", + "MixinBlockCactus", + "MixinBlockCarpet", + "MixinBlockFarmland", + "MixinBlockSlab", + "MixinBlockSnow", + "MixinBlockStairs", + "MixinRenderBlocks" + )) + ), + NOTFINE_NO_DYNAMIC_SURROUNDINGS(new Builder("NotFine no Dynamic Surroundings") + .setSide(Side.CLIENT).setPhase(Phase.EARLY) + .setApplyIf(() -> true) + .addTargetedMod(TargetedMod.VANILLA) + .addExcludedMod(TargetedMod.DYNAMIC_SURROUNDINGS_MIST) + .addExcludedMod(TargetedMod.DYNAMIC_SURROUNDINGS_ORIGINAL) + .addMixinClasses("notfine.toggle.MixinEntityRenderer$RenderRainSnow") + ), + NOTFINE_NO_CUSTOM_ITEM_TEXTURES(new Builder("NotFine no Custom Item Textures") + .setSide(Side.CLIENT).setPhase(Phase.EARLY) + .setApplyIf(() -> !AngelicaConfig.enableMCPatcherForgeFeatures || !MCPatcherForgeConfig.instance().customItemTexturesEnabled) + .addTargetedMod(TargetedMod.VANILLA) + .addMixinClasses(addPrefix("notfine.glint.", + "MixinItemRenderer", + "MixinRenderItem" + )) + ), + NOTFINE_THAUMCRAFT(new Builder("NotFine Thaumcraft compat") + .setSide(Side.CLIENT).setPhase(Phase.LATE) + .setApplyIf(() -> AngelicaConfig.enableNotFineFeatures) + .addTargetedMod(TargetedMod.THAUMCRAFT) + .addMixinClasses("notfine.leaves.thaumcraft.MixinBlockMagicalLeaves") + ), + THAUMCRAFT_BETTER_FACE_CULLING(new Builder("Better face culling Thaumcraft compat") + .setSide(Side.CLIENT).setPhase(Phase.LATE) + .setApplyIf(() -> NotFineConfig.betterBlockFaceCulling) + .addTargetedMod(TargetedMod.THAUMCRAFT) + .addMixinClasses(addPrefix("notfine.faceculling.thaumcraft.", + "MixinBlockWoodenDevice", + "MixinBlockStoneDevice", + "MixinBlockTable" + )) + ), + NOTFINE_WITCHERY(new Builder("NotFine Witchery compat") + .setSide(Side.CLIENT).setPhase(Phase.LATE) + .setApplyIf(() -> AngelicaConfig.enableNotFineFeatures) + .addTargetedMod(TargetedMod.WITCHERY) + .addMixinClasses("notfine.leaves.witchery.MixinBlockWitchLeaves") + ), + NOTFINE_TWILIGHT_FOREST(new Builder("NotFine Twilight Forest compat") + .setSide(Side.CLIENT).setPhase(Phase.LATE) + .setApplyIf(() -> AngelicaConfig.enableNotFineFeatures) + .addTargetedMod(TargetedMod.TWILIGHT_FOREST) + .addMixinClasses(addPrefix("notfine.leaves.twilightforest", + "MixinBlockTFLeaves", + "MixinBlockTFLeaves3", // TODO: Verify 2.3.8.18 or later to support non NH builds? - ,"notfine.leaves.twilightforest.MixinBlockTFMagicLeaves" - )), - NOTFINE_LATE_THAUMCRAFT_LEAVES(new Builder("NotFine Mod Leaves").addTargetedMod(TargetedMod.THAUMCRAFT).setSide(Side.CLIENT) - .setPhase(Phase.LATE).setApplyIf(() -> AngelicaConfig.enableNotFineFeatures).addMixinClasses( - "notfine.leaves.thaumcraft.MixinBlockMagicalLeaves" - )), - NOTFINE_LATE_WITCHERY_LEAVES(new Builder("NotFine Mod Leaves").addTargetedMod(TargetedMod.WITCHERY).setSide(Side.CLIENT) - .setPhase(Phase.LATE).setApplyIf(() -> AngelicaConfig.enableNotFineFeatures).addMixinClasses( - "notfine.leaves.witchery.MixinBlockWitchLeaves" - )), - - MCPATCHERFORGE_NOTFINE_COMPAT(new Builder("Notfine features and MCPF features where the 2 would clash").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) - .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableNotFineFeatures && - AngelicaConfig.enableMCPatcherForgeFeatures && - MCPatcherForgeConfig.instance().customItemTexturesEnabled) - .addMixinClasses(addPrefix( - "notfine_mcpf_compat.", - "MixinRenderItem", - "MixinItemRenderer"))), - - MCPATCHERFORGE_BASE_MOD(new Builder("Base MCPatcher mixins").setSide(Side.CLIENT) - .setPhase(Phase.EARLY) + "MixinBlockTFMagicLeaves" + )) + ), + MCPATCHER_FORGE(new Builder("MCPatcher Forge") + .setSide(Side.CLIENT).setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures) .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses(addPrefix( - "mcpatcherforge.", + .addMixinClasses(addPrefix("mcpatcherforge.", "base.MixinBlockGrass", - "base.MixinBlockMycelium", + "base.MixinBlockMycelium", - "base.MixinAbstractTexture", - "base.MixinTextureAtlasSprite", + "base.MixinAbstractTexture", + "base.MixinTextureAtlasSprite", - "base.MixinSimpleReloadableResourceManager", + "base.MixinSimpleReloadableResourceManager", - "base.MixinMinecraft" + "base.MixinMinecraft" - // TODO merge renderpass changes into Sodium renderer - // "renderpass.MixinEntityRenderer", - // "renderpass.MixinRenderBlocks", - // "renderpass.MixinRenderGlobal", - // "renderpass.MixinWorldRenderer" - - ) - )), - - MCPATCHERFORGE_CUSTOM_COLOURS(new Builder("Custom colors").setSide(Mixins.Side.CLIENT) - .setPhase(Mixins.Phase.EARLY) + // TODO merge renderpass changes into Sodium renderer + // "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) .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.instance().customColorsEnabled) .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses( - addPrefix( - "mcpatcherforge.cc.", - "block.material.MixinMapColor", + .addMixinClasses(addPrefix("mcpatcherforge.cc.", + "block.material.MixinMapColor", "block.MixinBlock", "block.MixinBlockDoublePlant", @@ -353,55 +371,56 @@ public enum Mixins { "world.MixinWorld", "world.MixinWorldProvider", "world.MixinWorldProviderEnd", - "world.MixinWorldProviderHell"))), - - MCPATCHERFORGE_CUSTOM_ITEM_TEXTURES(new Mixins.Builder("Custom Item Textures").setSide(Mixins.Side.CLIENT) - .setPhase(Phase.EARLY) - .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.instance().customItemTexturesEnabled) + "world.MixinWorldProviderHell" + )) + ), + MCPATCHER_FORGE_CUSTOM_ITEM_TEXTURES(new Builder("MCP:F Custom Item Textures") + .setSide(Side.CLIENT).setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.enableNotFineFeatures && MCPatcherForgeConfig.instance().customItemTexturesEnabled) .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses( - addPrefix( - "mcpatcherforge.cit.", + .addMixinClasses(addPrefix("mcpatcherforge.cit.", "client.renderer.entity.MixinRenderBiped", "client.renderer.entity.MixinRenderEntityLiving", "client.renderer.entity.MixinRenderItem", "client.renderer.entity.MixinRenderPlayer", "client.renderer.entity.MixinRenderSnowball", "client.renderer.MixinItemRenderer", + "client.renderer.MixinRenderGlobal", + "entity.MixinEntityLivingBase", "item.MixinItem", "nbt.MixinNBTTagCompound", - "nbt.MixinNBTTagList"))), - - MCPATCHERFORGE_CUSTOM_ITEM_TEXTURES_NO_NF(new Mixins.Builder("Custom Item Textures without notfine features").setSide(Mixins.Side.CLIENT) - .setPhase(Phase.EARLY) - .setApplyIf(() -> (AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.instance().customItemTexturesEnabled) && !AngelicaConfig.enableNotFineFeatures) - .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses(addPrefix( - "mcpatcherforge.cit.client.renderer.", - "entity.MixinRenderItemRenderDroppedItem", - "MixinItemRenderer_NO_NF" - ))), - - MCPATCHERFORGE_CONNECTED_TEXTURES(new Builder("Connected Textures").setSide(Side.CLIENT) - .setPhase(Mixins.Phase.EARLY) + "nbt.MixinNBTTagList", + "world.MixinWorld" + )) + ), + MCPATCHER_FORGE_CONNECTED_TEXTURES(new Builder("MCP:F Connected Textures") + .setSide(Side.CLIENT).setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.instance().connectedTexturesEnabled) .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses("mcpatcherforge.ctm.MixinRenderBlocks")), - - MCPATCHERFORGE_EXTENDED_HD(new Builder("Extended hd").setSide(Side.CLIENT) - .setPhase(Phase.EARLY) - .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.instance().extendedHDEnabled) + .addMixinClasses("mcpatcherforge.ctm.MixinRenderBlocks") + ), + MCPATCHER_FORGE_EXTENDED_HD(new Builder("MCP:F Extended hd") + .setSide(Side.CLIENT).setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.enableNotFineFeatures && MCPatcherForgeConfig.instance().extendedHDEnabled) .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses( - addPrefix("mcpatcherforge.hd.", "MixinFontRenderer", "MixinTextureClock", "MixinTextureCompass", "MixinTextureManager"))), - - MCPATCHERFORGE_RANDOM_MOBS(new Builder("Random Mobs").setSide(Side.CLIENT) - .setPhase(Phase.EARLY) + .addMixinClasses(addPrefix("mcpatcherforge.hd.", + "MixinTextureClock", + "MixinTextureCompass", + "MixinTextureManager" + )) + ), + MCPATCHER_FORGE_EXTENDED_HD_FONT(new Builder("MCP:F Extended HD Font") + .setSide(Side.CLIENT).setPhase(Phase.EARLY) + .setApplyIf(() -> (AngelicaConfig.enableNotFineFeatures && MCPatcherForgeConfig.instance().extendedHDEnabled && MCPatcherForgeConfig.instance().hdFont)) + .addTargetedMod(TargetedMod.VANILLA) + .addExcludedMod(TargetedMod.COFHCORE) + .addMixinClasses("mcpatcherforge.hd.MixinFontRenderer") + ), + MCPATCHER_FORGE_RANDOM_MOBS(new Builder("MCP:F Random Mobs") + .setSide(Side.CLIENT).setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.instance().randomMobsEnabled) .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses( - addPrefix( - "mcpatcherforge.mob.", + .addMixinClasses(addPrefix("mcpatcherforge.mob.", "MixinRender", "MixinRenderEnderman", "MixinRenderFish", @@ -411,50 +430,51 @@ public enum Mixins { "MixinRenderSnowMan", "MixinRenderSpider", "MixinRenderWolf", - "MixinEntityLivingBase"))), - - MCPATCHERFORGE_SKY(new Builder("Sky").setSide(Side.CLIENT) - .setPhase(Phase.EARLY) + "MixinEntityLivingBase" + )) + ), + MCPATCHER_FORGE_SKY(new Builder("MCP:F Sky") + .setSide(Side.CLIENT).setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.instance().betterSkiesEnabled) .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses(addPrefix("mcpatcherforge.sky.", "MixinEffectRenderer", "MixinRenderGlobal" - ))), - - MCPATCHERFORGE_CC_NO_CTM(new Builder("Custom colors, no connected textures").setSide(Side.CLIENT) - .setPhase(Phase.EARLY) - .setApplyIf( - () -> AngelicaConfig.enableMCPatcherForgeFeatures - && (!MCPatcherForgeConfig.instance().connectedTexturesEnabled - && MCPatcherForgeConfig.instance().customColorsEnabled)) + .addMixinClasses(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) + .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures + && !MCPatcherForgeConfig.instance().connectedTexturesEnabled + && MCPatcherForgeConfig.instance().customColorsEnabled) .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses("mcpatcherforge.ctm_cc.MixinRenderBlocksNoCTM")), - - MCPATCHERFORGE_CTM_AND_CC(new Builder("Connected textures and Custom Colors enabled").setSide(Side.CLIENT) - .setPhase(Phase.EARLY) - .setApplyIf( - () -> AngelicaConfig.enableMCPatcherForgeFeatures - && MCPatcherForgeConfig.instance().connectedTexturesEnabled - && MCPatcherForgeConfig.instance().customColorsEnabled) + .addMixinClasses("mcpatcherforge.cc_ctm.MixinRenderBlocksNoCTM") + ), + MCPATCHER_FORGE_CTM_NO_CC(new Builder("MCP:F Connected Textures, no Custom Colours") + .setSide(Side.CLIENT).setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures + && MCPatcherForgeConfig.instance().connectedTexturesEnabled + && !MCPatcherForgeConfig.instance().customColorsEnabled) .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses("mcpatcherforge.ctm_cc.MixinRenderBlocks")), - - MCPATCHERFORGE_CTM_NO_CC(new Builder("Connected textures, no custom colours").setSide(Side.CLIENT) - .setPhase(Phase.EARLY) - .setApplyIf( - () -> AngelicaConfig.enableMCPatcherForgeFeatures - && (MCPatcherForgeConfig.instance().connectedTexturesEnabled - && !MCPatcherForgeConfig.instance().customColorsEnabled)) + .addMixinClasses("mcpatcherforge.ctm_cc.MixinRenderBlocksNoCC") + ), + MCPATCHER_FORGE_CTM_AND_CC(new Builder("MCP:F Connected Textures and Custom Colors") + .setSide(Side.CLIENT).setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures + && MCPatcherForgeConfig.instance().connectedTexturesEnabled + && MCPatcherForgeConfig.instance().customColorsEnabled) .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses("mcpatcherforge.ctm_cc.MixinRenderBlocksNoCC")), - - MCPATCHERFORGE_CTM_OR_CC(new Builder("Connected textures or Custom Colors enabled").setSide(Side.CLIENT) - .setPhase(Phase.EARLY) - .setApplyIf( - () -> AngelicaConfig.enableMCPatcherForgeFeatures - && (MCPatcherForgeConfig.instance().connectedTexturesEnabled - || MCPatcherForgeConfig.instance().customColorsEnabled)) + .addMixinClasses("mcpatcherforge.ctm_cc.MixinRenderBlocks") + ), + MCPATCHER_FORGE_CTM_OR_CC(new Builder("MCP:F Connected Textures or Custom Colors") + .setSide(Side.CLIENT).setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.enableMCPatcherForgeFeatures + && MCPatcherForgeConfig.instance().connectedTexturesEnabled + || MCPatcherForgeConfig.instance().customColorsEnabled) .addTargetedMod(TargetedMod.VANILLA) - .addMixinClasses("mcpatcherforge.ctm_cc.MixinTextureMap")), + .addMixinClasses("mcpatcherforge.ctm_cc.MixinTextureMap") + ), + //End from NotFine NOVIS_OCULIS(new Builder("Non-Tessellator Quad provider") .setSide(Side.CLIENT) @@ -492,6 +512,15 @@ public enum Mixins { } public static List getEarlyMixins(Set loadedCoreMods) { + NotFineConfig.loadSettings(); + //These will probably break hard with Angelica. + //AdvancedOpenGL even breaks hard on its own. + NotFineConfig.allowAdvancedOpenGL = false; + NotFineConfig.allowToggleFBO = false; + //This may be possible to handle differently or fix. + if(loadedCoreMods.contains("cofh.asm.LoadingPlugin")) { + MCPatcherForgeConfig.instance().hdFont = false; + } final List mixins = new ArrayList<>(); final List notLoading = new ArrayList<>(); for (Mixins mixin : Mixins.values()) { diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinEntityRenderer.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinEntityRenderer.java index e4215086f..67518a15d 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinEntityRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/MixinEntityRenderer.java @@ -1,13 +1,9 @@ package com.gtnewhorizons.angelica.mixins.early.angelica; import com.gtnewhorizons.angelica.rendering.RenderingState; -import com.llamalad7.mixinextras.injector.wrapoperation.Operation; -import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; -import jss.notfine.core.Settings; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.WorldProvider; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -27,8 +23,4 @@ public abstract class MixinEntityRenderer { ); } - @WrapOperation(method = "setupFog", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/WorldProvider;getWorldHasVoidParticles()Z")) - private boolean angelica$wrapVoidFog(WorldProvider provider, Operation original){ - return ((boolean)Settings.VOID_FOG.option.getStore()) ? original.call(provider) : false; - } } diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/base/MixinAbstractTexture.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/base/MixinAbstractTexture.java index 42cbbba9c..0b39c10ae 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/base/MixinAbstractTexture.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/base/MixinAbstractTexture.java @@ -6,7 +6,7 @@ import org.lwjgl.opengl.GL11; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import com.gtnewhorizons.angelica.mixins.interfaces.AbstractTextureExpansion; +import jss.notfine.util.AbstractTextureExpansion; @Mixin(AbstractTexture.class) public abstract class MixinAbstractTexture implements AbstractTextureExpansion { diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/base/MixinMinecraft.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/base/MixinMinecraft.java index 03014dbac..8682b7dfc 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/base/MixinMinecraft.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/base/MixinMinecraft.java @@ -31,7 +31,7 @@ import com.prupe.mcpatcher.mal.resource.TexturePackChangeHandler; import com.prupe.mcpatcher.mal.tile.TileLoader; import com.prupe.mcpatcher.mob.MobRandomizer; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; +import jss.notfine.config.MCPatcherForgeConfig; @Mixin(Minecraft.class) public abstract class MixinMinecraft { diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/block/material/MixinMapColor.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/block/material/MixinMapColor.java index 3054c01dc..9b0f7fd49 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/block/material/MixinMapColor.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/block/material/MixinMapColor.java @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.gtnewhorizons.angelica.mixins.interfaces.MapColorExpansion; +import jss.notfine.util.MapColorExpansion; @Mixin(MapColor.class) public abstract class MixinMapColor implements MapColorExpansion { diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/client/particle/MixinEntityAuraFX.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/client/particle/MixinEntityAuraFX.java index ed0ffc157..7b4d57ffb 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/client/particle/MixinEntityAuraFX.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/client/particle/MixinEntityAuraFX.java @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.Mixin; import com.prupe.mcpatcher.cc.ColorizeEntity; import com.prupe.mcpatcher.cc.Colorizer; -import com.gtnewhorizons.angelica.mixins.interfaces.EntityAuraFXExpansion; +import jss.notfine.util.EntityAuraFXExpansion; @Mixin(EntityAuraFX.class) public abstract class MixinEntityAuraFX extends EntityFX implements EntityAuraFXExpansion { diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/client/particle/MixinEntityDropParticleFX.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/client/particle/MixinEntityDropParticleFX.java index d22e20348..cedc1fde5 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/client/particle/MixinEntityDropParticleFX.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/client/particle/MixinEntityDropParticleFX.java @@ -36,7 +36,7 @@ public abstract class MixinEntityDropParticleFX extends EntityFX { at = @At("RETURN")) private void modifyConstructor(World worldIn, double x, double y, double z, Material material, CallbackInfo ci) { if (material == Material.water) { - if (ColorizeBlock.computeWaterColor(true, (int) this.posX, (int) this.posY, (int) this.posZ)) { + if (ColorizeBlock.computeWaterColor(false, (int) this.posX, (int) this.posY, (int) this.posZ)) { this.particleRed = Colorizer.setColor[0]; this.particleGreen = Colorizer.setColor[1]; this.particleBlue = Colorizer.setColor[2]; @@ -45,10 +45,6 @@ public abstract class MixinEntityDropParticleFX extends EntityFX { this.particleGreen = 0.3f; this.particleBlue = 1.0f; } - } else { - this.particleRed = 1.0F; - this.particleGreen = 0.0F; - this.particleBlue = 0.0F; } } @@ -63,8 +59,8 @@ public abstract class MixinEntityDropParticleFX extends EntityFX { this.prevPosY = this.posY; this.prevPosZ = this.posZ; + // Patch start if (this.materialType != Material.water) { - // Patch start if (ColorizeEntity.computeLavaDropColor(40 - this.bobTimer)) { this.particleRed = Colorizer.setColor[0]; this.particleGreen = Colorizer.setColor[1]; @@ -74,12 +70,8 @@ public abstract class MixinEntityDropParticleFX extends EntityFX { this.particleGreen = 16.0f / (40 - this.bobTimer + 16); this.particleBlue = 4.0f / (40 - this.bobTimer + 8); } - // Patch end - } else { - this.particleRed = 1.0F; - this.particleGreen = 16.0F / (float) (40 - this.bobTimer + 16); - this.particleBlue = 4.0F / (float) (40 - this.bobTimer + 8); } + // Patch end this.motionY -= this.particleGravity; diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/client/particle/MixinEntitySplashFX.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/client/particle/MixinEntitySplashFX.java index e78dbf452..b8f58bb00 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/client/particle/MixinEntitySplashFX.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/client/particle/MixinEntitySplashFX.java @@ -26,6 +26,11 @@ public abstract class MixinEntitySplashFX extends EntityFX { this.particleRed = Colorizer.setColor[0]; this.particleGreen = Colorizer.setColor[1]; this.particleBlue = Colorizer.setColor[2]; + } else { + this.particleRed = 0.2f; + this.particleGreen = 0.3f; + this.particleBlue = 1.0f; } } + } diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/potion/MixinPotion.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/potion/MixinPotion.java index 79ec330ae..d3558fffa 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/potion/MixinPotion.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/potion/MixinPotion.java @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import com.prupe.mcpatcher.cc.ColorizeItem; -import com.gtnewhorizons.angelica.mixins.interfaces.PotionExpansion; +import jss.notfine.util.PotionExpansion; @Mixin(Potion.class) public abstract class MixinPotion implements PotionExpansion { diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/world/MixinWorld.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/world/MixinWorld.java index 455da4840..162b0bd81 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/world/MixinWorld.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cc/world/MixinWorld.java @@ -63,6 +63,7 @@ public abstract class MixinWorld { } return input; } + @SuppressWarnings("InvalidInjectorMethodSignature") @ModifyVariable( method = "getSkyColorBody(Lnet/minecraft/entity/Entity;F)Lnet/minecraft/util/Vec3;", diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/client/renderer/MixinItemRenderer_NO_NF.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/client/renderer/MixinItemRenderer_NO_NF.java deleted file mode 100644 index 360217cbf..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/client/renderer/MixinItemRenderer_NO_NF.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cit.client.renderer; - -import com.prupe.mcpatcher.cit.CITUtils; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(ItemRenderer.class) -public class MixinItemRenderer_NO_NF { - - @Redirect( - method = "renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;ILnet/minecraftforge/client/IItemRenderer$ItemRenderType;)V", - at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;hasEffect(I)Z"), - remap = false) - private boolean modifyRenderItem3(ItemStack item, int pass, EntityLivingBase entity, ItemStack itemStack, - int renderPass) { - return !CITUtils.renderEnchantmentHeld(item, renderPass) && item.hasEffect(pass); - } -} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/client/renderer/MixinRenderGlobal.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/client/renderer/MixinRenderGlobal.java new file mode 100644 index 000000000..463f68bc9 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/client/renderer/MixinRenderGlobal.java @@ -0,0 +1,51 @@ +package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cit.client.renderer; + +import com.prupe.mcpatcher.cit.CITUtils; +import jss.notfine.util.itembreakparticles.IRenderGlobalSpawnItemBreakParticle; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.WorldClient; +import net.minecraft.client.particle.EntityBreakingFX; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.renderer.RenderGlobal; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +@Mixin(value = RenderGlobal.class) +public abstract class MixinRenderGlobal implements IRenderGlobalSpawnItemBreakParticle { + + public EntityFX spawnItemBreakParticle(ItemStack itemStack, final double x, final double y, final double z, double velocityX, double velocityY, double velocityZ) { + int i = mc.gameSettings.particleSetting; + + if (i == 1 && theWorld.rand.nextInt(3) == 0) { + i = 2; + } + if (i > 1) { + return null; + } + + double relX = this.mc.renderViewEntity.posX - x; + double relY = this.mc.renderViewEntity.posY - y; + double relZ = this.mc.renderViewEntity.posZ - z; + + double distance = 16.0D; + + if (relX * relX + relY * relY + relZ * relZ > distance * distance) { + return null; + } + + Item item = itemStack.getItem(); + int meta = itemStack.getItemDamage(); + EntityFX entityfx = new EntityBreakingFX(theWorld, x, y, z, velocityX, velocityY, velocityZ, item, meta); + entityfx.particleIcon = CITUtils.getIcon(item.getIconFromDamage(meta), itemStack, 0); + mc.effectRenderer.addEffect(entityfx); + return entityfx; + } + + @Shadow + private Minecraft mc; + @Shadow + private WorldClient theWorld; + +} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/entity/MixinEntityLivingBase.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/entity/MixinEntityLivingBase.java new file mode 100644 index 000000000..c10dea9ad --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/entity/MixinEntityLivingBase.java @@ -0,0 +1,43 @@ +package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cit.entity; + +import jss.notfine.NotFine; +import jss.notfine.util.itembreakparticles.IWorldSpawnItemBreakParticle; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +@Mixin(value = EntityLivingBase.class) +public abstract class MixinEntityLivingBase extends Entity { + + /** + * @author jss2a98aj + * @reason Fix item break particles + */ + @Overwrite + public void renderBrokenItemStack(ItemStack itemStack) { + playSound("random.break", 0.8F, 0.8F + this.worldObj.rand.nextFloat() * 0.4F); + + for(int i = 0; i < 5; ++i) { + Vec3 vec3 = Vec3.createVectorHelper(((double)rand.nextFloat() - 0.5) * 0.1, Math.random() * 0.1 + 0.1, 0.0); + vec3.rotateAroundX(-rotationPitch * 3.1415927F / 180.0F); + vec3.rotateAroundY(-rotationYaw * 3.1415927F / 180.0F); + Vec3 vec31 = Vec3.createVectorHelper(((double)rand.nextFloat() - 0.5) * 0.3, (double)(-rand.nextFloat()) * 0.6 - 0.3, 0.6); + vec31.rotateAroundX(-rotationPitch * 3.1415927F / 180.0F); + vec31.rotateAroundY(-rotationYaw * 3.1415927F / 180.0F); + vec31 = vec31.addVector(posX, posY + (double)getEyeHeight(), posZ); + NotFine.logger.info("Item broken, calling IWorldSpawnItemBreakParticle spawnItemBreakParticle"); + ((IWorldSpawnItemBreakParticle)worldObj).spawnItemBreakParticle(itemStack, + "iconcrack_" + Item.getIdFromItem(itemStack.getItem()), + vec31.xCoord, vec31.yCoord, vec31.zCoord, vec3.xCoord, vec3.yCoord + 0.05, vec3.zCoord); + } + + } + + private MixinEntityLivingBase(World world) { super(world); } + +} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/nbt/MixinNBTTagCompound.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/nbt/MixinNBTTagCompound.java index 871d0c9d8..20babe66b 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/nbt/MixinNBTTagCompound.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/nbt/MixinNBTTagCompound.java @@ -9,7 +9,7 @@ import net.minecraft.nbt.NBTTagCompound; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import com.gtnewhorizons.angelica.mixins.interfaces.NBTTagCompoundExpansion; +import jss.notfine.util.NBTTagCompoundExpansion; @Mixin(NBTTagCompound.class) public abstract class MixinNBTTagCompound implements NBTTagCompoundExpansion { diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/nbt/MixinNBTTagList.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/nbt/MixinNBTTagList.java index 1edfe170d..77148eccb 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/nbt/MixinNBTTagList.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/nbt/MixinNBTTagList.java @@ -8,7 +8,7 @@ import net.minecraft.nbt.NBTTagList; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import com.gtnewhorizons.angelica.mixins.interfaces.NBTTagListExpansion; +import jss.notfine.util.NBTTagListExpansion; @Mixin(NBTTagList.class) public class MixinNBTTagList implements NBTTagListExpansion { diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/world/MixinWorld.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/world/MixinWorld.java new file mode 100644 index 000000000..f58073304 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/cit/world/MixinWorld.java @@ -0,0 +1,30 @@ +package com.gtnewhorizons.angelica.mixins.early.mcpatcherforge.cit.world; + +import jss.notfine.util.itembreakparticles.IRenderGlobalSpawnItemBreakParticle; +import jss.notfine.util.itembreakparticles.IWorldSpawnItemBreakParticle; +import net.minecraft.item.ItemStack; +import net.minecraft.world.IWorldAccess; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +import java.util.List; + +@Mixin(value = World.class) +public abstract class MixinWorld implements IWorldSpawnItemBreakParticle { + + public void spawnItemBreakParticle(ItemStack itemStack, String particleName, double x, double y, double z, double velocityX, double velocityY, double velocityZ) { + for (int i = 0; i < worldAccesses.size(); ++i) { + IWorldAccess access = (IWorldAccess)worldAccesses.get(i); + if (access instanceof IRenderGlobalSpawnItemBreakParticle) { + ((IRenderGlobalSpawnItemBreakParticle)access).spawnItemBreakParticle(itemStack, x, y, z, velocityX, velocityY, velocityZ); + } else { + access.spawnParticle(particleName, x, y, z, velocityX, velocityY, velocityZ); + } + } + } + + @Shadow + protected List worldAccesses; + +} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/ctm/MixinRenderBlocks.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/ctm/MixinRenderBlocks.java index 2f7a4cc51..d62d2fec0 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/ctm/MixinRenderBlocks.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/ctm/MixinRenderBlocks.java @@ -67,11 +67,14 @@ public abstract class MixinRenderBlocks { } @Redirect( - method = { "renderBlockVine(Lnet/minecraft/block/Block;III)Z", - "renderBlockLilyPad(Lnet/minecraft/block/Block;III)Z", "renderBlockLadder(Lnet/minecraft/block/Block;III)Z", + method = { + "renderBlockVine(Lnet/minecraft/block/Block;III)Z", + "renderBlockLilyPad(Lnet/minecraft/block/Block;III)Z", + "renderBlockLadder(Lnet/minecraft/block/Block;III)Z", "renderBlockTripWireSource(Lnet/minecraft/block/Block;III)Z", "renderBlockLever(Lnet/minecraft/block/Block;III)Z", - "renderBlockTripWire(Lnet/minecraft/block/Block;III)Z", }, + "renderBlockTripWire(Lnet/minecraft/block/Block;III)Z" + }, at = @At( value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderBlocks;getBlockIconFromSide(Lnet/minecraft/block/Block;I)Lnet/minecraft/util/IIcon;")) diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/ctm_cc/MixinRenderBlocks.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/ctm_cc/MixinRenderBlocks.java index ff2adb984..68c7d7f9d 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/ctm_cc/MixinRenderBlocks.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/ctm_cc/MixinRenderBlocks.java @@ -8,7 +8,6 @@ import net.minecraft.world.IBlockAccess; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; @@ -33,18 +32,6 @@ public abstract class MixinRenderBlocks { @Shadow public abstract IIcon getBlockIconFromSideAndMetadata(Block block, int side, int meta); - @Unique - private int mcpatcherforge$neededSideRenderBlockLiquid; - - @Unique - private float mcpatcherforge$neededFloat1; - - @Unique - private float mcpatcherforge$neededFloat2; - - @Unique - private float mcpatcherforge$neededFloat3; - // Redirect calls to this.getBlockIcon when possible @Redirect( diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/ctm_cc/MixinRenderBlocksNoCC.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/ctm_cc/MixinRenderBlocksNoCC.java index 1923289cb..8dba65295 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/ctm_cc/MixinRenderBlocksNoCC.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/ctm_cc/MixinRenderBlocksNoCC.java @@ -12,6 +12,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(RenderBlocks.class) public abstract class MixinRenderBlocksNoCC { + @Shadow public IBlockAccess blockAccess; diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/hd/MixinFontRenderer.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/hd/MixinFontRenderer.java index f93d8068c..da8761868 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/hd/MixinFontRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/hd/MixinFontRenderer.java @@ -25,7 +25,7 @@ import com.llamalad7.mixinextras.sugar.ref.LocalIntRef; import com.prupe.mcpatcher.cc.ColorizeWorld; import com.prupe.mcpatcher.hd.FontUtils; -import com.gtnewhorizons.angelica.mixins.interfaces.FontRendererExpansion; +import jss.notfine.util.FontRendererExpansion; @Mixin(FontRenderer.class) public abstract class MixinFontRenderer implements FontRendererExpansion { diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/renderpass/MixinEntityRenderer.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/renderpass/MixinEntityRenderer.java index 06f39d57f..ab16050c7 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/renderpass/MixinEntityRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/renderpass/MixinEntityRenderer.java @@ -39,7 +39,8 @@ public abstract class MixinEntityRenderer { return RenderPass.setAmbientOcclusion(this.mc.gameSettings.ambientOcclusion != 0); } - @WrapOperation(method = "renderWorld(FJ)V", + @WrapOperation( + method = "renderWorld(FJ)V", at = @At( value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderGlobal;sortAndRender(Lnet/minecraft/entity/EntityLivingBase;ID)I", @@ -58,5 +59,4 @@ public abstract class MixinEntityRenderer { this.renderRainSnow(partialTickTime); } - } diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/renderpass/MixinRenderBlocks.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/renderpass/MixinRenderBlocks.java index fad26a1d5..b4bfd8cec 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/renderpass/MixinRenderBlocks.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/renderpass/MixinRenderBlocks.java @@ -5,18 +5,14 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; import com.prupe.mcpatcher.renderpass.RenderPass; -@Mixin(RenderBlocks.class) +@Mixin(value = RenderBlocks.class) public abstract class MixinRenderBlocks { - @Shadow - public IBlockAccess blockAccess; - @Redirect( method = { "renderBlockBed(Lnet/minecraft/block/Block;III)Z", "renderStandardBlockWithAmbientOcclusion(Lnet/minecraft/block/Block;IIIFFF)Z", @@ -31,5 +27,4 @@ public abstract class MixinRenderBlocks { return RenderPass.shouldSideBeRendered(block, worldIn, x, y, z, side); } - } diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/renderpass/MixinRenderGlobal.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/renderpass/MixinRenderGlobal.java index 8c4807b75..f13e972dd 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/renderpass/MixinRenderGlobal.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/mcpatcherforge/renderpass/MixinRenderGlobal.java @@ -79,5 +79,4 @@ public abstract class MixinRenderGlobal implements IWorldAccess { RenderPass.enableDisableLightmap(instance, partialTick); } - } diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlock.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlock.java index 4402922e3..01d14bee0 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlock.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlock.java @@ -1,7 +1,5 @@ package com.gtnewhorizons.angelica.mixins.early.notfine.faceculling; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import jss.notfine.util.IFaceObstructionCheckHelper; import net.minecraft.block.Block; import net.minecraft.world.IBlockAccess; @@ -17,7 +15,6 @@ public abstract class MixinBlock { * @reason More accurate face culling. */ @Overwrite() - @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess worldIn, int x, int y, int z, int side) { //Check if side is touching another block switch(side) { diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockCactus.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockCactus.java new file mode 100644 index 000000000..c3fafb4b6 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockCactus.java @@ -0,0 +1,50 @@ +package com.gtnewhorizons.angelica.mixins.early.notfine.faceculling; + +import jss.notfine.util.IFaceObstructionCheckHelper; +import net.minecraft.block.Block; +import net.minecraft.block.BlockCactus; +import net.minecraft.block.material.Material; +import net.minecraft.world.IBlockAccess; +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(value = BlockCactus.class) +public abstract class MixinBlockCactus extends Block implements IFaceObstructionCheckHelper { + + /** + * @author jss2a98aj + * @reason More accurate face culling. + */ + public boolean shouldSideBeRendered(IBlockAccess worldIn, int x, int y, int z, int side) { + //If is not top or bottom + if(side > 1) { + return true; + } + //Check if other block is solid + Block otherBlock = worldIn.getBlock(x, y, z); + if(otherBlock.isOpaqueCube()) { + return false; + } + //Check for IFaceObstructionCheckHelper + if(otherBlock instanceof IFaceObstructionCheckHelper target) { + return target.isFaceNonObstructing(worldIn, x, y, z, side, 0.0625F, 0.0F, 0.0625F, 0.9375F, 1.0F, 0.9375F); + } + //Default + return true; + } + + @Override + public boolean isFaceNonObstructing(IBlockAccess worldIn, int x, int y, int z, int side, double otherMinX, double otherMinY, double otherMinZ, double otherMaxX, double otherMaxY, double otherMaxZ) { + if(getRenderBlockPass() == 1) { + return true; + } + if(side > 1) { + return true; + } + return otherMinX < 0.0625F || otherMinZ < 0.0625F || otherMaxX > 0.9375F || otherMaxZ > 0.9375F; + } + + MixinBlockCactus(Material material) { + super(material); + } + +} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockCarpet.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockCarpet.java new file mode 100644 index 000000000..ff8057f1d --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockCarpet.java @@ -0,0 +1,52 @@ +package com.gtnewhorizons.angelica.mixins.early.notfine.faceculling; + +import jss.notfine.util.IFaceObstructionCheckHelper; +import net.minecraft.block.Block; +import net.minecraft.block.BlockCarpet; +import net.minecraft.block.material.Material; +import net.minecraft.world.IBlockAccess; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +@Mixin(value = BlockCarpet.class) +public abstract class MixinBlockCarpet extends Block implements IFaceObstructionCheckHelper { + + /** + * @author jss2a98aj + * @reason More accurate face culling. + */ + @Overwrite() + public boolean shouldSideBeRendered(IBlockAccess worldIn, int x, int y, int z, int side) { + //If this is the top + if(side == 1) { + return true; + } + //Check if other block is solid + Block otherBlock = worldIn.getBlock(x, y, z); + if(otherBlock.isOpaqueCube()) { + return false; + } + //Check for IFaceObstructionCheckHelper + if(otherBlock instanceof IFaceObstructionCheckHelper target) { + return target.isFaceNonObstructing(worldIn, x, y, z, side, 0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F); + } + //Default + return true; + } + + @Override + public boolean isFaceNonObstructing(IBlockAccess worldIn, int x, int y, int z, int side, double otherMinX, double otherMinY, double otherMinZ, double otherMaxX, double otherMaxY, double otherMaxZ) { + if(getRenderBlockPass() == 1) { + return true; + } + if(side <= 1) { + return side == 0; + } + return otherMaxY > 0.0625F; + } + + MixinBlockCarpet(Material material) { + super(material); + } + +} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockFarmland.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockFarmland.java new file mode 100644 index 000000000..7d7e6dad6 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockFarmland.java @@ -0,0 +1,50 @@ +package com.gtnewhorizons.angelica.mixins.early.notfine.faceculling; + +import jss.notfine.util.IFaceObstructionCheckHelper; +import net.minecraft.block.Block; +import net.minecraft.block.BlockFarmland; +import net.minecraft.block.material.Material; +import net.minecraft.world.IBlockAccess; +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(value = BlockFarmland.class) +public abstract class MixinBlockFarmland extends Block implements IFaceObstructionCheckHelper { + + /** + * @author jss2a98aj + * @reason More accurate face culling. + */ + public boolean shouldSideBeRendered(IBlockAccess worldIn, int x, int y, int z, int side) { + //If this is the top + if(side == 1) { + return true; + } + //Check if other block is solid + Block otherBlock = worldIn.getBlock(x, y, z); + if(otherBlock.isOpaqueCube()) { + return false; + } + //Check for IFaceObstructionCheckHelper + if(otherBlock instanceof IFaceObstructionCheckHelper target) { + return target.isFaceNonObstructing(worldIn, x, y, z, side, 0.0F, 0.0F, 0.0F, 1.0F, 0.9375F, 1.0F); + } + //Default + return true; + } + + @Override + public boolean isFaceNonObstructing(IBlockAccess worldIn, int x, int y, int z, int side, double otherMinX, double otherMinY, double otherMinZ, double otherMaxX, double otherMaxY, double otherMaxZ) { + if(getRenderBlockPass() == 1) { + return true; + } + if(side <= 1) { + return side == 0; + } + return otherMaxY > 0.9375F; + } + + MixinBlockFarmland(Material material) { + super(material); + } + +} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockSlab.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockSlab.java index 42e43e9e0..60ca85656 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockSlab.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockSlab.java @@ -20,7 +20,8 @@ public abstract class MixinBlockSlab extends Block implements IFaceObstructionCh int thisX = x + Facing.offsetsXForSide[Facing.oppositeSide[side]]; int thisY = y + Facing.offsetsYForSide[Facing.oppositeSide[side]]; int thisZ = z + Facing.offsetsZForSide[Facing.oppositeSide[side]]; - if((worldIn.getBlockMetadata(thisX, thisY, thisZ) & 8) != side) { + boolean isTop = (worldIn.getBlockMetadata(thisX, thisY, thisZ) & 8) != 0; + if(isTop && side == 0 || !isTop && side == 1) { return true; } } @@ -61,7 +62,9 @@ public abstract class MixinBlockSlab extends Block implements IFaceObstructionCh }; } - MixinBlockSlab(Material material) { super(material); } + MixinBlockSlab(Material material) { + super(material); + } @Shadow @Final protected boolean field_150004_a; } diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockSnow.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockSnow.java index 97c7b0d24..a11b4c293 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockSnow.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockSnow.java @@ -14,10 +14,6 @@ import net.minecraft.world.IBlockAccess; @Mixin(value = BlockSnow.class) public abstract class MixinBlockSnow extends Block implements IFaceObstructionCheckHelper { - MixinBlockSnow(Material material) { - super(material); - } - /** * @author jss2a98aj * @reason More accurate face culling. @@ -56,5 +52,10 @@ public abstract class MixinBlockSnow extends Block implements IFaceObstructionCh default -> otherMaxY > (float) (2 * (1 + meta)) * 0.0625f; }; } + + MixinBlockSnow(Material material) { + super(material); + } + } diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockStairs.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockStairs.java index 526d2ae62..c98bdcb78 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockStairs.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinBlockStairs.java @@ -25,7 +25,7 @@ public abstract class MixinBlockStairs extends Block implements IFaceObstruction }; } - private MixinBlockStairs(Material materialIn) { + MixinBlockStairs(Material materialIn) { super(materialIn); } diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinRenderBlocks.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinRenderBlocks.java new file mode 100644 index 000000000..a9adb4a80 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/faceculling/MixinRenderBlocks.java @@ -0,0 +1,93 @@ +package com.gtnewhorizons.angelica.mixins.early.notfine.faceculling; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockFence; +import net.minecraft.block.BlockWall; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.init.Blocks; +import net.minecraft.world.IBlockAccess; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(value = RenderBlocks.class) +public abstract class MixinRenderBlocks { + + /** + * @author jss2a98aj + * @reason Culling a few more faces + */ + @Overwrite + public boolean renderBlockFence(BlockFence fence, int x, int y, int z) { + float min = 0.375F; + float max = 0.625F; + setRenderBounds(min, 0.0D, min, max, 1.0D, max); + renderStandardBlock(fence, x, y, z); + + boolean connectXNeg = fence.canConnectFenceTo(blockAccess, x - 1, y, z); + boolean connectXPos = fence.canConnectFenceTo(blockAccess, x + 1, y, z); + boolean connectZNeg = fence.canConnectFenceTo(blockAccess, x, y, z - 1); + boolean connectZPos = fence.canConnectFenceTo(blockAccess, x, y, z + 1); + boolean connectX = connectXNeg || connectXPos; + boolean connectZ = connectZNeg || connectZPos; + + min = 0.4375F; + max = 0.5625F; + float minY = 0.75F; + float maxY = 0.9375F; + float minX = connectXNeg ? 0.0F : min; + float maxX = connectXPos ? 1.0F : max; + float minZ = connectZNeg ? 0.0F : min; + float maxZ = connectZPos ? 1.0F : max; + field_152631_f = true; + //Upper beam + if(connectX) { + setRenderBounds(minX, minY, min, maxX, maxY, max); + renderStandardBlock(fence, x, y, z); + } + if(connectZ) { + setRenderBounds(min, minY, minZ, max, maxY, maxZ); + renderStandardBlock(fence, x, y, z); + } + + minY = 0.375F; + maxY = 0.5625F; + //Lower beam + if(connectX) { + setRenderBounds(minX, minY, min, maxX, maxY, max); + renderStandardBlock(fence, x, y, z); + } + if(connectZ) { + setRenderBounds(min, minY, minZ, max, maxY, maxZ); + renderStandardBlock(fence, x, y, z); + } + + field_152631_f = false; + fence.setBlockBoundsBasedOnState(blockAccess, x, y, z); + return true; + } + + /** + * @author jss2a98aj + * @reason Fix modded wall detection + */ + @Redirect( + method = "renderBlockFenceGate(Lnet/minecraft/block/BlockFenceGate;III)Z", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/world/IBlockAccess;getBlock(III)Lnet/minecraft/block/Block;" + ), + expect = 4 + ) + Block detectModdedWalls(IBlockAccess world, int x, int y, int z) { + return world.getBlock(x, y, z) instanceof BlockWall ? Blocks.cobblestone_wall : null; + } + + @Shadow public IBlockAccess blockAccess; + @Shadow public boolean field_152631_f; + @Shadow public abstract void setRenderBounds(double minX, double minY, double minZ, double maxX, double maxY, double maxZ); + @Shadow public abstract boolean renderStandardBlock(Block blockType, int blockX, int blockY, int blockZ); + +} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/optimization/MixinRenderItemFrame.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/optimization/MixinRenderItemFrame.java new file mode 100644 index 000000000..504892940 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/optimization/MixinRenderItemFrame.java @@ -0,0 +1,34 @@ +package com.gtnewhorizons.angelica.mixins.early.notfine.optimization; + +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.tileentity.RenderItemFrame; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(value = RenderItemFrame.class) +public abstract class MixinRenderItemFrame extends Render { + + private EntityItem cachedEntityItem; + + @Redirect( + method = "func_82402_b(Lnet/minecraft/entity/item/EntityItemFrame;)V", + at = @At( + value = "NEW", + target = "(Lnet/minecraft/world/World;DDDLnet/minecraft/item/ItemStack;)Lnet/minecraft/entity/item/EntityItem;", + ordinal = 0 + ) + ) + public EntityItem cacheEntityItem(World world, double x, double y, double z, ItemStack itemstack) { + if(cachedEntityItem == null) { + cachedEntityItem = new EntityItem(world, 0.0D, 0.0D, 0.0D, itemstack); + } else { + cachedEntityItem.setEntityItemStack(itemstack); + } + return cachedEntityItem; + } + +} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/particles/MixinWorldClient.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/particles/MixinWorldClient.java index b0bf70020..b58ca9987 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/particles/MixinWorldClient.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/particles/MixinWorldClient.java @@ -2,6 +2,10 @@ package com.gtnewhorizons.angelica.mixins.early.notfine.particles; import java.util.Random; +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import jss.notfine.core.Settings; +import net.minecraft.world.WorldProvider; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; @@ -16,9 +20,31 @@ public abstract class MixinWorldClient { * @author jss2a98aj * @reason Xoshiro256** is faster than Random. */ - @Redirect(method = "doVoidFogParticles(III)V", at = @At(value = "NEW", target = "java/util/Random", ordinal = 0)) + @Redirect( + method = "doVoidFogParticles(III)V", + at = @At( + value = "NEW", + target = "()Ljava/util/Random;", + ordinal = 0 + ) + ) private Random notFine$redirectDoVoidFogParticlesRandom() { return new RandomXoshiro256StarStar(); } + /** + * @author jss2a98aj + * @reason Toggle void particles. + */ + @WrapOperation( + method = "doVoidFogParticles(III)V", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/world/WorldProvider;getWorldHasVoidParticles()Z" + ) + ) + private boolean notFine$toggleVoidParticles(WorldProvider provider, Operation original){ + return ((boolean) Settings.PARTICLES_VOID.option.getStore()) ? original.call(provider) : false; + } + } diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/particles/MixinWorldProvider.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/particles/MixinWorldProvider.java deleted file mode 100644 index c5043a06b..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/particles/MixinWorldProvider.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.gtnewhorizons.angelica.mixins.early.notfine.particles; - -import jss.notfine.core.Settings; -import net.minecraft.world.WorldProvider; -import net.minecraft.world.WorldType; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; -import org.spongepowered.asm.mixin.Shadow; - -@Mixin(value = WorldProvider.class) -public class MixinWorldProvider { - - /** - * @author jss2a98aj - * @reason Toggle void particles. - */ - @Overwrite - public boolean getWorldHasVoidParticles() { - return (boolean)Settings.PARTICLES_VOID.option.getStore() && terrainType.hasVoidParticles(hasNoSky); - } - - @Shadow public WorldType terrainType; - @Shadow public boolean hasNoSky; - -} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/toggle/MixinEntityRenderer$RenderRainSnow.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/toggle/MixinEntityRenderer$RenderRainSnow.java new file mode 100644 index 000000000..6e2ed3196 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/toggle/MixinEntityRenderer$RenderRainSnow.java @@ -0,0 +1,35 @@ +package com.gtnewhorizons.angelica.mixins.early.notfine.toggle; + +import jss.notfine.core.SettingsManager; +import net.minecraft.client.renderer.EntityRenderer; +import net.minecraft.client.settings.GameSettings; +import org.spongepowered.asm.lib.Opcodes; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyVariable; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(EntityRenderer.class) +public abstract class MixinEntityRenderer$RenderRainSnow { + + @Redirect( + method = "renderRainSnow(F)V", + at = @At( + value = "FIELD", + target = "Lnet/minecraft/client/settings/GameSettings;fancyGraphics:Z", + opcode = Opcodes.GETFIELD + ) + ) + private boolean notFine$bypassWeatherMode(GameSettings settings) { + return false; + } + + @ModifyVariable( + method = "renderRainSnow(F)V", + at = @At("STORE"), + ordinal = 0 + ) + private byte notFine$weatherDistance(byte distance) { + return SettingsManager.downfallDistance; + } +} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/toggle/MixinEntityRenderer.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/toggle/MixinEntityRenderer.java index 6ec1b85ba..c8b86c1b9 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/toggle/MixinEntityRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine/toggle/MixinEntityRenderer.java @@ -1,13 +1,17 @@ package com.gtnewhorizons.angelica.mixins.early.notfine.toggle; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import jss.notfine.core.Settings; import jss.notfine.core.SettingsManager; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.settings.GameSettings; +import net.minecraft.world.WorldProvider; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(EntityRenderer.class) @@ -22,29 +26,39 @@ abstract public class MixinEntityRenderer { ordinal = 0 ) ) - private boolean notFine$toggleWaterDetail(GameSettings settings) { + private boolean toggleWaterDetail(GameSettings settings) { return SettingsManager.waterDetail; } - @Redirect( - method = "renderRainSnow(F)V", + @WrapOperation( + method = "setupFog", at = @At( - value = "FIELD", - target = "Lnet/minecraft/client/settings/GameSettings;fancyGraphics:Z", - opcode = Opcodes.GETFIELD + value = "INVOKE", + target = "Lnet/minecraft/world/WorldProvider;getWorldHasVoidParticles()Z" ) ) - private boolean notFine$bypassWeatherMode(GameSettings settings) { - return false; + private boolean angelica$wrapVoidFog(WorldProvider provider, Operation original){ + return ((boolean)Settings.VOID_FOG.option.getStore()) ? original.call(provider) : false; } - @ModifyVariable( - method = "renderRainSnow(F)V", - at = @At("STORE"), - ordinal = 0 + @Redirect( + method = "updateRenderer()V", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/renderer/EntityRenderer;updateTorchFlicker()V" + ) ) - private byte notFine$weatherDistance(byte distance) { - return SettingsManager.downfallDistance; + private void toggleTorchFlicker(EntityRenderer instance) { + if((boolean)Settings.MODE_LIGHT_FLICKER.option.getStore()) { + updateTorchFlicker(); + } else { + lightmapUpdateNeeded = true; + } } + @Shadow + abstract void updateTorchFlicker(); + + @Shadow private boolean lightmapUpdateNeeded; + } diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine_mcpf_compat/MixinItemRenderer.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine_mcpf_compat/MixinItemRenderer.java deleted file mode 100644 index 6b7e5b92a..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine_mcpf_compat/MixinItemRenderer.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.gtnewhorizons.angelica.mixins.early.notfine_mcpf_compat; - -import com.prupe.mcpatcher.cit.CITUtils; -import jss.notfine.core.Settings; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.item.ItemStack; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(ItemRenderer.class) -public class MixinItemRenderer { - - @Redirect( - method = "renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;ILnet/minecraftforge/client/IItemRenderer$ItemRenderType;)V", - at = @At( - value = "INVOKE", - target = "Lnet/minecraft/item/ItemStack;hasEffect(I)Z" - ), - remap = false - ) - private boolean notFine$toggleGlint(ItemStack stack, int pass) { - return (boolean) Settings.MODE_GLINT_WORLD.option.getStore() && stack.hasEffect(pass) && !CITUtils.renderEnchantmentHeld(stack, pass); - } -} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine_mcpf_compat/MixinRenderItem.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine_mcpf_compat/MixinRenderItem.java deleted file mode 100644 index 449f76bd0..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/notfine_mcpf_compat/MixinRenderItem.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.gtnewhorizons.angelica.mixins.early.notfine_mcpf_compat; - -import com.prupe.mcpatcher.cit.CITUtils; -import jss.notfine.core.Settings; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.item.ItemStack; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(RenderItem.class) -public class MixinRenderItem { - - @Redirect( - method = "renderDroppedItem(Lnet/minecraft/entity/item/EntityItem;Lnet/minecraft/util/IIcon;IFFFFI)V", - at = @At( - value = "INVOKE", - target = "Lnet/minecraft/item/ItemStack;hasEffect(I)Z" - ), - remap = false - ) - private boolean notFine$toggleGlint(ItemStack stack, int pass) { - return stack.hasEffect(pass) && !CITUtils.renderEnchantmentDropped(stack) && (boolean) Settings.MODE_GLINT_WORLD.option.getStore(); - } - -} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinEntityRenderer$WeatherQuality.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinEntityRenderer$WeatherQuality.java deleted file mode 100644 index 85059b97b..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinEntityRenderer$WeatherQuality.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.gtnewhorizons.angelica.mixins.early.sodium; - -import me.jellysquid.mods.sodium.client.SodiumClientMod; -import net.minecraft.client.renderer.EntityRenderer; -import net.minecraft.client.settings.GameSettings; -import org.spongepowered.asm.lib.Opcodes; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -/** - * Dynamic surroundings overwrites the method resulting in a clash - */ -@Mixin(EntityRenderer.class) -public abstract class MixinEntityRenderer$WeatherQuality { - - @Redirect(method = "renderRainSnow(F)V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/settings/GameSettings;fancyGraphics:Z", opcode = Opcodes.GETFIELD)) - protected boolean redirectGetFancyWeather(GameSettings settings) { - return SodiumClientMod.options().quality.weatherQuality.isFancy(); - } -} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinGuiIngameForge.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinGuiIngameForge.java deleted file mode 100644 index 7715670f2..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinGuiIngameForge.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.gtnewhorizons.angelica.mixins.early.sodium; - -import me.jellysquid.mods.sodium.client.SodiumClientMod; -import net.minecraftforge.client.GuiIngameForge; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(GuiIngameForge.class) -public class MixinGuiIngameForge { - - @Redirect(method = "renderGameOverlay(FZII)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;isFancyGraphicsEnabled()Z")) - private boolean checkVignette(float idk) { - return SodiumClientMod.options().quality.enableVignette.isFancy(); - } - -} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRender.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRender.java deleted file mode 100644 index 80be62237..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRender.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.gtnewhorizons.angelica.mixins.early.sodium; - -import me.jellysquid.mods.sodium.client.SodiumClientMod; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.settings.GameSettings; -import org.spongepowered.asm.lib.Opcodes; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(Render.class) -public class MixinRender { - - @Redirect(method = "doRenderShadowAndFire", at = @At(value = "FIELD", target = "Lnet/minecraft/client/settings/GameSettings;fancyGraphics:Z", opcode = Opcodes.GETFIELD, ordinal = 0)) - private boolean redirectGetFancyShadows(GameSettings settings) { - return SodiumClientMod.options().quality.entityShadows.isFancy(); - } - -} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/late/notfine/faceculling/thaumcraft/MixinBlockStoneDevice.java b/src/main/java/com/gtnewhorizons/angelica/mixins/late/notfine/faceculling/thaumcraft/MixinBlockStoneDevice.java new file mode 100644 index 000000000..9dca34f9d --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/late/notfine/faceculling/thaumcraft/MixinBlockStoneDevice.java @@ -0,0 +1,22 @@ +package com.gtnewhorizons.angelica.mixins.late.notfine.faceculling.thaumcraft; + +import jss.notfine.util.IFaceObstructionCheckHelper; +import net.minecraft.world.IBlockAccess; +import org.spongepowered.asm.mixin.Mixin; +import thaumcraft.common.blocks.BlockStoneDevice; + +@Mixin(value = BlockStoneDevice.class) +public abstract class MixinBlockStoneDevice implements IFaceObstructionCheckHelper { + + @Override + public boolean isFaceNonObstructing(IBlockAccess worldIn, int x, int y, int z, int side, double otherMinX, double otherMinY, double otherMinZ, double otherMaxX, double otherMaxY, double otherMaxZ) { + return switch (worldIn.getBlockMetadata(x, y, z)) { + case 0, 12 -> false; + case 1, 5, 9, 10, 14 -> side != 1; + case 11 -> side != 0; + case 13 -> side > 1; + default -> true; + }; + } + +} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/late/notfine/faceculling/thaumcraft/MixinBlockTable.java b/src/main/java/com/gtnewhorizons/angelica/mixins/late/notfine/faceculling/thaumcraft/MixinBlockTable.java new file mode 100644 index 000000000..3ea12c3d2 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/late/notfine/faceculling/thaumcraft/MixinBlockTable.java @@ -0,0 +1,31 @@ +package com.gtnewhorizons.angelica.mixins.late.notfine.faceculling.thaumcraft; + +import jss.notfine.util.IFaceObstructionCheckHelper; +import net.minecraft.world.IBlockAccess; +import org.spongepowered.asm.mixin.Mixin; +import thaumcraft.common.blocks.BlockTable; + +@Mixin(value = BlockTable.class) +public abstract class MixinBlockTable implements IFaceObstructionCheckHelper { + + @Override + public boolean isFaceNonObstructing(IBlockAccess worldIn, int x, int y, int z, int side, double otherMinX, double otherMinY, double otherMinZ, double otherMaxX, double otherMaxY, double otherMaxZ) { + switch(side) { + case 0: return false; + case 1: { + return worldIn.getBlockMetadata(x, y, z) < 14; + } + default: { + float lowerBound = 0.25f; + if(worldIn.getBlockMetadata(x, y, z) >= 14) { + lowerBound = 0.5f; + if(otherMaxY <= 0.25f) { + return false; + } + } + return otherMinY < lowerBound; + } + } + } + +} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/late/notfine/faceculling/thaumcraft/MixinBlockWoodenDevice.java b/src/main/java/com/gtnewhorizons/angelica/mixins/late/notfine/faceculling/thaumcraft/MixinBlockWoodenDevice.java new file mode 100644 index 000000000..e51158ea2 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/late/notfine/faceculling/thaumcraft/MixinBlockWoodenDevice.java @@ -0,0 +1,21 @@ +package com.gtnewhorizons.angelica.mixins.late.notfine.faceculling.thaumcraft; + +import jss.notfine.util.IFaceObstructionCheckHelper; +import net.minecraft.world.IBlockAccess; +import org.spongepowered.asm.mixin.Mixin; +import thaumcraft.common.blocks.BlockWoodenDevice; + +@Mixin(value = BlockWoodenDevice.class) +public abstract class MixinBlockWoodenDevice implements IFaceObstructionCheckHelper { + + @Override + public boolean isFaceNonObstructing(IBlockAccess worldIn, int x, int y, int z, int side, double otherMinX, double otherMinY, double otherMinZ, double otherMaxX, double otherMaxY, double otherMaxZ) { + return switch (worldIn.getBlockMetadata(x, y, z)) { + case 1 -> side != 1; + case 4 -> side > 1; + case 6, 7 -> false; + default -> true; + }; + } + +} diff --git a/src/main/java/com/gtnewhorizons/angelica/render/CloudRenderer.java b/src/main/java/com/gtnewhorizons/angelica/render/CloudRenderer.java index 5ac13bdcf..f1a87aaf7 100644 --- a/src/main/java/com/gtnewhorizons/angelica/render/CloudRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/render/CloudRenderer.java @@ -28,6 +28,8 @@ import com.gtnewhorizons.angelica.compat.mojang.VertexFormat; import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.glsm.TessellatorManager; import com.gtnewhorizons.angelica.glsm.VBOManager; +import jss.notfine.core.Settings; +import jss.notfine.gui.options.named.GraphicsQualityOff; import me.jellysquid.mods.sodium.client.SodiumClientMod; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.EntityRenderer; @@ -92,7 +94,8 @@ public class CloudRenderer implements IResourceManagerReloadListener { } private void vertices(CapturingTessellator tessellator) { - boolean fancy = SodiumClientMod.options().quality.cloudQuality.isFancy(); + GraphicsQualityOff cloudGraphicsQuality = (GraphicsQualityOff)Settings.MODE_CLOUDS.option.getStore(); + boolean fancy = cloudGraphicsQuality == GraphicsQualityOff.FANCY || cloudGraphicsQuality == GraphicsQualityOff.DEFAULT && mc.gameSettings.fancyGraphics; float scale = getScale(); float CULL_DIST = 2 * scale; @@ -235,7 +238,9 @@ public class CloudRenderer implements IResourceManagerReloadListener { } public void checkSettings() { - final int cloudQualitySetting = SodiumClientMod.options().quality.cloudQuality.isFancy() ? 2 : 1; + GraphicsQualityOff cloudGraphicsQuality = (GraphicsQualityOff)Settings.MODE_CLOUDS.option.getStore(); + final int cloudQualitySetting = cloudGraphicsQuality == GraphicsQualityOff.FANCY + || cloudGraphicsQuality == GraphicsQualityOff.DEFAULT && mc.gameSettings.fancyGraphics ? 2 : 1; boolean newEnabled = mc.gameSettings.shouldRenderClouds() && mc.theWorld != null && mc.theWorld.provider.isSurfaceWorld(); diff --git a/src/main/java/com/prupe/mcpatcher/MCLogger.java b/src/main/java/com/prupe/mcpatcher/MCLogger.java index 1f47810e3..b8c43f727 100644 --- a/src/main/java/com/prupe/mcpatcher/MCLogger.java +++ b/src/main/java/com/prupe/mcpatcher/MCLogger.java @@ -8,7 +8,7 @@ import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; +import jss.notfine.config.MCPatcherForgeConfig; public class MCLogger { diff --git a/src/main/java/com/prupe/mcpatcher/cc/ColorizeBlock.java b/src/main/java/com/prupe/mcpatcher/cc/ColorizeBlock.java index 00becbb42..07216d9f6 100644 --- a/src/main/java/com/prupe/mcpatcher/cc/ColorizeBlock.java +++ b/src/main/java/com/prupe/mcpatcher/cc/ColorizeBlock.java @@ -8,6 +8,7 @@ import java.util.Properties; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.init.Blocks; import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; @@ -27,7 +28,7 @@ import com.prupe.mcpatcher.mal.resource.PropertiesFile; import com.prupe.mcpatcher.mal.resource.ResourceList; import com.prupe.mcpatcher.mal.resource.TexturePackAPI; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; +import jss.notfine.config.MCPatcherForgeConfig; public class ColorizeBlock { @@ -136,8 +137,8 @@ public class ColorizeBlock { } static void reset() { - waterBlock = BlockAPI.getFixedBlock("minecraft:flowing_water"); - staticWaterBlock = BlockAPI.getFixedBlock("minecraft:water"); + waterBlock = Blocks.flowing_water; + staticWaterBlock = Blocks.water; blockColorMaps.clear(); waterColorMap = null; @@ -193,10 +194,6 @@ public class ColorizeBlock { private static void reloadWaterColors(PropertiesFile properties) { waterColorMap = registerColorMap(WATERCOLOR, "minecraft:flowing_water minecraft:water"); - if (waterColorMap == null) { - waterColorMap = new ColorMap.Water(); - registerColorMap(waterColorMap, null, "minecraft:flowing_water minecraft:water"); - } } private static void reloadSwampColors(PropertiesFile properties) { @@ -333,11 +330,11 @@ public class ColorizeBlock { return null; } - private static IColorMap findColorMap(Block block, IBlockAccess blockAccess, int i, int j, int k) { + private static IColorMap findColorMap(Block block, IBlockAccess blockAccess, int x, int y, int z) { List maps = findColorMaps(block); if (maps != null) { for (BlockStateMatcher matcher : maps) { - if (matcher.match(blockAccess, i, j, k)) { + if (matcher.match(blockAccess, x, y, z)) { return getThreadLocal(matcher); } } @@ -361,17 +358,17 @@ public class ColorizeBlock { } } - public static boolean colorizeBlock(Block block, IBlockAccess blockAccess, int i, int j, int k) { - IColorMap colorMap = findColorMap(block, blockAccess, i, j, k); - return colorizeBlock(block, blockAccess, colorMap, i, j, k); + public static boolean colorizeBlock(Block block, IBlockAccess blockAccess, int x, int y, int z) { + IColorMap colorMap = findColorMap(block, blockAccess, x, y, z); + return colorizeBlock(block, blockAccess, colorMap, x, y, z); } - private static boolean colorizeBlock(Block block, IBlockAccess blockAccess, IColorMap colorMap, int i, int j, - int k) { + private static boolean colorizeBlock(Block block, IBlockAccess blockAccess, IColorMap colorMap, int x, int y, + int z) { if (colorMap == null) { return false; } else { - blockColor = colorMap.getColorMultiplier(blockAccess, i, j, k); + blockColor = colorMap.getColorMultiplier(blockAccess, x, y, z); return true; } } @@ -382,11 +379,11 @@ public class ColorizeBlock { } } - public static boolean computeWaterColor(boolean includeBaseColor, int i, int j, int k) { + public static boolean computeWaterColor(boolean includeBaseColor, int x, int y, int z) { if (waterColorMap == null) { return false; } else { - Colorizer.setColorF(waterColorMap.getColorMultiplierF(BiomeAPI.getWorld(), i, j, k)); + Colorizer.setColorF(waterColorMap.getColorMultiplierF(BiomeAPI.getWorld(), x, y, z)); if (includeBaseColor) { Colorizer.setColor[0] *= ColorizeEntity.waterBaseColor[0]; Colorizer.setColor[1] *= ColorizeEntity.waterBaseColor[1]; @@ -418,46 +415,46 @@ public class ColorizeBlock { } } - public static int colorizeRedstoneWire(IBlockAccess blockAccess, int i, int j, int k, int defaultColor) { + public static int colorizeRedstoneWire(IBlockAccess blockAccess, int x, int y, int z, int defaultColor) { if (redstoneColor == null) { return defaultColor; } else { - int metadata = Math.max(Math.min(BlockAPI.getMetadataAt(blockAccess, i, j, k), 15), 0); + int metadata = Math.max(Math.min(blockAccess.getBlockMetadata(x, y, z), 15), 0); return ColorUtils.float3ToInt(redstoneColor[metadata]); } } - private static float[] getVertexColor(IBlockAccess blockAccess, IColorMap colorMap, int i, int j, int k, + private static float[] getVertexColor(IBlockAccess blockAccess, IColorMap colorMap, int x, int y, int z, int[] offsets) { if (enableTestColorSmoothing) { int rgb = 0; - if ((i + offsets[0]) % 2 == 0) { + if ((x + offsets[0]) % 2 == 0) { rgb |= 0xff0000; } - if ((j + offsets[1]) % 2 == 0) { + if ((y + offsets[1]) % 2 == 0) { rgb |= 0x00ff00; } - if ((k + offsets[2]) % 2 == 0) { + if ((z + offsets[2]) % 2 == 0) { rgb |= 0x0000ff; } ColorUtils.intToFloat3(rgb, Colorizer.setColor); return Colorizer.setColor; } else { - return colorMap.getColorMultiplierF(blockAccess, i + offsets[0], j + offsets[1], k + offsets[2]); + return colorMap.getColorMultiplierF(blockAccess, x + offsets[0], y + offsets[1], z + offsets[2]); } } // Called by asm @SuppressWarnings("unused") - public static boolean setupBlockSmoothing(RenderBlocks renderBlocks, Block block, IBlockAccess blockAccess, int i, - int j, int k, int face, float topLeft, float bottomLeft, float bottomRight, float topRight) { + public static boolean setupBlockSmoothing(RenderBlocks renderBlocks, Block block, IBlockAccess blockAccess, int x, + int y, int z, int face, float topLeft, float bottomLeft, float bottomRight, float topRight) { return RenderBlocksUtils.useColorMultiplier(face) && setupBiomeSmoothing( renderBlocks, block, blockAccess, - i, - j, - k, + x, + y, + z, face, true, topLeft, @@ -469,14 +466,14 @@ public class ColorizeBlock { // TODO: remove @Deprecated public static boolean setupBlockSmoothingGrassSide(RenderBlocks renderBlocks, Block block, IBlockAccess blockAccess, - int i, int j, int k, int face, float topLeft, float bottomLeft, float bottomRight, float topRight) { + int x, int y, int z, int face, float topLeft, float bottomLeft, float bottomRight, float topRight) { return checkBiomeSmoothing(block, face) && setupBiomeSmoothing( renderBlocks, block, blockAccess, - i, - j, - k, + x, + y, + z, face, true, topLeft, @@ -485,21 +482,21 @@ public class ColorizeBlock { topRight); } - public static boolean setupBlockSmoothing(RenderBlocks renderBlocks, Block block, IBlockAccess blockAccess, int i, - int j, int k, int face) { + public static boolean setupBlockSmoothing(RenderBlocks renderBlocks, Block block, IBlockAccess blockAccess, int x, + int y, int z, int face) { return checkBiomeSmoothing(block, face) - && setupBiomeSmoothing(renderBlocks, block, blockAccess, i, j, k, face, true, 1.0f, 1.0f, 1.0f, 1.0f); + && setupBiomeSmoothing(renderBlocks, block, blockAccess, x, y, z, face, true, 1.0f, 1.0f, 1.0f, 1.0f); } private static boolean checkBiomeSmoothing(Block block, int face) { return enableSmoothBiomes && face >= 0 && RenderBlocksUtils.isAmbientOcclusionEnabled() - && BlockAPI.getBlockLightValue(block) == 0; + && block.getLightValue() == 0; } - private static boolean setupBiomeSmoothing(RenderBlocks renderBlocks, Block block, IBlockAccess blockAccess, int i, - int j, int k, int face, boolean useAO, float topLeft, float bottomLeft, float bottomRight, float topRight) { - if (!setupBlockSmoothing(block, blockAccess, i, j, k, face)) { + private static boolean setupBiomeSmoothing(RenderBlocks renderBlocks, Block block, IBlockAccess blockAccess, int x, + int y, int z, int face, boolean useAO, float topLeft, float bottomLeft, float bottomRight, float topRight) { + if (!setupBlockSmoothing(block, blockAccess, x, y, z, face)) { return false; } @@ -530,18 +527,18 @@ public class ColorizeBlock { return true; } - public static void setupBlockSmoothing(Block block, IBlockAccess blockAccess, int i, int j, int k, int face, + public static void setupBlockSmoothing(Block block, IBlockAccess blockAccess, int x, int y, int z, int face, float r, float g, float b) { - if (!setupBlockSmoothing(block, blockAccess, i, j, k, face)) { + if (!setupBlockSmoothing(block, blockAccess, x, y, z, face)) { setVertexColors(r, g, b); } } - private static boolean setupBlockSmoothing(Block block, IBlockAccess blockAccess, int i, int j, int k, int face) { + private static boolean setupBlockSmoothing(Block block, IBlockAccess blockAccess, int x, int y, int z, int face) { if (!checkBiomeSmoothing(block, face)) { return false; } - IColorMap colorMap = findColorMap(block, blockAccess, i, j, k); + IColorMap colorMap = findColorMap(block, blockAccess, x, y, z); if (colorMap == null) { return false; } @@ -549,22 +546,22 @@ public class ColorizeBlock { int[][] offsets = FACE_VERTICES[face]; float[] color; - color = getVertexColor(blockAccess, colorMap, i, j, k, offsets[0]); + color = getVertexColor(blockAccess, colorMap, x, y, z, offsets[0]); colorRedTopLeft = color[0]; colorGreenTopLeft = color[1]; colorBlueTopLeft = color[2]; - color = getVertexColor(blockAccess, colorMap, i, j, k, offsets[1]); + color = getVertexColor(blockAccess, colorMap, x, y, z, offsets[1]); colorRedBottomLeft = color[0]; colorGreenBottomLeft = color[1]; colorBlueBottomLeft = color[2]; - color = getVertexColor(blockAccess, colorMap, i, j, k, offsets[2]); + color = getVertexColor(blockAccess, colorMap, x, y, z, offsets[2]); colorRedBottomRight = color[0]; colorGreenBottomRight = color[1]; colorBlueBottomRight = color[2]; - color = getVertexColor(blockAccess, colorMap, i, j, k, offsets[3]); + color = getVertexColor(blockAccess, colorMap, x, y, z, offsets[3]); colorRedTopRight = color[0]; colorGreenTopRight = color[1]; colorBlueTopRight = color[2]; diff --git a/src/main/java/com/prupe/mcpatcher/cc/ColorizeItem.java b/src/main/java/com/prupe/mcpatcher/cc/ColorizeItem.java index dd6577034..7a3e5e0d8 100644 --- a/src/main/java/com/prupe/mcpatcher/cc/ColorizeItem.java +++ b/src/main/java/com/prupe/mcpatcher/cc/ColorizeItem.java @@ -12,8 +12,8 @@ import net.minecraft.potion.PotionHelper; import com.prupe.mcpatcher.MCLogger; import com.prupe.mcpatcher.mal.resource.PropertiesFile; -import com.gtnewhorizons.angelica.mixins.interfaces.MapColorExpansion; -import com.gtnewhorizons.angelica.mixins.interfaces.PotionExpansion; +import jss.notfine.util.MapColorExpansion; +import jss.notfine.util.PotionExpansion; public class ColorizeItem { diff --git a/src/main/java/com/prupe/mcpatcher/cc/ColorizeWorld.java b/src/main/java/com/prupe/mcpatcher/cc/ColorizeWorld.java index 57d837ee1..362f73b99 100644 --- a/src/main/java/com/prupe/mcpatcher/cc/ColorizeWorld.java +++ b/src/main/java/com/prupe/mcpatcher/cc/ColorizeWorld.java @@ -22,7 +22,7 @@ import com.prupe.mcpatcher.mal.biome.IColorMap; import com.prupe.mcpatcher.mal.resource.PropertiesFile; import com.prupe.mcpatcher.mal.resource.TexturePackAPI; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; +import jss.notfine.config.MCPatcherForgeConfig; public class ColorizeWorld { diff --git a/src/main/java/com/prupe/mcpatcher/cc/Colorizer.java b/src/main/java/com/prupe/mcpatcher/cc/Colorizer.java index d5df85618..5f29a96d0 100644 --- a/src/main/java/com/prupe/mcpatcher/cc/Colorizer.java +++ b/src/main/java/com/prupe/mcpatcher/cc/Colorizer.java @@ -11,7 +11,7 @@ import com.prupe.mcpatcher.mal.resource.PropertiesFile; import com.prupe.mcpatcher.mal.resource.TexturePackAPI; import com.prupe.mcpatcher.mal.resource.TexturePackChangeHandler; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; +import jss.notfine.config.MCPatcherForgeConfig; public class Colorizer { diff --git a/src/main/java/com/prupe/mcpatcher/cc/Lightmap.java b/src/main/java/com/prupe/mcpatcher/cc/Lightmap.java index 6b7ef4a2e..d0b49f29f 100644 --- a/src/main/java/com/prupe/mcpatcher/cc/Lightmap.java +++ b/src/main/java/com/prupe/mcpatcher/cc/Lightmap.java @@ -14,7 +14,7 @@ import com.prupe.mcpatcher.MCLogger; import com.prupe.mcpatcher.mal.biome.ColorUtils; import com.prupe.mcpatcher.mal.resource.TexturePackAPI; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; +import jss.notfine.config.MCPatcherForgeConfig; public final class Lightmap { diff --git a/src/main/java/com/prupe/mcpatcher/cit/CITUtils.java b/src/main/java/com/prupe/mcpatcher/cit/CITUtils.java index 30c58f0cf..7be97f162 100644 --- a/src/main/java/com/prupe/mcpatcher/cit/CITUtils.java +++ b/src/main/java/com/prupe/mcpatcher/cit/CITUtils.java @@ -27,8 +27,8 @@ import com.prupe.mcpatcher.mal.resource.TexturePackAPI; import com.prupe.mcpatcher.mal.resource.TexturePackChangeHandler; import com.prupe.mcpatcher.mal.tile.TileLoader; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; -import com.gtnewhorizons.angelica.mixins.interfaces.NBTTagListExpansion; +import jss.notfine.config.MCPatcherForgeConfig; +import jss.notfine.util.NBTTagListExpansion; public class CITUtils { diff --git a/src/main/java/com/prupe/mcpatcher/ctm/BlockOrientation.java b/src/main/java/com/prupe/mcpatcher/ctm/BlockOrientation.java index 3328491e0..64dd0222c 100644 --- a/src/main/java/com/prupe/mcpatcher/ctm/BlockOrientation.java +++ b/src/main/java/com/prupe/mcpatcher/ctm/BlockOrientation.java @@ -4,7 +4,6 @@ import net.minecraft.block.Block; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import com.prupe.mcpatcher.mal.block.BlockAPI; import com.prupe.mcpatcher.mal.block.BlockStateMatcher; final class BlockOrientation extends RenderBlockState { @@ -116,77 +115,57 @@ final class BlockOrientation extends RenderBlockState { haveOffsets = false; di = dj = dk = 0; switch (renderType) { - case 1: // renderCrossedSquares - while (j + dj > 0 && block == BlockAPI.getBlockAt(blockAccess, i, j + dj - 1, k)) { + case 1 -> { // renderCrossedSquares + while (j + dj > 0 && block == blockAccess.getBlock(i, j + dj - 1, k)) { dj--; haveOffsets = true; } - break; - - case 7: // renderBlockDoor - case 40: // renderBlockDoublePlant - if ((metadata & 0x8) != 0 && block == BlockAPI.getBlockAt(blockAccess, i, j - 1, k)) { + } // renderBlockDoor + case 7, 40 -> { // renderBlockDoublePlant + if ((metadata & 0x8) != 0 && block == blockAccess.getBlock(i, j - 1, k)) { dj--; haveOffsets = true; } - break; - - case 14: // renderBlockBed - metadata = BlockAPI.getMetadataAt(blockAccess, i, j, k); + } + case 14 -> { // renderBlockBed + metadata = blockAccess.getBlockMetadata(i, j, k); switch (metadata) { - case 0: - case 4: - dk = 1; // head is one block south - break; - - case 1: - case 5: - di = -1; // head is one block west - break; - - case 2: - case 6: - dk = -1; // head is one block north - break; - - case 3: - case 7: - di = 1; // head is one block east - break; - - default: + case 0, 4 -> dk = 1; // head is one block south + case 1, 5 -> di = -1; // head is one block west + case 2, 6 -> dk = -1; // head is one block north + case 3, 7 -> di = 1; // head is one block east + default -> { return false; // head itself, no offset + } } - haveOffsets = block == BlockAPI.getBlockAt(blockAccess, i + di, j, k + dk); - break; - - default: - break; + haveOffsets = block == blockAccess.getBlock(i + di, j, k + dk); + } + default -> { + } } return haveOffsets; } @Override - public boolean shouldConnectByBlock(Block neighbor, int neighborI, int neighborJ, int neighborK) { + public boolean shouldConnectByBlock(Block neighbor, int neighborX, int neighborY, int neighborZ) { return block == neighbor - && (metadataBits & (1 << BlockAPI.getMetadataAt(blockAccess, neighborI, neighborJ, neighborK))) != 0; + && (metadataBits & (1 << blockAccess.getBlockMetadata(neighborX, neighborY, neighborZ))) != 0; } @Override - public boolean shouldConnectByTile(Block neighbor, IIcon origIcon, int neighborI, int neighborJ, int neighborK) { - return origIcon - == BlockAPI.getBlockIcon(neighbor, blockAccess, neighborI, neighborJ, neighborK, getTextureFaceOrig()); + public boolean shouldConnectByTile(Block neighbor, IIcon origIcon, int neighborX, int neighborY, int neighborZ) { + return origIcon == neighbor.getIcon(blockAccess, neighborX, neighborY, neighborZ, getTextureFaceOrig()); } - void setBlock(Block block, IBlockAccess blockAccess, int i, int j, int k) { + void setBlock(Block block, IBlockAccess blockAccess, int x, int y, int z) { this.block = block; this.blockAccess = blockAccess; inWorld = true; - this.i = i; - this.j = j; - this.k = k; + this.i = x; + this.j = y; + this.k = z; renderType = block.getRenderType(); - metadata = altMetadata = BlockAPI.getMetadataAt(blockAccess, i, j, k); + metadata = altMetadata = blockAccess.getBlockMetadata(x, y, z); offsetsComputed = false; } @@ -213,85 +192,66 @@ final class BlockOrientation extends RenderBlockState { private int getBlockFaceByRenderType(int face) { switch (renderType) { - case 1: // renderCrossedSquares + case 1 -> { // renderCrossedSquares return NORTH_FACE; - - case 8: // renderBlockLadder + } + case 8 -> { // renderBlockLadder switch (metadata) { - case 2: - case 3: - case 4: - case 5: + case 2, 3, 4, 5 -> { return metadata; - - default: - break; + } } - break; - - case 20: // renderBlockVine + } + case 20 -> { // renderBlockVine switch (metadata) { - case 1: + case 1 -> { return NORTH_FACE; - - case 2: + } + case 2 -> { return EAST_FACE; - - case 4: + } + case 4 -> { return SOUTH_FACE; - - case 8: + } + case 8 -> { return WEST_FACE; - - default: - break; + } } - break; - - default: - break; + } } return face; } private int blockFaceToTextureFace(int face) { switch (renderType) { - case 31: // renderBlockLog (also applies to hay) + case 31 -> { // renderBlockLog (also applies to hay) switch (metadata & 0xc) { - case 4: // west-east + case 4 -> { // west-east altMetadata &= ~0xc; rotateUV = ROTATE_UV_MAP[0][face + 6]; return ROTATE_UV_MAP[0][face]; - - case 8: // north-south + } + case 8 -> { // north-south altMetadata &= ~0xc; rotateUV = ROTATE_UV_MAP[1][face + 6]; return ROTATE_UV_MAP[1][face]; - - default: - break; + } } - break; - - case 39: // renderBlockQuartz + } + case 39 -> { // renderBlockQuartz switch (metadata) { - case 3: // north-south + case 3 -> { // north-south altMetadata = 2; rotateUV = ROTATE_UV_MAP[2][face + 6]; return ROTATE_UV_MAP[2][face]; - - case 4: // west-east + } + case 4 -> { // west-east altMetadata = 2; rotateUV = ROTATE_UV_MAP[3][face + 6]; return ROTATE_UV_MAP[3][face]; - - default: - break; + } } - break; - - default: - break; + } } return face; } @@ -300,10 +260,4 @@ final class BlockOrientation extends RenderBlockState { return (neighbor + rotateUV) & 7; } - boolean logIt() { - // return i == -31 && j == 72 && (k == 412 || k == 413); - // return j == 72 && (metadata == 7 || metadata == 11) && blockFace == 1 && - // BlockAPI.getBlockName(block).equals("minecraft:log"); - return false; - } } diff --git a/src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java b/src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java index 772964354..c42e5d0a9 100644 --- a/src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java +++ b/src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java @@ -26,7 +26,7 @@ import com.prupe.mcpatcher.mal.resource.TexturePackAPI; import com.prupe.mcpatcher.mal.resource.TexturePackChangeHandler; import com.prupe.mcpatcher.mal.tile.TileLoader; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; +import jss.notfine.config.MCPatcherForgeConfig; public class CTMUtils { @@ -53,7 +53,7 @@ public class CTMUtils { Class.forName(MCPatcherUtils.RENDER_PASS_CLASS) .getMethod("finish") .invoke(null); - } catch (Throwable e) {} + } catch (Throwable ignore) {} TexturePackChangeHandler.register(new TexturePackChangeHandler(MCPatcherUtils.CONNECTED_TEXTURES, 3) { diff --git a/src/main/java/com/prupe/mcpatcher/ctm/GlassPaneRenderer.java b/src/main/java/com/prupe/mcpatcher/ctm/GlassPaneRenderer.java index e6d9a1dad..b2939b2ae 100644 --- a/src/main/java/com/prupe/mcpatcher/ctm/GlassPaneRenderer.java +++ b/src/main/java/com/prupe/mcpatcher/ctm/GlassPaneRenderer.java @@ -8,9 +8,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import com.prupe.mcpatcher.mal.block.BlockAPI; - -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; +import jss.notfine.config.MCPatcherForgeConfig; public class GlassPaneRenderer { @@ -47,14 +45,14 @@ public class GlassPaneRenderer { } } - private static boolean setupIcons(RenderBlocks renderBlocks, Block blockPane, IIcon origIcon, int i, int j, int k) { + private static boolean setupIcons(RenderBlocks renderBlocks, Block blockPane, IIcon origIcon, int x, int y, int z) { skipPaneRendering = skipBottomEdgeRendering = skipTopEdgeRendering = false; if (!enable) { return false; } for (int face = BlockOrientation.NORTH_FACE; face <= BlockOrientation.EAST_FACE; face++) { icons[face] = CTMUtils - .getBlockIcon(origIcon, renderBlocks, blockPane, renderBlocks.blockAccess, i, j, k, face); + .getBlockIcon(origIcon, renderBlocks, blockPane, renderBlocks.blockAccess, x, y, z, face); if (icons[face] == null) { skipPaneRendering = false; return false; @@ -65,24 +63,24 @@ public class GlassPaneRenderer { return skipPaneRendering; } - private static void setupPaneEdges(RenderBlocks renderBlocks, Block blockPane, int i, int j, int k) { + private static void setupPaneEdges(RenderBlocks renderBlocks, Block blockPane, int x, int y, int z) { IBlockAccess blockAccess = renderBlocks.blockAccess; - int metadata = BlockAPI.getMetadataAt(blockAccess, i, j, k); - skipBottomEdgeRendering = BlockAPI.getBlockAt(blockAccess, i, j - 1, k) == blockPane - && BlockAPI.getMetadataAt(blockAccess, i, j - 1, k) == metadata; - skipTopEdgeRendering = BlockAPI.getBlockAt(blockAccess, i, j + 1, k) == blockPane - && BlockAPI.getMetadataAt(blockAccess, i, j + 1, k) == metadata; + int metadata = blockAccess.getBlockMetadata(x, y, z); + skipBottomEdgeRendering = blockAccess.getBlock(x, y - 1, z) == blockPane + && blockAccess.getBlockMetadata(x, y - 1, z) == metadata; + skipTopEdgeRendering = blockAccess.getBlock(x, y + 1, z) == blockPane + && blockAccess.getBlockMetadata(x, y + 1, z) == metadata; } - private static void render(int i, int j, int k, boolean connectNorth, boolean connectSouth, boolean connectWest, + private static void render(int x, int y, int z, boolean connectNorth, boolean connectSouth, boolean connectWest, boolean connectEast, double thickness, double uOffset, double yOffset, boolean edges) { - final double i0 = i; + final double i0 = x; final double i1 = i0 + 0.5 - thickness; final double i2 = i0 + 0.5 + thickness; final double i3 = i0 + 1.0; - final double j0 = j + yOffset; - final double j1 = j + 1.0 - yOffset; - final double k0 = k; + final double j0 = y + yOffset; + final double j1 = y + 1.0 - yOffset; + final double k0 = z; final double k1 = k0 + 0.5 - thickness; final double k2 = k0 + 0.5 + thickness; final double k3 = k0 + 1.0; diff --git a/src/main/java/com/prupe/mcpatcher/ctm/TileOverride.java b/src/main/java/com/prupe/mcpatcher/ctm/TileOverride.java index f13723b93..e2e2927f1 100644 --- a/src/main/java/com/prupe/mcpatcher/ctm/TileOverride.java +++ b/src/main/java/com/prupe/mcpatcher/ctm/TileOverride.java @@ -376,7 +376,7 @@ abstract class TileOverride implements ITileOverride { i += offset[0]; j += offset[1]; k += offset[2]; - Block neighbor = BlockAPI.getBlockAt(blockAccess, i, j, k); + Block neighbor = blockAccess.getBlock(i, j, k); if (neighbor == null) { return false; } @@ -390,8 +390,7 @@ abstract class TileOverride implements ITileOverride { int blockFace = renderBlockState.getBlockFace(); if (blockFace >= 0) { int[] normal = NORMALS[blockFace]; - if (!BlockAPI.shouldSideBeRendered( - neighbor, + if (!neighbor.shouldSideBeRendered( blockAccess, i + normal[0], j + normal[1], @@ -417,34 +416,34 @@ abstract class TileOverride implements ITileOverride { } IBlockAccess blockAccess = renderBlockState.getBlockAccess(); Block block = renderBlockState.getBlock(); - int i = renderBlockState.getI(); - int j = renderBlockState.getJ(); - int k = renderBlockState.getK(); + int x = renderBlockState.getI(); + int y = renderBlockState.getJ(); + int z = renderBlockState.getK(); if (renderBlockState.getBlockFace() < 0 && requiresFace()) { properties.warning( "method=%s is not supported for non-standard block %s:%d @ %d %d %d", getMethod(), BlockAPI.getBlockName(block), - BlockAPI.getMetadataAt(blockAccess, i, j, k), - i, - j, - k); + blockAccess.getBlockMetadata(x, y, z), + x, + y, + z); return null; } if (block == null || RenderPassAPI.instance.skipThisRenderPass(block, renderPass)) { return null; } BlockStateMatcher filter = renderBlockState.getFilter(); - if (filter != null && !filter.match(blockAccess, i, j, k)) { + if (filter != null && !filter.match(blockAccess, x, y, z)) { return null; } if (faceMatcher != null && !faceMatcher.match(renderBlockState)) { return null; } - if (height != null && !height.get(j)) { + if (height != null && !height.get(y)) { return null; } - if (biomes != null && !biomes.get(BiomeAPI.getBiomeIDAt(blockAccess, i, j, k))) { + if (biomes != null && !biomes.get(BiomeAPI.getBiomeIDAt(blockAccess, x, y, z))) { return null; } return getTileWorld_Impl(renderBlockState, origIcon); diff --git a/src/main/java/com/prupe/mcpatcher/ctm/TileOverrideIterator.java b/src/main/java/com/prupe/mcpatcher/ctm/TileOverrideIterator.java index 0f7c78a1f..f3bf200e8 100644 --- a/src/main/java/com/prupe/mcpatcher/ctm/TileOverrideIterator.java +++ b/src/main/java/com/prupe/mcpatcher/ctm/TileOverrideIterator.java @@ -11,7 +11,7 @@ import net.minecraft.util.IIcon; import com.prupe.mcpatcher.mal.block.BlockStateMatcher; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; +import jss.notfine.config.MCPatcherForgeConfig; abstract public class TileOverrideIterator implements Iterator { diff --git a/src/main/java/com/prupe/mcpatcher/hd/CustomAnimation.java b/src/main/java/com/prupe/mcpatcher/hd/CustomAnimation.java index d7c32d0c8..9abdcc1cd 100644 --- a/src/main/java/com/prupe/mcpatcher/hd/CustomAnimation.java +++ b/src/main/java/com/prupe/mcpatcher/hd/CustomAnimation.java @@ -22,7 +22,7 @@ import com.prupe.mcpatcher.mal.resource.ResourceList; import com.prupe.mcpatcher.mal.resource.TexturePackAPI; import com.prupe.mcpatcher.mal.resource.TexturePackChangeHandler; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; +import jss.notfine.config.MCPatcherForgeConfig; public class CustomAnimation implements Comparable { @@ -340,7 +340,7 @@ public class CustomAnimation implements Comparable { if (value != null && value.matches("^\\d+$")) { return Integer.parseInt(value); } - } catch (NumberFormatException e) {} + } catch (NumberFormatException ignore) {} return null; } diff --git a/src/main/java/com/prupe/mcpatcher/hd/FancyDial.java b/src/main/java/com/prupe/mcpatcher/hd/FancyDial.java index 4be159322..869360e05 100644 --- a/src/main/java/com/prupe/mcpatcher/hd/FancyDial.java +++ b/src/main/java/com/prupe/mcpatcher/hd/FancyDial.java @@ -37,7 +37,7 @@ import com.prupe.mcpatcher.mal.resource.PropertiesFile; import com.prupe.mcpatcher.mal.resource.TexturePackAPI; import com.prupe.mcpatcher.mal.util.InputHandler; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; +import jss.notfine.config.MCPatcherForgeConfig; public class FancyDial { diff --git a/src/main/java/com/prupe/mcpatcher/hd/FontUtils.java b/src/main/java/com/prupe/mcpatcher/hd/FontUtils.java index acd51a0d4..fc8142110 100644 --- a/src/main/java/com/prupe/mcpatcher/hd/FontUtils.java +++ b/src/main/java/com/prupe/mcpatcher/hd/FontUtils.java @@ -14,8 +14,8 @@ import com.prupe.mcpatcher.mal.resource.PropertiesFile; import com.prupe.mcpatcher.mal.resource.TexturePackAPI; import com.prupe.mcpatcher.mal.resource.TexturePackChangeHandler; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; -import com.gtnewhorizons.angelica.mixins.interfaces.FontRendererExpansion; +import jss.notfine.config.MCPatcherForgeConfig; +import jss.notfine.util.FontRendererExpansion; public class FontUtils { @@ -267,7 +267,7 @@ public class FontUtils { charWidthf[ch] = width; isOverride[ch] = true; } - } catch (NumberFormatException e) {} + } catch (NumberFormatException ignore) {} } } } diff --git a/src/main/java/com/prupe/mcpatcher/hd/MipmapHelper.java b/src/main/java/com/prupe/mcpatcher/hd/MipmapHelper.java index 92be526a3..76cfd0472 100644 --- a/src/main/java/com/prupe/mcpatcher/hd/MipmapHelper.java +++ b/src/main/java/com/prupe/mcpatcher/hd/MipmapHelper.java @@ -19,7 +19,7 @@ import com.prupe.mcpatcher.mal.resource.GLAPI; import com.prupe.mcpatcher.mal.resource.PropertiesFile; import com.prupe.mcpatcher.mal.resource.TexturePackAPI; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; +import jss.notfine.config.MCPatcherForgeConfig; public class MipmapHelper { diff --git a/src/main/java/com/prupe/mcpatcher/mal/biome/ColorMap.java b/src/main/java/com/prupe/mcpatcher/mal/biome/ColorMap.java index c752ed939..61a275cda 100644 --- a/src/main/java/com/prupe/mcpatcher/mal/biome/ColorMap.java +++ b/src/main/java/com/prupe/mcpatcher/mal/biome/ColorMap.java @@ -19,7 +19,7 @@ import com.prupe.mcpatcher.mal.resource.ResourceList; import com.prupe.mcpatcher.mal.resource.TexturePackAPI; import com.prupe.mcpatcher.mal.util.WeightedIndex; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; +import jss.notfine.config.MCPatcherForgeConfig; abstract public class ColorMap implements IColorMap { diff --git a/src/main/java/com/prupe/mcpatcher/mal/block/BlockAPI.java b/src/main/java/com/prupe/mcpatcher/mal/block/BlockAPI.java index a09e56275..0b2ee22d1 100644 --- a/src/main/java/com/prupe/mcpatcher/mal/block/BlockAPI.java +++ b/src/main/java/com/prupe/mcpatcher/mal/block/BlockAPI.java @@ -50,19 +50,6 @@ public class BlockAPI { } } - public static Block getFixedBlock(String name) { - Block block = parseBlockName(name); - if (block == null) { - new IllegalArgumentException("unknown block " + name).printStackTrace(); - } - return block; - } - - public static Block parseBlockName(String name) { - return GameData.getBlockRegistry() - .getObject(name); - } - public static String getBlockName(Block block) { return block == null ? "(null)" : block.getUnlocalizedName(); } @@ -78,26 +65,6 @@ public class BlockAPI { return blocks; } - public static Block getBlockAt(IBlockAccess blockAccess, int i, int j, int k) { - return blockAccess.getBlock(i, j, k); - } - - public static int getMetadataAt(IBlockAccess blockAccess, int i, int j, int k) { - return blockAccess.getBlockMetadata(i, j, k); - } - - public static IIcon getBlockIcon(Block block, IBlockAccess blockAccess, int i, int j, int k, int face) { - return block.getIcon(blockAccess, i, j, k, face); - } - - public static boolean shouldSideBeRendered(Block block, IBlockAccess blockAccess, int i, int j, int k, int face) { - return block.shouldSideBeRendered(blockAccess, i, j, k, face); - } - - public static int getBlockLightValue(Block block) { - return block.getLightValue(); - } - public static BlockStateMatcher createMatcher(PropertiesFile source, String matchString) { Map propertyMap = new HashMap<>(); String namespace = null; @@ -133,14 +100,14 @@ public class BlockAPI { } if (MCPatcherUtils.isNullOrEmpty(namespace)) { - namespace = source.getResource() - .getResourceDomain(); + namespace = source.getResource().getResourceDomain(); } if (MCPatcherUtils.isNullOrEmpty(blockName)) { source.warning("cannot parse namespace/block name from %s", matchString); return null; } - Block block = parseBlockName(namespace + ':' + blockName); + Block block = GameData.getBlockRegistry() + .getObject(namespace + ':' + blockName); if (block == null) { source.warning("unknown block %s:%s", namespace, blockName); return null; @@ -151,4 +118,5 @@ public class BlockAPI { metadata.toString() .trim()); } + } diff --git a/src/main/java/com/prupe/mcpatcher/mal/block/BlockStateMatcher.java b/src/main/java/com/prupe/mcpatcher/mal/block/BlockStateMatcher.java index 5f7264f11..b086860aa 100644 --- a/src/main/java/com/prupe/mcpatcher/mal/block/BlockStateMatcher.java +++ b/src/main/java/com/prupe/mcpatcher/mal/block/BlockStateMatcher.java @@ -65,15 +65,15 @@ public class BlockStateMatcher { return fullString; } - public boolean match(IBlockAccess blockAccess, int i, int j, int k) { - Block block = BlockAPI.getBlockAt(blockAccess, i, j, k); + public boolean match(IBlockAccess blockAccess, int x, int y, int z) { + Block block = blockAccess.getBlock(x, y, z); if (block != this.block) { return false; } - int metadata = BlockAPI.getMetadataAt(blockAccess, i, j, k); + int metadata = blockAccess.getBlockMetadata(x, y, z); if (block == doublePlantBlock) { - if ((metadata & 0x8) != 0 && BlockAPI.getBlockAt(blockAccess, i, j - 1, k) == block) { - metadata = BlockAPI.getMetadataAt(blockAccess, i, j - 1, k); + if ((metadata & 0x8) != 0 && blockAccess.getBlock(x, y - 1, z) == block) { + metadata = blockAccess.getBlockMetadata(x, y - 1, z); } metadata &= 0x7; } else if (block == logBlock) { diff --git a/src/main/java/com/prupe/mcpatcher/mal/block/RenderBlocksUtils.java b/src/main/java/com/prupe/mcpatcher/mal/block/RenderBlocksUtils.java index 8d8f620af..7b0b0be9b 100644 --- a/src/main/java/com/prupe/mcpatcher/mal/block/RenderBlocksUtils.java +++ b/src/main/java/com/prupe/mcpatcher/mal/block/RenderBlocksUtils.java @@ -2,20 +2,17 @@ package com.prupe.mcpatcher.mal.block; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; +import jss.notfine.config.MCPatcherForgeConfig; // Shared by both CTM and Custom Colors. public class RenderBlocksUtils { public static final boolean enableBetterGrass = MCPatcherForgeConfig.instance().betterGrass; - private static final Block grassBlock = BlockAPI.getFixedBlock("minecraft:grass"); - private static final Block snowBlock = BlockAPI.getFixedBlock("minecraft:snow_layer"); - private static final Block craftedSnowBlock = BlockAPI.getFixedBlock("minecraft:snow"); - private static final int COLOR = 0; private static final int NONCOLOR = 1; private static final int COLOR_AND_NONCOLOR = 2; @@ -28,7 +25,7 @@ public class RenderBlocksUtils { public static int layerIndex; public static IIcon blankIcon; - public static void setupColorMultiplier(Block block, IBlockAccess blockAccess, int i, int j, int k, + public static void setupColorMultiplier(Block block, IBlockAccess blockAccess, int x, int y, int z, boolean haveOverrideTexture, float r, float g, float b) { if (haveOverrideTexture || !RenderPassAPI.instance.useColorMultiplierThisPass(block)) { colorMultiplierType[0] = COLOR; @@ -36,24 +33,24 @@ public class RenderBlocksUtils { colorMultiplierType[3] = COLOR; colorMultiplierType[4] = COLOR; colorMultiplierType[5] = COLOR; - } else if (block == grassBlock) { + } else if (block == Blocks.grass) { colorMultiplierType[0] = NONCOLOR; if (enableBetterGrass) { - if (isSnowCovered(blockAccess, i, j, k)) { + if (isSnowCovered(blockAccess, x, y, z)) { colorMultiplierType[2] = NONCOLOR; colorMultiplierType[3] = NONCOLOR; colorMultiplierType[4] = NONCOLOR; colorMultiplierType[5] = NONCOLOR; } else { - j--; - colorMultiplierType[2] = block == BlockAPI.getBlockAt(blockAccess, i, j, k - 1) - && !isSnowCovered(blockAccess, i, j, k - 1) ? COLOR : COLOR_AND_NONCOLOR; - colorMultiplierType[3] = block == BlockAPI.getBlockAt(blockAccess, i, j, k + 1) - && !isSnowCovered(blockAccess, i, j, k + 1) ? COLOR : COLOR_AND_NONCOLOR; - colorMultiplierType[4] = block == BlockAPI.getBlockAt(blockAccess, i - 1, j, k) - && !isSnowCovered(blockAccess, i - 1, j, k) ? COLOR : COLOR_AND_NONCOLOR; - colorMultiplierType[5] = block == BlockAPI.getBlockAt(blockAccess, i + 1, j, k) - && !isSnowCovered(blockAccess, i + 1, j, k) ? COLOR : COLOR_AND_NONCOLOR; + y--; + colorMultiplierType[2] = block == blockAccess.getBlock(x, y, z - 1) + && !isSnowCovered(blockAccess, x, y, z - 1) ? COLOR : COLOR_AND_NONCOLOR; + colorMultiplierType[3] = block == blockAccess.getBlock(x, y, z + 1) + && !isSnowCovered(blockAccess, x, y, z + 1) ? COLOR : COLOR_AND_NONCOLOR; + colorMultiplierType[4] = block == blockAccess.getBlock(x - 1, y, z) + && !isSnowCovered(blockAccess, x - 1, y, z) ? COLOR : COLOR_AND_NONCOLOR; + colorMultiplierType[5] = block == blockAccess.getBlock(x + 1, y, z) + && !isSnowCovered(blockAccess, x + 1, y, z) ? COLOR : COLOR_AND_NONCOLOR; } } else { colorMultiplierType[2] = COLOR_AND_NONCOLOR; @@ -68,7 +65,7 @@ public class RenderBlocksUtils { colorMultiplierType[4] = COLOR; colorMultiplierType[5] = COLOR; } - if (!isAmbientOcclusionEnabled() || BlockAPI.getBlockLightValue(block) != 0) { + if (!isAmbientOcclusionEnabled() || block.getLightValue() != 0) { setupColorMultiplier(0, r, g, b); setupColorMultiplier(1, r, g, b); setupColorMultiplier(2, r, g, b); @@ -79,7 +76,7 @@ public class RenderBlocksUtils { } public static void setupColorMultiplier(Block block, boolean useColor) { - if (block == grassBlock || !useColor) { + if (block == Blocks.grass || !useColor) { colorMultiplierType[0] = NONCOLOR; colorMultiplierType[2] = NONCOLOR; colorMultiplierType[3] = NONCOLOR; @@ -136,49 +133,39 @@ public class RenderBlocksUtils { return face < 0 ? 1 : face % 6; } - public static IIcon getGrassTexture(Block block, IBlockAccess blockAccess, int i, int j, int k, int face, + public static IIcon getGrassTexture(Block block, IBlockAccess blockAccess, int x, int y, int z, int face, IIcon topIcon) { if (!enableBetterGrass || face < 2) { return null; } - boolean isSnow = isSnowCovered(blockAccess, i, j, k); - j--; + boolean isSnow = isSnowCovered(blockAccess, x, y, z); + y--; switch (face) { - case 2: - k--; - break; - - case 3: - k++; - break; - - case 4: - i--; - break; - - case 5: - i++; - break; - - default: + case 2 -> z--; + case 3 -> z++; + case 4 -> x--; + case 5 -> x++; + default -> { return null; + } } - if (block != BlockAPI.getBlockAt(blockAccess, i, j, k)) { + if (block != blockAccess.getBlock(x, y, z)) { return null; } - boolean neighborIsSnow = isSnowCovered(blockAccess, i, j, k); + boolean neighborIsSnow = isSnowCovered(blockAccess, x, y, z); if (isSnow != neighborIsSnow) { return null; } - return isSnow ? BlockAPI.getBlockIcon(snowBlock, blockAccess, i, j, k, face) : topIcon; + return isSnow ? Blocks.snow_layer.getIcon(blockAccess, x, y, z, face) : topIcon; } - private static boolean isSnowCovered(IBlockAccess blockAccess, int i, int j, int k) { - Block topBlock = BlockAPI.getBlockAt(blockAccess, i, j + 1, k); - return topBlock == snowBlock || topBlock == craftedSnowBlock; + private static boolean isSnowCovered(IBlockAccess blockAccess, int x, int y, int z) { + Block topBlock = blockAccess.getBlock(x, y + 1, z); + return topBlock == Blocks.snow_layer || topBlock == Blocks.snow; } public static boolean isAmbientOcclusionEnabled() { return Minecraft.isAmbientOcclusionEnabled(); } + } diff --git a/src/main/java/com/prupe/mcpatcher/mal/nbt/NBTRule.java b/src/main/java/com/prupe/mcpatcher/mal/nbt/NBTRule.java index d51001999..7306297a8 100644 --- a/src/main/java/com/prupe/mcpatcher/mal/nbt/NBTRule.java +++ b/src/main/java/com/prupe/mcpatcher/mal/nbt/NBTRule.java @@ -14,8 +14,8 @@ import net.minecraft.nbt.NBTTagLong; import net.minecraft.nbt.NBTTagShort; import net.minecraft.nbt.NBTTagString; -import com.gtnewhorizons.angelica.mixins.interfaces.NBTTagCompoundExpansion; -import com.gtnewhorizons.angelica.mixins.interfaces.NBTTagListExpansion; +import jss.notfine.util.NBTTagCompoundExpansion; +import jss.notfine.util.NBTTagListExpansion; abstract public class NBTRule { diff --git a/src/main/java/com/prupe/mcpatcher/mal/resource/TexturePackAPI.java b/src/main/java/com/prupe/mcpatcher/mal/resource/TexturePackAPI.java index acf43e16b..3a04db43c 100644 --- a/src/main/java/com/prupe/mcpatcher/mal/resource/TexturePackAPI.java +++ b/src/main/java/com/prupe/mcpatcher/mal/resource/TexturePackAPI.java @@ -34,7 +34,7 @@ import org.apache.commons.io.IOUtils; import com.prupe.mcpatcher.MCLogger; import com.prupe.mcpatcher.MCPatcherUtils; -import com.gtnewhorizons.angelica.mixins.interfaces.AbstractTextureExpansion; +import jss.notfine.util.AbstractTextureExpansion; public class TexturePackAPI { diff --git a/src/main/java/com/prupe/mcpatcher/mal/tile/TileLoader.java b/src/main/java/com/prupe/mcpatcher/mal/tile/TileLoader.java index c6ad35100..a2cd40c1c 100644 --- a/src/main/java/com/prupe/mcpatcher/mal/tile/TileLoader.java +++ b/src/main/java/com/prupe/mcpatcher/mal/tile/TileLoader.java @@ -23,7 +23,7 @@ import com.prupe.mcpatcher.mal.resource.BlendMethod; import com.prupe.mcpatcher.mal.resource.TexturePackAPI; import com.prupe.mcpatcher.mal.resource.TexturePackChangeHandler; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; +import jss.notfine.config.MCPatcherForgeConfig; public class TileLoader { diff --git a/src/main/java/com/prupe/mcpatcher/mob/LineRenderer.java b/src/main/java/com/prupe/mcpatcher/mob/LineRenderer.java index 198beee99..7ab4247cf 100644 --- a/src/main/java/com/prupe/mcpatcher/mob/LineRenderer.java +++ b/src/main/java/com/prupe/mcpatcher/mob/LineRenderer.java @@ -11,7 +11,7 @@ import com.prupe.mcpatcher.mal.resource.PropertiesFile; import com.prupe.mcpatcher.mal.resource.TexturePackAPI; import com.prupe.mcpatcher.mal.util.InputHandler; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; +import jss.notfine.config.MCPatcherForgeConfig; public class LineRenderer { diff --git a/src/main/java/com/prupe/mcpatcher/mob/MobRuleList.java b/src/main/java/com/prupe/mcpatcher/mob/MobRuleList.java index dba3c60db..609ef4efa 100644 --- a/src/main/java/com/prupe/mcpatcher/mob/MobRuleList.java +++ b/src/main/java/com/prupe/mcpatcher/mob/MobRuleList.java @@ -164,13 +164,13 @@ class MobRuleList { this.height = height; } - boolean match(int i, int j, int k, Integer biome) { + boolean match(int x, int y, int z, Integer biome) { if (biomes != null) { if (biome == null || !biomes.get(biome)) { return false; } } - return height == null || height.get(j); + return height == null || height.get(y); } @Override diff --git a/src/main/java/com/prupe/mcpatcher/renderpass/RenderPass.java b/src/main/java/com/prupe/mcpatcher/renderpass/RenderPass.java index b58d3440b..09c62bed6 100644 --- a/src/main/java/com/prupe/mcpatcher/renderpass/RenderPass.java +++ b/src/main/java/com/prupe/mcpatcher/renderpass/RenderPass.java @@ -234,11 +234,11 @@ public class RenderPass { } // pre-14w02a - public static boolean shouldSideBeRendered(Block block, IBlockAccess blockAccess, int i, int j, int k, int face) { - if (BlockAPI.shouldSideBeRendered(block, blockAccess, i, j, k, face)) { + public static boolean shouldSideBeRendered(Block block, IBlockAccess blockAccess, int x, int y, int z, int face) { + if (block.shouldSideBeRendered(blockAccess, x, y, z, face)) { return true; } else if (!extraRenderPass.containsKey(block)) { - Block neighbor = BlockAPI.getBlockAt(blockAccess, i, j, k); + Block neighbor = blockAccess.getBlock(x, y, z); return extraRenderPass.containsKey(neighbor); } else { return false; diff --git a/src/main/java/com/prupe/mcpatcher/sky/FireworksHelper.java b/src/main/java/com/prupe/mcpatcher/sky/FireworksHelper.java index d7d83c9d3..6749f95d9 100644 --- a/src/main/java/com/prupe/mcpatcher/sky/FireworksHelper.java +++ b/src/main/java/com/prupe/mcpatcher/sky/FireworksHelper.java @@ -13,7 +13,7 @@ import com.prupe.mcpatcher.mal.resource.GLAPI; import com.prupe.mcpatcher.mal.resource.PropertiesFile; import com.prupe.mcpatcher.mal.resource.TexturePackAPI; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; +import jss.notfine.config.MCPatcherForgeConfig; public class FireworksHelper { diff --git a/src/main/java/com/prupe/mcpatcher/sky/SkyRenderer.java b/src/main/java/com/prupe/mcpatcher/sky/SkyRenderer.java index f57ec6876..698e66e61 100644 --- a/src/main/java/com/prupe/mcpatcher/sky/SkyRenderer.java +++ b/src/main/java/com/prupe/mcpatcher/sky/SkyRenderer.java @@ -22,7 +22,7 @@ import com.prupe.mcpatcher.mal.resource.PropertiesFile; import com.prupe.mcpatcher.mal.resource.TexturePackAPI; import com.prupe.mcpatcher.mal.resource.TexturePackChangeHandler; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; +import jss.notfine.config.MCPatcherForgeConfig; public class SkyRenderer { diff --git a/src/main/java/mist475/mcpatcherforge/McPatcherForge.java b/src/main/java/jss/notfine/McPatcherForge.java similarity index 88% rename from src/main/java/mist475/mcpatcherforge/McPatcherForge.java rename to src/main/java/jss/notfine/McPatcherForge.java index 54b59e023..27edca6fe 100644 --- a/src/main/java/mist475/mcpatcherforge/McPatcherForge.java +++ b/src/main/java/jss/notfine/McPatcherForge.java @@ -1,4 +1,4 @@ -package mist475.mcpatcherforge; +package jss.notfine; import cpw.mods.fml.common.Mod; diff --git a/src/main/java/mist475/mcpatcherforge/asm/ASMUtils.java b/src/main/java/jss/notfine/asm/ASMUtils.java similarity index 99% rename from src/main/java/mist475/mcpatcherforge/asm/ASMUtils.java rename to src/main/java/jss/notfine/asm/ASMUtils.java index 32942a05d..89ae59523 100644 --- a/src/main/java/mist475/mcpatcherforge/asm/ASMUtils.java +++ b/src/main/java/jss/notfine/asm/ASMUtils.java @@ -1,4 +1,4 @@ -package mist475.mcpatcherforge.asm; +package jss.notfine.asm; import java.util.Objects; diff --git a/src/main/java/mist475/mcpatcherforge/asm/AsmTransformers.java b/src/main/java/jss/notfine/asm/AsmTransformers.java similarity index 89% rename from src/main/java/mist475/mcpatcherforge/asm/AsmTransformers.java rename to src/main/java/jss/notfine/asm/AsmTransformers.java index 906124463..f52d09822 100644 --- a/src/main/java/mist475/mcpatcherforge/asm/AsmTransformers.java +++ b/src/main/java/jss/notfine/asm/AsmTransformers.java @@ -1,4 +1,4 @@ -package mist475.mcpatcherforge.asm; +package jss.notfine.asm; import java.util.ArrayList; import java.util.Arrays; @@ -9,7 +9,7 @@ import com.gtnewhorizons.angelica.config.AngelicaConfig; import com.gtnewhorizons.angelica.loading.AngelicaTweaker; import cpw.mods.fml.relauncher.FMLLaunchHandler; -import mist475.mcpatcherforge.config.MCPatcherForgeConfig; +import jss.notfine.config.MCPatcherForgeConfig; /** * Adapted from Hodgepodge @@ -18,9 +18,9 @@ public enum AsmTransformers { RENDERBLOCKS("RenderBlocks transformer", () -> AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.instance().customColorsEnabled, - Side.CLIENT, "mist475.mcpatcherforge.asm.RenderBlocksTransformer"), + Side.CLIENT, "jss.notfine.asm.RenderBlocksTransformer"), WORLDRENDERER("WorldRenderer transformer", () -> AngelicaConfig.enableMCPatcherForgeFeatures, Side.CLIENT, - "mist475.mcpatcherforge.asm.WorldRendererTransformer"); + "jss.notfine.asm.WorldRendererTransformer"); private final Supplier applyIf; private final Side side; diff --git a/src/main/java/mist475/mcpatcherforge/asm/RenderBlocksTransformer.java b/src/main/java/jss/notfine/asm/RenderBlocksTransformer.java similarity index 99% rename from src/main/java/mist475/mcpatcherforge/asm/RenderBlocksTransformer.java rename to src/main/java/jss/notfine/asm/RenderBlocksTransformer.java index 0b1d9d3d2..d5968df8b 100644 --- a/src/main/java/mist475/mcpatcherforge/asm/RenderBlocksTransformer.java +++ b/src/main/java/jss/notfine/asm/RenderBlocksTransformer.java @@ -1,6 +1,6 @@ -package mist475.mcpatcherforge.asm; +package jss.notfine.asm; -import static mist475.mcpatcherforge.asm.ASMUtils.matchesNodeSequence; +import static jss.notfine.asm.ASMUtils.matchesNodeSequence; import net.minecraft.launchwrapper.IClassTransformer; @@ -24,7 +24,7 @@ import org.objectweb.asm.tree.MethodInsnNode; import org.objectweb.asm.tree.MethodNode; import org.objectweb.asm.tree.VarInsnNode; -import mist475.mcpatcherforge.asm.mappings.Names; +import jss.notfine.asm.mappings.Names; public class RenderBlocksTransformer implements IClassTransformer { diff --git a/src/main/java/mist475/mcpatcherforge/asm/WorldRendererTransformer.java b/src/main/java/jss/notfine/asm/WorldRendererTransformer.java similarity index 98% rename from src/main/java/mist475/mcpatcherforge/asm/WorldRendererTransformer.java rename to src/main/java/jss/notfine/asm/WorldRendererTransformer.java index 32b3cbf3c..2c0cc518a 100644 --- a/src/main/java/mist475/mcpatcherforge/asm/WorldRendererTransformer.java +++ b/src/main/java/jss/notfine/asm/WorldRendererTransformer.java @@ -1,6 +1,6 @@ -package mist475.mcpatcherforge.asm; +package jss.notfine.asm; -import static mist475.mcpatcherforge.asm.ASMUtils.matchesNodeSequence; +import static jss.notfine.asm.ASMUtils.matchesNodeSequence; import net.minecraft.launchwrapper.IClassTransformer; @@ -18,7 +18,7 @@ import org.objectweb.asm.tree.MethodInsnNode; import org.objectweb.asm.tree.MethodNode; import org.objectweb.asm.tree.VarInsnNode; -import mist475.mcpatcherforge.asm.mappings.Names; +import jss.notfine.asm.mappings.Names; public class WorldRendererTransformer implements IClassTransformer { diff --git a/src/main/java/mist475/mcpatcherforge/asm/mappings/Namer.java b/src/main/java/jss/notfine/asm/mappings/Namer.java similarity index 61% rename from src/main/java/mist475/mcpatcherforge/asm/mappings/Namer.java rename to src/main/java/jss/notfine/asm/mappings/Namer.java index 0df57f521..c866105ff 100644 --- a/src/main/java/mist475/mcpatcherforge/asm/mappings/Namer.java +++ b/src/main/java/jss/notfine/asm/mappings/Namer.java @@ -1,14 +1,10 @@ -package mist475.mcpatcherforge.asm.mappings; +package jss.notfine.asm.mappings; import java.util.ArrayList; import com.gtnewhorizons.angelica.loading.AngelicaTweaker; import net.minecraft.launchwrapper.Launch; -import mist475.mcpatcherforge.asm.mappings.Names.Clas; -import mist475.mcpatcherforge.asm.mappings.Names.Fiel; -import mist475.mcpatcherforge.asm.mappings.Names.Meth; - /** * This class und inherited classes are adapted from * ac = new ArrayList<>(); - ArrayList af = new ArrayList<>(); - ArrayList am = new ArrayList<>(); + ArrayList ac = new ArrayList<>(); + ArrayList af = new ArrayList<>(); + ArrayList am = new ArrayList<>(); - Clas c(String name) { - Clas x = new Clas(name); + Names.Clas c(String name) { + Names.Clas x = new Names.Clas(name); if (ac != null) ac.add(x); return x; } - Fiel f(Clas clas, String name, String desc) { - Fiel x = new Fiel(clas, name, desc); + Names.Fiel f(Names.Clas clas, String name, String desc) { + Names.Fiel x = new Names.Fiel(clas, name, desc); if (af != null) af.add(x); return x; } - Fiel f(Clas clas, Fiel fiel) { - Fiel x = new Fiel(clas, fiel.name, fiel.desc); + Names.Fiel f(Names.Clas clas, Names.Fiel fiel) { + Names.Fiel x = new Names.Fiel(clas, fiel.name, fiel.desc); if (af != null) af.add(x); return x; } - Meth m(Clas clas, String name, String desc) { - Meth x = new Meth(clas, name, desc); + Names.Meth m(Names.Clas clas, String name, String desc) { + Names.Meth x = new Names.Meth(clas, name, desc); if (am != null) am.add(x); return x; } - Meth m(Clas clas, Meth meth) { - Meth x = new Meth(clas, meth.name, meth.desc); + Names.Meth m(Names.Clas clas, Names.Meth meth) { + Names.Meth x = new Names.Meth(clas, meth.name, meth.desc); if (am != null) am.add(x); return x; } diff --git a/src/main/java/mist475/mcpatcherforge/asm/mappings/NamerMcp.java b/src/main/java/jss/notfine/asm/mappings/NamerMcp.java similarity index 94% rename from src/main/java/mist475/mcpatcherforge/asm/mappings/NamerMcp.java rename to src/main/java/jss/notfine/asm/mappings/NamerMcp.java index bd7467380..c94815fb1 100644 --- a/src/main/java/mist475/mcpatcherforge/asm/mappings/NamerMcp.java +++ b/src/main/java/jss/notfine/asm/mappings/NamerMcp.java @@ -1,4 +1,4 @@ -package mist475.mcpatcherforge.asm.mappings; +package jss.notfine.asm.mappings; import java.io.BufferedReader; import java.io.FileReader; @@ -7,9 +7,9 @@ import java.util.HashMap; import java.util.Map; import com.gtnewhorizons.angelica.loading.AngelicaTweaker; -import mist475.mcpatcherforge.asm.mappings.Names.Clas; -import mist475.mcpatcherforge.asm.mappings.Names.Fiel; -import mist475.mcpatcherforge.asm.mappings.Names.Meth; +import jss.notfine.asm.mappings.Names.Clas; +import jss.notfine.asm.mappings.Names.Fiel; +import jss.notfine.asm.mappings.Names.Meth; public class NamerMcp extends NamerSrg { diff --git a/src/main/java/mist475/mcpatcherforge/asm/mappings/NamerObf.java b/src/main/java/jss/notfine/asm/mappings/NamerObf.java similarity index 95% rename from src/main/java/mist475/mcpatcherforge/asm/mappings/NamerObf.java rename to src/main/java/jss/notfine/asm/mappings/NamerObf.java index 94d0aa889..46114df79 100644 --- a/src/main/java/mist475/mcpatcherforge/asm/mappings/NamerObf.java +++ b/src/main/java/jss/notfine/asm/mappings/NamerObf.java @@ -1,4 +1,4 @@ -package mist475.mcpatcherforge.asm.mappings; +package jss.notfine.asm.mappings; public class NamerObf extends Namer { diff --git a/src/main/java/mist475/mcpatcherforge/asm/mappings/NamerSrg.java b/src/main/java/jss/notfine/asm/mappings/NamerSrg.java similarity index 96% rename from src/main/java/mist475/mcpatcherforge/asm/mappings/NamerSrg.java rename to src/main/java/jss/notfine/asm/mappings/NamerSrg.java index 135dafbfb..5ac90c078 100644 --- a/src/main/java/mist475/mcpatcherforge/asm/mappings/NamerSrg.java +++ b/src/main/java/jss/notfine/asm/mappings/NamerSrg.java @@ -1,4 +1,4 @@ -package mist475.mcpatcherforge.asm.mappings; +package jss.notfine.asm.mappings; public class NamerSrg extends Namer { diff --git a/src/main/java/mist475/mcpatcherforge/asm/mappings/Names.java b/src/main/java/jss/notfine/asm/mappings/Names.java similarity index 98% rename from src/main/java/mist475/mcpatcherforge/asm/mappings/Names.java rename to src/main/java/jss/notfine/asm/mappings/Names.java index 303a919a2..35c13e18c 100644 --- a/src/main/java/mist475/mcpatcherforge/asm/mappings/Names.java +++ b/src/main/java/jss/notfine/asm/mappings/Names.java @@ -1,4 +1,4 @@ -package mist475.mcpatcherforge.asm.mappings; +package jss.notfine.asm.mappings; public class Names { diff --git a/src/main/java/mist475/mcpatcherforge/config/MCPatcherForgeConfig.java b/src/main/java/jss/notfine/config/MCPatcherForgeConfig.java similarity index 99% rename from src/main/java/mist475/mcpatcherforge/config/MCPatcherForgeConfig.java rename to src/main/java/jss/notfine/config/MCPatcherForgeConfig.java index 43f8a95d9..69e917b9e 100644 --- a/src/main/java/mist475/mcpatcherforge/config/MCPatcherForgeConfig.java +++ b/src/main/java/jss/notfine/config/MCPatcherForgeConfig.java @@ -1,4 +1,4 @@ -package mist475.mcpatcherforge.config; +package jss.notfine.config; import java.io.File; import java.util.logging.Level; diff --git a/src/main/java/jss/notfine/config/NotFineConfig.java b/src/main/java/jss/notfine/config/NotFineConfig.java index ec6b5ab70..1a229909e 100644 --- a/src/main/java/jss/notfine/config/NotFineConfig.java +++ b/src/main/java/jss/notfine/config/NotFineConfig.java @@ -8,19 +8,30 @@ import java.io.File; public class NotFineConfig { - public static boolean allowAdvancedOpenGL = true; + public static final String CATEGORY_GENERAL = "general"; + public static final String CATEGORY_TOGGLE = "toggle"; - public static final String CATEGORY_CLIENT = "client"; + public static boolean allowAdvancedOpenGL; + public static boolean allowToggle3DAnaglyph; + public static boolean allowToggleFBO; - private final Configuration notFineConfig; - public NotFineConfig() { + public static boolean betterBlockFaceCulling; + + public static void loadSettings() { File configFile = new File(Launch.minecraftHome + File.separator + "config" + File.separator + NotFine.MODID + File.separator + "notfine.cfg"); - notFineConfig = new Configuration(configFile); - } + Configuration notFineConfig = new Configuration(configFile); - public void loadSettings() { - allowAdvancedOpenGL = notFineConfig.getBoolean("allowAdvancedOpenGL", CATEGORY_CLIENT, true, "Allow or always disable the Advanced OpenGL button"); + allowAdvancedOpenGL = notFineConfig.getBoolean("allowAdvancedOpenGL", CATEGORY_GENERAL, false, + "Allow Advanced OpenGL to be enabled when it might be supported."); + allowToggle3DAnaglyph = notFineConfig.getBoolean("allowToggle3DAnaglyph", CATEGORY_GENERAL, true, + "Allow 3D Anaglyph to be enabled."); + allowToggleFBO = notFineConfig.getBoolean("allowToggleFBO", CATEGORY_GENERAL, false, + "Allow FBOs to be disabled."); + + notFineConfig.setCategoryComment(CATEGORY_TOGGLE, "Enable or disable various mod features."); + betterBlockFaceCulling = notFineConfig.getBoolean("betterBlockFaceCulling", CATEGORY_TOGGLE, true, + "Use more accurate block face culling when building chunk meshes."); if(notFineConfig.hasChanged()) { notFineConfig.save(); diff --git a/src/main/java/jss/notfine/core/Settings.java b/src/main/java/jss/notfine/core/Settings.java index cdb4c1e08..7edd406e9 100644 --- a/src/main/java/jss/notfine/core/Settings.java +++ b/src/main/java/jss/notfine/core/Settings.java @@ -79,6 +79,7 @@ public enum Settings { SettingsManager.leavesUpdated(); } }, + MODE_LIGHT_FLICKER(new NotFineOptionTickBox(true, OptionImpact.LOW)), MODE_SHADOWS(new NotFineOptionCycling<>(GraphicsToggle.DEFAULT, OptionImpact.LOW)) { @Override public void applyChanges() { diff --git a/src/main/java/jss/notfine/gui/NotFineGameOptionPages.java b/src/main/java/jss/notfine/gui/NotFineGameOptionPages.java index 0387490dd..0120e1445 100644 --- a/src/main/java/jss/notfine/gui/NotFineGameOptionPages.java +++ b/src/main/java/jss/notfine/gui/NotFineGameOptionPages.java @@ -1,6 +1,8 @@ package jss.notfine.gui; import com.google.common.collect.ImmutableList; +import com.gtnewhorizons.angelica.config.AngelicaConfig; +import com.gtnewhorizons.angelica.glsm.GLStateManager; import jss.notfine.config.NotFineConfig; import jss.notfine.core.Settings; import jss.notfine.core.SettingsManager; @@ -15,19 +17,26 @@ import me.jellysquid.mods.sodium.client.gui.options.control.CyclingControl; import me.jellysquid.mods.sodium.client.gui.options.control.SliderControl; import me.jellysquid.mods.sodium.client.gui.options.control.TickBoxControl; import me.jellysquid.mods.sodium.client.gui.options.named.GraphicsMode; +import me.jellysquid.mods.sodium.client.gui.options.named.GraphicsQuality; import me.jellysquid.mods.sodium.client.gui.options.named.LightingQuality; import me.jellysquid.mods.sodium.client.gui.options.named.ParticleMode; import me.jellysquid.mods.sodium.client.gui.options.storage.MinecraftOptionsStorage; +import me.jellysquid.mods.sodium.client.gui.options.storage.SodiumOptionsStorage; +import me.jellysquid.mods.sodium.client.render.chunk.backends.multidraw.MultidrawChunkRenderBackend; +import net.coderbot.iris.Iris; +import net.coderbot.iris.gui.option.IrisVideoSettings; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.client.settings.GameSettings; import org.lwjgl.opengl.Display; +import java.io.IOException; import java.util.ArrayList; import java.util.List; public class NotFineGameOptionPages { private static final MinecraftOptionsStorage vanillaOpts = new MinecraftOptionsStorage(); + private static final SodiumOptionsStorage sodiumOpts = new SodiumOptionsStorage(); public static OptionPage general() { List groups = new ArrayList<>(); @@ -76,6 +85,9 @@ public class NotFineGameOptionPages { } }, (opts) -> opts.fullScreen) .build()) + .build()); + + groups.add(OptionGroup.createBuilder() .add(OptionImpl.createBuilder(int.class, vanillaOpts) .setName(I18n.format("options.framerateLimit")) .setTooltip(I18n.format("sodium.options.fps_limit.tooltip")) @@ -84,11 +96,12 @@ public class NotFineGameOptionPages { .build()) .build()); + int maxGuiScale = Math.max(3, Math.min(Minecraft.getMinecraft().displayWidth / 320, Minecraft.getMinecraft().displayHeight / 240)); groups.add(OptionGroup.createBuilder() .add(OptionImpl.createBuilder(int.class, vanillaOpts) .setName(I18n.format("options.guiScale")) .setTooltip(I18n.format("sodium.options.gui_scale.tooltip")) - .setControl(option -> new SliderControl(option, 0, 4, 1, ControlValueFormatter.guiScale())) + .setControl(option -> new SliderControl(option, 0, maxGuiScale, 1, ControlValueFormatter.guiScale())) .setBinding((opts, value) -> opts.guiScale = value, opts -> opts.guiScale) .build()) .add(OptionImpl.createBuilder(boolean.class, vanillaOpts) @@ -97,7 +110,6 @@ public class NotFineGameOptionPages { .setControl(TickBoxControl::new) .setBinding((opts, value) -> opts.viewBobbing = value, opts -> opts.viewBobbing) .build()) - .add(Settings.DYNAMIC_FOV.option) .add(OptionImpl.createBuilder(LightingQuality.class, vanillaOpts) .setName(I18n.format("options.ao")) .setTooltip(I18n.format("sodium.options.smooth_lighting.tooltip")) @@ -112,6 +124,8 @@ public class NotFineGameOptionPages { .setControl(opt -> new SliderControl(opt, 0, 100, 1, ControlValueFormatter.brightness())) .setBinding((opts, value) -> opts.gammaSetting = value * 0.01F, (opts) -> (int) (opts.gammaSetting / 0.01F)) .build()) + .add(Settings.MODE_LIGHT_FLICKER.option) + .add(Settings.DYNAMIC_FOV.option) .add(OptionImpl.createBuilder(int.class, vanillaOpts) .setName(I18n.format("options.mipmapLevels")) .setTooltip(I18n.format("sodium.options.mipmap_levels.tooltip")) @@ -133,6 +147,31 @@ public class NotFineGameOptionPages { .setFlags(OptionFlag.REQUIRES_ASSET_RELOAD) .build()) .build()); + + if(AngelicaConfig.enableIris) { + final OptionImpl maxShadowDistanceSlider = OptionImpl.createBuilder(int.class, vanillaOpts) + .setName(I18n.format("options.iris.shadowDistance")) + .setTooltip(I18n.format("options.iris.shadowDistance.sodium_tooltip")) + .setControl(option -> new SliderControl(option, 0, 32, 1, ControlValueFormatter.quantity("options.chunks"))) + .setBinding((options, value) -> { + IrisVideoSettings.shadowDistance = value; + try { + Iris.getIrisConfig().save(); + } catch (IOException e) { + e.printStackTrace(); + } + }, + options -> IrisVideoSettings.getOverriddenShadowDistance(IrisVideoSettings.shadowDistance)) + .setImpact(OptionImpact.HIGH) + .setEnabled(true) + .build(); + maxShadowDistanceSlider.iris$dynamicallyEnable(IrisVideoSettings::isShadowDistanceSliderEnabled); + groups.add(OptionGroup.createBuilder() + .add(maxShadowDistanceSlider) + .build()); + } + + return new OptionPage(I18n.format("options.video"), ImmutableList.copyOf(groups)); } @@ -140,10 +179,19 @@ public class NotFineGameOptionPages { List groups = new ArrayList<>(); groups.add(OptionGroup.createBuilder() .add(Settings.MODE_LEAVES.option) + .add(OptionImpl.createBuilder(GraphicsQuality.class, sodiumOpts) + .setName(I18n.format("sodium.options.grass_quality.name")) + .setTooltip(I18n.format("sodium.options.grass_quality.tooltip")) + .setControl(option -> new CyclingControl<>(option, GraphicsQuality.class)) + .setBinding((opts, value) -> opts.quality.grassQuality = value, opts -> opts.quality.grassQuality) + .setImpact(OptionImpact.MEDIUM) + .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) + .build()) .add(Settings.MODE_WATER.option) .add(Settings.DOWNFALL_DISTANCE.option) .add(Settings.MODE_VIGNETTE.option) .add(Settings.MODE_SHADOWS.option) + .add(Settings.VOID_FOG.option) .add(Settings.MODE_DROPPED_ITEMS.option) .add(Settings.MODE_GLINT_WORLD.option) .add(Settings.MODE_GLINT_INV.option) @@ -157,12 +205,12 @@ public class NotFineGameOptionPages { .add(Settings.MODE_SKY.option) .add(Settings.MODE_SUN_MOON.option) .add(Settings.MODE_CLOUDS.option) - .add(Settings.RENDER_DISTANCE_CLOUDS.option) + //.add(Settings.RENDER_DISTANCE_CLOUDS.option) .add(Settings.CLOUD_HEIGHT.option) - .add(Settings.CLOUD_SCALE.option) + //.add(Settings.CLOUD_SCALE.option) .add(Settings.MODE_CLOUD_TRANSLUCENCY.option) + .add(Settings.MODE_STARS.option) .add(Settings.TOTAL_STARS.option) - .add(Settings.VOID_FOG.option) .build()); return new OptionPage(I18n.format("options.button.sky"), ImmutableList.copyOf(groups)); } @@ -200,6 +248,7 @@ public class NotFineGameOptionPages { .setTooltip(I18n.format("sodium.options.fbo.tooltip")) .setControl(TickBoxControl::new) .setBinding((opts, value) -> opts.fboEnable = value, opts -> opts.fboEnable) + .setEnabled(NotFineConfig.allowToggleFBO) .build()) .add(OptionImpl.createBuilder(boolean.class, vanillaOpts) .setName(I18n.format("options.anaglyph")) @@ -208,6 +257,7 @@ public class NotFineGameOptionPages { .setBinding((opts, value) -> opts.anaglyph = value, opts -> opts.anaglyph) .setImpact(OptionImpact.HIGH) .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) + .setEnabled(NotFineConfig.allowAdvancedOpenGL) .build()) .add(OptionImpl.createBuilder(boolean.class, vanillaOpts) .setName(I18n.format("options.showCape")) @@ -222,6 +272,137 @@ public class NotFineGameOptionPages { .add(Settings.GUI_BACKGROUND.option) .build()); + groups.add(OptionGroup.createBuilder() + .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) + .setName(I18n.format("sodium.options.use_chunk_multidraw.name")) + .setTooltip(I18n.format("sodium.options.use_chunk_multidraw.tooltip")) + .setControl(TickBoxControl::new) + .setBinding((opts, value) -> opts.advanced.useChunkMultidraw = value, opts -> opts.advanced.useChunkMultidraw) + .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) + .setImpact(OptionImpact.EXTREME) + .setEnabled(MultidrawChunkRenderBackend.isSupported(sodiumOpts.getData().advanced.ignoreDriverBlacklist)) + .build()) + .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) + .setName(I18n.format("sodium.options.use_vertex_objects.name")) + .setTooltip(I18n.format("sodium.options.use_vertex_objects.tooltip")) + .setControl(TickBoxControl::new) + .setBinding((opts, value) -> opts.advanced.useVertexArrayObjects = value, opts -> opts.advanced.useVertexArrayObjects) + .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) + .setImpact(OptionImpact.LOW) + .build()) + .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) + .setName(I18n.format("sodium.options.use_block_face_culling.name")) + .setTooltip(I18n.format("sodium.options.use_block_face_culling.tooltip")) + .setControl(TickBoxControl::new) + .setImpact(OptionImpact.MEDIUM) + .setBinding((opts, value) -> opts.advanced.useBlockFaceCulling = value, opts -> opts.advanced.useBlockFaceCulling) + .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) + .build()) + .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) + .setName(I18n.format("sodium.options.use_compact_vertex_format.name")) + .setTooltip(I18n.format("sodium.options.use_compact_vertex_format.tooltip")) + .setControl(TickBoxControl::new) + .setImpact(OptionImpact.MEDIUM) + .setBinding((opts, value) -> opts.advanced.useCompactVertexFormat = value, opts -> opts.advanced.useCompactVertexFormat) + .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) + .build()) + .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) + .setName(I18n.format("sodium.options.use_fog_occlusion.name")) + .setTooltip(I18n.format("sodium.options.use_fog_occlusion.tooltip")) + .setControl(TickBoxControl::new) + .setBinding((opts, value) -> opts.advanced.useFogOcclusion = value, opts -> opts.advanced.useFogOcclusion) + .setImpact(OptionImpact.MEDIUM) + .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) + .build()) + .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) + .setName(I18n.format("sodium.options.translucency_sorting.name")) + .setTooltip(I18n.format("sodium.options.translucency_sorting.tooltip")) + .setControl(TickBoxControl::new) + .setBinding((opts, value) -> opts.advanced.translucencySorting = value, opts -> opts.advanced.translucencySorting) + .setImpact(OptionImpact.MEDIUM) + .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) + .build()) + .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) + .setName(I18n.format("sodium.options.use_entity_culling.name")) + .setTooltip(I18n.format("sodium.options.use_entity_culling.tooltip")) + .setControl(TickBoxControl::new) + .setImpact(OptionImpact.MEDIUM) + .setBinding((opts, value) -> opts.advanced.useEntityCulling = value, opts -> opts.advanced.useEntityCulling) + .build()) + .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) + .setName(I18n.format("sodium.options.use_particle_culling.name")) + .setTooltip(I18n.format("sodium.options.use_particle_culling.tooltip")) + .setControl(TickBoxControl::new) + .setImpact(OptionImpact.MEDIUM) + .setBinding((opts, value) -> opts.advanced.useParticleCulling = value, opts -> opts.advanced.useParticleCulling) + .build()) + .build()); + groups.add(OptionGroup.createBuilder() + .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) + .setName(I18n.format("sodium.options.animate_only_visible_textures.name")) + .setTooltip(I18n.format("sodium.options.animate_only_visible_textures.tooltip")) + .setControl(TickBoxControl::new) + .setImpact(OptionImpact.MEDIUM) + .setBinding((opts, value) -> opts.advanced.animateOnlyVisibleTextures = value, opts -> opts.advanced.animateOnlyVisibleTextures) + .build()) + .build()); + groups.add(OptionGroup.createBuilder() + .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) + .setName(I18n.format("sodium.options.allow_direct_memory_access.name")) + .setTooltip(I18n.format("sodium.options.allow_direct_memory_access.tooltip")) + .setControl(TickBoxControl::new) + .setImpact(OptionImpact.HIGH) + .setBinding((opts, value) -> opts.advanced.allowDirectMemoryAccess = value, opts -> opts.advanced.allowDirectMemoryAccess) + .build()) + .build()); + groups.add(OptionGroup.createBuilder() + .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) + .setName(I18n.format("sodium.options.ignore_driver_blacklist.name")) + .setTooltip(I18n.format("sodium.options.ignore_driver_blacklist.tooltip")) + .setControl(TickBoxControl::new) + .setBinding((opts, value) -> opts.advanced.ignoreDriverBlacklist = value, opts -> opts.advanced.ignoreDriverBlacklist) + .build()) + .build()); + groups.add(OptionGroup.createBuilder() + .add(OptionImpl.createBuilder(int.class, sodiumOpts) + .setName(I18n.format("sodium.options.chunk_update_threads.name")) + .setTooltip(I18n.format("sodium.options.chunk_update_threads.tooltip")) + .setControl(o -> new SliderControl(o, 0, Runtime.getRuntime().availableProcessors(), 1, ControlValueFormatter.quantityOrDisabled("sodium.options.threads.value", "sodium.options.default"))) + .setImpact(OptionImpact.HIGH) + .setBinding((opts, value) -> opts.performance.chunkBuilderThreads = value, opts -> opts.performance.chunkBuilderThreads) + .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) + .build()) + .build()); + groups.add(OptionGroup.createBuilder() + .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) + .setName(I18n.format("sodium.options.always_defer_chunk_updates.name")) + .setTooltip(I18n.format("sodium.options.always_defer_chunk_updates.tooltip")) + .setControl(TickBoxControl::new) + .setImpact(OptionImpact.HIGH) + .setBinding((opts, value) -> opts.performance.alwaysDeferChunkUpdates = value, opts -> opts.performance.alwaysDeferChunkUpdates) + .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) + .build()) + .build()); + + groups.add(OptionGroup.createBuilder() + .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) + .setName(I18n.format("sodium.options.use_no_error_context.name")) + .setTooltip(I18n.format("sodium.options.use_no_error_context.tooltip")) + .setControl(TickBoxControl::new) + .setImpact(OptionImpact.LOW) + .setBinding((opts, value) -> opts.performance.useNoErrorGLContext = value, opts -> opts.performance.useNoErrorGLContext) + .setFlags(OptionFlag.REQUIRES_GAME_RESTART) + .build()) + .add(OptionImpl.createBuilder(boolean.class, sodiumOpts) + .setName(I18n.format("sodium.options.use_gl_state_cache.name")) + .setTooltip(I18n.format("sodium.options.use_gl_state_cache.tooltip")) + .setControl(TickBoxControl::new) + .setImpact(OptionImpact.EXTREME) + .setBinding((opts, value) -> GLStateManager.BYPASS_CACHE = !value, opts -> !GLStateManager.BYPASS_CACHE) + .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) + .build()) + .build()); + return new OptionPage(I18n.format("options.button.other"), ImmutableList.copyOf(groups)); } diff --git a/src/main/java/jss/notfine/gui/options/control/element/SliderControlElement.java b/src/main/java/jss/notfine/gui/options/control/element/SliderControlElement.java index d1f8547be..720d8b96e 100644 --- a/src/main/java/jss/notfine/gui/options/control/element/SliderControlElement.java +++ b/src/main/java/jss/notfine/gui/options/control/element/SliderControlElement.java @@ -13,6 +13,7 @@ public class SliderControlElement extends NotFineControlElement { private float value; private boolean mousePressed; + private boolean dirty = false; public SliderControlElement(Option option, Dim2i dim, int min, int max, int interval, ControlValueFormatter formatter) { super(option, dim); @@ -60,6 +61,10 @@ public class SliderControlElement extends NotFineControlElement { @Override public void mouseReleased(int mouseX, int mouseY) { mousePressed = false; + if(dirty) { + onOptionValueChanged(); + dirty = false; + } } private void updateSlider(int mouseX) { @@ -79,7 +84,7 @@ public class SliderControlElement extends NotFineControlElement { //Normalize value value = MathHelper.clamp_float((value - min) / (max - min), 0f, 1f); - onOptionValueChanged(); + dirty = true; } } diff --git a/src/main/java/jss/notfine/proxy/ClientProxy.java b/src/main/java/jss/notfine/proxy/ClientProxy.java index 830b4a0f8..c4d67fefb 100644 --- a/src/main/java/jss/notfine/proxy/ClientProxy.java +++ b/src/main/java/jss/notfine/proxy/ClientProxy.java @@ -14,12 +14,15 @@ public class ClientProxy extends CommonProxy { @Override public void preInit(FMLPreInitializationEvent event) { - NotFineConfig config = new NotFineConfig(); - config.loadSettings(); - if(!NotFineConfig.allowAdvancedOpenGL) { Minecraft.getMinecraft().gameSettings.advancedOpengl = false; } + if(!NotFineConfig.allowToggle3DAnaglyph) { + Minecraft.getMinecraft().gameSettings.anaglyph = false; + } + if(!NotFineConfig.allowToggleFBO) { + Minecraft.getMinecraft().gameSettings.fboEnable = true; + } for(Settings setting : Settings.values()) { setting.ready(); diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/AbstractTextureExpansion.java b/src/main/java/jss/notfine/util/AbstractTextureExpansion.java similarity index 58% rename from src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/AbstractTextureExpansion.java rename to src/main/java/jss/notfine/util/AbstractTextureExpansion.java index 69c03f1b1..854de9538 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/AbstractTextureExpansion.java +++ b/src/main/java/jss/notfine/util/AbstractTextureExpansion.java @@ -1,4 +1,4 @@ -package com.gtnewhorizons.angelica.mixins.interfaces; +package jss.notfine.util; public interface AbstractTextureExpansion { diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/EntityAuraFXExpansion.java b/src/main/java/jss/notfine/util/EntityAuraFXExpansion.java similarity index 70% rename from src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/EntityAuraFXExpansion.java rename to src/main/java/jss/notfine/util/EntityAuraFXExpansion.java index f5424f3dc..a80088e5e 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/EntityAuraFXExpansion.java +++ b/src/main/java/jss/notfine/util/EntityAuraFXExpansion.java @@ -1,4 +1,4 @@ -package com.gtnewhorizons.angelica.mixins.interfaces; +package jss.notfine.util; import net.minecraft.client.particle.EntityAuraFX; diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/FontRendererExpansion.java b/src/main/java/jss/notfine/util/FontRendererExpansion.java similarity index 89% rename from src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/FontRendererExpansion.java rename to src/main/java/jss/notfine/util/FontRendererExpansion.java index c45efb2d8..37f5bf4e4 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/FontRendererExpansion.java +++ b/src/main/java/jss/notfine/util/FontRendererExpansion.java @@ -1,4 +1,4 @@ -package com.gtnewhorizons.angelica.mixins.interfaces; +package jss.notfine.util; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/MapColorExpansion.java b/src/main/java/jss/notfine/util/MapColorExpansion.java similarity index 68% rename from src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/MapColorExpansion.java rename to src/main/java/jss/notfine/util/MapColorExpansion.java index ccfe12d2d..d55972ba0 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/MapColorExpansion.java +++ b/src/main/java/jss/notfine/util/MapColorExpansion.java @@ -1,4 +1,4 @@ -package com.gtnewhorizons.angelica.mixins.interfaces; +package jss.notfine.util; public interface MapColorExpansion { diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/NBTTagCompoundExpansion.java b/src/main/java/jss/notfine/util/NBTTagCompoundExpansion.java similarity index 73% rename from src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/NBTTagCompoundExpansion.java rename to src/main/java/jss/notfine/util/NBTTagCompoundExpansion.java index 362b03623..3dd8fccc9 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/NBTTagCompoundExpansion.java +++ b/src/main/java/jss/notfine/util/NBTTagCompoundExpansion.java @@ -1,4 +1,4 @@ -package com.gtnewhorizons.angelica.mixins.interfaces; +package jss.notfine.util; import java.util.Collection; diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/NBTTagListExpansion.java b/src/main/java/jss/notfine/util/NBTTagListExpansion.java similarity index 67% rename from src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/NBTTagListExpansion.java rename to src/main/java/jss/notfine/util/NBTTagListExpansion.java index 75703ece6..9033f4d20 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/NBTTagListExpansion.java +++ b/src/main/java/jss/notfine/util/NBTTagListExpansion.java @@ -1,4 +1,4 @@ -package com.gtnewhorizons.angelica.mixins.interfaces; +package jss.notfine.util; import net.minecraft.nbt.NBTBase; diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/PotionExpansion.java b/src/main/java/jss/notfine/util/PotionExpansion.java similarity index 64% rename from src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/PotionExpansion.java rename to src/main/java/jss/notfine/util/PotionExpansion.java index 45cab7c3b..f19f3bbfe 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/PotionExpansion.java +++ b/src/main/java/jss/notfine/util/PotionExpansion.java @@ -1,4 +1,4 @@ -package com.gtnewhorizons.angelica.mixins.interfaces; +package jss.notfine.util; public interface PotionExpansion { diff --git a/src/main/java/jss/notfine/util/itembreakparticles/IRenderGlobalSpawnItemBreakParticle.java b/src/main/java/jss/notfine/util/itembreakparticles/IRenderGlobalSpawnItemBreakParticle.java new file mode 100644 index 000000000..725615c48 --- /dev/null +++ b/src/main/java/jss/notfine/util/itembreakparticles/IRenderGlobalSpawnItemBreakParticle.java @@ -0,0 +1,10 @@ +package jss.notfine.util.itembreakparticles; + +import net.minecraft.client.particle.EntityFX; +import net.minecraft.item.ItemStack; + +public interface IRenderGlobalSpawnItemBreakParticle { + + EntityFX spawnItemBreakParticle(ItemStack itemStack, final double x, final double y, final double z, double velocityX, double velocityY, double velocityZ); + +} diff --git a/src/main/java/jss/notfine/util/itembreakparticles/IWorldSpawnItemBreakParticle.java b/src/main/java/jss/notfine/util/itembreakparticles/IWorldSpawnItemBreakParticle.java new file mode 100644 index 000000000..ab681a48d --- /dev/null +++ b/src/main/java/jss/notfine/util/itembreakparticles/IWorldSpawnItemBreakParticle.java @@ -0,0 +1,10 @@ +package jss.notfine.util.itembreakparticles; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +public interface IWorldSpawnItemBreakParticle { + + void spawnItemBreakParticle(ItemStack itemStack, String particleName, double x, double y, double z, double velocityX, double velocityY, double velocityZ); + +} diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java index c1ee3cfc5..824c40daa 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java @@ -78,17 +78,15 @@ public class SodiumGameOptionPages { .setControl(opt -> new SliderControl(opt, 0, 100, 1, ControlValueFormatter.brightness())) .setBinding((opts, value) -> opts.gammaSetting = value * 0.01F, (opts) -> (int) (opts.gammaSetting / 0.01F)) .build()); - firstGroupBuilder.add(Settings.MODE_SKY.option); - firstGroupBuilder.add(Settings.MODE_SUN_MOON.option); - firstGroupBuilder.add(Settings.MODE_STARS.option); - firstGroupBuilder.add(Settings.TOTAL_STARS.option); - firstGroupBuilder.add(OptionImpl.createBuilder(boolean.class, vanillaOpts) - .setName(I18n.format("sodium.options.clouds.name")) - .setTooltip(I18n.format("sodium.options.clouds.tooltip")) - .setControl(TickBoxControl::new) - .setBinding((opts, value) -> opts.clouds = value, (opts) -> opts.clouds) - .setImpact(OptionImpact.LOW) - .build()); + firstGroupBuilder.add(Settings.MODE_LIGHT_FLICKER.option) + .add(Settings.MODE_SKY.option) + .add(Settings.MODE_SUN_MOON.option) + //.add(Settings.RENDER_DISTANCE_CLOUDS.option) + .add(Settings.CLOUD_HEIGHT.option) + //.add(Settings.CLOUD_SCALE.option) + .add(Settings.MODE_CLOUD_TRANSLUCENCY.option) + .add(Settings.MODE_STARS.option) + .add(Settings.TOTAL_STARS.option); firstGroupBuilder.add(Settings.VOID_FOG.option); groups.add(firstGroupBuilder.build()); @@ -152,6 +150,8 @@ public class SodiumGameOptionPages { .setBinding((opts, value) -> opts.viewBobbing = value, opts -> opts.viewBobbing) .build()) .add(Settings.DYNAMIC_FOV.option) + .add(Settings.MODE_WATER.option) + .add(Settings.MODE_DROPPED_ITEMS.option) .build()); return new OptionPage(I18n.format("stat.generalButton"), ImmutableList.copyOf(groups)); @@ -175,29 +175,9 @@ public class SodiumGameOptionPages { .build()); groups.add(OptionGroup.createBuilder() - .add(OptionImpl.createBuilder(GraphicsQuality.class, sodiumOpts) - .setName(I18n.format("options.renderClouds")) - .setTooltip(I18n.format("sodium.options.clouds_quality.tooltip")) - .setControl(option -> new CyclingControl<>(option, GraphicsQuality.class)) - .setBinding((opts, value) -> opts.quality.cloudQuality = value, opts -> opts.quality.cloudQuality) - .setImpact(OptionImpact.LOW) - .build()) - .add(OptionImpl.createBuilder(GraphicsQuality.class, sodiumOpts) - .setName(I18n.format("soundCategory.weather")) - .setTooltip(I18n.format("sodium.options.weather_quality.tooltip")) - .setControl(option -> new CyclingControl<>(option, GraphicsQuality.class)) - .setBinding((opts, value) -> opts.quality.weatherQuality = value, opts -> opts.quality.weatherQuality) - .setImpact(OptionImpact.MEDIUM) - .build()) - .add(AngelicaConfig.enableNotFineFeatures ? Settings.MODE_LEAVES.option : - OptionImpl.createBuilder(GraphicsQuality.class, sodiumOpts) - .setName(I18n.format("sodium.options.leaves_quality.name")) - .setTooltip(I18n.format("sodium.options.leaves_quality.tooltip")) - .setControl(option -> new CyclingControl<>(option, GraphicsQuality.class)) - .setBinding((opts, value) -> opts.quality.leavesQuality = value, opts -> opts.quality.leavesQuality) - .setImpact(OptionImpact.MEDIUM) - .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) - .build()) + .add(Settings.MODE_CLOUDS.option) + .add(Settings.DOWNFALL_DISTANCE.option) + .add(Settings.MODE_LEAVES.option) .add(OptionImpl.createBuilder(ParticleMode.class, vanillaOpts) .setName(I18n.format("options.particles")) .setTooltip(I18n.format("sodium.options.particle_quality.tooltip")) @@ -205,6 +185,7 @@ public class SodiumGameOptionPages { .setBinding((opts, value) -> opts.particleSetting = value.ordinal(), (opts) -> ParticleMode.fromOrdinal(opts.particleSetting)) .setImpact(OptionImpact.LOW) .build()) + .add(Settings.PARTICLES_ENC_TABLE.option) .add(OptionImpl.createBuilder(GraphicsQuality.class, sodiumOpts) .setName(I18n.format("sodium.options.grass_quality.name")) .setTooltip(I18n.format("sodium.options.grass_quality.tooltip")) @@ -238,20 +219,8 @@ public class SodiumGameOptionPages { .setImpact(OptionImpact.MEDIUM) .build() )*/ - .add(OptionImpl.createBuilder(GraphicsQuality.class, sodiumOpts) - .setName(I18n.format("options.entityShadows")) - .setTooltip(I18n.format("sodium.options.entity_shadows.tooltip")) - .setControl(option -> new CyclingControl<>(option, GraphicsQuality.class)) - .setBinding((opts, value) -> opts.quality.entityShadows = value, opts -> opts.quality.entityShadows) - .setImpact(OptionImpact.LOW) - .build()) - .add(OptionImpl.createBuilder(GraphicsQuality.class, sodiumOpts) - .setName(I18n.format("sodium.options.vignette.name")) - .setTooltip(I18n.format("sodium.options.vignette.tooltip")) - .setControl(option -> new CyclingControl<>(option, GraphicsQuality.class)) - .setBinding((opts, value) -> opts.quality.enableVignette = value, opts -> opts.quality.enableVignette) - .setImpact(OptionImpact.LOW) - .build()) + .add(Settings.MODE_SHADOWS.option) + .add(Settings.MODE_VIGNETTE.option) .build()); diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java index a0c3fe241..67227815b 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java @@ -55,12 +55,7 @@ public class SodiumGameOptions { } } public static class QualitySettings { - public GraphicsQuality cloudQuality = GraphicsQuality.DEFAULT; - public GraphicsQuality weatherQuality = GraphicsQuality.DEFAULT; - public GraphicsQuality leavesQuality = GraphicsQuality.DEFAULT; public GraphicsQuality grassQuality = GraphicsQuality.DEFAULT; - public GraphicsQuality entityShadows = GraphicsQuality.DEFAULT; - public GraphicsQuality enableVignette = GraphicsQuality.DEFAULT; } private static final Gson GSON = new GsonBuilder() diff --git a/src/main/java/me/jellysquid/mods/sodium/proxy/ClientProxy.java b/src/main/java/me/jellysquid/mods/sodium/proxy/ClientProxy.java index 9623dcc3d..ce144049b 100644 --- a/src/main/java/me/jellysquid/mods/sodium/proxy/ClientProxy.java +++ b/src/main/java/me/jellysquid/mods/sodium/proxy/ClientProxy.java @@ -6,6 +6,7 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; 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.SodiumGameOptionPages; import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI; @@ -27,9 +28,12 @@ public class ClientProxy extends CommonProxy { public void onGui(GuiScreenEvent.InitGuiEvent.Pre event) { if(event.gui instanceof GuiVideoSettings eventGui) { event.setCanceled(true); - if(GuiScreen.isShiftKeyDown()) { - Minecraft.getMinecraft().displayGuiScreen(new GuiCustomMenu(eventGui.parentGuiScreen, SodiumGameOptionPages.general(), - SodiumGameOptionPages.quality(), SodiumGameOptionPages.advanced(), SodiumGameOptionPages.performance())); + if(AngelicaConfig.enableNotFineOptions || GuiScreen.isShiftKeyDown()) { + Minecraft.getMinecraft().displayGuiScreen(new GuiCustomMenu(eventGui.parentGuiScreen, + NotFineGameOptionPages.general(), + NotFineGameOptionPages.detail(), NotFineGameOptionPages.atmosphere(), + NotFineGameOptionPages.particles(), NotFineGameOptionPages.other() + )); } else if(!AngelicaConfig.enableReesesSodiumOptions || GuiScreen.isCtrlKeyDown()) { Minecraft.getMinecraft().displayGuiScreen(new SodiumOptionsGUI(eventGui.parentGuiScreen)); } else { diff --git a/src/main/resources/META-INF/notfine_at.cfg b/src/main/resources/META-INF/notfine_at.cfg index 6ebee9470..ec5951496 100644 --- a/src/main/resources/META-INF/notfine_at.cfg +++ b/src/main/resources/META-INF/notfine_at.cfg @@ -1,8 +1,12 @@ -# For changing gui background +#For changing gui background public-f net.minecraft.client.gui.Gui field_110325_k #optionsBackground -# For regenerating the stars render list +#For item break particle fixes +public net.minecraft.client.particle.EntityFX field_70550_a #particleIcon +#For regenerating the stars render list public net.minecraft.client.renderer.RenderGlobal field_72772_v #starGLCallList -# For adjusting vanilla option enumerators +#For star, sun & moon toggles +public net.minecraft.client.renderer.Tessellator field_78406_i #vertexCount +#For adjusting vanilla option enumerators public-f net.minecraft.client.settings.GameSettings$Options field_148270_M #valueStep -# For supporting some strangely setup mods +#For supporting some strangely setup mods public net.minecraft.block.BlockLeaves field_150129_M diff --git a/src/main/resources/assets/angelica/lang/en_US.lang b/src/main/resources/assets/angelica/lang/en_US.lang index 3fced8c09..492e3d588 100644 --- a/src/main/resources/assets/angelica/lang/en_US.lang +++ b/src/main/resources/assets/angelica/lang/en_US.lang @@ -39,19 +39,19 @@ sodium.options.entity_shadows.tooltip=If enabled, basic shadows will be rendered sodium.options.vignette.name=Vignette sodium.options.vignette.tooltip=If enabled, a vignette effect will be rendered on the player's view. This is very unlikely to make a difference to frame rates unless you are fill-rate limited. sodium.options.mipmap_levels.tooltip=Controls the number of mipmaps which will be used for block model textures. Higher values provide better rendering of blocks in the distance, but may adversely affect performance with many animated textures. -sodium.options.use_chunk_multidraw.name=Use Chunk Multi-Draw +sodium.options.use_chunk_multidraw.name=Chunk Multi-Draw sodium.options.use_chunk_multidraw.tooltip=Multi-draw allows multiple chunks to be rendered with fewer draw calls, greatly reducing CPU overhead when rendering the world while also potentially allowing for more efficient GPU utilization. This optimization may cause issues with some graphics drivers, so you should try disabling it if you are experiencing glitches. -sodium.options.use_vertex_objects.name=Use Vertex Array Objects +sodium.options.use_vertex_objects.name=Vertex Array Objects sodium.options.use_vertex_objects.tooltip=Helps to improve performance by moving information about how vertex data should be rendered into the driver, allowing it to better optimize for repeated rendering of the same objects. There is generally no reason to disable this unless you're using incompatible mods. -sodium.options.use_block_face_culling.name=Use Block Face Culling +sodium.options.use_block_face_culling.name=Block Face Culling sodium.options.use_block_face_culling.tooltip=If enabled, only the sides of blocks which are facing the camera will be submitted for rendering. This can eliminate a large number of block faces very early in the rendering process, saving memory bandwidth and time on the GPU. Some resource packs may have issues with this option, so try disabling it if you're seeing holes in blocks. -sodium.options.use_compact_vertex_format.name=Use Compact Vertex Format +sodium.options.use_compact_vertex_format.name=Compact Vertex Format sodium.options.use_compact_vertex_format.tooltip=If enabled, a more compact vertex format will be used for rendering chunks. This can reduce graphics memory usage and bandwidth requirements significantly, especially for integrated graphics cards, but can cause z-fighting with some resource packs due to how it reduces the precision of position and texture coordinate attributes. -sodium.options.use_fog_occlusion.name=Use Fog Occlusion +sodium.options.use_fog_occlusion.name=Fog Occlusion sodium.options.use_fog_occlusion.tooltip=If enabled, chunks which are determined to be fully hidden by fog effects will not be rendered, helping to improve performance. The improvement can be more dramatic when fog effects are heavier (such as while underwater), but it may cause undesirable visual artifacts between the sky and fog in some scenarios. -sodium.options.use_entity_culling.name=Use Entity Culling +sodium.options.use_entity_culling.name=Entity Culling sodium.options.use_entity_culling.tooltip=If enabled, entities determined not to be in any visible chunks will be skipped during rendering. This can help improve performance by avoiding the rendering of entities located underground or behind walls. -sodium.options.use_particle_culling.name=Use Particle Culling +sodium.options.use_particle_culling.name=Particle Culling sodium.options.use_particle_culling.tooltip=If enabled, only particles which are determined to be visible will be rendered. This can provide a significant improvement to frame rates when many particles are nearby. sodium.options.animate_only_visible_textures.name=Animate Only Visible Textures sodium.options.animate_only_visible_textures.tooltip=If enabled, only animated textures determined to be visible will be updated. This can provide a significant boost to frame rates on some hardware, especially with heavier resource packs. If you experience issues with some textures not being animated, try disabling this option. @@ -67,7 +67,7 @@ sodium.options.ignore_driver_blacklist.tooltip=If enabled, known incompatibiliti sodium.options.enable_memory_tracing.name=Enable Memory Tracing sodium.options.enable_memory_tracing.tooltip=Debugging feature. If enabled, stack traces will be collected alongside memory allocations to help improve diagnostic information when memory leaks are detected. sodium.options.performance_impact_string=Performance Impact: %s -sodium.options.use_persistent_mapping.name=Use Persistent Mapping +sodium.options.use_persistent_mapping.name=Persistent Mapping sodium.options.use_persistent_mapping.tooltip=If enabled, a small amount of memory will be persistently mapped for speeding up chunk updates and entity rendering.\n\nRequires OpenGL 4.4 or ARB_buffer_storage. sodium.options.chunk_memory_allocator.name=Chunk Memory Allocator sodium.options.chunk_memory_allocator.tooltip=Selects the memory allocator that will be used for chunk rendering.\n- ASYNC: Fastest option, works well with most modern graphics drivers.\n- SWAP: Fallback option for older graphics drivers. May increase memory usage significantly. @@ -77,9 +77,9 @@ sodium.options.chunk_update_threads.name=Chunk Update Threads sodium.options.chunk_update_threads.tooltip=Specifies the number of threads to use for chunk building. Using more threads can speed up chunk loading and update speed, but may negatively impact frame times. sodium.options.always_defer_chunk_updates.name=Always Defer Chunk Updates sodium.options.always_defer_chunk_updates.tooltip=If enabled, rendering will never wait for chunk updates to finish, even if they are important. This can greatly improve frame rates in some scenarios, but it may create significant visual lag in the world. -sodium.options.use_no_error_context.name=Use No Error Context +sodium.options.use_no_error_context.name=No Error Context sodium.options.use_no_error_context.tooltip=If enabled, the OpenGL context will be created with error checking disabled. This may slightly improve performance, but it also increases the risk that the game will crash instead of gracefully handling OpenGL errors. You should disable this option if you are experiencing sudden unexplained crashes. -sodium.options.use_gl_state_cache.name=Use GL State Cache +sodium.options.use_gl_state_cache.name=GL State Cache sodium.options.use_gl_state_cache.tooltip=If enabled, the OpenGL state cache will be used to reduce the number of redundant state changes. This can improve performance, but it may also cause issues with some mods. Does not persist across game restarts. sodium.options.threads.value=%s thread(s) sodium.options.default=Default diff --git a/src/main/resources/assets/notfine/lang/en_US.lang b/src/main/resources/assets/notfine/lang/en_US.lang index eecc98e10..2d7f63e7f 100644 --- a/src/main/resources/assets/notfine/lang/en_US.lang +++ b/src/main/resources/assets/notfine/lang/en_US.lang @@ -3,6 +3,7 @@ options.button.other=Other... options.button.particle=Particles... options.button.sky=Atmosphere... options.chunks=%s chunks +options.framerate=%s FPS options.graphics.shelledfancy=Hybrid Fancy options.graphics.shelledfast=Hybrid Fast options.graphics.smart=Smart @@ -14,6 +15,8 @@ options.cloud_scale=Cloud Scale options.gui_background=Background options.guiScale.massive=Massive options.downfall_distance=Weather Effects +options.dynamic_fov=Dynamic FOV +options.dynamic_fov.tooltip=If enabled, the game's field of view will change based on the player's speed. options.mode_cloud_translucency=Cloud Translucency options.mode_clouds=Clouds options.mode_dropped_items=Dropped Items @@ -21,6 +24,7 @@ options.mode_glint_inv=GUI Enchant VFX options.mode_glint_world=World Enchant VFX options.mode_gui_background=Menu Backgrounds options.mode_leaves=Foliage +options.mode_light_flicker=Light Flicker options.mode_shadows=Entity Shadows options.mode_sky=Sky options.mode_sun_moon=Sun & Moon diff --git a/src/main/resources/assets/notfine/lang/zh_CN.lang b/src/main/resources/assets/notfine/lang/zh_CN.lang index 24034a2ad..b0edfdc4d 100644 --- a/src/main/resources/assets/notfine/lang/zh_CN.lang +++ b/src/main/resources/assets/notfine/lang/zh_CN.lang @@ -1,39 +1,43 @@ -options.button.detail=细节设置 -options.button.other=其他设置 -options.button.particle=粒子设置 -options.button.sky=大气设置 -options.chunks=%s 区块 -options.graphics.shelledfancy=高品质混合 -options.graphics.shelledfast=快速混合 -options.graphics.smart=快速 -options.graphics.ultra=卓越 +options.button.detail=细节... +options.button.other=杂项... +options.button.particle=粒子... +options.button.sky=天空... +options.chunks=%s 个区块 +options.framerate=%s 帧率 +options.graphics.shelledfancy=默认 +options.graphics.shelledfast=流畅 +options.graphics.smart=智能 +options.graphics.ultra=高品质 options.off=关闭 -options.on=开启 +options.on=打开 options.cloud_height=云高度 -options.cloud_scale=云优化 +options.cloud_scale=云比例 options.gui_background=背景 options.guiScale.massive=巨大 -options.downfall_distance=天气效果 -options.mode_cloud_translucency=云半透明 +options.downfall_distance=天气效果距离 +options.dynamic_fov=动态视场 +options.dynamic_fov.tooltip=如果启用,游戏的视场将根据玩家的速度而变化 +options.mode_cloud_translucency=云透明度 options.mode_clouds=云 -options.mode_dropped_items=掉落物 -options.mode_glint_inv=GUI附魔效果 +options.mode_dropped_items=掉落物品 +options.mode_glint_inv=界面附魔效果 options.mode_glint_world=世界附魔效果 options.mode_gui_background=菜单背景 options.mode_leaves=树叶 +options.mode_light_flicker=光照闪烁 options.mode_shadows=实体阴影 options.mode_sky=天空 options.mode_sun_moon=太阳和月亮 options.mode_stars=星星 -options.mode_water=水 +options.mode_water=清澈水体 options.mode_vignette=晕影 -options.particles_enc_table=附魔粒子 -options.particles_void=虚空粒子 +options.particles_enc_table=附魔粒子效果 +options.particles_void=虚空粒子效果 options.render_distance_clouds=云渲染距离 -options.title.detail=细节设置 -options.title.other=其他设置 -options.title.particle=粒子设置 -options.title.sky=大气设置 -options.title.video=视频设置 +options.title.detail=细节设置 | 来自 NotFine +options.title.other=杂项设置 | 来自NotFine +options.title.particle=粒子设置 | 来自NotFine +options.title.sky=天空设置 | 来自NotFine +options.title.video=视频设置 | 来自NotFine options.total_stars=星星密度 options.void_fog=Void Fog