diff --git a/src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java b/src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java index 104f424..4cb2299 100755 --- a/src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java @@ -28,6 +28,7 @@ import net.minecraft.util.Identifier; import java.util.ArrayList; import java.util.List; +import java.util.function.Supplier; import static eu.midnightdust.motschen.decorative.util.RegistryUtil.registerFurniture; import static eu.midnightdust.motschen.decorative.util.RegistryUtil.registerGarden; @@ -71,12 +72,12 @@ public class DecorativeMain implements ModInitializer { MidnightConfig.init(MOD_ID, DecorativeConfig.class); PolymerSupport.init(); - IndoorGroup = createGroup(id("indoor"), DecorativeMain.Television); - TrafficGroup = createGroup(id("traffic"), DecorativeMain.TrafficCone); - GardenGroup = createGroup(id("garden"), LogsWithAxes.OAK_LOG_WITH_AXE); - PoolGroup = createGroup(id("pool"), Pool.BEACH_BALL_ITEM); + IndoorGroup = createGroup(id("indoor"), () -> DecorativeMain.Television); + TrafficGroup = createGroup(id("traffic"), () -> DecorativeMain.TrafficCone); + GardenGroup = createGroup(id("garden"), LogsWithAxes.TYPES::getFirst); + PoolGroup = createGroup(id("pool"), () -> Pool.BEACH_BALL_ITEM); + - BlockEntities.init(); // Traffic // registerTraffic(id("rocky_asphalt"), RockyAsphalt); @@ -111,17 +112,18 @@ public class DecorativeMain implements ModInitializer { DoubleLamps.init(); Clocks.init(); OreFeatures.init(); + BlockEntities.init(); DecorativeSoundEvents.init(); } public static Identifier id(String path) { return Identifier.of(MOD_ID, path); } - public static ItemGroup createGroup(Identifier id, ItemConvertible icon) { + public static ItemGroup createGroup(Identifier id, Supplier icon) { ItemGroup group; Text name = Text.translatable("itemGroup."+id.getNamespace()+"."+id.getPath()); //if (DecorativeConfig.polymerIntegration) { - group = PolymerItemGroupUtils.builder().displayName(name).icon(() -> new ItemStack(icon)).entries(((displayContext, entries) -> { + group = PolymerItemGroupUtils.builder().displayName(name).icon(() -> new ItemStack(icon.get())).entries(((displayContext, entries) -> { List groupItems = new ArrayList<>(); RegistryUtil.groupItems.stream().filter(itemEntry -> itemEntry.groupName() == name).forEach(itemEntry -> groupItems.add(itemEntry.stack())); entries.addAll(groupItems); diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/ChoppingLog.java b/src/main/java/eu/midnightdust/motschen/decorative/block/ChoppingLog.java index b7df087..7d9964a 100755 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/ChoppingLog.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/ChoppingLog.java @@ -57,11 +57,6 @@ public class ChoppingLog extends BlockWithEntity implements BlockEntityProvider, public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { return new ChoppingLogBlockEntity(pos, state); } - @Nullable - @Override - public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { - return validateTicker(type, BlockEntities.ChoppingLogBlockEntity, ChoppingLogBlockEntity::tick); - } @Override protected MapCodec getCodec() { diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/DigitalClock.java b/src/main/java/eu/midnightdust/motschen/decorative/block/DigitalClock.java index adb5651..8771a70 100755 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/DigitalClock.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/DigitalClock.java @@ -49,11 +49,6 @@ public class DigitalClock extends BlockWithEntity implements BlockEntityProvider public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { return new DigitalClockBlockEntity(pos, state); } - @Nullable - @Override - public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { - return validateTicker(type, BlockEntities.DigitalClockBlockEntity, DigitalClockBlockEntity::tick); - } @Override protected MapCodec getCodec() { diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/ChoppingLogBlockEntity.java b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/ChoppingLogBlockEntity.java index 5f79c47..6fb1d1a 100755 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/ChoppingLogBlockEntity.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/ChoppingLogBlockEntity.java @@ -2,51 +2,11 @@ package eu.midnightdust.motschen.decorative.block.blockentity; import eu.midnightdust.motschen.decorative.init.BlockEntities; import net.minecraft.block.BlockState; -import net.minecraft.block.HorizontalFacingBlock; import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; -import net.minecraft.world.World; public class ChoppingLogBlockEntity extends BlockEntity { - private int facing; - private double axe_x; - private double axe_z; - public ChoppingLogBlockEntity(BlockPos pos, BlockState state) { super(BlockEntities.ChoppingLogBlockEntity, pos, state); } - - public static void tick(World world, BlockPos pos, BlockState state, ChoppingLogBlockEntity blockEntity) { - if (state.get(HorizontalFacingBlock.FACING) == Direction.EAST) { - blockEntity.facing = 180; - blockEntity.axe_x = 0.2D; - blockEntity.axe_z = 0.5D; - } - else if (state.get(HorizontalFacingBlock.FACING) == Direction.SOUTH) { - blockEntity.facing = 90; - blockEntity.axe_x = 0.5D; - blockEntity.axe_z = 0.2D; - } - else if (state.get(HorizontalFacingBlock.FACING) == Direction.WEST) { - blockEntity.facing = 0; - blockEntity.axe_x = 0.8D; - blockEntity.axe_z = 0.5D; - } - else { - blockEntity.facing = 270; - blockEntity.axe_x = 0.5D; - blockEntity.axe_z = 0.8D; - } - } - - public int getFacing() { - return facing; - } - public double getAxeX() { - return axe_x; - } - public double getAxeZ() { - return axe_z; - } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/DigitalClockBlockEntity.java b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/DigitalClockBlockEntity.java index c5ef744..a477b36 100755 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/DigitalClockBlockEntity.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/DigitalClockBlockEntity.java @@ -2,62 +2,11 @@ package eu.midnightdust.motschen.decorative.block.blockentity; import eu.midnightdust.motschen.decorative.init.BlockEntities; import net.minecraft.block.BlockState; -import net.minecraft.block.HorizontalFacingBlock; import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import java.time.LocalTime; public class DigitalClockBlockEntity extends BlockEntity { - private int facing; - private double x; - private double z; - private int second; - public DigitalClockBlockEntity(BlockPos pos, BlockState state) { super(BlockEntities.DigitalClockBlockEntity, pos, state); } - - public static void tick(World world, BlockPos pos, BlockState state, DigitalClockBlockEntity blockEntity) { - if (LocalTime.now().getSecond() != blockEntity.second) { - blockEntity.second = LocalTime.now().getSecond(); - } - switch (state.get(HorizontalFacingBlock.FACING)) { - case NORTH: { - blockEntity.facing = 0; - blockEntity.x = 0.825; - blockEntity.z = 0.374; - break; - } - case EAST:{ - blockEntity.facing = 270; - blockEntity.x = 0.626; - blockEntity.z = 0.825; - break; - } - case SOUTH:{ - blockEntity.facing = 180; - blockEntity.x = 0.175; - blockEntity.z = 0.626; - break; - } - case WEST:{ - blockEntity.facing = 90; - blockEntity.x = 0.374; - blockEntity.z = 0.175; - break; - } - default: break; - } - } - public int getFacing() { - return facing; - } - public double getX() { - return x; - } - public double getZ() { - return z; - } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/WallClockBlockEntity.java b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/WallClockBlockEntity.java index 0094afe..f4dd881 100755 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/WallClockBlockEntity.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/WallClockBlockEntity.java @@ -2,7 +2,6 @@ package eu.midnightdust.motschen.decorative.block.blockentity; import eu.midnightdust.motschen.decorative.init.BlockEntities; import net.minecraft.block.BlockState; -import net.minecraft.block.HorizontalFacingBlock; import net.minecraft.block.entity.BlockEntity; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; @@ -12,9 +11,6 @@ import net.minecraft.world.World; import java.time.LocalTime; public class WallClockBlockEntity extends BlockEntity { - public int facing; - public double x; - public double z; public int second; public WallClockBlockEntity(BlockPos pos, BlockState state) { @@ -26,33 +22,5 @@ public class WallClockBlockEntity extends BlockEntity { blockEntity.second = LocalTime.now().getSecond(); world.playSound(null, pos, SoundEvents.BLOCK_WOODEN_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.04f, 1f); } - - switch (state.get(HorizontalFacingBlock.FACING)) { - case NORTH: { - blockEntity.facing = 0; - blockEntity.x = 0.5; - blockEntity.z = 0.95; - break; - } - case EAST: { - blockEntity.facing = 270; - blockEntity.x = 0.05; - blockEntity.z = 0.5; - break; - } - case SOUTH: { - blockEntity.facing = 180; - blockEntity.x = 0.5; - blockEntity.z = 0.05; - break; - } - case WEST: { - blockEntity.facing = 90; - blockEntity.x = 0.95; - blockEntity.z = 0.5; - break; - } - default: break; - } } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/render/ChoppingLogBlockEntityRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/block/render/ChoppingLogBlockEntityRenderer.java index 5a55564..402ff45 100755 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/render/ChoppingLogBlockEntityRenderer.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/render/ChoppingLogBlockEntityRenderer.java @@ -1,5 +1,6 @@ package eu.midnightdust.motschen.decorative.block.render; +import eu.midnightdust.motschen.decorative.block.ChoppingLog; import eu.midnightdust.motschen.decorative.block.blockentity.ChoppingLogBlockEntity; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -29,11 +30,27 @@ public class ChoppingLogBlockEntityRenderer implements BlockEntityRenderer { + facing = 180; x = 0.2D; z = 0.5D; + } + case SOUTH -> { + facing = 90; x = 0.5D; z = 0.2D; + } + case WEST -> { + facing = 0; x = 0.8D; z = 0.5D; + } + default -> { + facing = 270; x = 0.5D; z = 0.8D; + } + } int lightAbove = WorldRenderer.getLightmapCoordinates(Objects.requireNonNull(blockEntity.getWorld()), blockEntity.getPos().up()); - matrices.translate(blockEntity.getAxeX(), 1.5D, blockEntity.getAxeZ()); + matrices.push(); + matrices.translate(x, 1.5D, z); matrices.scale(2.5f,2.5f,2.5f); - matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(blockEntity.getFacing())); + matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(facing)); matrices.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(160)); client.getItemRenderer().renderItem(new ItemStack(Items.IRON_AXE), ModelTransformationMode.GROUND, lightAbove, overlay, matrices, vertexConsumers, blockEntity.getWorld(), 0); matrices.pop(); diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/render/DigitalClockRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/block/render/DigitalClockRenderer.java index 1621766..f2ed4c8 100755 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/render/DigitalClockRenderer.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/render/DigitalClockRenderer.java @@ -3,6 +3,7 @@ package eu.midnightdust.motschen.decorative.block.render; import eu.midnightdust.motschen.decorative.block.blockentity.DigitalClockBlockEntity; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.block.HorizontalFacingBlock; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.block.entity.BlockEntityRenderer; @@ -23,11 +24,35 @@ public class DigitalClockRenderer implements BlockEntityRenderer { + facing = 0; + x = 0.825; + z = 0.374; + } + case EAST -> { + facing = 270; + x = 0.626; + z = 0.825; + } + case SOUTH -> { + facing = 180; + x = 0.175; + z = 0.626; + } + default -> { + facing = 90; + x = 0.374; + z = 0.175; + } + } matrices.push(); - matrices.translate(blockEntity.getX(),0.35,blockEntity.getZ()); + matrices.translate(x,0.35,z); matrices.scale(0.025f, 0.025f, 0.025f); - matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(blockEntity.getFacing())); + matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(facing)); matrices.translate(0,0,-0.1); matrices.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(180)); textRenderer.draw(getTime(), 0, 0, 16382457, false, matrices.peek().getPositionMatrix(), vertexConsumers, TextRenderer.TextLayerType.POLYGON_OFFSET, 0, light); diff --git a/src/main/java/eu/midnightdust/motschen/decorative/block/render/WallClockRenderer.java b/src/main/java/eu/midnightdust/motschen/decorative/block/render/WallClockRenderer.java index d44ca86..f81ad53 100755 --- a/src/main/java/eu/midnightdust/motschen/decorative/block/render/WallClockRenderer.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/block/render/WallClockRenderer.java @@ -4,6 +4,7 @@ import eu.midnightdust.motschen.decorative.block.blockentity.WallClockBlockEntit import eu.midnightdust.motschen.decorative.block.render.model.WallClockHandsModel; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.block.HorizontalFacingBlock; import net.minecraft.client.render.*; import net.minecraft.client.render.block.entity.BlockEntityRenderer; import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; @@ -26,25 +27,41 @@ public class WallClockRenderer implements BlockEntityRenderer { + facing = 0; x = 0.5; z = 0.95; + } + case EAST -> { + facing = 270; x = 0.05; z = 0.5; + } + case SOUTH -> { + facing = 180; x = 0.5; z = 0.05; + } + default -> { + facing = 90; x = 0.95; z = 0.5; + } + } VertexConsumer vertex = vertexConsumers.getBuffer(RenderLayer.getEntityCutoutNoCull(Identifier.ofVanilla("textures/block/red_concrete.png"))); matrices.push(); - matrices.translate(blockEntity.x,0.5,blockEntity.z); - matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(blockEntity.facing)); + matrices.translate(x,0.5,z); + matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(facing)); matrices.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(LocalTime.now().getSecond() * 6)); handsModel.seconds.render(matrices, vertex, light, OverlayTexture.DEFAULT_UV, ColorHelper.Argb.fromFloats(1.0F, 1.0F, 1.0F, 1.0F)); matrices.pop(); matrices.push(); - matrices.translate(blockEntity.x,0.5,blockEntity.z); - matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(blockEntity.facing)); + matrices.translate(x,0.5,z); + matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(facing)); matrices.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(LocalTime.now().getMinute() * 6)); handsModel.minutes.render(matrices, vertex, light, OverlayTexture.DEFAULT_UV, ColorHelper.Argb.fromFloats(0.0F, 0.0F, 0.0F, 1.0F)); matrices.pop(); matrices.push(); - matrices.translate(blockEntity.x,0.5,blockEntity.z); - matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(blockEntity.facing)); + matrices.translate(x,0.5,z); + matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(facing)); matrices.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(getHour12hFormat() * 30)); handsModel.hours.render(matrices, vertex, light, OverlayTexture.DEFAULT_UV, ColorHelper.Argb.fromFloats(0.0F, 0.0F, 0.0F, 1.0F)); matrices.pop(); diff --git a/src/main/java/eu/midnightdust/motschen/decorative/init/LogsWithAxes.java b/src/main/java/eu/midnightdust/motschen/decorative/init/LogsWithAxes.java index 0d89ed3..19eae40 100755 --- a/src/main/java/eu/midnightdust/motschen/decorative/init/LogsWithAxes.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/init/LogsWithAxes.java @@ -3,7 +3,6 @@ package eu.midnightdust.motschen.decorative.init; import eu.midnightdust.motschen.decorative.block.ChoppingLog; import net.minecraft.block.WoodType; import net.minecraft.registry.Registries; -import net.minecraft.registry.RegistryKey; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.Identifier; @@ -15,7 +14,6 @@ import static eu.midnightdust.motschen.decorative.util.RegistryUtil.registerGard public class LogsWithAxes { public static final List TYPES = new ArrayList<>(); - public static ChoppingLog OAK_LOG_WITH_AXE; public static void init() { WoodType.stream().forEach(woodType -> { @@ -27,7 +25,6 @@ public class LogsWithAxes { if (Registries.BLOCK.containsId(Identifier.of(logName))) { var choppingLog = new ChoppingLog(Registries.BLOCK.get(Identifier.of(logName))); register(id(logName + "_with_axe"), choppingLog); - if (logName.equals("oak_log")) OAK_LOG_WITH_AXE = choppingLog; } }); } diff --git a/src/main/resources/assets/decorative/blockstates/bamboo_block_with_axe.json b/src/main/resources/assets/decorative/blockstates/bamboo_block_with_axe.json new file mode 100755 index 0000000..6222deb --- /dev/null +++ b/src/main/resources/assets/decorative/blockstates/bamboo_block_with_axe.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "block/bamboo_block" } + } +} diff --git a/src/main/resources/assets/decorative/blockstates/cherry_log_with_axe.json b/src/main/resources/assets/decorative/blockstates/cherry_log_with_axe.json new file mode 100755 index 0000000..4e0e1b5 --- /dev/null +++ b/src/main/resources/assets/decorative/blockstates/cherry_log_with_axe.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "block/cherry_log" } + } +} diff --git a/src/main/resources/assets/decorative/blockstates/crimson_stem_with_axe.json b/src/main/resources/assets/decorative/blockstates/crimson_stem_with_axe.json new file mode 100755 index 0000000..60eb203 --- /dev/null +++ b/src/main/resources/assets/decorative/blockstates/crimson_stem_with_axe.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "block/crimson_stem" } + } +} diff --git a/src/main/resources/assets/decorative/blockstates/mangrove_log_with_axe.json b/src/main/resources/assets/decorative/blockstates/mangrove_log_with_axe.json new file mode 100755 index 0000000..10ba266 --- /dev/null +++ b/src/main/resources/assets/decorative/blockstates/mangrove_log_with_axe.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "block/mangrove_log" } + } +} diff --git a/src/main/resources/assets/decorative/blockstates/warped_stem_with_axe.json b/src/main/resources/assets/decorative/blockstates/warped_stem_with_axe.json new file mode 100755 index 0000000..c1ecc6c --- /dev/null +++ b/src/main/resources/assets/decorative/blockstates/warped_stem_with_axe.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "block/warped_stem" } + } +} diff --git a/src/main/resources/assets/decorative/lang/en_us.json b/src/main/resources/assets/decorative/lang/en_us.json index 516b6bd..412541a 100755 --- a/src/main/resources/assets/decorative/lang/en_us.json +++ b/src/main/resources/assets/decorative/lang/en_us.json @@ -62,6 +62,11 @@ "block.decorative.acacia_log_with_axe":"Acacia Log with Axe", "block.decorative.jungle_log_with_axe":"Jungle Log with Axe", "block.decorative.dark_oak_log_with_axe":"Dark Oak Log with Axe", + "block.decorative.mangrove_log_with_axe":"Mangrove Log with Axe", + "block.decorative.cherry_log_with_axe":"Cherry Log with Axe", + "block.decorative.bamboo_block_with_axe":"Bamboo Block with Axe", + "block.decorative.crimson_stem_with_axe":"Crimson Stem with Axe", + "block.decorative.warped_stem_with_axe":"Warped Stem with Axe", "block.decorative.bird_bath":"Bird Bath", "block.decorative.water_pump":"Water Pump", diff --git a/src/main/resources/assets/decorative/models/block/acacia_log_with_axe.json b/src/main/resources/assets/decorative/models/block/acacia_log_with_axe.json deleted file mode 100755 index f62f4a8..0000000 --- a/src/main/resources/assets/decorative/models/block/acacia_log_with_axe.json +++ /dev/null @@ -1,219 +0,0 @@ -{ - "credit": "made by Motschen", - "parent": "block/block", - "textures": { - "0": "block/acacia_log", - "1": "block/acacia_log_top", - "2": "item/iron_axe", - "particle": "block/acacia_log" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#1"} - } - }, - { - "from": [7.5, 21, 3], - "to": [8.5, 22, 5], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "east": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [2, 14, 3, 15], "texture": "#2"} - } - }, - { - "from": [7.5, 20, 3], - "to": [8.5, 21, 6], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [2, 13, 3, 14], "rotation": 180, "texture": "#2"}, - "east": {"uv": [2, 13, 5, 14], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [2, 13, 5, 14], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [2, 13, 5, 14], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 19, 4], - "to": [8.5, 20, 7], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [3, 12, 4, 13], "rotation": 180, "texture": "#2"}, - "east": {"uv": [3, 12, 6, 13], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [2, 13, 5, 14], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [2, 13, 5, 14], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 18, 5], - "to": [8.5, 19, 8], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [4, 11, 5, 12], "rotation": 180, "texture": "#2"}, - "east": {"uv": [4, 11, 7, 12], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [4, 11, 7, 12], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [4, 11, 7, 12], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 17, 6], - "to": [8.5, 18, 9], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [5, 10, 6, 11], "rotation": 180, "texture": "#2"}, - "east": {"uv": [5, 10, 8, 11], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [5, 10, 8, 11], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [5, 10, 8, 11], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 16, 7], - "to": [8.5, 17, 10], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [6, 9, 7, 10], "rotation": 180, "texture": "#2"}, - "east": {"uv": [6, 9, 9, 10], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [6, 9, 9, 10], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [6, 9, 9, 10], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 15, 8], - "to": [8.5, 16, 11], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [7, 8, 8, 9], "rotation": 180, "texture": "#2"}, - "east": {"uv": [7, 8, 10, 9], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [7, 8, 10, 9], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [7, 8, 10, 9], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 14, 9], - "to": [8.5, 15, 15], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [8, 7, 9, 8], "rotation": 180, "texture": "#2"}, - "east": {"uv": [8, 7, 14, 8], "rotation": 180, "texture": "#2"}, - "south": {"uv": [13, 7, 14, 8], "rotation": 180, "texture": "#2"}, - "west": {"uv": [8, 7, 14, 8], "texture": "#2"}, - "up": {"uv": [8, 7, 14, 8], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [7.5, 15, 12], - "to": [8.5, 16, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [11, 8, 12, 9], "rotation": 180, "texture": "#2"}, - "east": {"uv": [11, 8, 13, 9], "rotation": 180, "texture": "#2"}, - "south": {"uv": [12, 8, 13, 9], "rotation": 180, "texture": "#2"}, - "west": {"uv": [11, 8, 13, 9], "texture": "#2"}, - "up": {"uv": [11, 8, 13, 9], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [7.5, 13, 8], - "to": [8.5, 14, 15], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [7, 6, 8, 7], "rotation": 180, "texture": "#2"}, - "east": {"uv": [7, 6, 14, 7], "rotation": 180, "texture": "#2"}, - "south": {"uv": [13, 6, 14, 7], "rotation": 180, "texture": "#2"}, - "west": {"uv": [7, 6, 14, 7], "texture": "#2"}, - "up": {"uv": [7, 6, 14, 7], "rotation": 90, "texture": "#2"}, - "down": {"uv": [7, 6, 14, 7], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 12, 7], - "to": [8.5, 13, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [6, 5, 7, 6], "rotation": 180, "texture": "#2"}, - "east": {"uv": [6, 5, 13, 6], "rotation": 180, "texture": "#2"}, - "south": {"uv": [12, 5, 13, 6], "rotation": 180, "texture": "#2"}, - "west": {"uv": [6, 5, 13, 6], "texture": "#2"}, - "up": {"uv": [6, 5, 13, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [7.5, 11, 7], - "to": [8.5, 12, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [6, 4, 7, 5], "rotation": 180, "texture": "#2"}, - "east": {"uv": [6, 4, 13, 5], "rotation": 180, "texture": "#2"}, - "south": {"uv": [12, 4, 13, 5], "rotation": 180, "texture": "#2"}, - "west": {"uv": [6, 4, 13, 5], "texture": "#2"}, - "down": {"uv": [6, 4, 13, 5], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 10, 8], - "to": [8.5, 11, 13], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [7, 3, 8, 4], "rotation": 180, "texture": "#2"}, - "east": {"uv": [7, 3, 12, 4], "rotation": 180, "texture": "#2"}, - "south": {"uv": [11, 3, 12, 4], "rotation": 180, "texture": "#2"}, - "west": {"uv": [7, 3, 12, 4], "texture": "#2"}, - "down": {"uv": [7, 3, 12, 4], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 9, 9], - "to": [8.5, 10, 13], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [8, 2, 9, 3], "rotation": 180, "texture": "#2"}, - "east": {"uv": [8, 2, 12, 3], "rotation": 180, "texture": "#2"}, - "south": {"uv": [11, 2, 12, 3], "rotation": 180, "texture": "#2"}, - "west": {"uv": [8, 2, 12, 3], "texture": "#2"}, - "down": {"uv": [8, 2, 12, 3], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 8, 10], - "to": [8.5, 9, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [9, 1, 10, 2], "rotation": 180, "texture": "#2"}, - "east": {"uv": [9, 1, 11, 2], "rotation": 180, "texture": "#2"}, - "south": {"uv": [10, 1, 11, 2], "rotation": 180, "texture": "#2"}, - "west": {"uv": [9, 1, 11, 2], "texture": "#2"}, - "down": {"uv": [9, 1, 11, 2], "rotation": 270, "texture": "#2"} - } - } - ], - "groups": [0, - { - "name": "axe", - "origin": [8, 8, 8], - "children": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/birch_log_with_axe.json b/src/main/resources/assets/decorative/models/block/birch_log_with_axe.json deleted file mode 100755 index 27ad57a..0000000 --- a/src/main/resources/assets/decorative/models/block/birch_log_with_axe.json +++ /dev/null @@ -1,219 +0,0 @@ -{ - "credit": "made by Motschen", - "parent": "block/block", - "textures": { - "0": "block/birch_log", - "1": "block/birch_log_top", - "2": "item/iron_axe", - "particle": "block/birch_log" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#1"} - } - }, - { - "from": [7.5, 21, 3], - "to": [8.5, 22, 5], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "east": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [2, 14, 3, 15], "texture": "#2"} - } - }, - { - "from": [7.5, 20, 3], - "to": [8.5, 21, 6], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [2, 13, 3, 14], "rotation": 180, "texture": "#2"}, - "east": {"uv": [2, 13, 5, 14], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [2, 13, 5, 14], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [2, 13, 5, 14], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 19, 4], - "to": [8.5, 20, 7], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [3, 12, 4, 13], "rotation": 180, "texture": "#2"}, - "east": {"uv": [3, 12, 6, 13], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [2, 13, 5, 14], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [2, 13, 5, 14], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 18, 5], - "to": [8.5, 19, 8], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [4, 11, 5, 12], "rotation": 180, "texture": "#2"}, - "east": {"uv": [4, 11, 7, 12], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [4, 11, 7, 12], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [4, 11, 7, 12], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 17, 6], - "to": [8.5, 18, 9], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [5, 10, 6, 11], "rotation": 180, "texture": "#2"}, - "east": {"uv": [5, 10, 8, 11], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [5, 10, 8, 11], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [5, 10, 8, 11], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 16, 7], - "to": [8.5, 17, 10], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [6, 9, 7, 10], "rotation": 180, "texture": "#2"}, - "east": {"uv": [6, 9, 9, 10], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [6, 9, 9, 10], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [6, 9, 9, 10], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 15, 8], - "to": [8.5, 16, 11], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [7, 8, 8, 9], "rotation": 180, "texture": "#2"}, - "east": {"uv": [7, 8, 10, 9], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [7, 8, 10, 9], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [7, 8, 10, 9], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 14, 9], - "to": [8.5, 15, 15], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [8, 7, 9, 8], "rotation": 180, "texture": "#2"}, - "east": {"uv": [8, 7, 14, 8], "rotation": 180, "texture": "#2"}, - "south": {"uv": [13, 7, 14, 8], "rotation": 180, "texture": "#2"}, - "west": {"uv": [8, 7, 14, 8], "texture": "#2"}, - "up": {"uv": [8, 7, 14, 8], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [7.5, 15, 12], - "to": [8.5, 16, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [11, 8, 12, 9], "rotation": 180, "texture": "#2"}, - "east": {"uv": [11, 8, 13, 9], "rotation": 180, "texture": "#2"}, - "south": {"uv": [12, 8, 13, 9], "rotation": 180, "texture": "#2"}, - "west": {"uv": [11, 8, 13, 9], "texture": "#2"}, - "up": {"uv": [11, 8, 13, 9], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [7.5, 13, 8], - "to": [8.5, 14, 15], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [7, 6, 8, 7], "rotation": 180, "texture": "#2"}, - "east": {"uv": [7, 6, 14, 7], "rotation": 180, "texture": "#2"}, - "south": {"uv": [13, 6, 14, 7], "rotation": 180, "texture": "#2"}, - "west": {"uv": [7, 6, 14, 7], "texture": "#2"}, - "up": {"uv": [7, 6, 14, 7], "rotation": 90, "texture": "#2"}, - "down": {"uv": [7, 6, 14, 7], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 12, 7], - "to": [8.5, 13, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [6, 5, 7, 6], "rotation": 180, "texture": "#2"}, - "east": {"uv": [6, 5, 13, 6], "rotation": 180, "texture": "#2"}, - "south": {"uv": [12, 5, 13, 6], "rotation": 180, "texture": "#2"}, - "west": {"uv": [6, 5, 13, 6], "texture": "#2"}, - "up": {"uv": [6, 5, 13, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [7.5, 11, 7], - "to": [8.5, 12, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [6, 4, 7, 5], "rotation": 180, "texture": "#2"}, - "east": {"uv": [6, 4, 13, 5], "rotation": 180, "texture": "#2"}, - "south": {"uv": [12, 4, 13, 5], "rotation": 180, "texture": "#2"}, - "west": {"uv": [6, 4, 13, 5], "texture": "#2"}, - "down": {"uv": [6, 4, 13, 5], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 10, 8], - "to": [8.5, 11, 13], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [7, 3, 8, 4], "rotation": 180, "texture": "#2"}, - "east": {"uv": [7, 3, 12, 4], "rotation": 180, "texture": "#2"}, - "south": {"uv": [11, 3, 12, 4], "rotation": 180, "texture": "#2"}, - "west": {"uv": [7, 3, 12, 4], "texture": "#2"}, - "down": {"uv": [7, 3, 12, 4], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 9, 9], - "to": [8.5, 10, 13], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [8, 2, 9, 3], "rotation": 180, "texture": "#2"}, - "east": {"uv": [8, 2, 12, 3], "rotation": 180, "texture": "#2"}, - "south": {"uv": [11, 2, 12, 3], "rotation": 180, "texture": "#2"}, - "west": {"uv": [8, 2, 12, 3], "texture": "#2"}, - "down": {"uv": [8, 2, 12, 3], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 8, 10], - "to": [8.5, 9, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [9, 1, 10, 2], "rotation": 180, "texture": "#2"}, - "east": {"uv": [9, 1, 11, 2], "rotation": 180, "texture": "#2"}, - "south": {"uv": [10, 1, 11, 2], "rotation": 180, "texture": "#2"}, - "west": {"uv": [9, 1, 11, 2], "texture": "#2"}, - "down": {"uv": [9, 1, 11, 2], "rotation": 270, "texture": "#2"} - } - } - ], - "groups": [0, - { - "name": "axe", - "origin": [8, 8, 8], - "children": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/dark_oak_log_with_axe.json b/src/main/resources/assets/decorative/models/block/dark_oak_log_with_axe.json deleted file mode 100755 index a3fdb4a..0000000 --- a/src/main/resources/assets/decorative/models/block/dark_oak_log_with_axe.json +++ /dev/null @@ -1,219 +0,0 @@ -{ - "credit": "made by Motschen", - "parent": "block/block", - "textures": { - "0": "block/dark_oak_log", - "1": "block/dark_oak_log_top", - "2": "item/iron_axe", - "particle": "block/dark_oak_log" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#1"} - } - }, - { - "from": [7.5, 21, 3], - "to": [8.5, 22, 5], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "east": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [2, 14, 3, 15], "texture": "#2"} - } - }, - { - "from": [7.5, 20, 3], - "to": [8.5, 21, 6], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [2, 13, 3, 14], "rotation": 180, "texture": "#2"}, - "east": {"uv": [2, 13, 5, 14], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [2, 13, 5, 14], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [2, 13, 5, 14], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 19, 4], - "to": [8.5, 20, 7], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [3, 12, 4, 13], "rotation": 180, "texture": "#2"}, - "east": {"uv": [3, 12, 6, 13], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [2, 13, 5, 14], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [2, 13, 5, 14], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 18, 5], - "to": [8.5, 19, 8], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [4, 11, 5, 12], "rotation": 180, "texture": "#2"}, - "east": {"uv": [4, 11, 7, 12], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [4, 11, 7, 12], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [4, 11, 7, 12], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 17, 6], - "to": [8.5, 18, 9], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [5, 10, 6, 11], "rotation": 180, "texture": "#2"}, - "east": {"uv": [5, 10, 8, 11], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [5, 10, 8, 11], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [5, 10, 8, 11], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 16, 7], - "to": [8.5, 17, 10], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [6, 9, 7, 10], "rotation": 180, "texture": "#2"}, - "east": {"uv": [6, 9, 9, 10], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [6, 9, 9, 10], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [6, 9, 9, 10], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 15, 8], - "to": [8.5, 16, 11], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [7, 8, 8, 9], "rotation": 180, "texture": "#2"}, - "east": {"uv": [7, 8, 10, 9], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [7, 8, 10, 9], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [7, 8, 10, 9], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 14, 9], - "to": [8.5, 15, 15], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [8, 7, 9, 8], "rotation": 180, "texture": "#2"}, - "east": {"uv": [8, 7, 14, 8], "rotation": 180, "texture": "#2"}, - "south": {"uv": [13, 7, 14, 8], "rotation": 180, "texture": "#2"}, - "west": {"uv": [8, 7, 14, 8], "texture": "#2"}, - "up": {"uv": [8, 7, 14, 8], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [7.5, 15, 12], - "to": [8.5, 16, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [11, 8, 12, 9], "rotation": 180, "texture": "#2"}, - "east": {"uv": [11, 8, 13, 9], "rotation": 180, "texture": "#2"}, - "south": {"uv": [12, 8, 13, 9], "rotation": 180, "texture": "#2"}, - "west": {"uv": [11, 8, 13, 9], "texture": "#2"}, - "up": {"uv": [11, 8, 13, 9], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [7.5, 13, 8], - "to": [8.5, 14, 15], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [7, 6, 8, 7], "rotation": 180, "texture": "#2"}, - "east": {"uv": [7, 6, 14, 7], "rotation": 180, "texture": "#2"}, - "south": {"uv": [13, 6, 14, 7], "rotation": 180, "texture": "#2"}, - "west": {"uv": [7, 6, 14, 7], "texture": "#2"}, - "up": {"uv": [7, 6, 14, 7], "rotation": 90, "texture": "#2"}, - "down": {"uv": [7, 6, 14, 7], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 12, 7], - "to": [8.5, 13, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [6, 5, 7, 6], "rotation": 180, "texture": "#2"}, - "east": {"uv": [6, 5, 13, 6], "rotation": 180, "texture": "#2"}, - "south": {"uv": [12, 5, 13, 6], "rotation": 180, "texture": "#2"}, - "west": {"uv": [6, 5, 13, 6], "texture": "#2"}, - "up": {"uv": [6, 5, 13, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [7.5, 11, 7], - "to": [8.5, 12, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [6, 4, 7, 5], "rotation": 180, "texture": "#2"}, - "east": {"uv": [6, 4, 13, 5], "rotation": 180, "texture": "#2"}, - "south": {"uv": [12, 4, 13, 5], "rotation": 180, "texture": "#2"}, - "west": {"uv": [6, 4, 13, 5], "texture": "#2"}, - "down": {"uv": [6, 4, 13, 5], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 10, 8], - "to": [8.5, 11, 13], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [7, 3, 8, 4], "rotation": 180, "texture": "#2"}, - "east": {"uv": [7, 3, 12, 4], "rotation": 180, "texture": "#2"}, - "south": {"uv": [11, 3, 12, 4], "rotation": 180, "texture": "#2"}, - "west": {"uv": [7, 3, 12, 4], "texture": "#2"}, - "down": {"uv": [7, 3, 12, 4], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 9, 9], - "to": [8.5, 10, 13], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [8, 2, 9, 3], "rotation": 180, "texture": "#2"}, - "east": {"uv": [8, 2, 12, 3], "rotation": 180, "texture": "#2"}, - "south": {"uv": [11, 2, 12, 3], "rotation": 180, "texture": "#2"}, - "west": {"uv": [8, 2, 12, 3], "texture": "#2"}, - "down": {"uv": [8, 2, 12, 3], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 8, 10], - "to": [8.5, 9, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [9, 1, 10, 2], "rotation": 180, "texture": "#2"}, - "east": {"uv": [9, 1, 11, 2], "rotation": 180, "texture": "#2"}, - "south": {"uv": [10, 1, 11, 2], "rotation": 180, "texture": "#2"}, - "west": {"uv": [9, 1, 11, 2], "texture": "#2"}, - "down": {"uv": [9, 1, 11, 2], "rotation": 270, "texture": "#2"} - } - } - ], - "groups": [0, - { - "name": "axe", - "origin": [8, 8, 8], - "children": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/jungle_log_with_axe.json b/src/main/resources/assets/decorative/models/block/jungle_log_with_axe.json deleted file mode 100755 index b6c264e..0000000 --- a/src/main/resources/assets/decorative/models/block/jungle_log_with_axe.json +++ /dev/null @@ -1,219 +0,0 @@ -{ - "credit": "made by Motschen", - "parent": "block/block", - "textures": { - "0": "block/jungle_log", - "1": "block/jungle_log_top", - "2": "item/iron_axe", - "particle": "block/jungle_log" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#1"} - } - }, - { - "from": [7.5, 21, 3], - "to": [8.5, 22, 5], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "east": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [2, 14, 3, 15], "texture": "#2"} - } - }, - { - "from": [7.5, 20, 3], - "to": [8.5, 21, 6], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [2, 13, 3, 14], "rotation": 180, "texture": "#2"}, - "east": {"uv": [2, 13, 5, 14], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [2, 13, 5, 14], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [2, 13, 5, 14], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 19, 4], - "to": [8.5, 20, 7], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [3, 12, 4, 13], "rotation": 180, "texture": "#2"}, - "east": {"uv": [3, 12, 6, 13], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [2, 13, 5, 14], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [2, 13, 5, 14], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 18, 5], - "to": [8.5, 19, 8], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [4, 11, 5, 12], "rotation": 180, "texture": "#2"}, - "east": {"uv": [4, 11, 7, 12], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [4, 11, 7, 12], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [4, 11, 7, 12], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 17, 6], - "to": [8.5, 18, 9], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [5, 10, 6, 11], "rotation": 180, "texture": "#2"}, - "east": {"uv": [5, 10, 8, 11], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [5, 10, 8, 11], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [5, 10, 8, 11], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 16, 7], - "to": [8.5, 17, 10], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [6, 9, 7, 10], "rotation": 180, "texture": "#2"}, - "east": {"uv": [6, 9, 9, 10], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [6, 9, 9, 10], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [6, 9, 9, 10], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 15, 8], - "to": [8.5, 16, 11], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [7, 8, 8, 9], "rotation": 180, "texture": "#2"}, - "east": {"uv": [7, 8, 10, 9], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [7, 8, 10, 9], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [7, 8, 10, 9], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 14, 9], - "to": [8.5, 15, 15], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [8, 7, 9, 8], "rotation": 180, "texture": "#2"}, - "east": {"uv": [8, 7, 14, 8], "rotation": 180, "texture": "#2"}, - "south": {"uv": [13, 7, 14, 8], "rotation": 180, "texture": "#2"}, - "west": {"uv": [8, 7, 14, 8], "texture": "#2"}, - "up": {"uv": [8, 7, 14, 8], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [7.5, 15, 12], - "to": [8.5, 16, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [11, 8, 12, 9], "rotation": 180, "texture": "#2"}, - "east": {"uv": [11, 8, 13, 9], "rotation": 180, "texture": "#2"}, - "south": {"uv": [12, 8, 13, 9], "rotation": 180, "texture": "#2"}, - "west": {"uv": [11, 8, 13, 9], "texture": "#2"}, - "up": {"uv": [11, 8, 13, 9], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [7.5, 13, 8], - "to": [8.5, 14, 15], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [7, 6, 8, 7], "rotation": 180, "texture": "#2"}, - "east": {"uv": [7, 6, 14, 7], "rotation": 180, "texture": "#2"}, - "south": {"uv": [13, 6, 14, 7], "rotation": 180, "texture": "#2"}, - "west": {"uv": [7, 6, 14, 7], "texture": "#2"}, - "up": {"uv": [7, 6, 14, 7], "rotation": 90, "texture": "#2"}, - "down": {"uv": [7, 6, 14, 7], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 12, 7], - "to": [8.5, 13, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [6, 5, 7, 6], "rotation": 180, "texture": "#2"}, - "east": {"uv": [6, 5, 13, 6], "rotation": 180, "texture": "#2"}, - "south": {"uv": [12, 5, 13, 6], "rotation": 180, "texture": "#2"}, - "west": {"uv": [6, 5, 13, 6], "texture": "#2"}, - "up": {"uv": [6, 5, 13, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [7.5, 11, 7], - "to": [8.5, 12, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [6, 4, 7, 5], "rotation": 180, "texture": "#2"}, - "east": {"uv": [6, 4, 13, 5], "rotation": 180, "texture": "#2"}, - "south": {"uv": [12, 4, 13, 5], "rotation": 180, "texture": "#2"}, - "west": {"uv": [6, 4, 13, 5], "texture": "#2"}, - "down": {"uv": [6, 4, 13, 5], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 10, 8], - "to": [8.5, 11, 13], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [7, 3, 8, 4], "rotation": 180, "texture": "#2"}, - "east": {"uv": [7, 3, 12, 4], "rotation": 180, "texture": "#2"}, - "south": {"uv": [11, 3, 12, 4], "rotation": 180, "texture": "#2"}, - "west": {"uv": [7, 3, 12, 4], "texture": "#2"}, - "down": {"uv": [7, 3, 12, 4], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 9, 9], - "to": [8.5, 10, 13], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [8, 2, 9, 3], "rotation": 180, "texture": "#2"}, - "east": {"uv": [8, 2, 12, 3], "rotation": 180, "texture": "#2"}, - "south": {"uv": [11, 2, 12, 3], "rotation": 180, "texture": "#2"}, - "west": {"uv": [8, 2, 12, 3], "texture": "#2"}, - "down": {"uv": [8, 2, 12, 3], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 8, 10], - "to": [8.5, 9, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [9, 1, 10, 2], "rotation": 180, "texture": "#2"}, - "east": {"uv": [9, 1, 11, 2], "rotation": 180, "texture": "#2"}, - "south": {"uv": [10, 1, 11, 2], "rotation": 180, "texture": "#2"}, - "west": {"uv": [9, 1, 11, 2], "texture": "#2"}, - "down": {"uv": [9, 1, 11, 2], "rotation": 270, "texture": "#2"} - } - } - ], - "groups": [0, - { - "name": "axe", - "origin": [8, 8, 8], - "children": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/oak_log_with_axe.json b/src/main/resources/assets/decorative/models/block/oak_log_with_axe.json deleted file mode 100755 index 1c0e0c0..0000000 --- a/src/main/resources/assets/decorative/models/block/oak_log_with_axe.json +++ /dev/null @@ -1,219 +0,0 @@ -{ - "credit": "made by Motschen", - "parent": "block/block", - "textures": { - "0": "block/oak_log", - "1": "block/oak_log_top", - "2": "item/iron_axe", - "particle": "block/oak_log" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#1"} - } - }, - { - "from": [7.5, 21, 3], - "to": [8.5, 22, 5], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "east": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [2, 14, 3, 15], "texture": "#2"} - } - }, - { - "from": [7.5, 20, 3], - "to": [8.5, 21, 6], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [2, 13, 3, 14], "rotation": 180, "texture": "#2"}, - "east": {"uv": [2, 13, 5, 14], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [2, 13, 5, 14], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [2, 13, 5, 14], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 19, 4], - "to": [8.5, 20, 7], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [3, 12, 4, 13], "rotation": 180, "texture": "#2"}, - "east": {"uv": [3, 12, 6, 13], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [2, 13, 5, 14], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [2, 13, 5, 14], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 18, 5], - "to": [8.5, 19, 8], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [4, 11, 5, 12], "rotation": 180, "texture": "#2"}, - "east": {"uv": [4, 11, 7, 12], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [4, 11, 7, 12], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [4, 11, 7, 12], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 17, 6], - "to": [8.5, 18, 9], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [5, 10, 6, 11], "rotation": 180, "texture": "#2"}, - "east": {"uv": [5, 10, 8, 11], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [5, 10, 8, 11], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [5, 10, 8, 11], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 16, 7], - "to": [8.5, 17, 10], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [6, 9, 7, 10], "rotation": 180, "texture": "#2"}, - "east": {"uv": [6, 9, 9, 10], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [6, 9, 9, 10], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [6, 9, 9, 10], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 15, 8], - "to": [8.5, 16, 11], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [7, 8, 8, 9], "rotation": 180, "texture": "#2"}, - "east": {"uv": [7, 8, 10, 9], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [7, 8, 10, 9], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [7, 8, 10, 9], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 14, 9], - "to": [8.5, 15, 15], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [8, 7, 9, 8], "rotation": 180, "texture": "#2"}, - "east": {"uv": [8, 7, 14, 8], "rotation": 180, "texture": "#2"}, - "south": {"uv": [13, 7, 14, 8], "rotation": 180, "texture": "#2"}, - "west": {"uv": [8, 7, 14, 8], "texture": "#2"}, - "up": {"uv": [8, 7, 14, 8], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [7.5, 15, 12], - "to": [8.5, 16, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [11, 8, 12, 9], "rotation": 180, "texture": "#2"}, - "east": {"uv": [11, 8, 13, 9], "rotation": 180, "texture": "#2"}, - "south": {"uv": [12, 8, 13, 9], "rotation": 180, "texture": "#2"}, - "west": {"uv": [11, 8, 13, 9], "texture": "#2"}, - "up": {"uv": [11, 8, 13, 9], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [7.5, 13, 8], - "to": [8.5, 14, 15], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [7, 6, 8, 7], "rotation": 180, "texture": "#2"}, - "east": {"uv": [7, 6, 14, 7], "rotation": 180, "texture": "#2"}, - "south": {"uv": [13, 6, 14, 7], "rotation": 180, "texture": "#2"}, - "west": {"uv": [7, 6, 14, 7], "texture": "#2"}, - "up": {"uv": [7, 6, 14, 7], "rotation": 90, "texture": "#2"}, - "down": {"uv": [7, 6, 14, 7], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 12, 7], - "to": [8.5, 13, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [6, 5, 7, 6], "rotation": 180, "texture": "#2"}, - "east": {"uv": [6, 5, 13, 6], "rotation": 180, "texture": "#2"}, - "south": {"uv": [12, 5, 13, 6], "rotation": 180, "texture": "#2"}, - "west": {"uv": [6, 5, 13, 6], "texture": "#2"}, - "up": {"uv": [6, 5, 13, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [7.5, 11, 7], - "to": [8.5, 12, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [6, 4, 7, 5], "rotation": 180, "texture": "#2"}, - "east": {"uv": [6, 4, 13, 5], "rotation": 180, "texture": "#2"}, - "south": {"uv": [12, 4, 13, 5], "rotation": 180, "texture": "#2"}, - "west": {"uv": [6, 4, 13, 5], "texture": "#2"}, - "down": {"uv": [6, 4, 13, 5], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 10, 8], - "to": [8.5, 11, 13], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [7, 3, 8, 4], "rotation": 180, "texture": "#2"}, - "east": {"uv": [7, 3, 12, 4], "rotation": 180, "texture": "#2"}, - "south": {"uv": [11, 3, 12, 4], "rotation": 180, "texture": "#2"}, - "west": {"uv": [7, 3, 12, 4], "texture": "#2"}, - "down": {"uv": [7, 3, 12, 4], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 9, 9], - "to": [8.5, 10, 13], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [8, 2, 9, 3], "rotation": 180, "texture": "#2"}, - "east": {"uv": [8, 2, 12, 3], "rotation": 180, "texture": "#2"}, - "south": {"uv": [11, 2, 12, 3], "rotation": 180, "texture": "#2"}, - "west": {"uv": [8, 2, 12, 3], "texture": "#2"}, - "down": {"uv": [8, 2, 12, 3], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 8, 10], - "to": [8.5, 9, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [9, 1, 10, 2], "rotation": 180, "texture": "#2"}, - "east": {"uv": [9, 1, 11, 2], "rotation": 180, "texture": "#2"}, - "south": {"uv": [10, 1, 11, 2], "rotation": 180, "texture": "#2"}, - "west": {"uv": [9, 1, 11, 2], "texture": "#2"}, - "down": {"uv": [9, 1, 11, 2], "rotation": 270, "texture": "#2"} - } - } - ], - "groups": [0, - { - "name": "axe", - "origin": [8, 8, 8], - "children": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/spruce_log_with_axe.json b/src/main/resources/assets/decorative/models/block/spruce_log_with_axe.json deleted file mode 100755 index cf37f5b..0000000 --- a/src/main/resources/assets/decorative/models/block/spruce_log_with_axe.json +++ /dev/null @@ -1,219 +0,0 @@ -{ - "credit": "made by Motschen", - "parent": "block/block", - "textures": { - "0": "block/spruce_log", - "1": "block/spruce_log_top", - "2": "item/iron_axe", - "particle": "block/spruce_log" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#1"} - } - }, - { - "from": [7.5, 21, 3], - "to": [8.5, 22, 5], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "east": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [2, 14, 3, 15], "texture": "#2"} - } - }, - { - "from": [7.5, 20, 3], - "to": [8.5, 21, 6], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [2, 13, 3, 14], "rotation": 180, "texture": "#2"}, - "east": {"uv": [2, 13, 5, 14], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [2, 13, 5, 14], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [2, 13, 5, 14], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 19, 4], - "to": [8.5, 20, 7], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [3, 12, 4, 13], "rotation": 180, "texture": "#2"}, - "east": {"uv": [3, 12, 6, 13], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [2, 13, 5, 14], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [2, 13, 5, 14], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 18, 5], - "to": [8.5, 19, 8], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [4, 11, 5, 12], "rotation": 180, "texture": "#2"}, - "east": {"uv": [4, 11, 7, 12], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [4, 11, 7, 12], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [4, 11, 7, 12], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 17, 6], - "to": [8.5, 18, 9], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [5, 10, 6, 11], "rotation": 180, "texture": "#2"}, - "east": {"uv": [5, 10, 8, 11], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [5, 10, 8, 11], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [5, 10, 8, 11], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 16, 7], - "to": [8.5, 17, 10], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [6, 9, 7, 10], "rotation": 180, "texture": "#2"}, - "east": {"uv": [6, 9, 9, 10], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [6, 9, 9, 10], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [6, 9, 9, 10], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 15, 8], - "to": [8.5, 16, 11], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [7, 8, 8, 9], "rotation": 180, "texture": "#2"}, - "east": {"uv": [7, 8, 10, 9], "rotation": 180, "texture": "#2"}, - "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, - "west": {"uv": [7, 8, 10, 9], "texture": "#2"}, - "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, - "down": {"uv": [7, 8, 10, 9], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 14, 9], - "to": [8.5, 15, 15], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [8, 7, 9, 8], "rotation": 180, "texture": "#2"}, - "east": {"uv": [8, 7, 14, 8], "rotation": 180, "texture": "#2"}, - "south": {"uv": [13, 7, 14, 8], "rotation": 180, "texture": "#2"}, - "west": {"uv": [8, 7, 14, 8], "texture": "#2"}, - "up": {"uv": [8, 7, 14, 8], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [7.5, 15, 12], - "to": [8.5, 16, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [11, 8, 12, 9], "rotation": 180, "texture": "#2"}, - "east": {"uv": [11, 8, 13, 9], "rotation": 180, "texture": "#2"}, - "south": {"uv": [12, 8, 13, 9], "rotation": 180, "texture": "#2"}, - "west": {"uv": [11, 8, 13, 9], "texture": "#2"}, - "up": {"uv": [11, 8, 13, 9], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [7.5, 13, 8], - "to": [8.5, 14, 15], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [7, 6, 8, 7], "rotation": 180, "texture": "#2"}, - "east": {"uv": [7, 6, 14, 7], "rotation": 180, "texture": "#2"}, - "south": {"uv": [13, 6, 14, 7], "rotation": 180, "texture": "#2"}, - "west": {"uv": [7, 6, 14, 7], "texture": "#2"}, - "up": {"uv": [7, 6, 14, 7], "rotation": 90, "texture": "#2"}, - "down": {"uv": [7, 6, 14, 7], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 12, 7], - "to": [8.5, 13, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [6, 5, 7, 6], "rotation": 180, "texture": "#2"}, - "east": {"uv": [6, 5, 13, 6], "rotation": 180, "texture": "#2"}, - "south": {"uv": [12, 5, 13, 6], "rotation": 180, "texture": "#2"}, - "west": {"uv": [6, 5, 13, 6], "texture": "#2"}, - "up": {"uv": [6, 5, 13, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [7.5, 11, 7], - "to": [8.5, 12, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [6, 4, 7, 5], "rotation": 180, "texture": "#2"}, - "east": {"uv": [6, 4, 13, 5], "rotation": 180, "texture": "#2"}, - "south": {"uv": [12, 4, 13, 5], "rotation": 180, "texture": "#2"}, - "west": {"uv": [6, 4, 13, 5], "texture": "#2"}, - "down": {"uv": [6, 4, 13, 5], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 10, 8], - "to": [8.5, 11, 13], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [7, 3, 8, 4], "rotation": 180, "texture": "#2"}, - "east": {"uv": [7, 3, 12, 4], "rotation": 180, "texture": "#2"}, - "south": {"uv": [11, 3, 12, 4], "rotation": 180, "texture": "#2"}, - "west": {"uv": [7, 3, 12, 4], "texture": "#2"}, - "down": {"uv": [7, 3, 12, 4], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 9, 9], - "to": [8.5, 10, 13], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [8, 2, 9, 3], "rotation": 180, "texture": "#2"}, - "east": {"uv": [8, 2, 12, 3], "rotation": 180, "texture": "#2"}, - "south": {"uv": [11, 2, 12, 3], "rotation": 180, "texture": "#2"}, - "west": {"uv": [8, 2, 12, 3], "texture": "#2"}, - "down": {"uv": [8, 2, 12, 3], "rotation": 270, "texture": "#2"} - } - }, - { - "from": [7.5, 8, 10], - "to": [8.5, 9, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, - "faces": { - "north": {"uv": [9, 1, 10, 2], "rotation": 180, "texture": "#2"}, - "east": {"uv": [9, 1, 11, 2], "rotation": 180, "texture": "#2"}, - "south": {"uv": [10, 1, 11, 2], "rotation": 180, "texture": "#2"}, - "west": {"uv": [9, 1, 11, 2], "texture": "#2"}, - "down": {"uv": [9, 1, 11, 2], "rotation": 270, "texture": "#2"} - } - } - ], - "groups": [0, - { - "name": "axe", - "origin": [8, 8, 8], - "children": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/acacia_log_with_axe.json b/src/main/resources/assets/decorative/models/item/acacia_log_with_axe.json index c405598..7e0fbf3 100755 --- a/src/main/resources/assets/decorative/models/item/acacia_log_with_axe.json +++ b/src/main/resources/assets/decorative/models/item/acacia_log_with_axe.json @@ -1,3 +1,8 @@ { - "parent": "decorative:block/acacia_log_with_axe" + "credit": "made by Motschen", + "parent": "decorative:item/oak_log_with_axe", + "textures": { + "0": "block/acacia_log", + "1": "block/acacia_log_top" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/bamboo_block_with_axe.json b/src/main/resources/assets/decorative/models/item/bamboo_block_with_axe.json new file mode 100755 index 0000000..70ff86e --- /dev/null +++ b/src/main/resources/assets/decorative/models/item/bamboo_block_with_axe.json @@ -0,0 +1,8 @@ +{ + "credit": "made by Motschen", + "parent": "decorative:item/oak_log_with_axe", + "textures": { + "0": "block/bamboo_block", + "1": "block/bamboo_block_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/birch_log_with_axe.json b/src/main/resources/assets/decorative/models/item/birch_log_with_axe.json index 8294d0f..fc4d342 100755 --- a/src/main/resources/assets/decorative/models/item/birch_log_with_axe.json +++ b/src/main/resources/assets/decorative/models/item/birch_log_with_axe.json @@ -1,3 +1,8 @@ { - "parent": "decorative:block/birch_log_with_axe" + "credit": "made by Motschen", + "parent": "decorative:item/oak_log_with_axe", + "textures": { + "0": "block/birch_log", + "1": "block/birch_log_top" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/cherry_log_with_axe.json b/src/main/resources/assets/decorative/models/item/cherry_log_with_axe.json new file mode 100755 index 0000000..9f3bf86 --- /dev/null +++ b/src/main/resources/assets/decorative/models/item/cherry_log_with_axe.json @@ -0,0 +1,8 @@ +{ + "credit": "made by Motschen", + "parent": "decorative:item/oak_log_with_axe", + "textures": { + "0": "block/cherry_log", + "1": "block/cherry_log_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/crimson_stem_with_axe.json b/src/main/resources/assets/decorative/models/item/crimson_stem_with_axe.json new file mode 100755 index 0000000..9f62a53 --- /dev/null +++ b/src/main/resources/assets/decorative/models/item/crimson_stem_with_axe.json @@ -0,0 +1,8 @@ +{ + "credit": "made by Motschen", + "parent": "decorative:item/oak_log_with_axe", + "textures": { + "0": "block/crimson_stem", + "1": "block/crimson_stem_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/dark_oak_log_with_axe.json b/src/main/resources/assets/decorative/models/item/dark_oak_log_with_axe.json index 8d38abc..b7b3506 100755 --- a/src/main/resources/assets/decorative/models/item/dark_oak_log_with_axe.json +++ b/src/main/resources/assets/decorative/models/item/dark_oak_log_with_axe.json @@ -1,3 +1,8 @@ { - "parent": "decorative:block/dark_oak_log_with_axe" + "credit": "made by Motschen", + "parent": "decorative:item/oak_log_with_axe", + "textures": { + "0": "block/dark_oak_log", + "1": "block/dark_oak_log_top" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/jungle_log_with_axe.json b/src/main/resources/assets/decorative/models/item/jungle_log_with_axe.json index 637a338..fa94292 100755 --- a/src/main/resources/assets/decorative/models/item/jungle_log_with_axe.json +++ b/src/main/resources/assets/decorative/models/item/jungle_log_with_axe.json @@ -1,3 +1,8 @@ { - "parent": "decorative:block/jungle_log_with_axe" + "credit": "made by Motschen", + "parent": "decorative:item/oak_log_with_axe", + "textures": { + "0": "block/jungle_log", + "1": "block/jungle_log_top" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/mangrove_log_with_axe.json b/src/main/resources/assets/decorative/models/item/mangrove_log_with_axe.json new file mode 100755 index 0000000..d4d70d1 --- /dev/null +++ b/src/main/resources/assets/decorative/models/item/mangrove_log_with_axe.json @@ -0,0 +1,8 @@ +{ + "credit": "made by Motschen", + "parent": "decorative:item/oak_log_with_axe", + "textures": { + "0": "block/mangrove_log", + "1": "block/mangrove_log_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/oak_log_with_axe.json b/src/main/resources/assets/decorative/models/item/oak_log_with_axe.json index ac5f163..7558cd6 100755 --- a/src/main/resources/assets/decorative/models/item/oak_log_with_axe.json +++ b/src/main/resources/assets/decorative/models/item/oak_log_with_axe.json @@ -1,3 +1,219 @@ { - "parent": "decorative:block/oak_log_with_axe" + "credit": "made by Motschen", + "parent": "block/block", + "textures": { + "0": "block/oak_log", + "1": "block/oak_log_top", + "2": "item/iron_axe", + "particle": "#0" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "from": [7.5, 21, 3], + "to": [8.5, 22, 5], + "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, + "faces": { + "north": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, + "east": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, + "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, + "west": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, + "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, + "down": {"uv": [2, 14, 3, 15], "texture": "#2"} + } + }, + { + "from": [7.5, 20, 3], + "to": [8.5, 21, 6], + "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, + "faces": { + "north": {"uv": [2, 13, 3, 14], "rotation": 180, "texture": "#2"}, + "east": {"uv": [2, 13, 5, 14], "rotation": 180, "texture": "#2"}, + "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, + "west": {"uv": [2, 13, 5, 14], "texture": "#2"}, + "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, + "down": {"uv": [2, 13, 5, 14], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [7.5, 19, 4], + "to": [8.5, 20, 7], + "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, + "faces": { + "north": {"uv": [3, 12, 4, 13], "rotation": 180, "texture": "#2"}, + "east": {"uv": [3, 12, 6, 13], "rotation": 180, "texture": "#2"}, + "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, + "west": {"uv": [2, 13, 5, 14], "texture": "#2"}, + "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, + "down": {"uv": [2, 13, 5, 14], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [7.5, 18, 5], + "to": [8.5, 19, 8], + "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, + "faces": { + "north": {"uv": [4, 11, 5, 12], "rotation": 180, "texture": "#2"}, + "east": {"uv": [4, 11, 7, 12], "rotation": 180, "texture": "#2"}, + "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, + "west": {"uv": [4, 11, 7, 12], "texture": "#2"}, + "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, + "down": {"uv": [4, 11, 7, 12], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [7.5, 17, 6], + "to": [8.5, 18, 9], + "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, + "faces": { + "north": {"uv": [5, 10, 6, 11], "rotation": 180, "texture": "#2"}, + "east": {"uv": [5, 10, 8, 11], "rotation": 180, "texture": "#2"}, + "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, + "west": {"uv": [5, 10, 8, 11], "texture": "#2"}, + "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, + "down": {"uv": [5, 10, 8, 11], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [7.5, 16, 7], + "to": [8.5, 17, 10], + "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, + "faces": { + "north": {"uv": [6, 9, 7, 10], "rotation": 180, "texture": "#2"}, + "east": {"uv": [6, 9, 9, 10], "rotation": 180, "texture": "#2"}, + "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, + "west": {"uv": [6, 9, 9, 10], "texture": "#2"}, + "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, + "down": {"uv": [6, 9, 9, 10], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [7.5, 15, 8], + "to": [8.5, 16, 11], + "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, + "faces": { + "north": {"uv": [7, 8, 8, 9], "rotation": 180, "texture": "#2"}, + "east": {"uv": [7, 8, 10, 9], "rotation": 180, "texture": "#2"}, + "south": {"uv": [2, 14, 3, 15], "rotation": 180, "texture": "#2"}, + "west": {"uv": [7, 8, 10, 9], "texture": "#2"}, + "up": {"uv": [2, 14, 3, 15], "texture": "#2"}, + "down": {"uv": [7, 8, 10, 9], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [7.5, 14, 9], + "to": [8.5, 15, 15], + "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, + "faces": { + "north": {"uv": [8, 7, 9, 8], "rotation": 180, "texture": "#2"}, + "east": {"uv": [8, 7, 14, 8], "rotation": 180, "texture": "#2"}, + "south": {"uv": [13, 7, 14, 8], "rotation": 180, "texture": "#2"}, + "west": {"uv": [8, 7, 14, 8], "texture": "#2"}, + "up": {"uv": [8, 7, 14, 8], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [7.5, 15, 12], + "to": [8.5, 16, 14], + "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, + "faces": { + "north": {"uv": [11, 8, 12, 9], "rotation": 180, "texture": "#2"}, + "east": {"uv": [11, 8, 13, 9], "rotation": 180, "texture": "#2"}, + "south": {"uv": [12, 8, 13, 9], "rotation": 180, "texture": "#2"}, + "west": {"uv": [11, 8, 13, 9], "texture": "#2"}, + "up": {"uv": [11, 8, 13, 9], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [7.5, 13, 8], + "to": [8.5, 14, 15], + "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, + "faces": { + "north": {"uv": [7, 6, 8, 7], "rotation": 180, "texture": "#2"}, + "east": {"uv": [7, 6, 14, 7], "rotation": 180, "texture": "#2"}, + "south": {"uv": [13, 6, 14, 7], "rotation": 180, "texture": "#2"}, + "west": {"uv": [7, 6, 14, 7], "texture": "#2"}, + "up": {"uv": [7, 6, 14, 7], "rotation": 90, "texture": "#2"}, + "down": {"uv": [7, 6, 14, 7], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [7.5, 12, 7], + "to": [8.5, 13, 14], + "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, + "faces": { + "north": {"uv": [6, 5, 7, 6], "rotation": 180, "texture": "#2"}, + "east": {"uv": [6, 5, 13, 6], "rotation": 180, "texture": "#2"}, + "south": {"uv": [12, 5, 13, 6], "rotation": 180, "texture": "#2"}, + "west": {"uv": [6, 5, 13, 6], "texture": "#2"}, + "up": {"uv": [6, 5, 13, 6], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [7.5, 11, 7], + "to": [8.5, 12, 14], + "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, + "faces": { + "north": {"uv": [6, 4, 7, 5], "rotation": 180, "texture": "#2"}, + "east": {"uv": [6, 4, 13, 5], "rotation": 180, "texture": "#2"}, + "south": {"uv": [12, 4, 13, 5], "rotation": 180, "texture": "#2"}, + "west": {"uv": [6, 4, 13, 5], "texture": "#2"}, + "down": {"uv": [6, 4, 13, 5], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [7.5, 10, 8], + "to": [8.5, 11, 13], + "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, + "faces": { + "north": {"uv": [7, 3, 8, 4], "rotation": 180, "texture": "#2"}, + "east": {"uv": [7, 3, 12, 4], "rotation": 180, "texture": "#2"}, + "south": {"uv": [11, 3, 12, 4], "rotation": 180, "texture": "#2"}, + "west": {"uv": [7, 3, 12, 4], "texture": "#2"}, + "down": {"uv": [7, 3, 12, 4], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [7.5, 9, 9], + "to": [8.5, 10, 13], + "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, + "faces": { + "north": {"uv": [8, 2, 9, 3], "rotation": 180, "texture": "#2"}, + "east": {"uv": [8, 2, 12, 3], "rotation": 180, "texture": "#2"}, + "south": {"uv": [11, 2, 12, 3], "rotation": 180, "texture": "#2"}, + "west": {"uv": [8, 2, 12, 3], "texture": "#2"}, + "down": {"uv": [8, 2, 12, 3], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [7.5, 8, 10], + "to": [8.5, 9, 12], + "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 14, -4]}, + "faces": { + "north": {"uv": [9, 1, 10, 2], "rotation": 180, "texture": "#2"}, + "east": {"uv": [9, 1, 11, 2], "rotation": 180, "texture": "#2"}, + "south": {"uv": [10, 1, 11, 2], "rotation": 180, "texture": "#2"}, + "west": {"uv": [9, 1, 11, 2], "texture": "#2"}, + "down": {"uv": [9, 1, 11, 2], "rotation": 270, "texture": "#2"} + } + } + ], + "groups": [0, + { + "name": "axe", + "origin": [8, 8, 8], + "children": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/spruce_log_with_axe.json b/src/main/resources/assets/decorative/models/item/spruce_log_with_axe.json index 5f9fd24..f4fbbe6 100755 --- a/src/main/resources/assets/decorative/models/item/spruce_log_with_axe.json +++ b/src/main/resources/assets/decorative/models/item/spruce_log_with_axe.json @@ -1,3 +1,8 @@ { - "parent": "decorative:block/spruce_log_with_axe" + "credit": "made by Motschen", + "parent": "decorative:item/oak_log_with_axe", + "textures": { + "0": "block/spruce_log", + "1": "block/spruce_log_top" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/warped_stem_with_axe.json b/src/main/resources/assets/decorative/models/item/warped_stem_with_axe.json new file mode 100755 index 0000000..068dbbe --- /dev/null +++ b/src/main/resources/assets/decorative/models/item/warped_stem_with_axe.json @@ -0,0 +1,8 @@ +{ + "credit": "made by Motschen", + "parent": "decorative:item/oak_log_with_axe", + "textures": { + "0": "block/warped_stem", + "1": "block/warped_stem_top" + } +} \ No newline at end of file