From b001c0813aa5bbd61cc2877debb7d57a5a2315cf Mon Sep 17 00:00:00 2001 From: Treetrain1 Date: Wed, 17 Aug 2022 02:53:23 -0500 Subject: [PATCH 1/6] fix oak hollowed log rendering --- src/main/java/net/frozenblock/wilderwild/WilderWildClient.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/frozenblock/wilderwild/WilderWildClient.java b/src/main/java/net/frozenblock/wilderwild/WilderWildClient.java index 9f73e5d9ee..8c1c808a06 100644 --- a/src/main/java/net/frozenblock/wilderwild/WilderWildClient.java +++ b/src/main/java/net/frozenblock/wilderwild/WilderWildClient.java @@ -88,6 +88,7 @@ public void onInitializeClient() { BlockRenderLayerMap.INSTANCE.putBlock(RegisterBlocks.HOLLOWED_DARK_OAK_LOG, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(RegisterBlocks.HOLLOWED_JUNGLE_LOG, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(RegisterBlocks.HOLLOWED_MANGROVE_LOG, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(RegisterBlocks.HOLLOWED_OAK_LOG, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(RegisterBlocks.HOLLOWED_SPRUCE_LOG, RenderLayer.getCutout()); ClientSpriteRegistryCallback.event(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE).register((((atlasTexture, registry) -> { From a84da3404b90603d43b1ea7d844bdb11bc0502f0 Mon Sep 17 00:00:00 2001 From: Treetrain1 Date: Wed, 20 Jul 2022 01:36:15 -0500 Subject: [PATCH 2/6] dependencies --- src/main/resources/fabric.mod.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index caa929c529..87ac1d901b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -45,10 +45,7 @@ "mm": ">=2.3", "fabricloader": ">=0.14.8", "fabric": ">=0.58.5", - "minecraft": [ - "1.19.1", - "1.19.2" - ], + "minecraft": ">=1.19.1", "java": ">=17" }, "breaks": { From ab8767cc3dd24c98c454e316c32f1cf7dcfe90dd Mon Sep 17 00:00:00 2001 From: Treetrain1 Date: Wed, 17 Aug 2022 07:29:01 -0500 Subject: [PATCH 3/6] algae + private static --- .../wilderwild/WilderWildClient.java | 20 +++++++++---------- .../mixin/server/BoneMealItemMixin.java | 2 +- .../mixin/server/SculkBlockMixin.java | 10 +++++++--- .../server/SculkSpreadManagerCursorMixin.java | 2 +- .../wilderwild/mixin/server/SlimeMixin.java | 6 +++--- .../mixin/server/SonicBoomTaskMixin.java | 2 +- .../registry/RegisterLootTables.java | 2 +- 7 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/main/java/net/frozenblock/wilderwild/WilderWildClient.java b/src/main/java/net/frozenblock/wilderwild/WilderWildClient.java index 8c1c808a06..0b75a790e2 100644 --- a/src/main/java/net/frozenblock/wilderwild/WilderWildClient.java +++ b/src/main/java/net/frozenblock/wilderwild/WilderWildClient.java @@ -173,7 +173,7 @@ public void onInitializeClient() { } - public void receiveAncientHornProjectilePacket() { + private static void receiveAncientHornProjectilePacket() { ClientPlayNetworking.registerGlobalReceiver(WilderWild.HORN_PROJECTILE_PACKET_ID, (ctx, handler, byteBuf, responseSender) -> { EntityType et = Registry.ENTITY_TYPE.get(byteBuf.readVarInt()); UUID uuid = byteBuf.readUuid(); @@ -200,7 +200,7 @@ public void receiveAncientHornProjectilePacket() { }); } - public void receiveEasyEchoerBubblePacket() { + private static void receiveEasyEchoerBubblePacket() { ClientPlayNetworking.registerGlobalReceiver(WilderWild.FLOATING_SCULK_BUBBLE_PACKET, (ctx, handler, byteBuf, responseSender) -> { Vec3d pos = new Vec3d(byteBuf.readDouble(), byteBuf.readDouble(), byteBuf.readDouble()); int size = byteBuf.readVarInt(); @@ -217,7 +217,7 @@ public void receiveEasyEchoerBubblePacket() { }); } - public void receiveSeedPacket() { + private static void receiveSeedPacket() { ClientPlayNetworking.registerGlobalReceiver(WilderWild.SEED_PACKET, (ctx, handler, byteBuf, responseSender) -> { Vec3d pos = new Vec3d(byteBuf.readDouble(), byteBuf.readDouble(), byteBuf.readDouble()); int count = byteBuf.readVarInt(); @@ -232,7 +232,7 @@ public void receiveSeedPacket() { }); } - public void receiveControlledSeedPacket() { + private static void receiveControlledSeedPacket() { ClientPlayNetworking.registerGlobalReceiver(WilderWild.CONTROLLED_SEED_PACKET, (ctx, handler, byteBuf, responseSender) -> { Vec3d pos = new Vec3d(byteBuf.readDouble(), byteBuf.readDouble(), byteBuf.readDouble()); double velx = byteBuf.readDouble(); @@ -250,7 +250,7 @@ public void receiveControlledSeedPacket() { }); } - public void receiveTermitePacket() { + private static void receiveTermitePacket() { ClientPlayNetworking.registerGlobalReceiver(WilderWild.TERMITE_PARTICLE_PACKET, (ctx, handler, byteBuf, responseSender) -> { Vec3d pos = new Vec3d(byteBuf.readDouble(), byteBuf.readDouble(), byteBuf.readDouble()); int count = byteBuf.readVarInt(); @@ -264,7 +264,7 @@ public void receiveTermitePacket() { }); } - public void receiveSensorHiccupPacket() { + private static void receiveSensorHiccupPacket() { ClientPlayNetworking.registerGlobalReceiver(WilderWild.SENSOR_HICCUP_PACKET, (ctx, handler, byteBuf, responseSender) -> { Vec3d pos = new Vec3d(byteBuf.readDouble(), byteBuf.readDouble(), byteBuf.readDouble()); ctx.execute(() -> { @@ -283,7 +283,7 @@ public void receiveSensorHiccupPacket() { }); } - public void receiveFireflyCaptureInfoPacket() { + private static void receiveFireflyCaptureInfoPacket() { ClientPlayNetworking.registerGlobalReceiver(WilderWild.CAPTURE_FIREFLY_NOTIFY_PACKET, (ctx, handler, byteBuf, responseSender) -> { boolean creative = byteBuf.readBoolean(); boolean natural = byteBuf.readBoolean(); @@ -295,7 +295,7 @@ public void receiveFireflyCaptureInfoPacket() { }); } - public void receiveAncientHornKillInfoPacket() { + private static void receiveAncientHornKillInfoPacket() { ClientPlayNetworking.registerGlobalReceiver(WilderWild.ANCIENT_HORN_KILL_NOTIFY_PACKET, (ctx, handler, byteBuf, responseSender) -> { boolean creative = byteBuf.readBoolean(); boolean natural = byteBuf.readBoolean(); @@ -307,7 +307,7 @@ public void receiveAncientHornKillInfoPacket() { }); } - public void receiveMovingLoopingSoundPacket() { + private static void receiveMovingLoopingSoundPacket() { ClientPlayNetworking.registerGlobalReceiver(WilderWild.MOVING_LOOPING_SOUND_PACKET, (ctx, handler, byteBuf, responseSender) -> { int id = byteBuf.readVarInt(); SoundEvent sound = byteBuf.readRegistryValue(Registry.SOUND_EVENT); @@ -331,7 +331,7 @@ public void receiveMovingLoopingSoundPacket() { }); } - public void receiveFlybySoundPacket() { + private static void receiveFlybySoundPacket() { ClientPlayNetworking.registerGlobalReceiver(WilderWild.FLYBY_SOUND_PACKET, (ctx, handler, byteBuf, responseSender) -> { int id = byteBuf.readVarInt(); SoundEvent sound = byteBuf.readRegistryValue(Registry.SOUND_EVENT); diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/server/BoneMealItemMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/server/BoneMealItemMixin.java index 95e6a7c196..d847f63670 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/server/BoneMealItemMixin.java +++ b/src/main/java/net/frozenblock/wilderwild/mixin/server/BoneMealItemMixin.java @@ -56,7 +56,7 @@ public void useOnBlock(ItemUsageContext context, CallbackInfoReturnable var4 = BlockPos.iterate(pos.add(-4, 0, -4), pos.add(4, 2, 4)).iterator(); diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/server/SculkSpreadManagerCursorMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/server/SculkSpreadManagerCursorMixin.java index 272a80494a..342816e4bd 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/server/SculkSpreadManagerCursorMixin.java +++ b/src/main/java/net/frozenblock/wilderwild/mixin/server/SculkSpreadManagerCursorMixin.java @@ -32,7 +32,7 @@ public class SculkSpreadManagerCursorMixin { @Final @Shadow - private static final ObjectArrayList OFFSETS = Util.make(new ObjectArrayList<>(18), (objectArrayList) -> { + private static ObjectArrayList OFFSETS = Util.make(new ObjectArrayList<>(18), (objectArrayList) -> { Stream var10000 = BlockPos.stream(new BlockPos(-1, -1, -1), new BlockPos(1, 1, 1)).filter((pos) -> { return (pos.getX() == 0 || pos.getY() == 0 || pos.getZ() == 0) && !pos.equals(BlockPos.ORIGIN); }).map(BlockPos::toImmutable); diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/server/SlimeMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/server/SlimeMixin.java index 517929499c..44b7425754 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/server/SlimeMixin.java +++ b/src/main/java/net/frozenblock/wilderwild/mixin/server/SlimeMixin.java @@ -28,7 +28,7 @@ private static void canSpawn(EntityType type, WorldAccess world, Sp //if (world.getBiome(pos).isIn(WilderBiomeTags.SLIMES_SPAWN_ON_FLOATING_MOSS)) { if (world.getLightLevel(LightType.BLOCK, pos) < random.nextInt(8)) { boolean test = spawnReason == SpawnReason.SPAWNER || random.nextInt(5) == 0; - if (test && isFloatingMossNearby(world, pos, 1)) { + if (test && isAlgaeNearby(world, pos, 1)) { info.setReturnValue(true); info.cancel(); } @@ -36,7 +36,7 @@ private static void canSpawn(EntityType type, WorldAccess world, Sp } } - private static boolean isFloatingMossNearby(WorldAccess world, BlockPos blockPos, int x) { + private static boolean isAlgaeNearby(WorldAccess world, BlockPos blockPos, int x) { Iterator iterator = BlockPos.iterate(blockPos.add(-x, -x, -x), blockPos.add(x, x, x)).iterator(); int count = 0; BlockPos pos; @@ -54,7 +54,7 @@ private static boolean isFloatingMossNearby(WorldAccess world, BlockPos blockPos @Override public boolean canSpawn(WorldView world) { - return (!world.containsFluid(this.getBoundingBox()) || isFloatingMossNearby(this.getWorld(), this.getBlockPos(), 1)) && world.doesNotIntersectEntities(this); + return (!world.containsFluid(this.getBoundingBox()) || isAlgaeNearby(this.getWorld(), this.getBlockPos(), 1)) && world.doesNotIntersectEntities(this); } } diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/server/SonicBoomTaskMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/server/SonicBoomTaskMixin.java index 3a3cbf8ccd..6b87d2b540 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/server/SonicBoomTaskMixin.java +++ b/src/main/java/net/frozenblock/wilderwild/mixin/server/SonicBoomTaskMixin.java @@ -32,7 +32,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -@Mixin(SonicBoomTask.class) +@Mixin(value = SonicBoomTask.class, priority = 1001) public class SonicBoomTaskMixin { @Final @Shadow diff --git a/src/main/java/net/frozenblock/wilderwild/registry/RegisterLootTables.java b/src/main/java/net/frozenblock/wilderwild/registry/RegisterLootTables.java index 721b8ce9c7..3b6e1af983 100644 --- a/src/main/java/net/frozenblock/wilderwild/registry/RegisterLootTables.java +++ b/src/main/java/net/frozenblock/wilderwild/registry/RegisterLootTables.java @@ -20,7 +20,7 @@ public static void init() { tableBuilder.pool(pool); } }); - //FLOATING MOSS + //ALGAE LootTableEvents.MODIFY.register((resourceManager, lootManager, id, tableBuilder, source) -> { if (LootTables.SHIPWRECK_SUPPLY_CHEST.equals(id) && source.isBuiltin()) { LootPool.Builder pool = LootPool.builder() From 66a0bc8661b0bc23ec6a117373e6aace6dce712b Mon Sep 17 00:00:00 2001 From: Treetrain1 Date: Wed, 17 Aug 2022 08:52:23 -0500 Subject: [PATCH 4/6] sculk --- .../server/SculkSpreadManagerCursorMixin.java | 38 +++++++------------ 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/server/SculkSpreadManagerCursorMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/server/SculkSpreadManagerCursorMixin.java index 342816e4bd..f35442a72f 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/server/SculkSpreadManagerCursorMixin.java +++ b/src/main/java/net/frozenblock/wilderwild/mixin/server/SculkSpreadManagerCursorMixin.java @@ -28,7 +28,7 @@ import java.util.stream.Stream; @Mixin(SculkSpreadManager.Cursor.class) -public class SculkSpreadManagerCursorMixin { +public abstract class SculkSpreadManagerCursorMixin { @Final @Shadow @@ -100,17 +100,10 @@ public void spread(WorldAccess world, BlockPos pos, Random random, SculkSpreadMa } private static SculkSpreadable getSpreadableNew(BlockState state, boolean isWorldGen) { - Block var2 = state.getBlock(); - SculkSpreadable var10000; - if (var2 instanceof SculkSpreadable) { - var10000 = (SculkSpreadable) var2; - } else if (isWorldGen && (state.isIn(WilderBlockTags.SCULK_WALL_REPLACEABLE_WORLDGEN) || state.isIn(WilderBlockTags.SCULK_SLAB_REPLACEABLE_WORLDGEN) || state.isIn(WilderBlockTags.SCULK_STAIR_REPLACEABLE_WORLDGEN))) { - var10000 = new WilderSculkSpreader(); - } else { - var10000 = SculkSpreadable.VEIN_ONLY_SPREADER; + if (isWorldGen && (state.isIn(WilderBlockTags.SCULK_WALL_REPLACEABLE_WORLDGEN) || state.isIn(WilderBlockTags.SCULK_SLAB_REPLACEABLE_WORLDGEN) || state.isIn(WilderBlockTags.SCULK_STAIR_REPLACEABLE_WORLDGEN))) { + return new WilderSculkSpreader(); } - - return var10000; + return getSpreadable(state); } @Shadow @@ -127,32 +120,22 @@ private boolean canSpread(WorldAccess world, BlockPos pos, boolean worldGen) { } private static boolean canSpreadNew(WorldAccess world, BlockPos sourcePos, BlockPos targetPos) { - if (sourcePos.getManhattanDistance(targetPos) == 1) { - return true; - } else { + if (sourcePos.getManhattanDistance(targetPos) != 1) { BlockState cheatState = world.getBlockState(targetPos); if (cheatState.isIn(WilderBlockTags.SCULK_STAIR_REPLACEABLE_WORLDGEN) || cheatState.isIn(WilderBlockTags.SCULK_WALL_REPLACEABLE_WORLDGEN) || cheatState.isIn(WilderBlockTags.SCULK_SLAB_REPLACEABLE_WORLDGEN)) { return true; } - BlockPos blockPos = targetPos.subtract(sourcePos); - Direction direction = Direction.from(Direction.Axis.X, blockPos.getX() < 0 ? Direction.AxisDirection.NEGATIVE : Direction.AxisDirection.POSITIVE); - Direction direction2 = Direction.from(Direction.Axis.Y, blockPos.getY() < 0 ? Direction.AxisDirection.NEGATIVE : Direction.AxisDirection.POSITIVE); - Direction direction3 = Direction.from(Direction.Axis.Z, blockPos.getZ() < 0 ? Direction.AxisDirection.NEGATIVE : Direction.AxisDirection.POSITIVE); - if (blockPos.getX() == 0) { - return canSpread(world, sourcePos, direction2) || canSpread(world, sourcePos, direction3); - } else if (blockPos.getY() == 0) { - return canSpread(world, sourcePos, direction) || canSpread(world, sourcePos, direction3); - } else { - return canSpread(world, sourcePos, direction) || canSpread(world, sourcePos, direction2); - } } + return canSpread(world, sourcePos, targetPos); } + @Shadow private static boolean canSpread(WorldAccess world, BlockPos pos, Direction direction) { BlockPos blockPos = pos.offset(direction); return !world.getBlockState(blockPos).isSideSolidFullSquare(world, blockPos, direction.getOpposite()); } + @Shadow private static SculkSpreadable getSpreadable(BlockState state) { Block var2 = state.getBlock(); SculkSpreadable var10000; @@ -170,6 +153,11 @@ private static List shuffleOffsets(Random random) { return Util.copyShuffled(OFFSETS, random); } + @Shadow + private static boolean canSpread(WorldAccess world, BlockPos sourcePos, BlockPos targetPos) { + return false; + } + private static BlockPos getSpreadPosNew(WorldAccess world, BlockPos pos, Random random) { BlockPos.Mutable mutable = pos.mutableCopy(); BlockPos.Mutable mutable2 = pos.mutableCopy(); From 455a0980d911b81f29c4454fa4072dec2608e6f3 Mon Sep 17 00:00:00 2001 From: Treetrain1 Date: Wed, 17 Aug 2022 09:07:55 -0500 Subject: [PATCH 5/6] new sculk --- .../server/SculkSpreadManagerCursorMixin.java | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/server/SculkSpreadManagerCursorMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/server/SculkSpreadManagerCursorMixin.java index f35442a72f..71d57455ca 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/server/SculkSpreadManagerCursorMixin.java +++ b/src/main/java/net/frozenblock/wilderwild/mixin/server/SculkSpreadManagerCursorMixin.java @@ -21,6 +21,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import java.util.List; import java.util.Objects; @@ -75,7 +76,7 @@ public void spread(WorldAccess world, BlockPos pos, Random random, SculkSpreadMa if (this.charge <= 0) { sculkSpreadable.spreadAtSamePosition(world, blockState, this.pos, random); } else { - BlockPos blockPos = getSpreadPosNew(world, this.pos, random); + BlockPos blockPos = getSpreadPos(world, this.pos, random); if (blockPos != null) { sculkSpreadable.spreadAtSamePosition(world, blockState, this.pos, random); this.pos = blockPos.toImmutable(); @@ -129,12 +130,6 @@ private static boolean canSpreadNew(WorldAccess world, BlockPos sourcePos, Block return canSpread(world, sourcePos, targetPos); } - @Shadow - private static boolean canSpread(WorldAccess world, BlockPos pos, Direction direction) { - BlockPos blockPos = pos.offset(direction); - return !world.getBlockState(blockPos).isSideSolidFullSquare(world, blockPos, direction.getOpposite()); - } - @Shadow private static SculkSpreadable getSpreadable(BlockState state) { Block var2 = state.getBlock(); @@ -158,22 +153,34 @@ private static boolean canSpread(WorldAccess world, BlockPos sourcePos, BlockPos return false; } - private static BlockPos getSpreadPosNew(WorldAccess world, BlockPos pos, Random random) { + @Shadow + @Nullable + private static BlockPos getSpreadPos(WorldAccess world, BlockPos pos, Random random) { + return null; + } + + @Inject(method = "getSpreadPos", at = @At("HEAD"), cancellable = true) + private static void getSpreadPos(WorldAccess world, BlockPos pos, Random random, CallbackInfoReturnable cir) { BlockPos.Mutable mutable = pos.mutableCopy(); BlockPos.Mutable mutable2 = pos.mutableCopy(); + boolean canReturn = false; for (Vec3i vec3i : shuffleOffsets(random)) { mutable2.set(pos, vec3i); BlockState blockState = world.getBlockState(mutable2); boolean isInTags = blockState.isIn(WilderBlockTags.SCULK_SLAB_REPLACEABLE_WORLDGEN) || blockState.isIn(WilderBlockTags.SCULK_WALL_REPLACEABLE_WORLDGEN) || blockState.isIn(WilderBlockTags.SCULK_STAIR_REPLACEABLE_WORLDGEN); - if ((blockState.getBlock() instanceof SculkSpreadable || isInTags) && canSpreadNew(world, pos, mutable2)) { + if (isInTags && canSpreadNew(world, pos, mutable2)) { mutable.set(mutable2); + canReturn = true; if (SculkVeinBlock.veinCoversSculkReplaceable(world, blockState, mutable2)) { break; } } } - return mutable.equals(pos) ? null : mutable; + if (canReturn) { + cir.setReturnValue(mutable.equals(pos) ? null : mutable); + cir.cancel(); + } } } From a740b72ac2dad0269d6c0ba669b0b82d25a8abf4 Mon Sep 17 00:00:00 2001 From: Merp <27739930+MerpisMe@users.noreply.github.com> Date: Wed, 17 Aug 2022 14:41:21 -0700 Subject: [PATCH 6/6] Add files via upload --- .../wilderwild/models/block/template_hollowed_log.json | 6 ++++-- .../models/block/template_hollowed_log_horizontal.json | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/resources/assets/wilderwild/models/block/template_hollowed_log.json b/src/main/resources/assets/wilderwild/models/block/template_hollowed_log.json index d3796e3e8f..b86c748237 100644 --- a/src/main/resources/assets/wilderwild/models/block/template_hollowed_log.json +++ b/src/main/resources/assets/wilderwild/models/block/template_hollowed_log.json @@ -4,6 +4,7 @@ }, "elements": [ { + "name": "outer", "from": [0, 0, 0], "to": [16, 16, 16], "faces": { @@ -16,8 +17,9 @@ } }, { - "from": [13, 16, 13], - "to": [3, 0, 3], + "name": "inner", + "from": [13.01, 16.01, 13.01], + "to": [2.99, -0.01, 2.99], "faces": { "north": {"uv": [13, 16, 3, 0], "texture": "#inner"}, "east": {"uv": [13, 16, 3, 0], "texture": "#inner"}, diff --git a/src/main/resources/assets/wilderwild/models/block/template_hollowed_log_horizontal.json b/src/main/resources/assets/wilderwild/models/block/template_hollowed_log_horizontal.json index d3796e3e8f..b86c748237 100644 --- a/src/main/resources/assets/wilderwild/models/block/template_hollowed_log_horizontal.json +++ b/src/main/resources/assets/wilderwild/models/block/template_hollowed_log_horizontal.json @@ -4,6 +4,7 @@ }, "elements": [ { + "name": "outer", "from": [0, 0, 0], "to": [16, 16, 16], "faces": { @@ -16,8 +17,9 @@ } }, { - "from": [13, 16, 13], - "to": [3, 0, 3], + "name": "inner", + "from": [13.01, 16.01, 13.01], + "to": [2.99, -0.01, 2.99], "faces": { "north": {"uv": [13, 16, 3, 0], "texture": "#inner"}, "east": {"uv": [13, 16, 3, 0], "texture": "#inner"},