From 95948c76028f926f4c220d0021d9c1374a03bebf Mon Sep 17 00:00:00 2001 From: Sen Date: Fri, 25 Jul 2025 10:44:34 +0200 Subject: [PATCH] remove useless mipped layer --- .../main/java/client/renderer/EntityRenderer.java | 3 --- .../client/renderer/RegionRenderCacheBuilder.java | 3 +-- .../main/java/client/renderer/chunk/RenderChunk.java | 12 ++++++------ .../main/java/common/block/artificial/BlockPane.java | 2 +- .../java/common/block/foliage/BlockDryLeaves.java | 2 +- .../main/java/common/block/foliage/BlockGrass.java | 2 +- .../java/common/block/foliage/BlockLeavesBase.java | 2 +- .../java/common/block/foliage/BlockMycelium.java | 2 +- .../main/java/common/block/foliage/BlockSwamp.java | 2 +- .../java/common/block/foliage/BlockTianSoil.java | 2 +- .../main/java/common/block/natural/BlockPodzol.java | 2 +- .../src/main/java/common/block/tech/BlockHopper.java | 2 +- .../java/common/block/tech/BlockTripWireHook.java | 2 +- common/src/main/java/common/model/BlockLayer.java | 1 - 14 files changed, 17 insertions(+), 22 deletions(-) diff --git a/client/src/main/java/client/renderer/EntityRenderer.java b/client/src/main/java/client/renderer/EntityRenderer.java index 9b05d830..dbc61636 100755 --- a/client/src/main/java/client/renderer/EntityRenderer.java +++ b/client/src/main/java/client/renderer/EntityRenderer.java @@ -1181,10 +1181,7 @@ public class EntityRenderer { GlState.disableAlpha(); renderglobal.renderBlockLayer(BlockLayer.SOLID, (double)partialTicks, entity); GlState.enableAlpha(); - renderglobal.renderBlockLayer(BlockLayer.CUTOUT_MIPPED, (double)partialTicks, entity); -// this.gm.getTextureManager().getTexture(TextureMap.locationBlocksTexture).unsetMipmap(); renderglobal.renderBlockLayer(BlockLayer.CUTOUT, (double)partialTicks, entity); -// this.gm.getTextureManager().getTexture(TextureMap.locationBlocksTexture).restoreLastMipmap(); GlState.shadeModel(GL11.GL_FLAT); GlState.alphaFunc(GL11.GL_GREATER, 0.1F); diff --git a/client/src/main/java/client/renderer/RegionRenderCacheBuilder.java b/client/src/main/java/client/renderer/RegionRenderCacheBuilder.java index 7318dc33..1bc34e5b 100755 --- a/client/src/main/java/client/renderer/RegionRenderCacheBuilder.java +++ b/client/src/main/java/client/renderer/RegionRenderCacheBuilder.java @@ -9,8 +9,7 @@ public class RegionRenderCacheBuilder public RegionRenderCacheBuilder() { this.buffers[BlockLayer.SOLID.ordinal()] = new RenderBuffer(2097152); - this.buffers[BlockLayer.CUTOUT.ordinal()] = new RenderBuffer(131072); - this.buffers[BlockLayer.CUTOUT_MIPPED.ordinal()] = new RenderBuffer(131072); + this.buffers[BlockLayer.CUTOUT.ordinal()] = new RenderBuffer(262144); this.buffers[BlockLayer.TRANSLUCENT.ordinal()] = new RenderBuffer(262144); } diff --git a/client/src/main/java/client/renderer/chunk/RenderChunk.java b/client/src/main/java/client/renderer/chunk/RenderChunk.java index 6ca7f3a3..6868c157 100755 --- a/client/src/main/java/client/renderer/chunk/RenderChunk.java +++ b/client/src/main/java/client/renderer/chunk/RenderChunk.java @@ -170,20 +170,20 @@ public class RenderChunk } } - BlockLayer enumworldblocklayer1 = block.getRenderLayer(); - int j = enumworldblocklayer1.ordinal(); + BlockLayer layer = block.getRenderLayer(); + int idx = layer.ordinal(); if (block != Blocks.air) { - RenderBuffer worldrenderer = generator.getRegionRenderCacheBuilder().getWorldRendererByLayerId(j); + RenderBuffer worldrenderer = generator.getRegionRenderCacheBuilder().getWorldRendererByLayerId(idx); - if (!compiledchunk.isLayerStarted(enumworldblocklayer1)) + if (!compiledchunk.isLayerStarted(layer)) { - compiledchunk.setLayerStarted(enumworldblocklayer1); + compiledchunk.setLayerStarted(layer); this.preRenderBlocks(worldrenderer, blockpos); } - aboolean[j] |= blockrendererdispatcher.renderBlock(iblockstate, blockpos$mutableblockpos, iblockaccess, worldrenderer); + aboolean[idx] |= blockrendererdispatcher.renderBlock(iblockstate, blockpos$mutableblockpos, iblockaccess, worldrenderer); } } diff --git a/common/src/main/java/common/block/artificial/BlockPane.java b/common/src/main/java/common/block/artificial/BlockPane.java index eac63954..2ec5bc9d 100755 --- a/common/src/main/java/common/block/artificial/BlockPane.java +++ b/common/src/main/java/common/block/artificial/BlockPane.java @@ -183,7 +183,7 @@ public class BlockPane extends Block public BlockLayer getRenderLayer() { - return BlockLayer.CUTOUT_MIPPED; + return BlockLayer.CUTOUT; } protected Property[] getProperties() diff --git a/common/src/main/java/common/block/foliage/BlockDryLeaves.java b/common/src/main/java/common/block/foliage/BlockDryLeaves.java index 210f333d..5e64c4b8 100755 --- a/common/src/main/java/common/block/foliage/BlockDryLeaves.java +++ b/common/src/main/java/common/block/foliage/BlockDryLeaves.java @@ -57,7 +57,7 @@ public class BlockDryLeaves extends BlockLeavesBase // // public EnumWorldBlockLayer getBlockLayer() // { -// return this.isTransparent ? EnumWorldBlockLayer.CUTOUT_MIPPED : EnumWorldBlockLayer.SOLID; +// return this.isTransparent ? EnumWorldBlockLayer.CUTOUT : EnumWorldBlockLayer.SOLID; // } // // public boolean isVisuallyOpaque() diff --git a/common/src/main/java/common/block/foliage/BlockGrass.java b/common/src/main/java/common/block/foliage/BlockGrass.java index 84e3e7e0..fbbe993d 100755 --- a/common/src/main/java/common/block/foliage/BlockGrass.java +++ b/common/src/main/java/common/block/foliage/BlockGrass.java @@ -94,7 +94,7 @@ public class BlockGrass extends Block implements IGrowable public BlockLayer getRenderLayer() { - return BlockLayer.CUTOUT_MIPPED; + return BlockLayer.CUTOUT; } public Model getModel(ModelProvider provider, String name, State state) { diff --git a/common/src/main/java/common/block/foliage/BlockLeavesBase.java b/common/src/main/java/common/block/foliage/BlockLeavesBase.java index 22495fc9..ec166adc 100755 --- a/common/src/main/java/common/block/foliage/BlockLeavesBase.java +++ b/common/src/main/java/common/block/foliage/BlockLeavesBase.java @@ -28,7 +28,7 @@ public class BlockLeavesBase extends Block public BlockLayer getRenderLayer() { - return /* this.transparent ? */ BlockLayer.CUTOUT_MIPPED; // : BlockLayer.SOLID; + return /* this.transparent ? */ BlockLayer.CUTOUT; // : BlockLayer.SOLID; } public boolean isVisuallyOpaque() diff --git a/common/src/main/java/common/block/foliage/BlockMycelium.java b/common/src/main/java/common/block/foliage/BlockMycelium.java index cf5824a6..aa1c7785 100755 --- a/common/src/main/java/common/block/foliage/BlockMycelium.java +++ b/common/src/main/java/common/block/foliage/BlockMycelium.java @@ -95,7 +95,7 @@ public class BlockMycelium extends Block public BlockLayer getRenderLayer() { - return BlockLayer.CUTOUT_MIPPED; + return BlockLayer.CUTOUT; } public Model getModel(ModelProvider provider, String name, State state) { diff --git a/common/src/main/java/common/block/foliage/BlockSwamp.java b/common/src/main/java/common/block/foliage/BlockSwamp.java index 93a626b2..a28ad611 100644 --- a/common/src/main/java/common/block/foliage/BlockSwamp.java +++ b/common/src/main/java/common/block/foliage/BlockSwamp.java @@ -52,7 +52,7 @@ public class BlockSwamp extends Block public BlockLayer getRenderLayer() { - return BlockLayer.CUTOUT_MIPPED; + return BlockLayer.CUTOUT; } public Model getModel(ModelProvider provider, String name, State state) { diff --git a/common/src/main/java/common/block/foliage/BlockTianSoil.java b/common/src/main/java/common/block/foliage/BlockTianSoil.java index b7db746d..8cee5d6f 100755 --- a/common/src/main/java/common/block/foliage/BlockTianSoil.java +++ b/common/src/main/java/common/block/foliage/BlockTianSoil.java @@ -44,7 +44,7 @@ public class BlockTianSoil extends Block public BlockLayer getRenderLayer() { - return BlockLayer.CUTOUT_MIPPED; + return BlockLayer.CUTOUT; } public Model getModel(ModelProvider provider, String name, State state) { diff --git a/common/src/main/java/common/block/natural/BlockPodzol.java b/common/src/main/java/common/block/natural/BlockPodzol.java index dd63c2ea..5071ad68 100644 --- a/common/src/main/java/common/block/natural/BlockPodzol.java +++ b/common/src/main/java/common/block/natural/BlockPodzol.java @@ -40,7 +40,7 @@ public class BlockPodzol extends Block { public BlockLayer getRenderLayer() { - return BlockLayer.CUTOUT_MIPPED; + return BlockLayer.CUTOUT; } public Model getModel(ModelProvider provider, String name, State state) { diff --git a/common/src/main/java/common/block/tech/BlockHopper.java b/common/src/main/java/common/block/tech/BlockHopper.java index cd9e6bb7..802ed580 100755 --- a/common/src/main/java/common/block/tech/BlockHopper.java +++ b/common/src/main/java/common/block/tech/BlockHopper.java @@ -181,7 +181,7 @@ public class BlockHopper extends Block implements ITileEntityProvider, Direction public BlockLayer getRenderLayer() { - return BlockLayer.CUTOUT_MIPPED; + return BlockLayer.CUTOUT; } protected Property[] getProperties() diff --git a/common/src/main/java/common/block/tech/BlockTripWireHook.java b/common/src/main/java/common/block/tech/BlockTripWireHook.java index 3f0e926f..db6b9edb 100755 --- a/common/src/main/java/common/block/tech/BlockTripWireHook.java +++ b/common/src/main/java/common/block/tech/BlockTripWireHook.java @@ -327,7 +327,7 @@ public class BlockTripWireHook extends Block implements Rotatable public BlockLayer getRenderLayer() { - return BlockLayer.CUTOUT_MIPPED; + return BlockLayer.CUTOUT; } protected Property[] getProperties() diff --git a/common/src/main/java/common/model/BlockLayer.java b/common/src/main/java/common/model/BlockLayer.java index 80f80033..59d6fb65 100755 --- a/common/src/main/java/common/model/BlockLayer.java +++ b/common/src/main/java/common/model/BlockLayer.java @@ -5,7 +5,6 @@ import common.util.Clientside; @Clientside public enum BlockLayer { SOLID("Solid"), - CUTOUT_MIPPED("Mipped Cutout"), CUTOUT("Cutout"), TRANSLUCENT("Translucent");