diff --git a/.gitignore b/.gitignore index 4f340a1..1fc1fad 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,6 @@ classes/ .metadata .vscode .settings -*.launch \ No newline at end of file +*.launch + +.DS_Store \ No newline at end of file diff --git a/common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/FurnaceBlockEntityRenderer.java b/common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/FurnaceBlockEntityRenderer.java index d9644d0..8748bcb 100755 --- a/common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/FurnaceBlockEntityRenderer.java +++ b/common/src/main/java/eu/midnightdust/visualoverhaul/block/renderer/FurnaceBlockEntityRenderer.java @@ -14,9 +14,9 @@ import net.minecraft.client.render.block.entity.BlockEntityRenderer; import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; import net.minecraft.client.render.model.json.ModelTransformationMode; -import net.minecraft.client.texture.Sprite; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.ItemStack; +import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.tag.ItemTags; import net.minecraft.util.Identifier; import org.joml.AxisAngle4f; @@ -74,9 +74,17 @@ public void render(E blockEntity, float tickDelta, MatrixStack matrices, VertexC } else if (!fuel.isEmpty()) { matrices.push(); - BlockState state = Block.getBlockFromItem(fuel.getItem()).getDefaultState(); - Sprite texture = MinecraftClient.getInstance().getBlockRenderManager().getModel(state).getParticleSprite(); - VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getEntityCutoutNoCull(spriteToTexture(texture))); + Block block = Block.getBlockFromItem(fuel.getItem()); + Identifier blockId = Objects.requireNonNull(MinecraftClient.getInstance().getNetworkHandler()) + .getRegistryManager() + .get(RegistryKeys.BLOCK) + .getId(block); + + assert blockId != null; + String texturePath = "textures/block/" + blockId.getPath() + ".png"; + Identifier texture = Identifier.of(blockId.getNamespace(), texturePath); + + VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getEntityCutoutNoCull(texture)); matrices.translate(0.5f, -1.3f, 0.5f); if (blockEntity.getCachedState().getBlock().equals(Blocks.SMOKER)) matrices.translate(0f, 0.06f, 0f); @@ -89,10 +97,5 @@ else if (!fuel.isEmpty()) { matrices.pop(); } } - - } - public static Identifier spriteToTexture(Sprite sprite) { - String texture = sprite.getContents().getId().getPath(); - return Identifier.of(sprite.getAtlasId().getNamespace(), "textures/" + texture + ".png"); } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 68ae896..354d6df 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ yarn_mappings=1.21+build.2 enabled_platforms=fabric,neoforge archives_base_name=visualoverhaul -mod_version=5.2.1 +mod_version=5.2.2 maven_group=eu.midnightdust release_type=release curseforge_id=432008