diff --git a/build.gradle b/build.gradle index 43ddf68..2ac9e98 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.8-SNAPSHOT' + id 'fabric-loom' version '1.9-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index ba6b5cf..21327f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.2 -yarn_mappings=1.21.2+build.1 -loader_version=0.16.7 +minecraft_version=1.21.4 +yarn_mappings=1.21.4+build.1 +loader_version=0.16.9 # Mod Properties -mod_version=0.1.4+mc1.21.2 +mod_version=0.1.4+mc1.21.4 maven_group=tobinio.visibleentities archives_base_name=visible-entities # Dependencies -fabric_version=0.106.1+1.21.2 -yacl_version=3.6.1+1.21.2-fabric -modmenu_version=12.0.0-beta.1 \ No newline at end of file +fabric_version=0.111.0+1.21.4 +yacl_version=3.6.2+1.21.4-fabric +modmenu_version=13.0.0-beta.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b41..94113f2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/client/java/tobinio/visibleentities/mixin/client/ItemFrameEntityRendererMixin.java b/src/client/java/tobinio/visibleentities/mixin/client/ItemFrameEntityRendererMixin.java index 16d943f..47a2f0e 100644 --- a/src/client/java/tobinio/visibleentities/mixin/client/ItemFrameEntityRendererMixin.java +++ b/src/client/java/tobinio/visibleentities/mixin/client/ItemFrameEntityRendererMixin.java @@ -32,17 +32,15 @@ public abstract class ItemFrameEntityRendererMixin { @Final private BlockRenderManager blockRenderManager; - @Inject (at = @At (value = "INVOKE_ASSIGN", target = "Lnet/minecraft/item/ItemStack;isEmpty()Z"), method = "render(Lnet/minecraft/client/render/entity/state/ItemFrameEntityRenderState;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V") + @Inject (at = @At (value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;multiply(Lorg/joml/Quaternionf;)V", ordinal = 1), method = "render(Lnet/minecraft/client/render/entity/state/ItemFrameEntityRenderState;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V") private void renderTransparent(ItemFrameEntityRenderState state, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, CallbackInfo ci) { Config instance = Config.HANDLER.instance(); if (instance.isActive && instance.showItemFrames && state.invisible) { - ItemStack itemStack = state.contents; - BakedModelManager bakedModelManager = this.blockRenderManager.getModels().getModelManager(); - ModelIdentifier modelIdentifier = this.getTransparentModelId(state, itemStack); + ModelIdentifier modelIdentifier = this.getTransparentModelId(state); matrixStack.push(); matrixStack.translate(-0.5F, -0.5F, -0.5F); this.blockRenderManager.getModelRenderer() @@ -85,8 +83,8 @@ public abstract class ItemFrameEntityRendererMixin { } @Unique - private ModelIdentifier getTransparentModelId(ItemFrameEntityRenderState state, ItemStack stack) { - if (stack.isOf(Items.FILLED_MAP)) { + private ModelIdentifier getTransparentModelId(ItemFrameEntityRenderState state) { + if (state.mapId != null) { return state.glow ? TRANSPARENT_MAP_GLOW_FRAME : TRANSPARENT_MAP_FRAME; } else { return state.glow ? TRANSPARENT_GLOW_FRAME : TRANSPARENT_NORMAL_FRAME;