I HATE this preprocessor setup

Polyfrost · Dec 24, 2024 · 1b4adff · 1b4adff
1 parent ebb9a0e
commit 1b4adff
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 1 deletion.
diff --git a/versions/mappings/forge-1.17.1-1.16.5.txt b/versions/mappings/forge-1.17.1-1.16.5.txt
@@ -66,6 +66,9 @@ net.minecraft.client.Options renderDebug showDebugInfo
 net.minecraft.client.Timer net.minecraft.util.Timer
 net.minecraft.client.Timer partialTick renderPartialTicks
 
+net.minecraft.client.resources.sounds.SoundInstance getSound() getCategory()
+net.minecraft.client.resources.sounds.Sound net.minecraft.util.SoundCategory
+
 net.minecraft.client.User getName() getUsername()
 net.minecraft.client.User net.minecraft.util.Session
 
@@ -104,12 +107,15 @@ net.minecraft.client.player.LocalPlayer net.minecraft.client.entity.player.Clien
 net.minecraft.client.renderer.EffectInstance getUniform() getShaderUniform()
 net.minecraft.client.renderer.EffectInstance net.minecraft.client.shader.ShaderInstance
 
+net.minecraft.client.renderer.GameRenderer renderLevel() renderWorld()
+net.minecraft.client.renderer.GameRenderer renderItemInHand() renderHand()
 net.minecraft.client.renderer.GameRenderer currentEffect() getShaderGroup()
 net.minecraft.client.renderer.GameRenderer loadEffect() loadShader()
 net.minecraft.client.renderer.GameRenderer render() updateCameraAndRender()
 net.minecraft.client.renderer.GameRenderer shutdownEffect() stopUseShader()
 
 net.minecraft.client.renderer.LevelRenderer net.minecraft.client.renderer.WorldRenderer
+net.minecraft.client.renderer.LevelRenderer renderLevel() updateCameraAndRender()
 
 net.minecraft.client.renderer.PostChain getName() getShaderGroupName()
 net.minecraft.client.renderer.PostChain net.minecraft.client.shader.ShaderGroup
@@ -176,6 +182,7 @@ net.minecraft.util.datafix.DataFixers net.minecraft.util.datafix.DataFixesManage
 net.minecraft.util.profiling.ProfilerFiller net.minecraft.profiler.IProfiler
 net.minecraft.util.profiling.ProfilerFiller pop() endSection()
 net.minecraft.util.profiling.ProfilerFiller push() startSection()
+net.minecraft.util.profiling.ProfilerFiller popPush() endStartSection()
 
 net.minecraft.world.level.dimension.DimensionType net.minecraft.world.DimensionType
 

diff --git a/versions/mappings/forge-1.19.4-1.18.2.txt b/versions/mappings/forge-1.19.4-1.18.2.txt
@@ -4,3 +4,5 @@ net.minecraftforge.client.gui.overlay.ForgeGui net.minecraftforge.client.gui.For
 
 net.minecraftforge.client.event.ScreenOpenEvent getNewScreen() getScreen()
 net.minecraftforge.client.event.ScreenEvent$Opening net.minecraftforge.client.event.ScreenOpenEvent
+
+org.joml.Matrix4f com.mojang.math.Matrix4f
diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/OneConfigMixinInit.java b/versions/src/main/java/org/polyfrost/oneconfig/internal/OneConfigMixinInit.java
@@ -99,6 +99,7 @@ public List<String> getMixins() {
         } else {
             // legacy
             mixins.add("GuiScreenMixin");
+            mixins.add("SoundManagerAccessorMixin");
             mixins.add("hidpi.EntityRendererMixin");
         }
 

diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/EntityRendererMixin.java b/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/EntityRendererMixin.java
@@ -32,11 +32,19 @@ public class EntityRendererMixin {
                     //#if MC >= 1.16.5
                     //$$ from = @At(
                     //$$     value = "INVOKE",
+                    //#if MC >= 1.17.1
+                    //$$     target = "Lnet/minecraft/client/renderer/LevelRenderer;renderLevel(Lcom/mojang/blaze3d/vertex/PoseStack;FJZLnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/GameRenderer;Lnet/minecraft/client/renderer/LightTexture;Lcom/mojang/math/Matrix4f;)V"
+                    //#else
                     //$$     target = "Lnet/minecraft/client/renderer/WorldRenderer;updateCameraAndRender(Lcom/mojang/blaze3d/matrix/MatrixStack;FJZLnet/minecraft/client/renderer/ActiveRenderInfo;Lnet/minecraft/client/renderer/GameRenderer;Lnet/minecraft/client/renderer/LightTexture;Lnet/minecraft/util/math/vector/Matrix4f;)V"
+                    //#endif
                     //$$ ),
                     //$$ to = @At(
                     //$$     value = "INVOKE",
+                    //#if MC >= 1.17.1
+                    //$$     target = "Lnet/minecraft/client/renderer/GameRenderer;renderItemInHand(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/Camera;F)V"
+                    //#else
                     //$$     target = "Lnet/minecraft/client/renderer/GameRenderer;renderHand(Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/ActiveRenderInfo;F)V"
+                    //#endif
                     //$$ )
                     //#else
                     from = @At(

diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/SoundManagerAccessorMixin.java b/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/SoundManagerAccessorMixin.java
@@ -1,5 +1,6 @@
 package org.polyfrost.oneconfig.internal.mixin;
 
+//#if MC <= 1.8.9
 import net.minecraft.client.audio.SoundHandler;
 import net.minecraft.client.audio.SoundManager;
 import org.spongepowered.asm.mixin.Mixin;
@@ -12,3 +13,4 @@ public interface SoundManagerAccessorMixin {
     SoundHandler getSndHandler();
 
 }
+//#endif
diff --git a/versions/src/main/resources/mixins.oneconfig.json b/versions/src/main/resources/mixins.oneconfig.json
@@ -16,7 +16,6 @@
     "ScoreboardMixin",
     "ShaderGroupAccessor",
     "SoundManagerMixin",
-    "SoundManagerAccessorMixin",
     "EntityRendererMixin",
     "WorldClientMixin",
     "SoundManagerMixin",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,5 @@ net.minecraftforge.client.gui.overlay.ForgeGui net.minecraftforge.client.gui.For

		net.minecraftforge.client.event.ScreenOpenEvent getNewScreen() getScreen()
		net.minecraftforge.client.event.ScreenEvent$Opening net.minecraftforge.client.event.ScreenOpenEvent

		org.joml.Matrix4f com.mojang.math.Matrix4f