From 40cdd197ef68f1d66785627b0190ea07ba81dc12 Mon Sep 17 00:00:00 2001 From: H31M5 <2211923909@qq.com> Date: Wed, 1 Jul 2026 12:34:07 +0800 Subject: [PATCH 1/3] Compatible with RealCamera --- build.gradle.kts | 43 ++++++++++++++----- gradle.properties | 2 +- .../entity_model_features/mixin/Plugin.java | 4 +- .../mod_compat/MixinRealCameraCore.java | 34 +++++++++++++++ .../MixinRealCameraModelAnalyser.java | 36 ++++++++++++++++ .../mod_compat/RealCameraCompat.java | 9 ++++ .../math/asm/ASMAnimationHandler.java | 8 ++-- .../entity_model_features.mixins.json | 2 + 8 files changed, 123 insertions(+), 15 deletions(-) create mode 100644 src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraCore.java create mode 100644 src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraModelAnalyser.java create mode 100644 src/main/java/traben/entity_model_features/mod_compat/RealCameraCompat.java diff --git a/build.gradle.kts b/build.gradle.kts index 5a40ee34..c1c73727 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -95,10 +95,26 @@ dependencies { //region MOD DEPENDENCIES fun modImpl(modPrefix: String, vararg versions: Pair): Boolean { - for ((versionMC, versionMod) in versions) { + for ((versionMC, ImplVersionMod) in versions) { if (platform.mcVersion >= versionMC) { - if (versionMod != null) { - modImplementation("$modPrefix$versionMod") { + if (ImplVersionMod != null) { + modImplementation("$modPrefix$ImplVersionMod") { + exclude("net.fabricmc.fabric-api") + isTransitive = true + } + return true + } + break + } + } + return false + } + + fun modComp(modPrefix: String, vararg versions: Pair): Boolean { + for ((versionMC, CompVersionMod) in versions) { + if (platform.mcVersion >= versionMC) { + if (CompVersionMod != null) { + compileOnly("$modPrefix$CompVersionMod") { exclude("net.fabricmc.fabric-api") isTransitive = true } @@ -166,15 +182,22 @@ dependencies { } if (!platform.isForge) { - if (mcVersion >= 12109) { - compileOnly("com.zigythebird.playeranim:PlayerAnimationLibCommon:1.1.0+alpha.1+mc.1.21.9") - compileOnly("com.zigythebird.playeranim:PlayerAnimationLibCore:1.1.0+alpha.1+mc.1.21.9") - } else if (mcVersion >= 12100) { - compileOnly("com.zigythebird.playeranim:PlayerAnimationLibCommon:1.0.14+mc.1.21.1") - compileOnly("com.zigythebird.playeranim:PlayerAnimationLibCore:1.0.14+mc.1.21.1") - } + val playerAnimVersions = arrayOf( + 12109 to "1.1.0+alpha.1+mc.1.21.9", + 12100 to "1.0.14+mc.1.21.1" + ) + modComp("com.zigythebird.playeranim:PlayerAnimationLibCommon:", *playerAnimVersions) + modComp("com.zigythebird.playeranim:PlayerAnimationLibCore:", *playerAnimVersions) } + modComp("maven.modrinth:real-camera:", + 26_01_00 to ver("8iDFFsGL", null, "tPhOLg40"), + 1_21_04 to ver("ERGbfBFO", null, "j9j0EChP"), + 1_21_02 to ver("ERGbfBFO", null, "j9j0EChP"), + 1_21_00 to ver("ERGbfBFO", null, "j9j0EChP"), + 1_20_01 to ver("GtVt9wyh", "zxrGLIlw", null), + ) + //endregion if (platform.isNeoForge && mcVersion < 12002) { // NeoForge 20.2.84+ added it themselves diff --git a/gradle.properties b/gradle.properties index feaa31a4..1c64152d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ essential.defaults.loom.mappings=mojmap loom.ignoreDependencyLoomVersionValidation=true archives_base_name=entity_model_features -mod_version=3.2.4 +mod_version=3.2.5 maven_group=traben.entity_model_features etf_version=7.1 diff --git a/src/main/java/traben/entity_model_features/mixin/Plugin.java b/src/main/java/traben/entity_model_features/mixin/Plugin.java index 97e87d25..c67c7036 100644 --- a/src/main/java/traben/entity_model_features/mixin/Plugin.java +++ b/src/main/java/traben/entity_model_features/mixin/Plugin.java @@ -8,6 +8,7 @@ import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; import org.spongepowered.asm.service.MixinService; +import traben.entity_texture_features.ETF; import java.io.IOException; import java.util.List; @@ -29,6 +30,7 @@ public String getRefMapperConfig() { @Override public boolean shouldApplyMixin(final String targetClassName, final String mixinClassName) { + if (targetClassName.contains("MixinRealCamera")) return ETF.isThisModLoaded("realcamera"); return !targetClassName.equals("traben.entity_texture_features.mixin.CancelTarget"); } @@ -58,4 +60,4 @@ public void preApply(final String targetClassName, final ClassNode targetClass, public void postApply(final String targetClassName, final ClassNode targetClass, final String mixinClassName, final IMixinInfo mixinInfo) { } -} +} \ No newline at end of file diff --git a/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraCore.java b/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraCore.java new file mode 100644 index 00000000..4b2cf210 --- /dev/null +++ b/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraCore.java @@ -0,0 +1,34 @@ +package traben.entity_model_features.mixin.mixins.mod_compat; + +import net.minecraft.client.Minecraft; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Pseudo; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import traben.entity_model_features.mod_compat.RealCameraCompat; + +@Pseudo +@Mixin(targets = "com.xtracr.realcamera.RealCameraCore", remap = false) +public class MixinRealCameraCore { +//#if MC == 12001 && !NEOFORGE +//#if MC >= 12101 && MC <= 12104 && !FORGE +//#if MC == 2601 && !FORGE +//$$ +//$$ // This method is used to get the vertex catcher +//$$ // It does NOT render the entity in the world +//$$ @Inject(method = "computeCamera", at = @At("HEAD")) +//$$ private static void EFM$onComputeCameraHead(Minecraft client, float partialTicks, CallbackInfo ci) { +//$$ RealCameraCompat.isComputeCameraRendering = true; +//$$ } +//$$ +//$$ @Inject(method = "computeCamera", at = @At("RETURN")) +//$$ private static void EFM$onComputeCameraReturn(Minecraft client, float partialTicks, CallbackInfo ci) { +//$$ RealCameraCompat.isComputeCameraRendering = false; +//$$ } +//#endif +//#endif +//#endif +} + diff --git a/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraModelAnalyser.java b/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraModelAnalyser.java new file mode 100644 index 00000000..577ecd54 --- /dev/null +++ b/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraModelAnalyser.java @@ -0,0 +1,36 @@ +package traben.entity_model_features.mixin.mixins.mod_compat; + + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.Minecraft; +import net.minecraft.world.entity.Entity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Pseudo; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import traben.entity_model_features.mod_compat.RealCameraCompat; + +import java.util.List; + +@Pseudo +@Mixin(targets = "com.xtracr.realcamera.gui.ModelAnalyser", remap = false) +public class MixinRealCameraModelAnalyser { +//#if MC == 12001 && !NEOFORGE || MC >= 12101 && MC <= 12104 && !FORGE || MC == 2601 && !FORGE +//$$ +//$$ // This method is for drawing on screen, +//$$ // It does NOT render the entity in the world +//$$ @Inject(method = "captureModel", at = @At("HEAD")) +//$$ private void onCaptureModelHead(Minecraft client, Entity entity, float partialTicks, PoseStack poseStack, com.xtracr.realcamera.config.BindTarget target, CallbackInfoReturnable> ci) { +//$$ RealCameraCompat.isComputeCameraRendering = true; +//$$ } +//$$ +//$$ @Inject(method = "captureModel", at = @At("RETURN")) +//$$ private void onCaptureModelReturn(Minecraft client, Entity entity, float partialTicks, PoseStack poseStack, com.xtracr.realcamera.config.BindTarget target, CallbackInfoReturnable> ci) { +//$$ RealCameraCompat.isComputeCameraRendering = false; +//$$ } +//$$ +//#endif + +} + diff --git a/src/main/java/traben/entity_model_features/mod_compat/RealCameraCompat.java b/src/main/java/traben/entity_model_features/mod_compat/RealCameraCompat.java new file mode 100644 index 00000000..5987cc3a --- /dev/null +++ b/src/main/java/traben/entity_model_features/mod_compat/RealCameraCompat.java @@ -0,0 +1,9 @@ +package traben.entity_model_features.mod_compat; + +public class RealCameraCompat { + public static boolean isComputeCameraRendering = false; + + public static boolean isShouldRenderEntity() { + return !isComputeCameraRendering; + } +} \ No newline at end of file diff --git a/src/main/java/traben/entity_model_features/models/animation/math/asm/ASMAnimationHandler.java b/src/main/java/traben/entity_model_features/models/animation/math/asm/ASMAnimationHandler.java index 416bb91d..961b818a 100644 --- a/src/main/java/traben/entity_model_features/models/animation/math/asm/ASMAnimationHandler.java +++ b/src/main/java/traben/entity_model_features/models/animation/math/asm/ASMAnimationHandler.java @@ -10,6 +10,7 @@ import traben.entity_model_features.models.animation.math.expression_tree.MathValue; import traben.entity_model_features.models.animation.math.variables.VariableRegistry; import traben.entity_model_features.models.animation.math.variables.factories.GlobalVariableFactory; +import traben.entity_model_features.mod_compat.RealCameraCompat; import traben.entity_model_features.utils.EMFUtils; import traben.entity_texture_features.utils.ETFLruCache; @@ -61,8 +62,9 @@ protected void animateInner(ModelPart[] pausedParts) throws Throwable { if (logsASM) asmLog(asmVariableHandler, vars, "Start ASM anim with variable state:"); compiledAnimationExecutor.execute(vars.floats(), vars.bools()); - - varConsumer.accept(vars, true); + //Default is TRUE + boolean shouldUpdateVars = RealCameraCompat.isShouldRenderEntity(); + varConsumer.accept(vars, shouldUpdateVars); if (lod && state != null) lastResultsPerEntity.put(state.uuid(), vars); if (logsASM) asmLog(asmVariableHandler, vars, "End ASM anim with variable state:"); @@ -255,4 +257,4 @@ private interface VarConsumer { } private record AnimVars(float[] floats, boolean[] bools) { } -} +} \ No newline at end of file diff --git a/src/main/resources/entity_model_features.mixins.json b/src/main/resources/entity_model_features.mixins.json index 7b74e758..196e09b0 100644 --- a/src/main/resources/entity_model_features.mixins.json +++ b/src/main/resources/entity_model_features.mixins.json @@ -26,6 +26,8 @@ "exporting.MixinBabyModelTransform", "exporting.MixinEntityModelSet", "exporting.MixinMeshTransformer", + "mod_compat.MixinRealCameraCore", + "mod_compat.MixinRealCameraModelAnalyser", "rendering.Mixin_SpecialModelRenderers_SetCurrentSpecifiedModel", "rendering.MixinBannerRenderer", "rendering.MixinBlockEntityRenderDispatcher", From d70fdabcf5f73e2a1b0dc534bc76bacaa0168e61 Mon Sep 17 00:00:00 2001 From: H31M5 <2211923909@qq.com> Date: Wed, 1 Jul 2026 15:06:13 +0800 Subject: [PATCH 2/3] Adjust the Mixin injection point --- .../mod_compat/MixinRealCameraCore.java | 5 ++- .../MixinRealCameraModelAnalyser.java | 36 ------------------- .../MixinRealCameraModelViewScreen.java | 36 +++++++++++++++++++ .../entity_model_features.mixins.json | 2 +- 4 files changed, 39 insertions(+), 40 deletions(-) delete mode 100644 src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraModelAnalyser.java create mode 100644 src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraModelViewScreen.java diff --git a/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraCore.java b/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraCore.java index 4b2cf210..5726e6a0 100644 --- a/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraCore.java +++ b/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraCore.java @@ -12,12 +12,11 @@ @Pseudo @Mixin(targets = "com.xtracr.realcamera.RealCameraCore", remap = false) public class MixinRealCameraCore { + // This method is used to get the vertex catcher + // It does NOT render the entity in the world //#if MC == 12001 && !NEOFORGE //#if MC >= 12101 && MC <= 12104 && !FORGE //#if MC == 2601 && !FORGE -//$$ -//$$ // This method is used to get the vertex catcher -//$$ // It does NOT render the entity in the world //$$ @Inject(method = "computeCamera", at = @At("HEAD")) //$$ private static void EFM$onComputeCameraHead(Minecraft client, float partialTicks, CallbackInfo ci) { //$$ RealCameraCompat.isComputeCameraRendering = true; diff --git a/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraModelAnalyser.java b/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraModelAnalyser.java deleted file mode 100644 index 577ecd54..00000000 --- a/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraModelAnalyser.java +++ /dev/null @@ -1,36 +0,0 @@ -package traben.entity_model_features.mixin.mixins.mod_compat; - - -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.Minecraft; -import net.minecraft.world.entity.Entity; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Pseudo; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import traben.entity_model_features.mod_compat.RealCameraCompat; - -import java.util.List; - -@Pseudo -@Mixin(targets = "com.xtracr.realcamera.gui.ModelAnalyser", remap = false) -public class MixinRealCameraModelAnalyser { -//#if MC == 12001 && !NEOFORGE || MC >= 12101 && MC <= 12104 && !FORGE || MC == 2601 && !FORGE -//$$ -//$$ // This method is for drawing on screen, -//$$ // It does NOT render the entity in the world -//$$ @Inject(method = "captureModel", at = @At("HEAD")) -//$$ private void onCaptureModelHead(Minecraft client, Entity entity, float partialTicks, PoseStack poseStack, com.xtracr.realcamera.config.BindTarget target, CallbackInfoReturnable> ci) { -//$$ RealCameraCompat.isComputeCameraRendering = true; -//$$ } -//$$ -//$$ @Inject(method = "captureModel", at = @At("RETURN")) -//$$ private void onCaptureModelReturn(Minecraft client, Entity entity, float partialTicks, PoseStack poseStack, com.xtracr.realcamera.config.BindTarget target, CallbackInfoReturnable> ci) { -//$$ RealCameraCompat.isComputeCameraRendering = false; -//$$ } -//$$ -//#endif - -} - diff --git a/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraModelViewScreen.java b/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraModelViewScreen.java new file mode 100644 index 00000000..fea2ee5d --- /dev/null +++ b/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraModelViewScreen.java @@ -0,0 +1,36 @@ +package traben.entity_model_features.mixin.mixins.mod_compat; + + +import net.minecraft.world.entity.LivingEntity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Pseudo; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import traben.entity_model_features.mod_compat.RealCameraCompat; + +import java.util.List; + +@Pseudo +@Mixin(targets = "com.xtracr.realcamera.gui.ModelViewScreen", remap = false) +public class MixinRealCameraModelViewScreen { + // This method is for drawing on screen, + // It does NOT render the entity in the world +//#if MC == 12001 && !NEOFORGE +//#if MC >= 12101 && MC <= 12104 && !FORGE +//#if MC == 2601 && !FORGE +//$$ @Inject(method = "captureRotatedEntity", at = @At("HEAD")) +//$$ private void Emf$OnCaptureRotatedEntityHead (com.xtracr.realcamera.gui.ModelAnalyser analyser, com.xtracr.realcamera.config.BindTarget target, LivingEntity entity, CallbackInfoReturnable> cir){ +//$$ RealCameraCompat.isComputeCameraRendering = true; +//$$ } +//$$ +//$$ @Inject(method = "captureRotatedEntity", at = @At("RETURN")) +//$$ private void Emf$OnCaptureRotatedEntityReturn (com.xtracr.realcamera.gui.ModelAnalyser analyser, com.xtracr.realcamera.config.BindTarget target, LivingEntity entity, CallbackInfoReturnable> cir){ +//$$ RealCameraCompat.isComputeCameraRendering = false; +//$$ } +//$$ +//#endif +//#endif +//#endif +} + diff --git a/src/main/resources/entity_model_features.mixins.json b/src/main/resources/entity_model_features.mixins.json index 196e09b0..82719282 100644 --- a/src/main/resources/entity_model_features.mixins.json +++ b/src/main/resources/entity_model_features.mixins.json @@ -27,7 +27,7 @@ "exporting.MixinEntityModelSet", "exporting.MixinMeshTransformer", "mod_compat.MixinRealCameraCore", - "mod_compat.MixinRealCameraModelAnalyser", + "mod_compat.MixinRealCameraModelViewScreen", "rendering.Mixin_SpecialModelRenderers_SetCurrentSpecifiedModel", "rendering.MixinBannerRenderer", "rendering.MixinBlockEntityRenderDispatcher", From be2293987c231d72fe3333496caf1c5e96ff4075 Mon Sep 17 00:00:00 2001 From: H31M5 <2211923909@qq.com> Date: Sun, 26 Jul 2026 12:29:03 +0800 Subject: [PATCH 3/3] Apply suggestion from @Traben-0 --- build.gradle.kts | 12 +++---- gradle.properties | 2 +- .../entity_model_features/mixin/Plugin.java | 2 -- .../mod_compat/MixinRealCameraCore.java | 6 +--- .../MixinRealCameraModelViewScreen.java | 36 ------------------- .../entity_model_features.mixins.json | 1 - 6 files changed, 8 insertions(+), 51 deletions(-) delete mode 100644 src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraModelViewScreen.java diff --git a/build.gradle.kts b/build.gradle.kts index c1c73727..afb8465a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -95,10 +95,10 @@ dependencies { //region MOD DEPENDENCIES fun modImpl(modPrefix: String, vararg versions: Pair): Boolean { - for ((versionMC, ImplVersionMod) in versions) { + for ((versionMC, implVersionMod) in versions) { if (platform.mcVersion >= versionMC) { - if (ImplVersionMod != null) { - modImplementation("$modPrefix$ImplVersionMod") { + if (implVersionMod != null) { + modImplementation("$modPrefix$implVersionMod") { exclude("net.fabricmc.fabric-api") isTransitive = true } @@ -111,10 +111,10 @@ dependencies { } fun modComp(modPrefix: String, vararg versions: Pair): Boolean { - for ((versionMC, CompVersionMod) in versions) { + for ((versionMC, compVersionMod) in versions) { if (platform.mcVersion >= versionMC) { - if (CompVersionMod != null) { - compileOnly("$modPrefix$CompVersionMod") { + if (compVersionMod != null) { + compileOnly("$modPrefix$compVersionMod") { exclude("net.fabricmc.fabric-api") isTransitive = true } diff --git a/gradle.properties b/gradle.properties index 1c64152d..feaa31a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ essential.defaults.loom.mappings=mojmap loom.ignoreDependencyLoomVersionValidation=true archives_base_name=entity_model_features -mod_version=3.2.5 +mod_version=3.2.4 maven_group=traben.entity_model_features etf_version=7.1 diff --git a/src/main/java/traben/entity_model_features/mixin/Plugin.java b/src/main/java/traben/entity_model_features/mixin/Plugin.java index c67c7036..aa2faa59 100644 --- a/src/main/java/traben/entity_model_features/mixin/Plugin.java +++ b/src/main/java/traben/entity_model_features/mixin/Plugin.java @@ -8,7 +8,6 @@ import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; import org.spongepowered.asm.service.MixinService; -import traben.entity_texture_features.ETF; import java.io.IOException; import java.util.List; @@ -30,7 +29,6 @@ public String getRefMapperConfig() { @Override public boolean shouldApplyMixin(final String targetClassName, final String mixinClassName) { - if (targetClassName.contains("MixinRealCamera")) return ETF.isThisModLoaded("realcamera"); return !targetClassName.equals("traben.entity_texture_features.mixin.CancelTarget"); } diff --git a/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraCore.java b/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraCore.java index 5726e6a0..a97a58c8 100644 --- a/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraCore.java +++ b/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraCore.java @@ -14,9 +14,7 @@ public class MixinRealCameraCore { // This method is used to get the vertex catcher // It does NOT render the entity in the world -//#if MC == 12001 && !NEOFORGE -//#if MC >= 12101 && MC <= 12104 && !FORGE -//#if MC == 2601 && !FORGE +//#if MC == 1.20.1 && !NEOFORGE || MC >= 1.21.1 && MC <= 1.21.4 && !FORGE || MC == 26.1 && !FORGE //$$ @Inject(method = "computeCamera", at = @At("HEAD")) //$$ private static void EFM$onComputeCameraHead(Minecraft client, float partialTicks, CallbackInfo ci) { //$$ RealCameraCompat.isComputeCameraRendering = true; @@ -27,7 +25,5 @@ public class MixinRealCameraCore { //$$ RealCameraCompat.isComputeCameraRendering = false; //$$ } //#endif -//#endif -//#endif } diff --git a/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraModelViewScreen.java b/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraModelViewScreen.java deleted file mode 100644 index fea2ee5d..00000000 --- a/src/main/java/traben/entity_model_features/mixin/mixins/mod_compat/MixinRealCameraModelViewScreen.java +++ /dev/null @@ -1,36 +0,0 @@ -package traben.entity_model_features.mixin.mixins.mod_compat; - - -import net.minecraft.world.entity.LivingEntity; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Pseudo; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import traben.entity_model_features.mod_compat.RealCameraCompat; - -import java.util.List; - -@Pseudo -@Mixin(targets = "com.xtracr.realcamera.gui.ModelViewScreen", remap = false) -public class MixinRealCameraModelViewScreen { - // This method is for drawing on screen, - // It does NOT render the entity in the world -//#if MC == 12001 && !NEOFORGE -//#if MC >= 12101 && MC <= 12104 && !FORGE -//#if MC == 2601 && !FORGE -//$$ @Inject(method = "captureRotatedEntity", at = @At("HEAD")) -//$$ private void Emf$OnCaptureRotatedEntityHead (com.xtracr.realcamera.gui.ModelAnalyser analyser, com.xtracr.realcamera.config.BindTarget target, LivingEntity entity, CallbackInfoReturnable> cir){ -//$$ RealCameraCompat.isComputeCameraRendering = true; -//$$ } -//$$ -//$$ @Inject(method = "captureRotatedEntity", at = @At("RETURN")) -//$$ private void Emf$OnCaptureRotatedEntityReturn (com.xtracr.realcamera.gui.ModelAnalyser analyser, com.xtracr.realcamera.config.BindTarget target, LivingEntity entity, CallbackInfoReturnable> cir){ -//$$ RealCameraCompat.isComputeCameraRendering = false; -//$$ } -//$$ -//#endif -//#endif -//#endif -} - diff --git a/src/main/resources/entity_model_features.mixins.json b/src/main/resources/entity_model_features.mixins.json index 82719282..b0f69eec 100644 --- a/src/main/resources/entity_model_features.mixins.json +++ b/src/main/resources/entity_model_features.mixins.json @@ -27,7 +27,6 @@ "exporting.MixinEntityModelSet", "exporting.MixinMeshTransformer", "mod_compat.MixinRealCameraCore", - "mod_compat.MixinRealCameraModelViewScreen", "rendering.Mixin_SpecialModelRenderers_SetCurrentSpecifiedModel", "rendering.MixinBannerRenderer", "rendering.MixinBlockEntityRenderDispatcher",