diff --git a/gradle.properties b/gradle.properties index ab19580..1095699 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ loader_version=0.16.10 fabric_version=0.114.3+1.21.4 -mod_version = 0.11.1+1.21.4 +mod_version = 0.11.2+1.21.4 maven_group = foundationgames archives_base_name = enhancedblockentities diff --git a/src/main/java/foundationgames/enhancedblockentities/client/render/entity/SignBlockEntityRendererOverride.java b/src/main/java/foundationgames/enhancedblockentities/client/render/entity/SignBlockEntityRendererOverride.java index d328aac..ff19b42 100644 --- a/src/main/java/foundationgames/enhancedblockentities/client/render/entity/SignBlockEntityRendererOverride.java +++ b/src/main/java/foundationgames/enhancedblockentities/client/render/entity/SignBlockEntityRendererOverride.java @@ -2,7 +2,6 @@ import foundationgames.enhancedblockentities.client.render.BlockEntityRendererOverride; import foundationgames.enhancedblockentities.mixin.AbstractSignBlockEntityRenderAccessor; -import foundationgames.enhancedblockentities.mixin.SignBlockEntityRenderAccessor; import net.minecraft.block.AbstractSignBlock; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.SignBlockEntity; @@ -18,11 +17,10 @@ public void render(BlockEntityRenderer renderer, BlockEntity blockE if (blockEntity instanceof SignBlockEntity entity) { var state = entity.getCachedState(); AbstractSignBlock block = (AbstractSignBlock) state.getBlock(); - var sign = (SignBlockEntityRenderAccessor) renderer; - var aSign = (AbstractSignBlockEntityRenderAccessor) renderer; + var sign = (AbstractSignBlockEntityRenderAccessor) renderer; sign.enhanced_bes$applyTransforms(matrices, -block.getRotationDegrees(state), state); - aSign.enhanced_bes$renderText(entity.getPos(), entity.getFrontText(), matrices, vertexConsumers, light, entity.getTextLineHeight(), entity.getMaxTextWidth(), true); - aSign.enhanced_bes$renderText(entity.getPos(), entity.getBackText(), matrices, vertexConsumers, light, entity.getTextLineHeight(), entity.getMaxTextWidth(), false); + sign.enhanced_bes$renderText(entity.getPos(), entity.getFrontText(), matrices, vertexConsumers, light, entity.getTextLineHeight(), entity.getMaxTextWidth(), true); + sign.enhanced_bes$renderText(entity.getPos(), entity.getBackText(), matrices, vertexConsumers, light, entity.getTextLineHeight(), entity.getMaxTextWidth(), false); } } } diff --git a/src/main/java/foundationgames/enhancedblockentities/mixin/AbstractSignBlockEntityRenderAccessor.java b/src/main/java/foundationgames/enhancedblockentities/mixin/AbstractSignBlockEntityRenderAccessor.java index fc1c1f3..d223dc4 100644 --- a/src/main/java/foundationgames/enhancedblockentities/mixin/AbstractSignBlockEntityRenderAccessor.java +++ b/src/main/java/foundationgames/enhancedblockentities/mixin/AbstractSignBlockEntityRenderAccessor.java @@ -1,5 +1,6 @@ package foundationgames.enhancedblockentities.mixin; +import net.minecraft.block.BlockState; import net.minecraft.block.entity.SignText; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.block.entity.AbstractSignBlockEntityRenderer; @@ -11,6 +12,9 @@ @Mixin(AbstractSignBlockEntityRenderer.class) public interface AbstractSignBlockEntityRenderAccessor { + @Invoker("applyTransforms") + void enhanced_bes$applyTransforms(MatrixStack matrices, float rotationDegrees, BlockState state); + @Invoker("renderText") void enhanced_bes$renderText(BlockPos pos, SignText signText, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int lineHeight, int lineWidth, boolean front); diff --git a/src/main/java/foundationgames/enhancedblockentities/mixin/SignBlockEntityRenderAccessor.java b/src/main/java/foundationgames/enhancedblockentities/mixin/SignBlockEntityRenderAccessor.java deleted file mode 100644 index 284cb5e..0000000 --- a/src/main/java/foundationgames/enhancedblockentities/mixin/SignBlockEntityRenderAccessor.java +++ /dev/null @@ -1,13 +0,0 @@ -package foundationgames.enhancedblockentities.mixin; - -import net.minecraft.block.BlockState; -import net.minecraft.client.render.block.entity.SignBlockEntityRenderer; -import net.minecraft.client.util.math.MatrixStack; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -@Mixin(SignBlockEntityRenderer.class) -public interface SignBlockEntityRenderAccessor { - @Invoker("applyTransforms") - void enhanced_bes$applyTransforms(MatrixStack matrices, float rotationDegrees, BlockState state); -} diff --git a/src/main/resources/enhancedblockentities.mixins.json b/src/main/resources/enhancedblockentities.mixins.json index 957d076..498e278 100644 --- a/src/main/resources/enhancedblockentities.mixins.json +++ b/src/main/resources/enhancedblockentities.mixins.json @@ -15,7 +15,6 @@ "LifecycledResourceManagerImplMixin", "MinecraftClientMixin", "ShulkerBoxBlockEntityMixin", - "SignBlockEntityRenderAccessor", "SignEditScreenMixin", "VideoOptionsScreenMixin", "WorldRendererMixin",