From d1a08473039caf3fed78d1dc1b1008c353406734 Mon Sep 17 00:00:00 2001 From: Sen Date: Fri, 30 May 2025 18:08:07 +0200 Subject: [PATCH] cleanup, remove ambient occlusion from models --- client/src/main/java/client/Client.java | 4 +- .../java/client/renderer/RenderGlobal.java | 4 +- .../renderer/blockmodel/ModelBlock.java | 11 ---- .../common/block/artificial/BlockDoor.java | 8 +-- .../block/artificial/BlockDragonEgg.java | 2 +- .../block/artificial/BlockFenceGate.java | 4 +- .../block/artificial/BlockFlowerPot.java | 6 +- .../common/block/artificial/BlockLadder.java | 2 +- .../common/block/artificial/BlockPane.java | 34 +++++----- .../common/block/foliage/BlockCactus.java | 2 +- .../java/common/block/foliage/BlockCocoa.java | 6 +- .../java/common/block/foliage/BlockCrops.java | 2 +- .../block/foliage/BlockDoublePlant.java | 2 +- .../common/block/foliage/BlockLilyPad.java | 2 +- .../java/common/block/foliage/BlockStem.java | 18 +++--- .../java/common/block/foliage/BlockVine.java | 2 +- .../java/common/block/natural/BlockFire.java | 64 +++++++++---------- .../java/common/block/tech/BlockBeacon.java | 2 +- .../java/common/block/tech/BlockCauldron.java | 8 +-- .../java/common/block/tech/BlockHopper.java | 4 +- .../java/common/block/tech/BlockLever.java | 2 +- .../java/common/block/tech/BlockRailBase.java | 8 +-- .../block/tech/BlockRedstoneComparator.java | 8 +-- .../block/tech/BlockRedstoneRepeater.java | 32 +++++----- .../common/block/tech/BlockRedstoneWire.java | 48 +++++++------- .../java/common/block/tech/BlockTorch.java | 4 +- .../java/common/block/tech/BlockTripWire.java | 40 ++++++------ .../src/main/java/common/item/ItemFence.java | 2 +- .../src/main/java/common/item/ItemWall.java | 2 +- common/src/main/java/common/model/Model.java | 5 +- .../main/java/common/model/ModelProvider.java | 4 -- ...MultiMap.java => InheritanceMultiMap.java} | 6 +- .../{LazyLoadBase.java => LazyLoader.java} | 2 +- common/src/main/java/common/world/Chunk.java | 8 +-- server/src/main/java/server/Server.java | 4 +- .../java/server/world}/NextTickListEntry.java | 3 +- server/src/main/java/server/world/Region.java | 1 - .../main/java/server/world/WorldServer.java | 1 - 38 files changed, 175 insertions(+), 192 deletions(-) rename common/src/main/java/common/util/{ClassInheritanceMultiMap.java => InheritanceMultiMap.java} (93%) rename common/src/main/java/common/util/{LazyLoadBase.java => LazyLoader.java} (88%) rename {common/src/main/java/common/util => server/src/main/java/server/world}/NextTickListEntry.java (97%) diff --git a/client/src/main/java/client/Client.java b/client/src/main/java/client/Client.java index 420bf47..4768029 100755 --- a/client/src/main/java/client/Client.java +++ b/client/src/main/java/client/Client.java @@ -167,7 +167,7 @@ import common.util.CharValidator; import common.util.ExtMath; import common.util.Facing; import common.util.HitPosition; -import common.util.LazyLoadBase; +import common.util.LazyLoader; import common.util.Util; import common.util.HitPosition.ObjectType; import common.world.LightType; @@ -268,7 +268,7 @@ public class Client implements IThreadListener { public static final String VERSION = Version.NAME + " Client " + Util.VERSION; public static final int LOG_BUFFER = 32768; - private static final LazyLoadBase CLIENT_NIO_EVENTLOOP = new LazyLoadBase() + private static final LazyLoader CLIENT_NIO_EVENTLOOP = new LazyLoader() { protected NioEventLoopGroup load() { diff --git a/client/src/main/java/client/renderer/RenderGlobal.java b/client/src/main/java/client/renderer/RenderGlobal.java index 9f87e5f..cec250d 100755 --- a/client/src/main/java/client/renderer/RenderGlobal.java +++ b/client/src/main/java/client/renderer/RenderGlobal.java @@ -46,7 +46,7 @@ import common.tileentity.TileEntity; import common.tileentity.TileEntityChest; import common.util.BlockPos; import common.util.BoundingBox; -import common.util.ClassInheritanceMultiMap; +import common.util.InheritanceMultiMap; import common.util.ExtMath; import common.util.Facing; import common.util.HitPosition; @@ -605,7 +605,7 @@ public class RenderGlobal for (RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation : this.renderInfos) { ChunkClient chunk = this.theWorld.getChunk(renderglobal$containerlocalrenderinformation.renderChunk.getPosition()); - ClassInheritanceMultiMap classinheritancemultimap = chunk.getEntities()[ExtMath.clampi(renderglobal$containerlocalrenderinformation.renderChunk.getPosition().getY() / 16, 0, 31)]; + InheritanceMultiMap classinheritancemultimap = chunk.getEntities()[ExtMath.clampi(renderglobal$containerlocalrenderinformation.renderChunk.getPosition().getY() / 16, 0, 31)]; if (!classinheritancemultimap.isEmpty()) { diff --git a/client/src/main/java/client/renderer/blockmodel/ModelBlock.java b/client/src/main/java/client/renderer/blockmodel/ModelBlock.java index 69504fa..351704d 100755 --- a/client/src/main/java/client/renderer/blockmodel/ModelBlock.java +++ b/client/src/main/java/client/renderer/blockmodel/ModelBlock.java @@ -37,7 +37,6 @@ public class ModelBlock extends Model { private final String[] layers; private final ModelBlock parent; - private boolean occlusion; private ModelRotation rotation; private boolean uvLock; private Transforms transform; @@ -49,11 +48,6 @@ public class ModelBlock extends Model { ModelProvider.setProvider(PROVIDER); } - public ModelBlock noOcclude() { - this.occlusion = false; - return this; - } - public ModelBlock uvLock() { this.uvLock = true; return this; @@ -151,7 +145,6 @@ public class ModelBlock extends Model { layers[z] = layers[z].indexOf('/') == -1 ? "items/" + layers[z] : layers[z]; } this.elements = parent == null ? elements : parent.getElements(); - this.occlusion = parent == null ? occlude : parent.isAmbientOcclusion(); this.gui3d = gui3d; this.primary = primary == null ? TextureMap.LOCATION_MISSING_TEXTURE : primary; this.parent = parent; @@ -165,10 +158,6 @@ public class ModelBlock extends Model { return this.elements; } - public boolean isAmbientOcclusion() { - return this.occlusion; - } - public boolean isGui3d() { return this.gui3d; } diff --git a/common/src/main/java/common/block/artificial/BlockDoor.java b/common/src/main/java/common/block/artificial/BlockDoor.java index 0747230..eb445ea 100755 --- a/common/src/main/java/common/block/artificial/BlockDoor.java +++ b/common/src/main/java/common/block/artificial/BlockDoor.java @@ -460,7 +460,7 @@ public class BlockDoor extends Block String top = name + "_top"; if(state.getValue(HALF) == EnumDoorHalf.LOWER) { if(state.getValue(HINGE) == EnumHingePosition.LEFT == state.getValue(OPEN)) - return provider.getModel(bottom).noOcclude() + return provider.getModel(bottom) .add(0, 0, 0, 3, 16, 16) .d().uv(13, 0, 16, 16) .n().uv(3, 0, 0, 16) @@ -469,7 +469,7 @@ public class BlockDoor extends Block .e().uv(0, 0, 16, 16).noCull() .rotate(getRotation(state.getValue(FACING), state.getValue(OPEN) ? 1 : 0)); else - return provider.getModel(bottom).noOcclude() + return provider.getModel(bottom) .add(0, 0, 0, 3, 16, 16) .d().uv(13, 0, 16, 16) .n().uv(3, 0, 0, 16) @@ -480,7 +480,7 @@ public class BlockDoor extends Block } else { if(state.getValue(HINGE) == EnumHingePosition.LEFT == state.getValue(OPEN)) - return provider.getModel(top).noOcclude() + return provider.getModel(top) .add(0, 0, 0, 3, 16, 16) .u(bottom).uv(13, 0, 16, 16) .n().uv(3, 0, 0, 16) @@ -489,7 +489,7 @@ public class BlockDoor extends Block .e().uv(0, 0, 16, 16).noCull() .rotate(getRotation(state.getValue(FACING), state.getValue(OPEN) ? 1 : 0)); else - return provider.getModel(top).noOcclude() + return provider.getModel(top) .add(0, 0, 0, 3, 16, 16) .u(bottom).uv(13, 0, 16, 16) .n().uv(3, 0, 0, 16) diff --git a/common/src/main/java/common/block/artificial/BlockDragonEgg.java b/common/src/main/java/common/block/artificial/BlockDragonEgg.java index 4fb515b..0aea693 100755 --- a/common/src/main/java/common/block/artificial/BlockDragonEgg.java +++ b/common/src/main/java/common/block/artificial/BlockDragonEgg.java @@ -20,7 +20,7 @@ import common.world.AWorldServer; public class BlockDragonEgg extends Block { - private static final Model dragon_egg = ModelProvider.getModelProvider().getModel("dragon_egg").noOcclude() + private static final Model dragon_egg = ModelProvider.getModelProvider().getModel("dragon_egg") .add(6, 15, 6, 10, 16, 10) .d().uv(6, 6, 10, 10).noCull() .u().uv(6, 6, 10, 10).noCull() diff --git a/common/src/main/java/common/block/artificial/BlockFenceGate.java b/common/src/main/java/common/block/artificial/BlockFenceGate.java index 85314c9..887479f 100755 --- a/common/src/main/java/common/block/artificial/BlockFenceGate.java +++ b/common/src/main/java/common/block/artificial/BlockFenceGate.java @@ -210,7 +210,7 @@ public class BlockFenceGate extends BlockDirectional } public Model getModel(ModelProvider provider, String name, State state) { - return (state.getValue(IN_WALL) ? (state.getValue(OPEN) ? provider.getModel(this.texture).noOcclude().uvLock() + return (state.getValue(IN_WALL) ? (state.getValue(OPEN) ? provider.getModel(this.texture).uvLock() .add(0, 2, 7, 2, 13, 9) .d().uv(0, 7, 2, 9).noCull() .u().uv(0, 7, 2, 9).noCull() @@ -258,7 +258,7 @@ public class BlockFenceGate extends BlockDirectional .d().uv(14, 9, 16, 13).noCull() .u().uv(14, 9, 16, 13).noCull() .w().uv(13, 1, 15, 4).noCull() - .e().uv(13, 1, 15, 4).noCull() : provider.getModel(this.texture).noOcclude().uvLock() + .e().uv(13, 1, 15, 4).noCull() : provider.getModel(this.texture).uvLock() .add(0, 2, 7, 2, 13, 9) .d().uv(0, 7, 2, 9).noCull() .u().uv(0, 7, 2, 9).noCull() diff --git a/common/src/main/java/common/block/artificial/BlockFlowerPot.java b/common/src/main/java/common/block/artificial/BlockFlowerPot.java index d904c9f..7c3436b 100755 --- a/common/src/main/java/common/block/artificial/BlockFlowerPot.java +++ b/common/src/main/java/common/block/artificial/BlockFlowerPot.java @@ -24,7 +24,7 @@ import common.world.AWorldServer; public class BlockFlowerPot extends Block // Container { - private static final Model flower_pot_cactus = ModelProvider.getModelProvider().getModel("flower_pot").noOcclude() + private static final Model flower_pot_cactus = ModelProvider.getModelProvider().getModel("flower_pot") .add(5, 0, 5, 6, 6, 11) .d().uv(5, 5, 6, 11) .u().uv(5, 5, 6, 11).noCull() @@ -69,7 +69,7 @@ public class BlockFlowerPot extends Block // Container .w("cactus_side").uv(6, 0, 10, 4).noCull() .e("cactus_side").uv(6, 0, 10, 4).noCull() ; - private static final Model flower_pot = ModelProvider.getModelProvider().getModel("flower_pot").noOcclude() + private static final Model flower_pot = ModelProvider.getModelProvider().getModel("flower_pot") .add(5, 0, 5, 6, 6, 11) .d().uv(5, 5, 6, 11) .u().uv(5, 5, 6, 11).noCull() @@ -357,7 +357,7 @@ public class BlockFlowerPot extends Block // Container // return flower_pot_fern; default: String plant = BlockFlower.EnumFlowerType.getType(BlockFlower.EnumFlowerColor.BASE, state.getValue(CONTENTS) - 2).getName().toLowerCase(); - return provider.getModel("flower_pot").noOcclude() + return provider.getModel("flower_pot") .add(5, 0, 5, 6, 6, 11) .d().uv(5, 5, 6, 11) .u().uv(5, 5, 6, 11).noCull() diff --git a/common/src/main/java/common/block/artificial/BlockLadder.java b/common/src/main/java/common/block/artificial/BlockLadder.java index 1400468..20c8ac2 100755 --- a/common/src/main/java/common/block/artificial/BlockLadder.java +++ b/common/src/main/java/common/block/artificial/BlockLadder.java @@ -167,7 +167,7 @@ public class BlockLadder extends Block } public Model getModel(ModelProvider provider, String name, State state) { - return provider.getModel("ladder").noOcclude() + return provider.getModel("ladder") .add(0, 0, 15.2f, 16, 16, 15.2f).noShade() .n().uv(0, 0, 16, 16).noCull() .s().uv(0, 0, 16, 16).noCull() diff --git a/common/src/main/java/common/block/artificial/BlockPane.java b/common/src/main/java/common/block/artificial/BlockPane.java index 39e3da2..edcbab6 100755 --- a/common/src/main/java/common/block/artificial/BlockPane.java +++ b/common/src/main/java/common/block/artificial/BlockPane.java @@ -226,7 +226,7 @@ public class BlockPane extends Block int sides = (n ? 1 : 0) + (s ? 1 : 0) + (w ? 1 : 0) + (e ? 1 : 0); if(this.canDrop) { if(sides == 0 || sides == 4) - return provider.getModel(name).noOcclude() + return provider.getModel(name) .add(8, 0, 0, 8, 16, 16) .w().uv(0, 0, 16, 16).noCull() .e().uv(0, 0, 16, 16).noCull() @@ -249,7 +249,7 @@ public class BlockPane extends Block .d().uv(9, 0, 7, 7).rot(90).noCull() .u().uv(7, 0, 9, 7).rot(90).noCull(); else if(sides == 1) - return provider.getModel(name).noOcclude() + return provider.getModel(name) .add(8, 0, 0, 8, 16, 8) .w().uv(8, 0, 16, 16).noCull() .e().uv(8, 0, 16, 16).noCull() @@ -261,7 +261,7 @@ public class BlockPane extends Block .u().uv(7, 0, 9, 9).noCull() .rotate(n ? ModelRotation.X0_Y0 : (s ? ModelRotation.X0_Y180 : (w ? ModelRotation.X0_Y270 : ModelRotation.X0_Y90))); else if(sides == 2 && ((e != w) || (n != s))) - return provider.getModel(name).noOcclude() + return provider.getModel(name) .add(8, 0, 0, 8, 16, 8) .w().uv(0, 0, 8, 16).noCull() .e().uv(8, 0, 16, 16).noCull() @@ -281,7 +281,7 @@ public class BlockPane extends Block .rotate(n && e ? ModelRotation.X0_Y0 : (s && w ? ModelRotation.X0_Y180 : (n && w ? ModelRotation.X0_Y270 : ModelRotation.X0_Y90))); else if(sides == 2) - return provider.getModel(name).noOcclude() + return provider.getModel(name) .add(8, 0, 0, 8, 16, 16) .w().uv(0, 0, 16, 16).noCull() .e().uv(0, 0, 16, 16).noCull() @@ -293,7 +293,7 @@ public class BlockPane extends Block .u().uv(9, 0, 7, 16).noCull() .rotate(n ? ModelRotation.X0_Y0 : ModelRotation.X0_Y90); else - return provider.getModel(name).noOcclude() + return provider.getModel(name) .add(8, 0, 0, 8, 16, 16) .w().uv(0, 0, 16, 16).noCull() .e().uv(0, 0, 16, 16).noCull() @@ -317,7 +317,7 @@ public class BlockPane extends Block String pane = this.getPaneBase(state); String edge = this.getPaneEdge(state); if(sides == 0 || sides == 4) - return provider.getModel(pane).noOcclude() + return provider.getModel(pane) .add(7, 0, 0, 9, 16, 16).noShade() .d(edge).uv(7, 0, 9, 16).noCull() .u(edge).uv(7, 0, 9, 16).noCull() @@ -333,7 +333,7 @@ public class BlockPane extends Block .w(edge).uv(7, 0, 9, 16) .e(edge).uv(7, 0, 9, 16); else if(sides == 1 && (n || e)) - return provider.getModel(pane).noOcclude() + return provider.getModel(pane) .add(7, 0, 0, 9, 16, 9).noShade() .d(edge).uv(7, 0, 9, 9).noCull() .u(edge).uv(7, 0, 9, 9).noCull() @@ -343,7 +343,7 @@ public class BlockPane extends Block .e().uv(7, 0, 16, 16).noCull() .rotate(n ? ModelRotation.X0_Y0 : ModelRotation.X0_Y90); else if(sides == 1) - return provider.getModel(pane).noOcclude() + return provider.getModel(pane) .add(7, 0, 7, 9, 16, 16).noShade() .d(edge).uv(7, 7, 9, 16).noCull() .u(edge).uv(7, 7, 9, 16).noCull() @@ -353,7 +353,7 @@ public class BlockPane extends Block .e().uv(0, 0, 9, 16).noCull() .rotate(s ? ModelRotation.X0_Y0 : ModelRotation.X0_Y90); else if(e && n && !s && !w) - return provider.getModel(pane).noOcclude() + return provider.getModel(pane) .add(7, 0, 0, 9, 16, 9).noShade() .d(edge).uv(7, 0, 9, 9).noCull() .u(edge).uv(7, 0, 9, 9).noCull() @@ -369,7 +369,7 @@ public class BlockPane extends Block .w().uv(7, 0, 9, 16).noCull() .e(edge).uv(7, 0, 9, 16); else if(e && !n && s && !w) - return provider.getModel(pane).noOcclude() + return provider.getModel(pane) .add(7, 0, 7, 9, 16, 16).noShade() .d(edge).uv(7, 7, 9, 16).noCull() .u(edge).uv(7, 7, 9, 16).noCull() @@ -385,7 +385,7 @@ public class BlockPane extends Block .w().uv(7, 0, 9, 16).noCull() .e(edge).uv(7, 0, 9, 16); else if(!e && !n && s && w) - return provider.getModel(pane).noOcclude() + return provider.getModel(pane) .add(7, 0, 7, 9, 16, 16).noShade() .d(edge).uv(7, 7, 9, 16).noCull() .u(edge).uv(7, 7, 9, 16).noCull() @@ -401,7 +401,7 @@ public class BlockPane extends Block .w(edge).uv(7, 0, 9, 16) .e().uv(7, 0, 9, 16).noCull(); else if(!e && n && !s && w) - return provider.getModel(pane).noOcclude() + return provider.getModel(pane) .add(7, 0, 0, 9, 16, 9).noShade() .d(edge).uv(7, 0, 9, 9).noCull() .u(edge).uv(7, 0, 9, 9).noCull() @@ -417,7 +417,7 @@ public class BlockPane extends Block .w(edge).uv(7, 0, 9, 16) .e().uv(7, 0, 9, 16).noCull(); else if((!e && n && s && !w) || (e && !n && !s && w)) - return provider.getModel(pane).noOcclude() + return provider.getModel(pane) .add(7, 0, 0, 9, 16, 16).noShade() .d(edge).uv(7, 0, 9, 16).noCull() .u(edge).uv(7, 0, 9, 16).noCull() @@ -427,7 +427,7 @@ public class BlockPane extends Block .e().uv(0, 0, 16, 16).noCull() .rotate(s ? ModelRotation.X0_Y0 : ModelRotation.X0_Y90); else if(!w) - return provider.getModel(pane).noOcclude() + return provider.getModel(pane) .add(7, 0, 0, 9, 16, 16).noShade() .d(edge).uv(7, 0, 9, 16).noCull() .u(edge).uv(7, 0, 9, 16).noCull() @@ -443,7 +443,7 @@ public class BlockPane extends Block .w(edge).uv(7, 0, 9, 16).noCull() .e(edge).uv(7, 0, 9, 16); else if(!n) - return provider.getModel(pane).noOcclude() + return provider.getModel(pane) .add(7, 0, 9, 9, 16, 16).noShade() .d(edge).uv(7, 9, 9, 16).noCull() .u(edge).uv(7, 9, 9, 16).noCull() @@ -459,7 +459,7 @@ public class BlockPane extends Block .w(edge).uv(7, 0, 9, 16) .e(edge).uv(7, 0, 9, 16); else if(!e) - return provider.getModel(pane).noOcclude() + return provider.getModel(pane) .add(7, 0, 0, 9, 16, 16).noShade() .d(edge).uv(7, 0, 9, 16).noCull() .u(edge).uv(7, 0, 9, 16).noCull() @@ -475,7 +475,7 @@ public class BlockPane extends Block .w(edge).uv(7, 0, 9, 16).cull(Facing.EAST) .e(edge).uv(7, 0, 9, 16).noCull(); else - return provider.getModel(pane).noOcclude() + return provider.getModel(pane) .add(7, 0, 0, 9, 16, 7).noShade() .d(edge).uv(7, 0, 9, 7).noCull() .u(edge).uv(7, 0, 9, 7).noCull() diff --git a/common/src/main/java/common/block/foliage/BlockCactus.java b/common/src/main/java/common/block/foliage/BlockCactus.java index 5fe8b0b..bf4123a 100755 --- a/common/src/main/java/common/block/foliage/BlockCactus.java +++ b/common/src/main/java/common/block/foliage/BlockCactus.java @@ -22,7 +22,7 @@ import common.world.AWorldServer; public class BlockCactus extends Block { - private static final Model cactus = ModelProvider.getModelProvider().getModel("cactus_side").noOcclude() + private static final Model cactus = ModelProvider.getModelProvider().getModel("cactus_side") .add(0, 0, 0, 16, 16, 16) .d("cactus_bottom").uv(0, 0, 16, 16) .u("cactus_top").uv(0, 0, 16, 16) diff --git a/common/src/main/java/common/block/foliage/BlockCocoa.java b/common/src/main/java/common/block/foliage/BlockCocoa.java index 7c62bb9..37f87e8 100755 --- a/common/src/main/java/common/block/foliage/BlockCocoa.java +++ b/common/src/main/java/common/block/foliage/BlockCocoa.java @@ -237,7 +237,7 @@ public class BlockCocoa extends BlockDirectional implements IGrowable Model model; switch(state.getValue(AGE)) { case 0: - model = provider.getModel("cocoa_0").noOcclude() + model = provider.getModel("cocoa_0") .add(6, 7, 11, 10, 12, 15) .d().uv(0, 0, 4, 4).noCull() .u().uv(0, 0, 4, 4).noCull() @@ -250,7 +250,7 @@ public class BlockCocoa extends BlockDirectional implements IGrowable .e().uv(16, 0, 12, 4).noCull(); break; case 1: - model = provider.getModel("cocoa_1").noOcclude() + model = provider.getModel("cocoa_1") .add(5, 5, 9, 11, 12, 15) .d().uv(0, 0, 6, 6).noCull() .u().uv(0, 0, 6, 6).noCull() @@ -264,7 +264,7 @@ public class BlockCocoa extends BlockDirectional implements IGrowable break; case 2: default: - model = provider.getModel("cocoa_2").noOcclude() + model = provider.getModel("cocoa_2") .add(4, 3, 7, 12, 12, 15) .d().uv(0, 0, 7, 7).noCull() .u().uv(0, 0, 7, 7).noCull() diff --git a/common/src/main/java/common/block/foliage/BlockCrops.java b/common/src/main/java/common/block/foliage/BlockCrops.java index 7a5277a..07b9562 100755 --- a/common/src/main/java/common/block/foliage/BlockCrops.java +++ b/common/src/main/java/common/block/foliage/BlockCrops.java @@ -227,7 +227,7 @@ public class BlockCrops extends BlockBush implements IGrowable } public static Model crop(ModelProvider provider, String crop) { - return provider.getModel(crop).noOcclude() + return provider.getModel(crop) .add(4, -1, 0, 4, 15, 16).noShade() .w().uv(0, 0, 16, 16).noCull() .e().uv(0, 0, 16, 16).noCull() diff --git a/common/src/main/java/common/block/foliage/BlockDoublePlant.java b/common/src/main/java/common/block/foliage/BlockDoublePlant.java index fb4b135..51c9d14 100755 --- a/common/src/main/java/common/block/foliage/BlockDoublePlant.java +++ b/common/src/main/java/common/block/foliage/BlockDoublePlant.java @@ -350,7 +350,7 @@ public class BlockDoublePlant extends BlockBush implements IGrowable public Model getModel(ModelProvider provider, String name, State state) { if(state.getValue(VARIANT) == EnumPlantType.SUNFLOWER && state.getValue(HALF) == EnumBlockHalf.UPPER) - return provider.getModel("sunflower_front").noOcclude() + return provider.getModel("sunflower_front") .add(0.8f, 0f, 8f, 15.2f, 8f, 8f).noShade().rotate(8, 8, 8, Axis.Y, 45, true).ns("sunflower_top") .uv(0, 8, 16, 16).noCull() .add(8f, 0f, 0.8f, 8f, 8f, 15.2f).noShade().rotate(8, 8, 8, Axis.Y, 45, true).we("sunflower_top") diff --git a/common/src/main/java/common/block/foliage/BlockLilyPad.java b/common/src/main/java/common/block/foliage/BlockLilyPad.java index c2273a7..1102480 100755 --- a/common/src/main/java/common/block/foliage/BlockLilyPad.java +++ b/common/src/main/java/common/block/foliage/BlockLilyPad.java @@ -106,7 +106,7 @@ public class BlockLilyPad extends BlockBush } public Model getModel(ModelProvider provider, String name, State state) { - return provider.getModel("waterlily").noOcclude() + return provider.getModel("waterlily") .add(0, 0.25f, 0, 16, 0.25f, 16) .d().uv(16, 16, 0, 0).tint().noCull() .u().uv(16, 0, 0, 16).tint().noCull() diff --git a/common/src/main/java/common/block/foliage/BlockStem.java b/common/src/main/java/common/block/foliage/BlockStem.java index 7467439..bdd703d 100755 --- a/common/src/main/java/common/block/foliage/BlockStem.java +++ b/common/src/main/java/common/block/foliage/BlockStem.java @@ -245,7 +245,7 @@ public class BlockStem extends BlockBush implements IGrowable if(state.getValue(FACING) == Facing.UP) { switch(state.getValue(AGE)) { case 0: - return provider.getModel(stem).noOcclude() + return provider.getModel(stem) .add(0, -1, 8, 16, 1, 8).rotate(8, 8, 8, Facing.Axis.Y, 45, true) .n().uv(0, 0, 16, 2).tint().noCull() .s().uv(16, 0, 0, 2).tint().noCull() @@ -253,7 +253,7 @@ public class BlockStem extends BlockBush implements IGrowable .w().uv(0, 0, 16, 2).tint().noCull() .e().uv(16, 0, 0, 2).tint().noCull(); case 1: - return provider.getModel(stem).noOcclude() + return provider.getModel(stem) .add(0, -1, 8, 16, 3, 8).rotate(8, 8, 8, Facing.Axis.Y, 45, true) .n().uv(0, 0, 16, 4).tint().noCull() .s().uv(16, 0, 0, 4).tint().noCull() @@ -261,7 +261,7 @@ public class BlockStem extends BlockBush implements IGrowable .w().uv(0, 0, 16, 4).tint().noCull() .e().uv(16, 0, 0, 4).tint().noCull(); case 2: - return provider.getModel(stem).noOcclude() + return provider.getModel(stem) .add(0, -1, 8, 16, 5, 8).rotate(8, 8, 8, Facing.Axis.Y, 45, true) .n().uv(0, 0, 16, 6).tint().noCull() .s().uv(16, 0, 0, 6).tint().noCull() @@ -269,7 +269,7 @@ public class BlockStem extends BlockBush implements IGrowable .w().uv(0, 0, 16, 6).tint().noCull() .e().uv(16, 0, 0, 6).tint().noCull(); case 3: - return provider.getModel(stem).noOcclude() + return provider.getModel(stem) .add(0, -1, 8, 16, 7, 8).rotate(8, 8, 8, Facing.Axis.Y, 45, true) .n().uv(0, 0, 16, 8).tint().noCull() .s().uv(16, 0, 0, 8).tint().noCull() @@ -277,7 +277,7 @@ public class BlockStem extends BlockBush implements IGrowable .w().uv(0, 0, 16, 8).tint().noCull() .e().uv(16, 0, 0, 8).tint().noCull(); case 4: - return provider.getModel(stem).noOcclude() + return provider.getModel(stem) .add(0, -1, 8, 16, 9, 8).rotate(8, 8, 8, Facing.Axis.Y, 45, true) .n().uv(0, 0, 16, 10).tint().noCull() .s().uv(16, 0, 0, 10).tint().noCull() @@ -285,7 +285,7 @@ public class BlockStem extends BlockBush implements IGrowable .w().uv(0, 0, 16, 10).tint().noCull() .e().uv(16, 0, 0, 10).tint().noCull(); case 5: - return provider.getModel(stem).noOcclude() + return provider.getModel(stem) .add(0, -1, 8, 16, 11, 8).rotate(8, 8, 8, Facing.Axis.Y, 45, true) .n().uv(0, 0, 16, 12).tint().noCull() .s().uv(16, 0, 0, 12).tint().noCull() @@ -293,7 +293,7 @@ public class BlockStem extends BlockBush implements IGrowable .w().uv(0, 0, 16, 12).tint().noCull() .e().uv(16, 0, 0, 12).tint().noCull(); case 6: - return provider.getModel(stem).noOcclude() + return provider.getModel(stem) .add(0, -1, 8, 16, 13, 8).rotate(8, 8, 8, Facing.Axis.Y, 45, true) .n().uv(0, 0, 16, 14).tint().noCull() .s().uv(16, 0, 0, 14).tint().noCull() @@ -302,7 +302,7 @@ public class BlockStem extends BlockBush implements IGrowable .e().uv(16, 0, 0, 14).tint().noCull(); case 7: default: - return provider.getModel(stem).noOcclude() + return provider.getModel(stem) .add(0, -1, 8, 16, 15, 8).rotate(8, 8, 8, Facing.Axis.Y, 45, true) .n().uv(0, 0, 16, 16).tint().noCull() .s().uv(16, 0, 0, 16).tint().noCull() @@ -312,7 +312,7 @@ public class BlockStem extends BlockBush implements IGrowable } } else { - return provider.getModel(stem).noOcclude() + return provider.getModel(stem) .add(0, -1, 8, 16, 7, 8).rotate(8, 8, 8, Facing.Axis.Y, 45, true) .n().uv(0, 0, 16, 8).tint().noCull() .s().uv(16, 0, 0, 8).tint().noCull() diff --git a/common/src/main/java/common/block/foliage/BlockVine.java b/common/src/main/java/common/block/foliage/BlockVine.java index fc0868e..7f75a8a 100755 --- a/common/src/main/java/common/block/foliage/BlockVine.java +++ b/common/src/main/java/common/block/foliage/BlockVine.java @@ -521,7 +521,7 @@ public class BlockVine extends Block } public Model getModel(ModelProvider provider, String name, State state) { - Model model = provider.getModel("vine").noOcclude(); + Model model = provider.getModel("vine"); if(state.getValue(UP)) model.add(0, 15.2f, 0, 16, 15.2f, 16).noShade() .d().uv(0, 0, 16, 16).tint().noCull() diff --git a/common/src/main/java/common/block/natural/BlockFire.java b/common/src/main/java/common/block/natural/BlockFire.java index cce8a47..be18c65 100755 --- a/common/src/main/java/common/block/natural/BlockFire.java +++ b/common/src/main/java/common/block/natural/BlockFire.java @@ -458,7 +458,7 @@ public class BlockFire extends Block } private static Model fire_nsu2_flip(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(16, 0, 0, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -473,7 +473,7 @@ public class BlockFire extends Block .d().uv(0, 0, 16, 16).noCull().tint(); } private static Model fire_nu1(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(0, 0, 16, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -484,7 +484,7 @@ public class BlockFire extends Block .d().uv(0, 0, 16, 16).rot(90).noCull().tint(); } private static Model fire_nseu2_flip(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(16, 0, 0, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -503,7 +503,7 @@ public class BlockFire extends Block .d().uv(0, 0, 16, 16).noCull().tint(); } private static Model fire_neu1_flip(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(16, 0, 0, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -518,7 +518,7 @@ public class BlockFire extends Block .d().uv(0, 0, 16, 16).rot(90).noCull().tint(); } private static Model fire_nsu2(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(0, 0, 16, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -533,7 +533,7 @@ public class BlockFire extends Block .d().uv(0, 0, 16, 16).noCull().tint(); } private static Model fire_nu2_flip(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(16, 0, 0, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -544,7 +544,7 @@ public class BlockFire extends Block .d().uv(0, 0, 16, 16).noCull().tint(); } private static Model fire_neu2_flip(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(16, 0, 0, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -559,7 +559,7 @@ public class BlockFire extends Block .d().uv(0, 0, 16, 16).noCull().tint(); } private static Model fire_nsewu2_flip(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(16, 0, 0, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -582,7 +582,7 @@ public class BlockFire extends Block .d().uv(0, 0, 16, 16).noCull().tint(); } private static Model fire_nsewu2(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(0, 0, 16, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -605,7 +605,7 @@ public class BlockFire extends Block .d().uv(0, 0, 16, 16).noCull().tint(); } private static Model fire_nsew(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(0, 0, 16, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -624,7 +624,7 @@ public class BlockFire extends Block .w().uv(0, 0, 16, 16).noCull().tint(); } private static Model fire_floor(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 0, 8.8f, 16, 22.4f, 8.8f).noShade().rotate(8, 8, 8, Facing.Axis.X, -22.5f, true) .s().uv(0, 0, 16, 16).noCull().tint() .add(0, 0, 7.2f, 16, 22.4f, 7.2f).noShade().rotate(8, 8, 8, Facing.Axis.X, 22.5f, true) @@ -643,21 +643,21 @@ public class BlockFire extends Block .e().uv(0, 0, 16, 16).noCull().tint(); } private static Model fire_u1(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 16, 0, 16, 16, 16).noShade().rotate(16, 16, 8, Facing.Axis.Z, 22.5f, true) .d().uv(0, 0, 16, 16).rot(270).noCull().tint() .add(0, 16, 0, 16, 16, 16).noShade().rotate(0, 16, 8, Facing.Axis.Z, -22.5f, true) .d().uv(0, 0, 16, 16).rot(90).noCull().tint(); } private static Model fire_n_flip(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(16, 0, 0, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .n().uv(16, 0, 0, 16).noCull().tint(); } private static Model fire_ne(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(0, 0, 16, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -668,7 +668,7 @@ public class BlockFire extends Block .w().uv(0, 0, 16, 16).noCull().tint(); } private static Model fire_nsew_flip(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(16, 0, 0, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -687,7 +687,7 @@ public class BlockFire extends Block .w().uv(16, 0, 0, 16).noCull().tint(); } private static Model fire_nse(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(0, 0, 16, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -702,7 +702,7 @@ public class BlockFire extends Block .w().uv(0, 0, 16, 16).noCull().tint(); } private static Model fire_nse_flip(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(16, 0, 0, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -717,7 +717,7 @@ public class BlockFire extends Block .w().uv(16, 0, 0, 16).noCull().tint(); } private static Model fire_nsu1_flip(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(16, 0, 0, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -732,14 +732,14 @@ public class BlockFire extends Block .d().uv(0, 0, 16, 16).rot(90).noCull().tint(); } private static Model fire_n(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(0, 0, 16, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .n().uv(0, 0, 16, 16).noCull().tint(); } private static Model fire_ns(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(0, 0, 16, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -750,7 +750,7 @@ public class BlockFire extends Block .n().uv(0, 0, 16, 16).noCull().tint(); } private static Model fire_neu1(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(0, 0, 16, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -765,14 +765,14 @@ public class BlockFire extends Block .d().uv(0, 0, 16, 16).rot(90).noCull().tint(); } private static Model fire_u2(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 16, 0, 16, 16, 16).noShade().rotate(8, 16, 16, Facing.Axis.X, -22.5f, true) .d().uv(0, 0, 16, 16).rot(180).noCull().tint() .add(0, 16, 0, 16, 16, 16).noShade().rotate(8, 16, 0, Facing.Axis.X, 22.5f, true) .d().uv(0, 0, 16, 16).noCull().tint(); } private static Model fire_nseu2(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(0, 0, 16, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -791,7 +791,7 @@ public class BlockFire extends Block .d().uv(0, 0, 16, 16).noCull().tint(); } private static Model fire_neu2(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(0, 0, 16, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -806,7 +806,7 @@ public class BlockFire extends Block .d().uv(0, 0, 16, 16).noCull().tint(); } private static Model fire_nu2(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(0, 0, 16, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -817,7 +817,7 @@ public class BlockFire extends Block .d().uv(0, 0, 16, 16).noCull().tint(); } private static Model fire_nseu1(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(0, 0, 16, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -836,7 +836,7 @@ public class BlockFire extends Block .d().uv(0, 0, 16, 16).rot(90).noCull().tint(); } private static Model fire_ns_flip(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(16, 0, 0, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -847,7 +847,7 @@ public class BlockFire extends Block .n().uv(16, 0, 0, 16).noCull().tint(); } private static Model fire_nsewu1(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(0, 0, 16, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -870,7 +870,7 @@ public class BlockFire extends Block .d().uv(0, 0, 16, 16).rot(90).noCull().tint(); } private static Model fire_nsu1(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(0, 0, 16, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -885,7 +885,7 @@ public class BlockFire extends Block .d().uv(0, 0, 16, 16).rot(90).noCull().tint(); } private static Model fire_nsewu1_flip(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(16, 0, 0, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -908,7 +908,7 @@ public class BlockFire extends Block .d().uv(0, 0, 16, 16).rot(90).noCull().tint(); } private static Model fire_ne_flip(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(16, 0, 0, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() @@ -919,7 +919,7 @@ public class BlockFire extends Block .w().uv(16, 0, 0, 16).noCull().tint(); } private static Model fire_nseu1_flip(String fire) { - return ModelProvider.getModelProvider().getModel(fire).noOcclude() + return ModelProvider.getModelProvider().getModel(fire) .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() .s().uv(16, 0, 0, 16).noCull().tint() .add(0, 1, 0.01f, 16, 23.4f, 0.01f).noShade() diff --git a/common/src/main/java/common/block/tech/BlockBeacon.java b/common/src/main/java/common/block/tech/BlockBeacon.java index 521e9ce..83986bc 100755 --- a/common/src/main/java/common/block/tech/BlockBeacon.java +++ b/common/src/main/java/common/block/tech/BlockBeacon.java @@ -17,7 +17,7 @@ import common.world.World; public class BlockBeacon extends BlockContainer { - private static final Model beacon = ModelProvider.getModelProvider().getModel("glass").noOcclude() + private static final Model beacon = ModelProvider.getModelProvider().getModel("glass") .add(0, 0, 0, 16, 16, 16) .d().uv(0, 0, 16, 16).noCull() .u().uv(0, 0, 16, 16).noCull() diff --git a/common/src/main/java/common/block/tech/BlockCauldron.java b/common/src/main/java/common/block/tech/BlockCauldron.java index a2d9599..087c865 100755 --- a/common/src/main/java/common/block/tech/BlockCauldron.java +++ b/common/src/main/java/common/block/tech/BlockCauldron.java @@ -29,7 +29,7 @@ import common.world.World; public class BlockCauldron extends Block { - private static final Model cauldron_empty = ModelProvider.getModelProvider().getModel("cauldron_side").noOcclude() + private static final Model cauldron_empty = ModelProvider.getModelProvider().getModel("cauldron_side") .add(0, 3, 0, 2, 16, 16) .d("cauldron_inner").uv(0, 0, 2, 16) .u("cauldron_top").uv(0, 0, 2, 16) @@ -122,7 +122,7 @@ public class BlockCauldron extends Block .w().uv(14, 13, 12, 16).noCull() .e().uv(14, 13, 12, 16).noCull() ; - private static final Model cauldron_level1 = ModelProvider.getModelProvider().getModel("cauldron_side").noOcclude() + private static final Model cauldron_level1 = ModelProvider.getModelProvider().getModel("cauldron_side") .add(0, 3, 0, 2, 16, 16) .d("cauldron_inner").uv(0, 0, 2, 16) .u("cauldron_top").uv(0, 0, 2, 16) @@ -217,7 +217,7 @@ public class BlockCauldron extends Block .add(2, 9, 2, 14, 9, 14) .u("water_still").uv(2, 2, 14, 14).noCull() ; - private static final Model cauldron_level2 = ModelProvider.getModelProvider().getModel("cauldron_side").noOcclude() + private static final Model cauldron_level2 = ModelProvider.getModelProvider().getModel("cauldron_side") .add(0, 3, 0, 2, 16, 16) .d("cauldron_inner").uv(0, 0, 2, 16) .u("cauldron_top").uv(0, 0, 2, 16) @@ -312,7 +312,7 @@ public class BlockCauldron extends Block .add(2, 12, 2, 14, 12, 14) .u("water_still").uv(2, 2, 14, 14).noCull() ; - private static final Model cauldron_level3 = ModelProvider.getModelProvider().getModel("cauldron_side").noOcclude() + private static final Model cauldron_level3 = ModelProvider.getModelProvider().getModel("cauldron_side") .add(0, 3, 0, 2, 16, 16) .d("cauldron_inner").uv(0, 0, 2, 16) .u("cauldron_top").uv(0, 0, 2, 16) diff --git a/common/src/main/java/common/block/tech/BlockHopper.java b/common/src/main/java/common/block/tech/BlockHopper.java index 5690a9c..524a799 100755 --- a/common/src/main/java/common/block/tech/BlockHopper.java +++ b/common/src/main/java/common/block/tech/BlockHopper.java @@ -32,7 +32,7 @@ import common.world.AWorldServer; public class BlockHopper extends BlockContainer { - private static final Model hopper_down = ModelProvider.getModelProvider().getModel("hopper_outside").noOcclude() + private static final Model hopper_down = ModelProvider.getModelProvider().getModel("hopper_outside") .add(0, 10, 0, 16, 11, 16) .d().uv(0, 0, 16, 16).noCull() .u("hopper_inside").uv(0, 0, 16, 16).noCull() @@ -312,7 +312,7 @@ public class BlockHopper extends BlockContainer } public Model getModel(ModelProvider provider, String name, State state) { - return state.getValue(FACING) == Facing.DOWN ? hopper_down : provider.getModel("hopper_outside").noOcclude() + return state.getValue(FACING) == Facing.DOWN ? hopper_down : provider.getModel("hopper_outside") .add(0, 10, 0, 16, 11, 16) .d().uv(0, 0, 16, 16).noCull() .u("hopper_inside").uv(0, 0, 16, 16).noCull() diff --git a/common/src/main/java/common/block/tech/BlockLever.java b/common/src/main/java/common/block/tech/BlockLever.java index 369c363..6e5e276 100755 --- a/common/src/main/java/common/block/tech/BlockLever.java +++ b/common/src/main/java/common/block/tech/BlockLever.java @@ -298,7 +298,7 @@ public class BlockLever extends Block } public Model getModel(ModelProvider provider, String name, State state) { - return provider.getModel("cobblestone").noOcclude() + return provider.getModel("cobblestone") .add(5, 0, 4, 11, 3, 12) .d().uv(5, 4, 11, 12).noCull() .u().uv(5, 4, 11, 12).noCull() diff --git a/common/src/main/java/common/block/tech/BlockRailBase.java b/common/src/main/java/common/block/tech/BlockRailBase.java index 198c04e..df3e43c 100755 --- a/common/src/main/java/common/block/tech/BlockRailBase.java +++ b/common/src/main/java/common/block/tech/BlockRailBase.java @@ -195,7 +195,7 @@ public abstract class BlockRailBase extends Block case NORTH_SOUTH: case EAST_WEST: default: - return provider.getModel(name).noOcclude() + return provider.getModel(name) .add(0, 1, 0, 16, 1, 16) .d().uv(0, 16, 16, 0).noCull() .u().uv(0, 0, 16, 16).noCull() @@ -204,7 +204,7 @@ public abstract class BlockRailBase extends Block case NORTH_WEST: case SOUTH_EAST: case SOUTH_WEST: - return provider.getModel(name + "_turned").noOcclude() + return provider.getModel(name + "_turned") .add(0, 1, 0, 16, 1, 16) .d().uv(0, 16, 16, 0).noCull() .u().uv(0, 0, 16, 16).noCull() @@ -212,14 +212,14 @@ public abstract class BlockRailBase extends Block ModelRotation.X0_Y180 : (dir == EnumRailDirection.NORTH_EAST ? ModelRotation.X0_Y270 : ModelRotation.X0_Y0))); case ASCENDING_NORTH: case ASCENDING_EAST: - return provider.getModel(name).noOcclude() + return provider.getModel(name) .add(0, 9, 0, 16, 9, 16).rotate(8, 9, 8, Facing.Axis.X, 45, true) .d().uv(0, 16, 16, 0).noCull() .u().uv(0, 0, 16, 16).noCull() .rotate(dir == EnumRailDirection.ASCENDING_EAST ? ModelRotation.X0_Y90 : ModelRotation.X0_Y0); case ASCENDING_SOUTH: case ASCENDING_WEST: - return provider.getModel(name).noOcclude() + return provider.getModel(name) .add(0, 9, 0, 16, 9, 16).rotate(8, 9, 8, Facing.Axis.X, -45, true) .d().uv(0, 16, 16, 0).noCull() .u().uv(0, 0, 16, 16).noCull() diff --git a/common/src/main/java/common/block/tech/BlockRedstoneComparator.java b/common/src/main/java/common/block/tech/BlockRedstoneComparator.java index 9a484fe..635d9f4 100755 --- a/common/src/main/java/common/block/tech/BlockRedstoneComparator.java +++ b/common/src/main/java/common/block/tech/BlockRedstoneComparator.java @@ -316,7 +316,7 @@ public class BlockRedstoneComparator extends BlockRedstoneDiode implements ITile } public Model getModel(ModelProvider provider, String name, State state) { - return (state.getValue(POWERED) ? (state.getValue(MODE) == Mode.SUBTRACT ? provider.getModel("comparator_on").noOcclude() + return (state.getValue(POWERED) ? (state.getValue(MODE) == Mode.SUBTRACT ? provider.getModel("comparator_on") .add(0, 0, 0, 16, 2, 16) .d("double_stone_top").uv(0, 0, 16, 16) .u().uv(0, 0, 16, 16).noCull() @@ -347,7 +347,7 @@ public class BlockRedstoneComparator extends BlockRedstoneDiode implements ITile .e("redstone_torch").uv(6, 5, 10, 9).noCull() .add(6, 2, 2, 10, 6, 4) .n("redstone_torch").uv(6, 5, 10, 9).noCull() - .s("redstone_torch").uv(6, 5, 10, 9).noCull() : provider.getModel("comparator_on").noOcclude() + .s("redstone_torch").uv(6, 5, 10, 9).noCull() : provider.getModel("comparator_on") .add(0, 0, 0, 16, 2, 16) .d("double_stone_top").uv(0, 0, 16, 16) .u().uv(0, 0, 16, 16).noCull() @@ -378,7 +378,7 @@ public class BlockRedstoneComparator extends BlockRedstoneDiode implements ITile .s("unlit_redstone_torch").uv(7, 6, 9, 8).noCull() .w("unlit_redstone_torch").uv(7, 6, 9, 8).noCull() .e("unlit_redstone_torch").uv(7, 6, 9, 8).noCull()) - : (state.getValue(MODE) == Mode.SUBTRACT ? provider.getModel("comparator_off").noOcclude() + : (state.getValue(MODE) == Mode.SUBTRACT ? provider.getModel("comparator_off") .add(0, 0, 0, 16, 2, 16) .d("double_stone_top").uv(0, 0, 16, 16) .u().uv(0, 0, 16, 16).noCull() @@ -407,7 +407,7 @@ public class BlockRedstoneComparator extends BlockRedstoneDiode implements ITile .e("redstone_torch").uv(6, 5, 10, 9).noCull() .add(6, 2, 2, 10, 6, 4) .n("redstone_torch").uv(6, 5, 10, 9).noCull() - .s("redstone_torch").uv(6, 5, 10, 9).noCull() : provider.getModel("comparator_off").noOcclude() + .s("redstone_torch").uv(6, 5, 10, 9).noCull() : provider.getModel("comparator_off") .add(0, 0, 0, 16, 2, 16) .d("double_stone_top").uv(0, 0, 16, 16) .u().uv(0, 0, 16, 16).noCull() diff --git a/common/src/main/java/common/block/tech/BlockRedstoneRepeater.java b/common/src/main/java/common/block/tech/BlockRedstoneRepeater.java index 54adc67..07499f2 100755 --- a/common/src/main/java/common/block/tech/BlockRedstoneRepeater.java +++ b/common/src/main/java/common/block/tech/BlockRedstoneRepeater.java @@ -162,7 +162,7 @@ public class BlockRedstoneRepeater extends BlockRedstoneDiode switch(delay) { case 1: default: - return ModelProvider.getModelProvider().getModel("repeater_off").noOcclude() + return ModelProvider.getModelProvider().getModel("repeater_off") .add(0, 0, 0, 16, 2, 16) .d("double_stone_top").uv(0, 0, 16, 16) .u().uv(0, 0, 16, 16).noCull() @@ -185,7 +185,7 @@ public class BlockRedstoneRepeater extends BlockRedstoneDiode .w("unlit_redstone_torch").uv(7, 6, 9, 11).noCull() .e("unlit_redstone_torch").uv(7, 6, 9, 11).noCull(); case 2: - return ModelProvider.getModelProvider().getModel("repeater_off").noOcclude() + return ModelProvider.getModelProvider().getModel("repeater_off") .add(0, 0, 0, 16, 2, 16) .d("double_stone_top").uv(0, 0, 16, 16) .u().uv(0, 0, 16, 16).noCull() @@ -208,7 +208,7 @@ public class BlockRedstoneRepeater extends BlockRedstoneDiode .w("unlit_redstone_torch").uv(7, 6, 9, 11).noCull() .e("unlit_redstone_torch").uv(7, 6, 9, 11).noCull(); case 3: - return ModelProvider.getModelProvider().getModel("repeater_off").noOcclude() + return ModelProvider.getModelProvider().getModel("repeater_off") .add(0, 0, 0, 16, 2, 16) .d("double_stone_top").uv(0, 0, 16, 16) .u().uv(0, 0, 16, 16).noCull() @@ -231,7 +231,7 @@ public class BlockRedstoneRepeater extends BlockRedstoneDiode .w("unlit_redstone_torch").uv(7, 6, 9, 11).noCull() .e("unlit_redstone_torch").uv(7, 6, 9, 11).noCull(); case 4: - return ModelProvider.getModelProvider().getModel("repeater_off").noOcclude() + return ModelProvider.getModelProvider().getModel("repeater_off") .add(0, 0, 0, 16, 2, 16) .d("double_stone_top").uv(0, 0, 16, 16) .u().uv(0, 0, 16, 16).noCull() @@ -260,7 +260,7 @@ public class BlockRedstoneRepeater extends BlockRedstoneDiode switch(delay) { case 1: default: - return ModelProvider.getModelProvider().getModel("repeater_on").noOcclude() + return ModelProvider.getModelProvider().getModel("repeater_on") .add(0, 0, 0, 16, 2, 16) .d("double_stone_top").uv(0, 0, 16, 16) .u().uv(0, 0, 16, 16).noCull() @@ -285,7 +285,7 @@ public class BlockRedstoneRepeater extends BlockRedstoneDiode .n("redstone_torch").uv(6, 5, 10, 11).noCull() .s("redstone_torch").uv(6, 5, 10, 11).noCull(); case 2: - return ModelProvider.getModelProvider().getModel("repeater_on").noOcclude() + return ModelProvider.getModelProvider().getModel("repeater_on") .add(0, 0, 0, 16, 2, 16) .d("double_stone_top").uv(0, 0, 16, 16) .u().uv(0, 0, 16, 16).noCull() @@ -310,7 +310,7 @@ public class BlockRedstoneRepeater extends BlockRedstoneDiode .n("redstone_torch").uv(6, 5, 10, 11).noCull() .s("redstone_torch").uv(6, 5, 10, 11).noCull(); case 3: - return ModelProvider.getModelProvider().getModel("repeater_on").noOcclude() + return ModelProvider.getModelProvider().getModel("repeater_on") .add(0, 0, 0, 16, 2, 16) .d("double_stone_top").uv(0, 0, 16, 16) .u().uv(0, 0, 16, 16).noCull() @@ -335,7 +335,7 @@ public class BlockRedstoneRepeater extends BlockRedstoneDiode .n("redstone_torch").uv(6, 5, 10, 11).noCull() .s("redstone_torch").uv(6, 5, 10, 11).noCull(); case 4: - return ModelProvider.getModelProvider().getModel("repeater_on").noOcclude() + return ModelProvider.getModelProvider().getModel("repeater_on") .add(0, 0, 0, 16, 2, 16) .d("double_stone_top").uv(0, 0, 16, 16) .u().uv(0, 0, 16, 16).noCull() @@ -366,7 +366,7 @@ public class BlockRedstoneRepeater extends BlockRedstoneDiode switch(delay) { case 1: default: - return ModelProvider.getModelProvider().getModel("repeater_off").noOcclude() + return ModelProvider.getModelProvider().getModel("repeater_off") .add(0, 0, 0, 16, 2, 16) .d("double_stone_top").uv(0, 0, 16, 16) .u().uv(0, 0, 16, 16).noCull() @@ -389,7 +389,7 @@ public class BlockRedstoneRepeater extends BlockRedstoneDiode .w("unlit_redstone_torch").uv(7, 6, 9, 11).noCull() .e("unlit_redstone_torch").uv(7, 6, 9, 11).noCull(); case 2: - return ModelProvider.getModelProvider().getModel("repeater_off").noOcclude() + return ModelProvider.getModelProvider().getModel("repeater_off") .add(0, 0, 0, 16, 2, 16) .d("double_stone_top").uv(0, 0, 16, 16) .u().uv(0, 0, 16, 16).noCull() @@ -412,7 +412,7 @@ public class BlockRedstoneRepeater extends BlockRedstoneDiode .w("unlit_redstone_torch").uv(7, 6, 9, 11).noCull() .e("unlit_redstone_torch").uv(7, 6, 9, 11).noCull(); case 3: - return ModelProvider.getModelProvider().getModel("repeater_off").noOcclude() + return ModelProvider.getModelProvider().getModel("repeater_off") .add(0, 0, 0, 16, 2, 16) .d("double_stone_top").uv(0, 0, 16, 16) .u().uv(0, 0, 16, 16).noCull() @@ -435,7 +435,7 @@ public class BlockRedstoneRepeater extends BlockRedstoneDiode .w("unlit_redstone_torch").uv(7, 6, 9, 11).noCull() .e("unlit_redstone_torch").uv(7, 6, 9, 11).noCull(); case 4: - return ModelProvider.getModelProvider().getModel("repeater_off").noOcclude() + return ModelProvider.getModelProvider().getModel("repeater_off") .add(0, 0, 0, 16, 2, 16) .d("double_stone_top").uv(0, 0, 16, 16) .u().uv(0, 0, 16, 16).noCull() @@ -464,7 +464,7 @@ public class BlockRedstoneRepeater extends BlockRedstoneDiode switch(delay) { case 1: default: - return ModelProvider.getModelProvider().getModel("repeater_on").noOcclude() + return ModelProvider.getModelProvider().getModel("repeater_on") .add(0, 0, 0, 16, 2, 16) .d("double_stone_top").uv(0, 0, 16, 16) .u().uv(0, 0, 16, 16).noCull() @@ -488,7 +488,7 @@ public class BlockRedstoneRepeater extends BlockRedstoneDiode .n("redstone_torch").uv(6, 5, 10, 11).noCull() .s("redstone_torch").uv(6, 5, 10, 11).noCull(); case 2: - return ModelProvider.getModelProvider().getModel("repeater_on").noOcclude() + return ModelProvider.getModelProvider().getModel("repeater_on") .add(0, 0, 0, 16, 2, 16) .d("double_stone_top").uv(0, 0, 16, 16) .u().uv(0, 0, 16, 16).noCull() @@ -512,7 +512,7 @@ public class BlockRedstoneRepeater extends BlockRedstoneDiode .n("redstone_torch").uv(6, 5, 10, 11).noCull() .s("redstone_torch").uv(6, 5, 10, 11).noCull(); case 3: - return ModelProvider.getModelProvider().getModel("repeater_on").noOcclude() + return ModelProvider.getModelProvider().getModel("repeater_on") .add(0, 0, 0, 16, 2, 16) .d("double_stone_top").uv(0, 0, 16, 16) .u().uv(0, 0, 16, 16).noCull() @@ -536,7 +536,7 @@ public class BlockRedstoneRepeater extends BlockRedstoneDiode .n("redstone_torch").uv(6, 5, 10, 11).noCull() .s("redstone_torch").uv(6, 5, 10, 11).noCull(); case 4: - return ModelProvider.getModelProvider().getModel("repeater_on").noOcclude() + return ModelProvider.getModelProvider().getModel("repeater_on") .add(0, 0, 0, 16, 2, 16) .d("double_stone_top").uv(0, 0, 16, 16) .u().uv(0, 0, 16, 16).noCull() diff --git a/common/src/main/java/common/block/tech/BlockRedstoneWire.java b/common/src/main/java/common/block/tech/BlockRedstoneWire.java index c461f4f..514b546 100755 --- a/common/src/main/java/common/block/tech/BlockRedstoneWire.java +++ b/common/src/main/java/common/block/tech/BlockRedstoneWire.java @@ -34,19 +34,19 @@ import common.world.AWorldServer; public class BlockRedstoneWire extends Block { - private static final Model redstone_none = ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude() + private static final Model redstone_none = ModelProvider.getModelProvider().getModel("redstone_dust_cross") .add(5, 0.25f, 5, 11, 0.25f, 11).noShade() .u().uv(5, 5, 11, 11).tint().noCull() .add(5, 0.25f, 5, 11, 0.25f, 11).noShade() .u("redstone_dust_cross_overlay").uv(5, 5, 11, 11).noCull() ; - private static final Model redstone_nsew = ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude().uvLock() + private static final Model redstone_nsew = ModelProvider.getModelProvider().getModel("redstone_dust_cross").uvLock() .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() .u().uv(0, 0, 16, 16).tint().noCull() .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() .u("redstone_dust_cross_overlay").uv(0, 0, 16, 16).noCull() ; - private static final Model redstone_unusueuw = ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude().uvLock() + private static final Model redstone_unusueuw = ModelProvider.getModelProvider().getModel("redstone_dust_cross").uvLock() .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() .u().uv(0, 0, 16, 16).tint().noCull() .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() @@ -68,7 +68,7 @@ public class BlockRedstoneWire extends Block .add(0.25f, 0, 0, 0.25f, 16, 16).noShade() .e("redstone_dust_line_overlay").uv(0, 0, 16, 16).rot(90).noCull() ; - private static final Model redstone_unus = ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude() + private static final Model redstone_unus = ModelProvider.getModelProvider().getModel("redstone_dust_cross") .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() .u("redstone_dust_line").uv(0, 0, 16, 16).rot(90).tint().noCull() .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() @@ -82,7 +82,7 @@ public class BlockRedstoneWire extends Block .add(0, 0, 15.75f, 16, 16, 15.75f).noShade() .n("redstone_dust_line_overlay").uv(0, 0, 16, 16).rot(90).noCull() ; - private static final Model redstone_ueuw = ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude() + private static final Model redstone_ueuw = ModelProvider.getModelProvider().getModel("redstone_dust_cross") .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() .u("redstone_dust_line").uv(0, 0, 16, 16).tint().noCull() .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() @@ -98,7 +98,7 @@ public class BlockRedstoneWire extends Block ; private static Model redstone_n(boolean rot) { - return ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude() + return ModelProvider.getModelProvider().getModel("redstone_dust_cross") .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() .u("redstone_dust_line").uv(0, 0, 16, 16).rot(90).tint().noCull() .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() @@ -107,7 +107,7 @@ public class BlockRedstoneWire extends Block } private static Model redstone_ne(ModelRotation rot) { - return ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude().uvLock() + return ModelProvider.getModelProvider().getModel("redstone_dust_cross").uvLock() .add(5, 0.25f, 0, 16, 0.25f, 11).noShade() .u().uv(5, 0, 16, 11).tint().noCull() .add(5, 0.25f, 0, 16, 0.25f, 11).noShade() @@ -116,7 +116,7 @@ public class BlockRedstoneWire extends Block } private static Model redstone_uew(boolean rot) { - Model model = ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude() + Model model = ModelProvider.getModelProvider().getModel("redstone_dust_cross") .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() .u("redstone_dust_line").uv(0, 0, 16, 16).tint().noCull() .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() @@ -128,7 +128,7 @@ public class BlockRedstoneWire extends Block return rot ? model.uvLock().rotate(ModelRotation.X0_Y180) : model; } private static Model redstone_nue(ModelRotation rot) { - return ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude().uvLock() + return ModelProvider.getModelProvider().getModel("redstone_dust_cross").uvLock() .add(5, 0.25f, 0, 16, 0.25f, 11).noShade() .u().uv(5, 0, 16, 11).tint().noCull() .add(5, 0.25f, 0, 16, 0.25f, 11).noShade() @@ -140,7 +140,7 @@ public class BlockRedstoneWire extends Block .rotate(rot); } private static Model redstone_une(ModelRotation rot) { - return ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude().uvLock() + return ModelProvider.getModelProvider().getModel("redstone_dust_cross").uvLock() .add(5, 0.25f, 0, 16, 0.25f, 11).noShade() .u().uv(5, 0, 16, 11).tint().noCull() .add(5, 0.25f, 0, 16, 0.25f, 11).noShade() @@ -152,7 +152,7 @@ public class BlockRedstoneWire extends Block .rotate(rot); } private static Model redstone_nse(ModelRotation rot) { - return ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude().uvLock() + return ModelProvider.getModelProvider().getModel("redstone_dust_cross").uvLock() .add(5, 0.25f, 0, 16, 0.25f, 16).noShade() .u().uv(5, 0, 16, 16).tint().noCull() .add(5, 0.25f, 0, 16, 0.25f, 16).noShade() @@ -160,7 +160,7 @@ public class BlockRedstoneWire extends Block .rotate(rot); } private static Model redstone_uns(boolean lock, ModelRotation rot) { - Model model = ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude() + Model model = ModelProvider.getModelProvider().getModel("redstone_dust_cross") .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() .u("redstone_dust_line").uv(0, 0, 16, 16).rot(90).tint().noCull() .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() @@ -174,7 +174,7 @@ public class BlockRedstoneWire extends Block } private static Model redstone_nsue(ModelRotation rot) { - return ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude().uvLock() + return ModelProvider.getModelProvider().getModel("redstone_dust_cross").uvLock() .add(5, 0.25f, 0, 16, 0.25f, 16).noShade() .u().uv(5, 0, 16, 16).tint().noCull() .add(5, 0.25f, 0, 16, 0.25f, 16).noShade() @@ -186,7 +186,7 @@ public class BlockRedstoneWire extends Block .rotate(rot); } private static Model redstone_unse(ModelRotation rot) { - return ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude().uvLock() + return ModelProvider.getModelProvider().getModel("redstone_dust_cross").uvLock() .add(5, 0.25f, 0, 16, 0.25f, 16).noShade() .u().uv(5, 0, 16, 16).tint().noCull() .add(5, 0.25f, 0, 16, 0.25f, 16).noShade() @@ -198,7 +198,7 @@ public class BlockRedstoneWire extends Block .rotate(rot); } private static Model redstone_nuse(ModelRotation rot) { - return ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude().uvLock() + return ModelProvider.getModelProvider().getModel("redstone_dust_cross").uvLock() .add(5, 0.25f, 0, 16, 0.25f, 16).noShade() .u().uv(5, 0, 16, 16).tint().noCull() .add(5, 0.25f, 0, 16, 0.25f, 16).noShade() @@ -210,7 +210,7 @@ public class BlockRedstoneWire extends Block .rotate(rot); } private static Model redstone_unue(ModelRotation rot) { - return ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude().uvLock() + return ModelProvider.getModelProvider().getModel("redstone_dust_cross").uvLock() .add(5, 0.25f, 0, 16, 0.25f, 11).noShade() .u().uv(5, 0, 16, 11).tint().noCull() .add(5, 0.25f, 0, 16, 0.25f, 11).noShade() @@ -227,7 +227,7 @@ public class BlockRedstoneWire extends Block } private static Model redstone_unusue(ModelRotation rot) { - return ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude().uvLock() + return ModelProvider.getModelProvider().getModel("redstone_dust_cross").uvLock() .add(5, 0.25f, 0, 16, 0.25f, 16).noShade() .u().uv(5, 0, 16, 16).tint().noCull() .add(5, 0.25f, 0, 16, 0.25f, 16).noShade() @@ -247,7 +247,7 @@ public class BlockRedstoneWire extends Block .rotate(rot); } private static Model redstone_unusew(boolean rot) { - return ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude().uvLock() + return ModelProvider.getModelProvider().getModel("redstone_dust_cross").uvLock() .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() .u().uv(0, 0, 16, 16).tint().noCull() .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() @@ -263,7 +263,7 @@ public class BlockRedstoneWire extends Block .rotate(rot ? ModelRotation.X0_Y90 : ModelRotation.X0_Y0); } private static Model redstone_unusuew(ModelRotation rot) { - return ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude().uvLock() + return ModelProvider.getModelProvider().getModel("redstone_dust_cross").uvLock() .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() .u().uv(0, 0, 16, 16).tint().noCull() .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() @@ -283,7 +283,7 @@ public class BlockRedstoneWire extends Block .rotate(rot); } private static Model redstone_unuse(ModelRotation rot) { - return ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude().uvLock() + return ModelProvider.getModelProvider().getModel("redstone_dust_cross").uvLock() .add(5, 0.25f, 0, 16, 0.25f, 16).noShade() .u().uv(5, 0, 16, 16).tint().noCull() .add(5, 0.25f, 0, 16, 0.25f, 16).noShade() @@ -299,7 +299,7 @@ public class BlockRedstoneWire extends Block .rotate(rot); } private static Model redstone_nusue(ModelRotation rot) { - return ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude().uvLock() + return ModelProvider.getModelProvider().getModel("redstone_dust_cross").uvLock() .add(5, 0.25f, 0, 16, 0.25f, 16).noShade() .u().uv(5, 0, 16, 16).tint().noCull() .add(5, 0.25f, 0, 16, 0.25f, 16).noShade() @@ -315,7 +315,7 @@ public class BlockRedstoneWire extends Block .rotate(rot); } private static Model redstone_unsew(ModelRotation rot) { - return ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude().uvLock() + return ModelProvider.getModelProvider().getModel("redstone_dust_cross").uvLock() .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() .u().uv(0, 0, 16, 16).tint().noCull() .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() @@ -327,7 +327,7 @@ public class BlockRedstoneWire extends Block .rotate(rot); } private static Model redstone_unsuew(ModelRotation rot) { - return ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude().uvLock() + return ModelProvider.getModelProvider().getModel("redstone_dust_cross").uvLock() .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() .u().uv(0, 0, 16, 16).tint().noCull() .add(0, 0.25f, 0, 16, 0.25f, 16).noShade() @@ -343,7 +343,7 @@ public class BlockRedstoneWire extends Block .rotate(rot); } private static Model redstone_unsue(ModelRotation rot) { - return ModelProvider.getModelProvider().getModel("redstone_dust_cross").noOcclude().uvLock() + return ModelProvider.getModelProvider().getModel("redstone_dust_cross").uvLock() .add(5, 0.25f, 0, 16, 0.25f, 16).noShade() .u().uv(5, 0, 16, 16).tint().noCull() .add(5, 0.25f, 0, 16, 0.25f, 16).noShade() diff --git a/common/src/main/java/common/block/tech/BlockTorch.java b/common/src/main/java/common/block/tech/BlockTorch.java index eed80aa..91d82e4 100755 --- a/common/src/main/java/common/block/tech/BlockTorch.java +++ b/common/src/main/java/common/block/tech/BlockTorch.java @@ -327,7 +327,7 @@ public class BlockTorch extends Block public Model getModel(ModelProvider provider, String name, State state) { if(state.getValue(FACING) == Facing.UP) - return provider.getModel(name).noOcclude() + return provider.getModel(name) .add(7, 0, 7, 9, 10, 9).noShade() .d().uv(7, 13, 9, 15).noCull() .u().uv(7, 6, 9, 8).noCull() @@ -338,7 +338,7 @@ public class BlockTorch extends Block .n().uv(0, 0, 16, 16).noCull() .s().uv(0, 0, 16, 16).noCull(); else - return provider.getModel(name).noOcclude() + return provider.getModel(name) .add(-1, 3.5f, 7, 1, 13.5f, 9).noShade().rotate(0, 3.5f, 8, Facing.Axis.Z, -22.5f, false) .d().uv(7, 13, 9, 15).noCull() .u().uv(7, 6, 9, 8).noCull() diff --git a/common/src/main/java/common/block/tech/BlockTripWire.java b/common/src/main/java/common/block/tech/BlockTripWire.java index 2ed4b05..8ed734d 100755 --- a/common/src/main/java/common/block/tech/BlockTripWire.java +++ b/common/src/main/java/common/block/tech/BlockTripWire.java @@ -307,7 +307,7 @@ public class BlockTripWire extends Block private static Model getModelDetached(boolean n, boolean s, boolean w, boolean e, int sides) { if(sides == 1) - return ModelProvider.getModelProvider().getModel("trip_wire").noOcclude() + return ModelProvider.getModelProvider().getModel("trip_wire") .add(7.75f, 1.5f, 0, 8.25f, 1.5f, 4).noShade() .d().uv(0, 2, 16, 0).rot(90).noCull() .u().uv(0, 0, 16, 2).rot(90).noCull() @@ -319,7 +319,7 @@ public class BlockTripWire extends Block .u().uv(0, 0, 16, 2).rot(90).noCull() .rotate(n ? ModelRotation.X0_Y0 : (s ? ModelRotation.X0_Y180 : (w ? ModelRotation.X0_Y270 : ModelRotation.X0_Y90))); else if(sides == 2 && ((e != w) || (n != s))) - return ModelProvider.getModelProvider().getModel("trip_wire").noOcclude() + return ModelProvider.getModelProvider().getModel("trip_wire") .add(7.75f, 1.5f, 0, 8.25f, 1.5f, 4).noShade() .d().uv(0, 2, 16, 0).rot(90).noCull() .u().uv(0, 0, 16, 2).rot(90).noCull() @@ -335,7 +335,7 @@ public class BlockTripWire extends Block .rotate(n && e ? ModelRotation.X0_Y0 : (s && w ? ModelRotation.X0_Y180 : (n && w ? ModelRotation.X0_Y270 : ModelRotation.X0_Y90))); else if(sides == 2) - return ModelProvider.getModelProvider().getModel("trip_wire").noOcclude() + return ModelProvider.getModelProvider().getModel("trip_wire") .add(7.75f, 1.5f, 0, 8.25f, 1.5f, 4).noShade() .d().uv(0, 2, 16, 0).rot(90).noCull() .u().uv(0, 0, 16, 2).rot(90).noCull() @@ -350,7 +350,7 @@ public class BlockTripWire extends Block .u().uv(0, 0, 16, 2).rot(90).noCull() .rotate(n ? ModelRotation.X0_Y0 : ModelRotation.X0_Y90); else if(sides == 3) - return ModelProvider.getModelProvider().getModel("trip_wire").noOcclude() + return ModelProvider.getModelProvider().getModel("trip_wire") .add(7.75f, 1.5f, 0, 8.25f, 1.5f, 4).noShade() .d().uv(0, 2, 16, 0).rot(90).noCull() .u().uv(0, 0, 16, 2).rot(90).noCull() @@ -371,7 +371,7 @@ public class BlockTripWire extends Block .u().uv(0, 0, 16, 2).noCull() .rotate(!w ? ModelRotation.X0_Y0 : (!e ? ModelRotation.X0_Y180 : (!s ? ModelRotation.X0_Y270 : ModelRotation.X0_Y90))); else - return ModelProvider.getModelProvider().getModel("trip_wire").noOcclude() + return ModelProvider.getModelProvider().getModel("trip_wire") .add(7.75f, 1.5f, 0, 8.25f, 1.5f, 4).noShade() .d().uv(0, 2, 16, 0).rot(90).noCull() .u().uv(0, 0, 16, 2).rot(90).noCull() @@ -400,7 +400,7 @@ public class BlockTripWire extends Block private static Model getModelAttached(boolean n, boolean s, boolean w, boolean e, int sides) { if(sides == 1) - return ModelProvider.getModelProvider().getModel("trip_wire").noOcclude() + return ModelProvider.getModelProvider().getModel("trip_wire") .add(7.75f, 1.5f, 0, 8.25f, 1.5f, 4).noShade() .d().uv(0, 4, 16, 2).rot(90).noCull() .u().uv(0, 2, 16, 4).rot(90).noCull() @@ -412,7 +412,7 @@ public class BlockTripWire extends Block .u().uv(0, 2, 16, 4).rot(90).noCull() .rotate(n ? ModelRotation.X0_Y0 : (s ? ModelRotation.X0_Y180 : (w ? ModelRotation.X0_Y270 : ModelRotation.X0_Y90))); else if(sides == 2 && ((e != w) || (n != s))) - return ModelProvider.getModelProvider().getModel("trip_wire").noOcclude() + return ModelProvider.getModelProvider().getModel("trip_wire") .add(7.75f, 1.5f, 0, 8.25f, 1.5f, 4).noShade() .d().uv(0, 4, 16, 2).rot(90).noCull() .u().uv(0, 2, 16, 4).rot(90).noCull() @@ -428,7 +428,7 @@ public class BlockTripWire extends Block .rotate(n && e ? ModelRotation.X0_Y0 : (s && w ? ModelRotation.X0_Y180 : (n && w ? ModelRotation.X0_Y270 : ModelRotation.X0_Y90))); else if(sides == 2) - return ModelProvider.getModelProvider().getModel("trip_wire").noOcclude() + return ModelProvider.getModelProvider().getModel("trip_wire") .add(7.75f, 1.5f, 0, 8.25f, 1.5f, 4).noShade() .d().uv(0, 4, 16, 2).rot(90).noCull() .u().uv(0, 2, 16, 4).rot(90).noCull() @@ -443,7 +443,7 @@ public class BlockTripWire extends Block .u().uv(0, 2, 16, 4).rot(90).noCull() .rotate(n ? ModelRotation.X0_Y0 : ModelRotation.X0_Y90); else if(sides == 3) - return ModelProvider.getModelProvider().getModel("trip_wire").noOcclude() + return ModelProvider.getModelProvider().getModel("trip_wire") .add(7.75f, 1.5f, 0, 8.25f, 1.5f, 4).noShade() .d().uv(0, 4, 16, 2).rot(90).noCull() .u().uv(0, 2, 16, 4).rot(90).noCull() @@ -464,7 +464,7 @@ public class BlockTripWire extends Block .u().uv(0, 2, 16, 4).noCull() .rotate(!w ? ModelRotation.X0_Y0 : (!e ? ModelRotation.X0_Y180 : (!s ? ModelRotation.X0_Y270 : ModelRotation.X0_Y90))); else - return ModelProvider.getModelProvider().getModel("trip_wire").noOcclude() + return ModelProvider.getModelProvider().getModel("trip_wire") .add(7.75f, 1.5f, 0, 8.25f, 1.5f, 4).noShade() .d().uv(0, 4, 16, 2).rot(90).noCull() .u().uv(0, 2, 16, 4).rot(90).noCull() @@ -493,7 +493,7 @@ public class BlockTripWire extends Block private static Model getModelDetSuspend(boolean n, boolean s, boolean w, boolean e, int sides) { if(sides == 1) - return ModelProvider.getModelProvider().getModel("trip_wire").noOcclude() + return ModelProvider.getModelProvider().getModel("trip_wire") .add(7.75f, 3.5f, 0, 8.25f, 3.5f, 4).noShade() .d().uv(0, 2, 16, 0).rot(90).noCull() .u().uv(0, 0, 16, 2).rot(90).noCull() @@ -505,7 +505,7 @@ public class BlockTripWire extends Block .u().uv(0, 0, 16, 2).rot(90).noCull() .rotate(n ? ModelRotation.X0_Y0 : (s ? ModelRotation.X0_Y180 : (w ? ModelRotation.X0_Y270 : ModelRotation.X0_Y90))); else if(sides == 2 && ((e != w) || (n != s))) - return ModelProvider.getModelProvider().getModel("trip_wire").noOcclude() + return ModelProvider.getModelProvider().getModel("trip_wire") .add(7.75f, 3.5f, 0, 8.25f, 3.5f, 4).noShade() .d().uv(0, 2, 16, 0).rot(90).noCull() .u().uv(0, 0, 16, 2).rot(90).noCull() @@ -521,7 +521,7 @@ public class BlockTripWire extends Block .rotate(n && e ? ModelRotation.X0_Y0 : (s && w ? ModelRotation.X0_Y180 : (n && w ? ModelRotation.X0_Y270 : ModelRotation.X0_Y90))); else if(sides == 2) - return ModelProvider.getModelProvider().getModel("trip_wire").noOcclude() + return ModelProvider.getModelProvider().getModel("trip_wire") .add(7.75f, 3.5f, 0, 8.25f, 3.5f, 4).noShade() .d().uv(0, 2, 16, 0).rot(90).noCull() .u().uv(0, 0, 16, 2).rot(90).noCull() @@ -536,7 +536,7 @@ public class BlockTripWire extends Block .u().uv(0, 0, 16, 2).rot(90).noCull() .rotate(n ? ModelRotation.X0_Y0 : ModelRotation.X0_Y90); else if(sides == 3) - return ModelProvider.getModelProvider().getModel("trip_wire").noOcclude() + return ModelProvider.getModelProvider().getModel("trip_wire") .add(7.75f, 3.5f, 0, 8.25f, 3.5f, 4).noShade() .d().uv(0, 2, 16, 0).rot(90).noCull() .u().uv(0, 0, 16, 2).rot(90).noCull() @@ -557,7 +557,7 @@ public class BlockTripWire extends Block .u().uv(0, 0, 16, 2).noCull() .rotate(!w ? ModelRotation.X0_Y0 : (!e ? ModelRotation.X0_Y180 : (!s ? ModelRotation.X0_Y270 : ModelRotation.X0_Y90))); else - return ModelProvider.getModelProvider().getModel("trip_wire").noOcclude() + return ModelProvider.getModelProvider().getModel("trip_wire") .add(7.75f, 3.5f, 0, 8.25f, 3.5f, 4).noShade() .d().uv(0, 2, 16, 0).rot(90).noCull() .u().uv(0, 0, 16, 2).rot(90).noCull() @@ -586,7 +586,7 @@ public class BlockTripWire extends Block private static Model getModelAttSuspend(boolean n, boolean s, boolean w, boolean e, int sides) { if(sides == 1) - return ModelProvider.getModelProvider().getModel("trip_wire").noOcclude() + return ModelProvider.getModelProvider().getModel("trip_wire") .add(7.75f, 3.5f, 0, 8.25f, 3.5f, 4).noShade() .d().uv(0, 4, 16, 2).rot(90).noCull() .u().uv(0, 2, 16, 4).rot(90).noCull() @@ -598,7 +598,7 @@ public class BlockTripWire extends Block .u().uv(0, 2, 16, 4).rot(90).noCull() .rotate(n ? ModelRotation.X0_Y0 : (s ? ModelRotation.X0_Y180 : (w ? ModelRotation.X0_Y270 : ModelRotation.X0_Y90))); else if(sides == 2 && ((e != w) || (n != s))) - return ModelProvider.getModelProvider().getModel("trip_wire").noOcclude() + return ModelProvider.getModelProvider().getModel("trip_wire") .add(7.75f, 3.5f, 0, 8.25f, 3.5f, 4).noShade() .d().uv(0, 4, 16, 2).rot(90).noCull() .u().uv(0, 2, 16, 4).rot(90).noCull() @@ -614,7 +614,7 @@ public class BlockTripWire extends Block .rotate(n && e ? ModelRotation.X0_Y0 : (s && w ? ModelRotation.X0_Y180 : (n && w ? ModelRotation.X0_Y270 : ModelRotation.X0_Y90))); else if(sides == 2) - return ModelProvider.getModelProvider().getModel("trip_wire").noOcclude() + return ModelProvider.getModelProvider().getModel("trip_wire") .add(7.75f, 3.5f, 0, 8.25f, 3.5f, 4).noShade() .d().uv(0, 4, 16, 2).rot(90).noCull() .u().uv(0, 2, 16, 4).rot(90).noCull() @@ -629,7 +629,7 @@ public class BlockTripWire extends Block .u().uv(0, 2, 16, 4).rot(90).noCull() .rotate(n ? ModelRotation.X0_Y0 : ModelRotation.X0_Y90); else if(sides == 3) - return ModelProvider.getModelProvider().getModel("trip_wire").noOcclude() + return ModelProvider.getModelProvider().getModel("trip_wire") .add(7.75f, 3.5f, 0, 8.25f, 3.5f, 4).noShade() .d().uv(0, 4, 16, 2).rot(90).noCull() .u().uv(0, 2, 16, 4).rot(90).noCull() @@ -650,7 +650,7 @@ public class BlockTripWire extends Block .u().uv(0, 2, 16, 4).noCull() .rotate(!w ? ModelRotation.X0_Y0 : (!e ? ModelRotation.X0_Y180 : (!s ? ModelRotation.X0_Y270 : ModelRotation.X0_Y90))); else - return ModelProvider.getModelProvider().getModel("trip_wire").noOcclude() + return ModelProvider.getModelProvider().getModel("trip_wire") .add(7.75f, 3.5f, 0, 8.25f, 3.5f, 4).noShade() .d().uv(0, 4, 16, 2).rot(90).noCull() .u().uv(0, 2, 16, 4).rot(90).noCull() diff --git a/common/src/main/java/common/item/ItemFence.java b/common/src/main/java/common/item/ItemFence.java index 007ce6b..cd6c5c0 100755 --- a/common/src/main/java/common/item/ItemFence.java +++ b/common/src/main/java/common/item/ItemFence.java @@ -11,7 +11,7 @@ public class ItemFence extends ItemBlock { } public Model getModel(ModelProvider provider, String name, int meta) { - return provider.getModel(provider.getModel(((BlockFence)this.block).getTexture()).noOcclude() + return provider.getModel(provider.getModel(((BlockFence)this.block).getTexture()) .add(6, 0, 0, 10, 16, 4) .d().uv(6, 0, 10, 4) .u().uv(6, 0, 10, 4).noCull() diff --git a/common/src/main/java/common/item/ItemWall.java b/common/src/main/java/common/item/ItemWall.java index fbb0276..9e138fd 100755 --- a/common/src/main/java/common/item/ItemWall.java +++ b/common/src/main/java/common/item/ItemWall.java @@ -14,7 +14,7 @@ public class ItemWall extends ItemMultiTexture { public Model getModel(ModelProvider provider, String name, int meta) { return provider.getModel( - provider.getModel(this.block.getStateFromMeta(this.getMetadata(meta)).getValue(BlockWall.VARIANT).getName()).noOcclude() + provider.getModel(this.block.getStateFromMeta(this.getMetadata(meta)).getValue(BlockWall.VARIANT).getName()) .add(4, 0, 4, 12, 16, 12) .d().uv(4, 4, 12, 12) .u().uv(4, 4, 12, 12).noCull() diff --git a/common/src/main/java/common/model/Model.java b/common/src/main/java/common/model/Model.java index 8affcad..ba446c8 100644 --- a/common/src/main/java/common/model/Model.java +++ b/common/src/main/java/common/model/Model.java @@ -3,7 +3,6 @@ package common.model; import common.util.Facing; public abstract class Model { - public abstract Model noOcclude(); public abstract Model uvLock(); public abstract Model rotate(ModelRotation rot); public abstract Model add(float x1, float y1, float z1, float x2, float y2, float z2); @@ -42,7 +41,7 @@ public abstract class Model { } public Model cross() { - return this.noOcclude() + return this .add(0.8f, 0f, 8f, 15.2f, 16f, 8f).noShade().rotate(8, 8, 8, Facing.Axis.Y, 45, true) .ns().uv(0, 0, 16, 16).noCull() .add(8f, 0f, 0.8f, 8f, 16f, 15.2f).noShade().rotate(8, 8, 8, Facing.Axis.Y, 45, true) @@ -50,7 +49,7 @@ public abstract class Model { } public Model crossTint() { - return this.noOcclude() + return this .add(0.8f, 0f, 8f, 15.2f, 16f, 8f).noShade().rotate(8, 8, 8, Facing.Axis.Y, 45, true) .ns().uv(0, 0, 16, 16).noCull().tint() .add(8f, 0f, 0.8f, 8f, 16f, 15.2f).noShade().rotate(8, 8, 8, Facing.Axis.Y, 45, true) diff --git a/common/src/main/java/common/model/ModelProvider.java b/common/src/main/java/common/model/ModelProvider.java index f4cb0bf..4cf3877 100644 --- a/common/src/main/java/common/model/ModelProvider.java +++ b/common/src/main/java/common/model/ModelProvider.java @@ -10,10 +10,6 @@ public interface ModelProvider { Model getEntityModel(); public static class DummyModel extends Model { - public Model noOcclude() { - return this; - } - public Model uvLock() { return this; } diff --git a/common/src/main/java/common/util/ClassInheritanceMultiMap.java b/common/src/main/java/common/util/InheritanceMultiMap.java similarity index 93% rename from common/src/main/java/common/util/ClassInheritanceMultiMap.java rename to common/src/main/java/common/util/InheritanceMultiMap.java index 78b03ec..49e336e 100755 --- a/common/src/main/java/common/util/ClassInheritanceMultiMap.java +++ b/common/src/main/java/common/util/InheritanceMultiMap.java @@ -12,7 +12,7 @@ import common.collect.Iterators; import common.collect.Lists; import common.collect.Maps; -public class ClassInheritanceMultiMap extends AbstractSet +public class InheritanceMultiMap extends AbstractSet { private static final Set < Class> CLASSES = Collections.newSetFromMap(new ConcurrentHashMap, Boolean>()); // fix exception @@ -21,7 +21,7 @@ public class ClassInheritanceMultiMap extends AbstractSet private final Class baseClass; private final List values = Lists.newArrayList(); - public ClassInheritanceMultiMap(Class baseClassIn) + public InheritanceMultiMap(Class baseClassIn) { this.baseClass = baseClassIn; this.knownKeys.add(baseClassIn); @@ -124,7 +124,7 @@ public class ClassInheritanceMultiMap extends AbstractSet { public Iterator iterator() { - List list = (List)ClassInheritanceMultiMap.this.map.get(ClassInheritanceMultiMap.this.initializeClassLookup(clazz)); + List list = (List)InheritanceMultiMap.this.map.get(InheritanceMultiMap.this.initializeClassLookup(clazz)); if (list == null) { diff --git a/common/src/main/java/common/util/LazyLoadBase.java b/common/src/main/java/common/util/LazyLoader.java similarity index 88% rename from common/src/main/java/common/util/LazyLoadBase.java rename to common/src/main/java/common/util/LazyLoader.java index 11e3858..2e6801e 100755 --- a/common/src/main/java/common/util/LazyLoadBase.java +++ b/common/src/main/java/common/util/LazyLoader.java @@ -1,6 +1,6 @@ package common.util; -public abstract class LazyLoadBase +public abstract class LazyLoader { private T value; private boolean isLoaded = false; diff --git a/common/src/main/java/common/world/Chunk.java b/common/src/main/java/common/world/Chunk.java index c70a379..2f05337 100755 --- a/common/src/main/java/common/world/Chunk.java +++ b/common/src/main/java/common/world/Chunk.java @@ -18,7 +18,7 @@ import common.log.Log; import common.tileentity.TileEntity; import common.util.BlockPos; import common.util.BoundingBox; -import common.util.ClassInheritanceMultiMap; +import common.util.InheritanceMultiMap; import common.util.ExtMath; import common.util.Facing; import common.util.IntHashMap; @@ -36,7 +36,7 @@ public abstract class Chunk { protected final boolean[] updateSky = new boolean[256]; protected final int[] height = new int[256]; protected final Map tiles = Maps.newHashMap(); - protected final ClassInheritanceMultiMap[] entities = new ClassInheritanceMultiMap[32]; + protected final InheritanceMultiMap[] entities = new InheritanceMultiMap[32]; protected final ConcurrentLinkedQueue tileQueue = new ConcurrentLinkedQueue(); protected boolean loaded; @@ -58,7 +58,7 @@ public abstract class Chunk { this.filler = world.dimension.getFiller(); this.fillerBlock = this.filler.getBlock(); for(int y = 0; y < this.entities.length; ++y) { - this.entities[y] = new ClassInheritanceMultiMap(Entity.class); + this.entities[y] = new InheritanceMultiMap(Entity.class); } Arrays.fill(this.precHeight, -99999999); Arrays.fill(this.biomes, (byte)-1); @@ -837,7 +837,7 @@ public abstract class Chunk { return this.loaded; } - public ClassInheritanceMultiMap[] getEntities() { + public InheritanceMultiMap[] getEntities() { return this.entities; } diff --git a/server/src/main/java/server/Server.java b/server/src/main/java/server/Server.java index 4e719f1..8dd097c 100755 --- a/server/src/main/java/server/Server.java +++ b/server/src/main/java/server/Server.java @@ -84,7 +84,7 @@ import common.tags.TagObject; import common.util.BlockPos; import common.util.EncryptUtil; import common.util.ExtMath; -import common.util.LazyLoadBase; +import common.util.LazyLoader; import common.util.PortalType; import common.util.Position; import common.util.Util; @@ -103,7 +103,7 @@ import server.world.Region; import server.world.WorldServer; public final class Server implements IThreadListener { - private static final LazyLoadBase SERVER_NIO_EVENTLOOP = new LazyLoadBase() { + private static final LazyLoader SERVER_NIO_EVENTLOOP = new LazyLoader() { protected NioEventLoopGroup load() { return new NioEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Server IO #%d").setDaemon(true).build()); } diff --git a/common/src/main/java/common/util/NextTickListEntry.java b/server/src/main/java/server/world/NextTickListEntry.java similarity index 97% rename from common/src/main/java/common/util/NextTickListEntry.java rename to server/src/main/java/server/world/NextTickListEntry.java index 6f492ad..76ee322 100755 --- a/common/src/main/java/common/util/NextTickListEntry.java +++ b/server/src/main/java/server/world/NextTickListEntry.java @@ -1,7 +1,8 @@ -package common.util; +package server.world; import common.block.Block; import common.init.BlockRegistry; +import common.util.BlockPos; public class NextTickListEntry implements Comparable { diff --git a/server/src/main/java/server/world/Region.java b/server/src/main/java/server/world/Region.java index b2da029..e54ad34 100755 --- a/server/src/main/java/server/world/Region.java +++ b/server/src/main/java/server/world/Region.java @@ -28,7 +28,6 @@ import common.log.Log; import common.tags.TagObject; import common.tileentity.TileEntity; import common.util.BlockPos; -import common.util.NextTickListEntry; import common.util.NibbleArray; import common.util.Util; import common.world.BlockArray; diff --git a/server/src/main/java/server/world/WorldServer.java b/server/src/main/java/server/world/WorldServer.java index 95c33d2..a03eaef 100755 --- a/server/src/main/java/server/world/WorldServer.java +++ b/server/src/main/java/server/world/WorldServer.java @@ -64,7 +64,6 @@ import common.util.ChunkPos; import common.util.ExtMath; import common.util.IntHashMap; import common.util.LongHashMap; -import common.util.NextTickListEntry; import common.util.PortalType; import common.util.Position; import common.util.Vec3;