diff --git a/src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java b/src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java index b1f5056df..6fd619892 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java +++ b/src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java @@ -27,7 +27,7 @@ public class BlockRegistryApiculture extends BlockRegistry { public BlockRegistryApiculture() { apiculture = registerBlock(new BlockApiculture(), ItemBlockForestry.class, "apiculture"); - apicultureChest = registerBlock(new BlockBase<>(true, BlockTypeApicultureTesr.class), ItemBlockForestry.class, "apicultureChest"); + apicultureChest = registerBlock(new BlockBase<>(BlockTypeApicultureTesr.class), ItemBlockForestry.class, "apicultureChest"); apicultureChest.setCreativeTab(Tabs.tabApiculture); apicultureChest.setHarvestLevel("axe", 0); diff --git a/src/main/java/forestry/apiculture/blocks/BlockTypeApiculture.java b/src/main/java/forestry/apiculture/blocks/BlockTypeApiculture.java index 6b6687083..c97c01ac7 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockTypeApiculture.java +++ b/src/main/java/forestry/apiculture/blocks/BlockTypeApiculture.java @@ -15,11 +15,12 @@ import javax.annotation.Nonnull; import forestry.apiculture.tiles.TileApiary; import forestry.apiculture.tiles.TileBeeHouse; import forestry.core.blocks.IBlockType; +import forestry.core.blocks.IBlockTypeCustom; import forestry.core.blocks.IMachineProperties; import forestry.core.blocks.MachineProperties; import forestry.core.tiles.TileForestry; -public enum BlockTypeApiculture implements IBlockType { +public enum BlockTypeApiculture implements IBlockTypeCustom { APIARY(0, TileApiary.class, "apiary"), BEE_HOUSE(1, TileBeeHouse.class, "bee.house"); @@ -34,7 +35,7 @@ public enum BlockTypeApiculture implements IBlockType { @Nonnull @Override - public IMachineProperties getMachineProperties() { + public IMachineProperties getMachineProperties() { return machineProperties; } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArboriculture.java b/src/main/java/forestry/arboriculture/blocks/BlockArboriculture.java index 9b54c5fc3..f8d1f0ecc 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArboriculture.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArboriculture.java @@ -15,7 +15,7 @@ import forestry.core.blocks.BlockBase; public class BlockArboriculture extends BlockBase { public BlockArboriculture() { - super(true, BlockTypeArboricultureTesr.class); + super(BlockTypeArboricultureTesr.class); setCreativeTab(Tabs.tabArboriculture); } } diff --git a/src/main/java/forestry/core/blocks/BlockBase.java b/src/main/java/forestry/core/blocks/BlockBase.java index eed36b2fd..3f0d6094a 100644 --- a/src/main/java/forestry/core/blocks/BlockBase.java +++ b/src/main/java/forestry/core/blocks/BlockBase.java @@ -59,6 +59,7 @@ import jline.internal.Log; public class BlockBase

& IBlockType & IStringSerializable> extends BlockForestry implements IItemModelRegister, IStateMapperRegister { private final Map properties = new HashMap<>(); private final boolean hasTESR; + private final boolean hasCustom; private final Class

machinePropertiesClass; /* PROPERTIES */ @@ -68,15 +69,12 @@ public class BlockBase

& IBlockType & IStringSerializable> ext protected final BlockState blockState; private boolean isReady = false; - - public BlockBase(Class

machinePropertiesClass) { - this(false, machinePropertiesClass); - } - public BlockBase(boolean hasTESR, Class

machinePropertiesClass) { + public BlockBase(Class

machinePropertiesClass) { super(Material.iron); - this.hasTESR = hasTESR; + this.hasTESR = IBlockTypeTesr.class.isAssignableFrom(machinePropertiesClass);; + this.hasCustom = IBlockTypeCustom.class.isAssignableFrom(machinePropertiesClass); this.lightOpacity = this.isOpaqueCube() ? 255 : 0; this.machinePropertiesClass = machinePropertiesClass; @@ -105,12 +103,12 @@ public class BlockBase

& IBlockType & IStringSerializable> ext @Override public boolean isOpaqueCube() { - return !hasTESR; + return !hasTESR && !hasCustom; } @Override public boolean isNormalCube() { - return !hasTESR; + return !hasTESR && !hasCustom; } @Override diff --git a/src/main/java/forestry/core/blocks/BlockCore.java b/src/main/java/forestry/core/blocks/BlockCore.java index 5a2b47698..570487db3 100644 --- a/src/main/java/forestry/core/blocks/BlockCore.java +++ b/src/main/java/forestry/core/blocks/BlockCore.java @@ -12,6 +12,6 @@ package forestry.core.blocks; public class BlockCore extends BlockBase { public BlockCore() { - super(true, BlockTypeCoreTesr.class); + super(BlockTypeCoreTesr.class); } } diff --git a/src/main/java/forestry/core/blocks/IBlockTypeCustom.java b/src/main/java/forestry/core/blocks/IBlockTypeCustom.java new file mode 100644 index 000000000..e0f6132c5 --- /dev/null +++ b/src/main/java/forestry/core/blocks/IBlockTypeCustom.java @@ -0,0 +1,5 @@ +package forestry.core.blocks; + +public interface IBlockTypeCustom extends IBlockType{ + +} diff --git a/src/main/java/forestry/core/blocks/IBlockTypeTesr.java b/src/main/java/forestry/core/blocks/IBlockTypeTesr.java index 099d56d8a..1bbcef9ef 100644 --- a/src/main/java/forestry/core/blocks/IBlockTypeTesr.java +++ b/src/main/java/forestry/core/blocks/IBlockTypeTesr.java @@ -5,5 +5,5 @@ import javax.annotation.Nonnull; public interface IBlockTypeTesr extends IBlockType { @Override @Nonnull - IMachinePropertiesTesr getMachineProperties(); + IMachineProperties getMachineProperties(); } diff --git a/src/main/java/forestry/energy/blocks/BlockEngine.java b/src/main/java/forestry/energy/blocks/BlockEngine.java index 4810a00bc..a9ec59a46 100644 --- a/src/main/java/forestry/energy/blocks/BlockEngine.java +++ b/src/main/java/forestry/energy/blocks/BlockEngine.java @@ -53,7 +53,7 @@ public class BlockEngine extends BlockBase { } public BlockEngine() { - super(true, BlockTypeEngine.class); + super(BlockTypeEngine.class); } @Override diff --git a/src/main/java/forestry/factory/blocks/BlockFactoryTESR.java b/src/main/java/forestry/factory/blocks/BlockFactoryTESR.java index e7ada781a..f44dee3c0 100644 --- a/src/main/java/forestry/factory/blocks/BlockFactoryTESR.java +++ b/src/main/java/forestry/factory/blocks/BlockFactoryTESR.java @@ -14,6 +14,6 @@ import forestry.core.blocks.BlockBase; public class BlockFactoryTESR extends BlockBase { public BlockFactoryTESR() { - super(true, BlockTypeFactoryTesr.class); + super(BlockTypeFactoryTesr.class); } } diff --git a/src/main/java/forestry/lepidopterology/blocks/BlockLepidopterology.java b/src/main/java/forestry/lepidopterology/blocks/BlockLepidopterology.java index 0884fc00a..eb47ae1db 100644 --- a/src/main/java/forestry/lepidopterology/blocks/BlockLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/blocks/BlockLepidopterology.java @@ -15,7 +15,7 @@ import forestry.core.blocks.BlockBase; public class BlockLepidopterology extends BlockBase { public BlockLepidopterology() { - super(true, BlockTypeLepidopterologyTesr.class); + super(BlockTypeLepidopterologyTesr.class); setCreativeTab(Tabs.tabLepidopterology); } } diff --git a/src/main/resources/assets/forestry/models/block/apiculture_apiary.json b/src/main/resources/assets/forestry/models/block/apiculture_apiary.json index 10a3833bf..4d23237ef 100644 --- a/src/main/resources/assets/forestry/models/block/apiculture_apiary.json +++ b/src/main/resources/assets/forestry/models/block/apiculture_apiary.json @@ -1,12 +1,335 @@ { - "parent": "block/cube", - "textures": { - "particle": "forestry:blocks/apiary.4", - "down": "forestry:blocks/apiary.0", - "up": "forestry:blocks/apiary.1", - "north": "forestry:blocks/apiary.2", - "east": "forestry:blocks/apiary.4", - "south": "forestry:blocks/apiary.4", - "west": "forestry:blocks/apiary.4" +"textures": { + "particle": "forestry:blocks/apiary.4", + "front": "forestry:blocks/apiary.4", + "front_2": "forestry:blocks/apiary.2", + "buttom": "forestry:blocks/apiary.0", + "top": "forestry:blocks/apiary.1" +}, +"elements": [ +{ + "from": [ 0, 14, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 16, 16, 0, 0 ], "rotation": 180, "texture": "#top" }, + "up": { "uv": [ 0, 0, 16, 16 ], "rotation": 180, "texture": "#top" }, + "north": { "uv": [ 0, 0, 16, 2 ], "texture": "#front" }, + "south": { "uv": [ 0, 0, 16, 2 ], "texture": "#front" }, + "west": { "uv": [ 0, 0, 16, 2 ], "texture": "#front" }, + "east": { "uv": [ 0, 0, 16, 2 ], "texture": "#front" } + } +}, +{ + "from": [ 1, 0, 1 ], + "to": [ 15, 14, 15 ], + "faces": { + "down": { "uv": [ 1, 1, 15, 15 ], "rotation": 180, "texture": "#buttom" }, + "up": { "uv": [ 1, 1, 15, 15 ], "rotation": 180, "texture": "#buttom" }, + "north": { "uv": [ 0, 2, 16, 16 ], "texture": "#front_2" }, + "south": { "uv": [ 0, 2, 16, 16 ], "texture": "#front" }, + "west": { "uv": [ 0, 2, 16, 16 ], "texture": "#front" }, + "east": { "uv": [ 0, 2, 16, 16 ], "texture": "#front" } + } +}, +{ + "from": [ 15, 11, 3.5 ], + "to": [ 16, 12, 5.5 ], + "faces": { + "down": { "uv": [ 11, 4, 13, 5 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 11, 4, 13, 5 ], "rotation": 180, "texture": "#front" }, + "north": { "uv": [ 12, 4, 13, 5 ], "texture": "#front" }, + "south": { "uv": [ 12, 4, 13, 5 ], "texture": "#front" }, + "west": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" }, + "east": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" } + } +}, +{ + "from": [ 0, 8, 2.5 ], + "to": [ 1, 11, 6.5 ], + "faces": { + "down": { "uv": [ 6, 8, 2, 7 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 2, 5, 6, 6 ], "rotation": 270, "texture": "#front" }, + "north": { "uv": [ 2, 5, 3, 8 ], "texture": "#front" }, + "south": { "uv": [ 5, 5, 6, 8 ], "texture": "#front" }, + "west": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" }, + "east": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" } + } +}, +{ + "from": [ 15, 7, 1.5 ], + "to": [ 16, 8, 7.5 ], + "faces": { + "down": { "uv": [ 9, 9, 15, 8 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 9, 8, 15, 9 ], "rotation": 180, "texture": "#front" }, + "north": { "uv": [ 14, 8, 15, 9 ], "texture": "#front" }, + "south": { "uv": [ 14, 8, 15, 9 ], "texture": "#front" }, + "west": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" }, + "east": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" } + } +}, +{ + "from": [ 0, 11, 10.5 ], + "to": [ 1, 12, 12.5 ], + "faces": { + "down": { "uv": [ 13, 5, 11, 4 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 11, 4, 13, 5 ], "rotation": 180, "texture": "#front" }, + "north": { "uv": [ 11, 4, 12, 5 ], "texture": "#front" }, + "south": { "uv": [ 12, 4, 13, 5 ], "texture": "#front" }, + "west": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" }, + "east": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" } + } +}, +{ + "from": [ 0, 8, 9.5 ], + "to": [ 1, 11, 13.5 ], + "faces": { + "down": { "uv": [ 14, 8, 10, 7 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 10, 5, 14, 6 ], "rotation": 270, "texture": "#front" }, + "north": { "uv": [ 13, 5, 14, 8 ], "texture": "#front" }, + "south": { "uv": [ 13, 5, 14, 8 ], "texture": "#front" }, + "west": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" }, + "east": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" } + } +}, +{ + "from": [ 0, 7, 8.5 ], + "to": [ 1, 8, 14.5 ], + "faces": { + "down": { "uv": [ 15, 9, 9, 8 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 9, 8, 15, 9 ], "rotation": 180, "texture": "#front" }, + "north": { "uv": [ 9, 8, 10, 9 ], "texture": "#front" }, + "south": { "uv": [ 14, 8, 15, 9 ], "texture": "#front" }, + "west": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" }, + "east": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" } + } +}, +{ + "from": [ 0, 11, 3.5 ], + "to": [ 1, 12, 5.5 ], + "faces": { + "down": { "uv": [ 3, 4, 5, 5 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 3, 4, 5, 5 ], "rotation": 180, "texture": "#front" }, + "north": { "uv": [ 4, 4, 5, 5 ], "texture": "#front" }, + "south": { "uv": [ 3, 4, 4, 5 ], "texture": "#front" }, + "west": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" }, + "east": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" } + } +}, +{ + "from": [ 15, 8, 2.5 ], + "to": [ 16, 11, 6.5 ], + "faces": { + "down": { "uv": [ 14, 8, 10, 7 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 10, 5, 14, 6 ], "rotation": 270, "texture": "#front" }, + "north": { "uv": [ 10, 5, 11, 8 ], "texture": "#front" }, + "south": { "uv": [ 13, 5, 14, 8 ], "texture": "#front" }, + "west": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" }, + "east": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" } + } +}, +{ + "from": [ 0, 7, 1.5 ], + "to": [ 1, 8, 7.5 ], + "faces": { + "down": { "uv": [ 1, 9, 7, 8 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 1, 8, 7, 9 ], "rotation": 180, "texture": "#front" }, + "north": { "uv": [ 6, 8, 7, 9 ], "texture": "#front" }, + "south": { "uv": [ 1, 8, 2, 9 ], "texture": "#front" }, + "west": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" }, + "east": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" } + } +}, +{ + "from": [ 15, 11, 10.5 ], + "to": [ 16, 12, 12.5 ], + "faces": { + "down": { "uv": [ 5, 5, 3, 4 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 3, 4, 5, 5 ], "rotation": 180, "texture": "#front" }, + "north": { "uv": [ 4, 4, 5, 5 ], "texture": "#front" }, + "south": { "uv": [ 4, 4, 5, 5 ], "texture": "#front" }, + "west": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" }, + "east": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" } + } +}, +{ + "from": [ 15, 8, 9.5 ], + "to": [ 16, 11, 13.5 ], + "faces": { + "down": { "uv": [ 6, 8, 2, 7 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 2, 5, 6, 6 ], "rotation": 270, "texture": "#front" }, + "north": { "uv": [ 2, 5, 3, 8 ], "texture": "#front" }, + "south": { "uv": [ 5, 5, 6, 8 ], "texture": "#front" }, + "west": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" }, + "east": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" } + } +}, +{ + "from": [ 15, 7, 8.5 ], + "to": [ 16, 8, 14.5 ], + "faces": { + "down": { "uv": [ 7, 9, 1, 8 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 1, 8, 7, 9 ], "rotation": 180, "texture": "#front" }, + "north": { "uv": [ 1, 8, 2, 9 ], "texture": "#front" }, + "south": { "uv": [ 6, 8, 7, 9 ], "texture": "#front" }, + "west": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" }, + "east": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" } + } +}, +{ + "from": [ 8.5, 7, 15 ], + "to": [ 14.5, 8, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 15, 8 ], "rotation": 270, "texture": "#front" }, + "up": { "uv": [ 9, 8, 15, 9 ], "rotation": 270, "texture": "#front" }, + "north": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" }, + "south": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" }, + "west": { "uv": [ 14, 8, 15, 9 ], "texture": "#front" }, + "east": { "uv": [ 9, 8, 10, 9 ], "texture": "#front" } + } +}, +{ + "from": [ 2.5, 8, 15 ], + "to": [ 6.5, 11, 16 ], + "faces": { + "down": { "uv": [ 6, 8, 2, 7 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 2, 5, 6, 6 ], "rotation": 180, "texture": "#front" }, + "north": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" }, + "south": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" }, + "west": { "uv": [ 5, 5, 6, 8 ], "texture": "#front" }, + "east": { "uv": [ 2, 5, 3, 8 ], "texture": "#front" } + } +}, +{ + "from": [ 10.5, 11, 15 ], + "to": [ 12.5, 12, 16 ], + "faces": { + "down": { "uv": [ 13, 5, 11, 4 ], "rotation": 270, "texture": "#front" }, + "up": { "uv": [ 11, 4, 13, 5 ], "rotation": 270, "texture": "#front" }, + "north": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" }, + "south": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" }, + "west": { "uv": [ 12, 4, 13, 5 ], "texture": "#front" }, + "east": { "uv": [ 11, 4, 12, 5 ], "texture": "#front" } + } +}, +{ + "from": [ 1.5, 7, 15 ], + "to": [ 7.5, 8, 16 ], + "faces": { + "down": { "uv": [ 7, 9, 1, 8 ], "rotation": 270, "texture": "#front" }, + "up": { "uv": [ 1, 8, 7, 9 ], "rotation": 270, "texture": "#front" }, + "north": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" }, + "south": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" }, + "west": { "uv": [ 6, 8, 7, 9 ], "texture": "#front" }, + "east": { "uv": [ 1, 8, 2, 9 ], "texture": "#front" } + } +}, +{ + "from": [ 9.5, 8, 15 ], + "to": [ 13.5, 11, 16 ], + "faces": { + "down": { "uv": [ 14, 8, 10, 7 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 10, 5, 14, 6 ], "rotation": 180, "texture": "#front" }, + "north": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" }, + "south": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" }, + "west": { "uv": [ 13, 5, 14, 8 ], "texture": "#front" }, + "east": { "uv": [ 10, 5, 11, 8 ], "texture": "#front" } + } +}, +{ + "from": [ 3.5, 11, 15 ], + "to": [ 5.5, 12, 16 ], + "faces": { + "down": { "uv": [ 5, 5, 3, 4 ], "rotation": 270, "texture": "#front" }, + "up": { "uv": [ 3, 4, 5, 5 ], "rotation": 270, "texture": "#front" }, + "north": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" }, + "south": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" }, + "west": { "uv": [ 4, 4, 5, 5 ], "texture": "#front" }, + "east": { "uv": [ 3, 4, 4, 5 ], "texture": "#front" } + } +}, +{ + "from": [ 8.5, 7, 0 ], + "to": [ 14.5, 8, 1 ], + "faces": { + "down": { "uv": [ 7, 9, 1, 8 ], "rotation": 180, "texture": "#front_2" }, + "up": { "uv": [ 1, 8, 7, 9 ], "rotation": 180, "texture": "#front_2" }, + "north": { "uv": [ 1, 8, 7, 9 ], "texture": "#front_2" }, + "south": { "uv": [ 1, 8, 7, 9 ], "texture": "#front_2" }, + "west": { "uv": [ 1, 8, 2, 9 ], "texture": "#front_2" }, + "east": { "uv": [ 6, 8, 7, 9 ], "texture": "#front_2" } + } +}, +{ + "from": [ 2.5, 8, 0 ], + "to": [ 6.5, 11, 1 ], + "faces": { + "down": { "uv": [ 14, 8, 10, 7 ], "rotation": 180, "texture": "#front_2" }, + "up": { "uv": [ 10, 5, 14, 6 ], "rotation": 180, "texture": "#front_2" }, + "north": { "uv": [ 10, 5, 14, 8 ], "texture": "#front_2" }, + "south": { "uv": [ 10, 5, 14, 8 ], "texture": "#front_2" }, + "west": { "uv": [ 13, 5, 14, 8 ], "texture": "#front_2" }, + "east": { "uv": [ 10, 5, 11, 8 ], "texture": "#front_2" } + } +}, +{ + "from": [ 10.5, 11, 0 ], + "to": [ 12.5, 12, 1 ], + "faces": { + "down": { "uv": [ 5, 5, 3, 4 ], "rotation": 180, "texture": "#front_2" }, + "up": { "uv": [ 3, 4, 5, 5 ], "rotation": 180, "texture": "#front_2" }, + "north": { "uv": [ 3, 4, 5, 5 ], "texture": "#front_2" }, + "south": { "uv": [ 3, 4, 5, 5 ], "texture": "#front_2" }, + "west": { "uv": [ 4, 4, 5, 5 ], "texture": "#front_2" }, + "east": { "uv": [ 3, 4, 4, 5 ], "texture": "#front_2" } + } +}, +{ + "from": [ 1.5, 7, 0 ], + "to": [ 7.5, 8, 1 ], + "faces": { + "down": { "uv": [ 15, 9, 9, 8 ], "rotation": 270, "texture": "#front_2" }, + "up": { "uv": [ 9, 8, 15, 9 ], "rotation": 270, "texture": "#front_2" }, + "north": { "uv": [ 9, 8, 15, 9 ], "texture": "#front_2" }, + "south": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" }, + "west": { "uv": [ 14, 8, 15, 9 ], "texture": "#front_2" }, + "east": { "uv": [ 9, 8, 10, 9 ], "texture": "#front_2" } + } +}, +{ + "from": [ 9.5, 8, 0 ], + "to": [ 13.5, 11, 1 ], + "faces": { + "down": { "uv": [ 6, 8, 2, 7 ], "rotation": 180, "texture": "#front_2" }, + "up": { "uv": [ 2, 5, 6, 6 ], "rotation": 180, "texture": "#front_2" }, + "north": { "uv": [ 2, 5, 6, 8 ], "texture": "#front_2" }, + "south": { "uv": [ 2, 5, 6, 8 ], "texture": "#front_2" }, + "west": { "uv": [ 5, 5, 6, 8 ], "texture": "#front_2" }, + "east": { "uv": [ 2, 5, 3, 8 ], "texture": "#front_2" } + } +}, +{ + "from": [ 3.5, 11, 0 ], + "to": [ 5.5, 12, 1 ], + "faces": { + "down": { "uv": [ 13, 5, 11, 4 ], "rotation": 270, "texture": "#front_2" }, + "up": { "uv": [ 11, 4, 13, 5 ], "rotation": 270, "texture": "#front_2" }, + "north": { "uv": [ 11, 4, 13, 5 ], "texture": "#front_2" }, + "south": { "uv": [ 11, 4, 13, 5 ], "texture": "#front_2" }, + "west": { "uv": [ 12, 4, 13, 5 ], "texture": "#front_2" }, + "east": { "uv": [ 11, 4, 12, 5 ], "texture": "#front_2" } + } +}, +{ + "from": [ 10.5, 6, 0 ], + "to": [ 11.5, 7, 1 ], + "faces": { + "down": { "uv": [ 5, 10, 4, 9 ], "rotation": 270, "texture": "#front_2" }, + "up": { "uv": [ 4, 9, 5, 10 ], "rotation": 270, "texture": "#front_2" }, + "north": { "uv": [ 4, 9, 5, 10 ], "texture": "#front_2" }, + "south": { "uv": [ 4, 9, 5, 10 ], "texture": "#front_2" }, + "west": { "uv": [ 4, 9, 5, 10 ], "texture": "#front_2" }, + "east": { "uv": [ 4, 9, 5, 10 ], "texture": "#front_2" } } } +] +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/apiculture_bee.house.json b/src/main/resources/assets/forestry/models/block/apiculture_bee.house.json index 49f9ae61c..6640956ef 100644 --- a/src/main/resources/assets/forestry/models/block/apiculture_bee.house.json +++ b/src/main/resources/assets/forestry/models/block/apiculture_bee.house.json @@ -1,12 +1,335 @@ { - "parent": "block/cube", - "textures": { - "particle": "forestry:blocks/beehouse.4", - "down": "forestry:blocks/beehouse.0", - "up": "forestry:blocks/beehouse.1", - "north": "forestry:blocks/beehouse.2", - "east": "forestry:blocks/beehouse.4", - "south": "forestry:blocks/beehouse.4", - "west": "forestry:blocks/beehouse.4" +"textures": { + "particle": "forestry:blocks/beehouse.4", + "front": "forestry:blocks/beehouse.4", + "front_2": "forestry:blocks/beehouse.2", + "buttom": "forestry:blocks/beehouse.0", + "top": "forestry:blocks/beehouse.1" +}, +"elements": [ +{ + "from": [ 0, 14, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 16, 16, 0, 0 ], "rotation": 180, "texture": "#top" }, + "up": { "uv": [ 0, 0, 16, 16 ], "rotation": 180, "texture": "#top" }, + "north": { "uv": [ 0, 0, 16, 2 ], "texture": "#front" }, + "south": { "uv": [ 0, 0, 16, 2 ], "texture": "#front" }, + "west": { "uv": [ 0, 0, 16, 2 ], "texture": "#front" }, + "east": { "uv": [ 0, 0, 16, 2 ], "texture": "#front" } + } +}, +{ + "from": [ 1, 0, 1 ], + "to": [ 15, 14, 15 ], + "faces": { + "down": { "uv": [ 1, 1, 15, 15 ], "rotation": 180, "texture": "#buttom" }, + "up": { "uv": [ 1, 1, 15, 15 ], "rotation": 180, "texture": "#buttom" }, + "north": { "uv": [ 0, 2, 16, 16 ], "texture": "#front_2" }, + "south": { "uv": [ 0, 2, 16, 16 ], "texture": "#front" }, + "west": { "uv": [ 0, 2, 16, 16 ], "texture": "#front" }, + "east": { "uv": [ 0, 2, 16, 16 ], "texture": "#front" } + } +}, +{ + "from": [ 15, 11, 3.5 ], + "to": [ 16, 12, 5.5 ], + "faces": { + "down": { "uv": [ 11, 4, 13, 5 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 11, 4, 13, 5 ], "rotation": 180, "texture": "#front" }, + "north": { "uv": [ 12, 4, 13, 5 ], "texture": "#front" }, + "south": { "uv": [ 12, 4, 13, 5 ], "texture": "#front" }, + "west": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" }, + "east": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" } + } +}, +{ + "from": [ 0, 8, 2.5 ], + "to": [ 1, 11, 6.5 ], + "faces": { + "down": { "uv": [ 6, 8, 2, 7 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 2, 5, 6, 6 ], "rotation": 270, "texture": "#front" }, + "north": { "uv": [ 2, 5, 3, 8 ], "texture": "#front" }, + "south": { "uv": [ 5, 5, 6, 8 ], "texture": "#front" }, + "west": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" }, + "east": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" } + } +}, +{ + "from": [ 15, 7, 1.5 ], + "to": [ 16, 8, 7.5 ], + "faces": { + "down": { "uv": [ 9, 9, 15, 8 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 9, 8, 15, 9 ], "rotation": 180, "texture": "#front" }, + "north": { "uv": [ 14, 8, 15, 9 ], "texture": "#front" }, + "south": { "uv": [ 14, 8, 15, 9 ], "texture": "#front" }, + "west": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" }, + "east": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" } + } +}, +{ + "from": [ 0, 11, 10.5 ], + "to": [ 1, 12, 12.5 ], + "faces": { + "down": { "uv": [ 13, 5, 11, 4 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 11, 4, 13, 5 ], "rotation": 180, "texture": "#front" }, + "north": { "uv": [ 11, 4, 12, 5 ], "texture": "#front" }, + "south": { "uv": [ 12, 4, 13, 5 ], "texture": "#front" }, + "west": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" }, + "east": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" } + } +}, +{ + "from": [ 0, 8, 9.5 ], + "to": [ 1, 11, 13.5 ], + "faces": { + "down": { "uv": [ 14, 8, 10, 7 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 10, 5, 14, 6 ], "rotation": 270, "texture": "#front" }, + "north": { "uv": [ 13, 5, 14, 8 ], "texture": "#front" }, + "south": { "uv": [ 13, 5, 14, 8 ], "texture": "#front" }, + "west": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" }, + "east": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" } + } +}, +{ + "from": [ 0, 7, 8.5 ], + "to": [ 1, 8, 14.5 ], + "faces": { + "down": { "uv": [ 15, 9, 9, 8 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 9, 8, 15, 9 ], "rotation": 180, "texture": "#front" }, + "north": { "uv": [ 9, 8, 10, 9 ], "texture": "#front" }, + "south": { "uv": [ 14, 8, 15, 9 ], "texture": "#front" }, + "west": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" }, + "east": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" } + } +}, +{ + "from": [ 0, 11, 3.5 ], + "to": [ 1, 12, 5.5 ], + "faces": { + "down": { "uv": [ 3, 4, 5, 5 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 3, 4, 5, 5 ], "rotation": 180, "texture": "#front" }, + "north": { "uv": [ 4, 4, 5, 5 ], "texture": "#front" }, + "south": { "uv": [ 3, 4, 4, 5 ], "texture": "#front" }, + "west": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" }, + "east": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" } + } +}, +{ + "from": [ 15, 8, 2.5 ], + "to": [ 16, 11, 6.5 ], + "faces": { + "down": { "uv": [ 14, 8, 10, 7 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 10, 5, 14, 6 ], "rotation": 270, "texture": "#front" }, + "north": { "uv": [ 10, 5, 11, 8 ], "texture": "#front" }, + "south": { "uv": [ 13, 5, 14, 8 ], "texture": "#front" }, + "west": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" }, + "east": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" } + } +}, +{ + "from": [ 0, 7, 1.5 ], + "to": [ 1, 8, 7.5 ], + "faces": { + "down": { "uv": [ 1, 9, 7, 8 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 1, 8, 7, 9 ], "rotation": 180, "texture": "#front" }, + "north": { "uv": [ 6, 8, 7, 9 ], "texture": "#front" }, + "south": { "uv": [ 1, 8, 2, 9 ], "texture": "#front" }, + "west": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" }, + "east": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" } + } +}, +{ + "from": [ 15, 11, 10.5 ], + "to": [ 16, 12, 12.5 ], + "faces": { + "down": { "uv": [ 5, 5, 3, 4 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 3, 4, 5, 5 ], "rotation": 180, "texture": "#front" }, + "north": { "uv": [ 4, 4, 5, 5 ], "texture": "#front" }, + "south": { "uv": [ 4, 4, 5, 5 ], "texture": "#front" }, + "west": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" }, + "east": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" } + } +}, +{ + "from": [ 15, 8, 9.5 ], + "to": [ 16, 11, 13.5 ], + "faces": { + "down": { "uv": [ 6, 8, 2, 7 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 2, 5, 6, 6 ], "rotation": 270, "texture": "#front" }, + "north": { "uv": [ 2, 5, 3, 8 ], "texture": "#front" }, + "south": { "uv": [ 5, 5, 6, 8 ], "texture": "#front" }, + "west": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" }, + "east": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" } + } +}, +{ + "from": [ 15, 7, 8.5 ], + "to": [ 16, 8, 14.5 ], + "faces": { + "down": { "uv": [ 7, 9, 1, 8 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 1, 8, 7, 9 ], "rotation": 180, "texture": "#front" }, + "north": { "uv": [ 1, 8, 2, 9 ], "texture": "#front" }, + "south": { "uv": [ 6, 8, 7, 9 ], "texture": "#front" }, + "west": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" }, + "east": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" } + } +}, +{ + "from": [ 8.5, 7, 15 ], + "to": [ 14.5, 8, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 15, 8 ], "rotation": 270, "texture": "#front" }, + "up": { "uv": [ 9, 8, 15, 9 ], "rotation": 270, "texture": "#front" }, + "north": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" }, + "south": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" }, + "west": { "uv": [ 14, 8, 15, 9 ], "texture": "#front" }, + "east": { "uv": [ 9, 8, 10, 9 ], "texture": "#front" } + } +}, +{ + "from": [ 2.5, 8, 15 ], + "to": [ 6.5, 11, 16 ], + "faces": { + "down": { "uv": [ 6, 8, 2, 7 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 2, 5, 6, 6 ], "rotation": 180, "texture": "#front" }, + "north": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" }, + "south": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" }, + "west": { "uv": [ 5, 5, 6, 8 ], "texture": "#front" }, + "east": { "uv": [ 2, 5, 3, 8 ], "texture": "#front" } + } +}, +{ + "from": [ 10.5, 11, 15 ], + "to": [ 12.5, 12, 16 ], + "faces": { + "down": { "uv": [ 13, 5, 11, 4 ], "rotation": 270, "texture": "#front" }, + "up": { "uv": [ 11, 4, 13, 5 ], "rotation": 270, "texture": "#front" }, + "north": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" }, + "south": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" }, + "west": { "uv": [ 12, 4, 13, 5 ], "texture": "#front" }, + "east": { "uv": [ 11, 4, 12, 5 ], "texture": "#front" } + } +}, +{ + "from": [ 1.5, 7, 15 ], + "to": [ 7.5, 8, 16 ], + "faces": { + "down": { "uv": [ 7, 9, 1, 8 ], "rotation": 270, "texture": "#front" }, + "up": { "uv": [ 1, 8, 7, 9 ], "rotation": 270, "texture": "#front" }, + "north": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" }, + "south": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" }, + "west": { "uv": [ 6, 8, 7, 9 ], "texture": "#front" }, + "east": { "uv": [ 1, 8, 2, 9 ], "texture": "#front" } + } +}, +{ + "from": [ 9.5, 8, 15 ], + "to": [ 13.5, 11, 16 ], + "faces": { + "down": { "uv": [ 14, 8, 10, 7 ], "rotation": 180, "texture": "#front" }, + "up": { "uv": [ 10, 5, 14, 6 ], "rotation": 180, "texture": "#front" }, + "north": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" }, + "south": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" }, + "west": { "uv": [ 13, 5, 14, 8 ], "texture": "#front" }, + "east": { "uv": [ 10, 5, 11, 8 ], "texture": "#front" } + } +}, +{ + "from": [ 3.5, 11, 15 ], + "to": [ 5.5, 12, 16 ], + "faces": { + "down": { "uv": [ 5, 5, 3, 4 ], "rotation": 270, "texture": "#front" }, + "up": { "uv": [ 3, 4, 5, 5 ], "rotation": 270, "texture": "#front" }, + "north": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" }, + "south": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" }, + "west": { "uv": [ 4, 4, 5, 5 ], "texture": "#front" }, + "east": { "uv": [ 3, 4, 4, 5 ], "texture": "#front" } + } +}, +{ + "from": [ 8.5, 7, 0 ], + "to": [ 14.5, 8, 1 ], + "faces": { + "down": { "uv": [ 7, 9, 1, 8 ], "rotation": 180, "texture": "#front_2" }, + "up": { "uv": [ 1, 8, 7, 9 ], "rotation": 180, "texture": "#front_2" }, + "north": { "uv": [ 1, 8, 7, 9 ], "texture": "#front_2" }, + "south": { "uv": [ 1, 8, 7, 9 ], "texture": "#front_2" }, + "west": { "uv": [ 1, 8, 2, 9 ], "texture": "#front_2" }, + "east": { "uv": [ 6, 8, 7, 9 ], "texture": "#front_2" } + } +}, +{ + "from": [ 2.5, 8, 0 ], + "to": [ 6.5, 11, 1 ], + "faces": { + "down": { "uv": [ 14, 8, 10, 7 ], "rotation": 180, "texture": "#front_2" }, + "up": { "uv": [ 10, 5, 14, 6 ], "rotation": 180, "texture": "#front_2" }, + "north": { "uv": [ 10, 5, 14, 8 ], "texture": "#front_2" }, + "south": { "uv": [ 10, 5, 14, 8 ], "texture": "#front_2" }, + "west": { "uv": [ 13, 5, 14, 8 ], "texture": "#front_2" }, + "east": { "uv": [ 10, 5, 11, 8 ], "texture": "#front_2" } + } +}, +{ + "from": [ 10.5, 11, 0 ], + "to": [ 12.5, 12, 1 ], + "faces": { + "down": { "uv": [ 5, 5, 3, 4 ], "rotation": 180, "texture": "#front_2" }, + "up": { "uv": [ 3, 4, 5, 5 ], "rotation": 180, "texture": "#front_2" }, + "north": { "uv": [ 3, 4, 5, 5 ], "texture": "#front_2" }, + "south": { "uv": [ 3, 4, 5, 5 ], "texture": "#front_2" }, + "west": { "uv": [ 4, 4, 5, 5 ], "texture": "#front_2" }, + "east": { "uv": [ 3, 4, 4, 5 ], "texture": "#front_2" } + } +}, +{ + "from": [ 1.5, 7, 0 ], + "to": [ 7.5, 8, 1 ], + "faces": { + "down": { "uv": [ 15, 9, 9, 8 ], "rotation": 270, "texture": "#front_2" }, + "up": { "uv": [ 9, 8, 15, 9 ], "rotation": 270, "texture": "#front_2" }, + "north": { "uv": [ 9, 8, 15, 9 ], "texture": "#front_2" }, + "south": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" }, + "west": { "uv": [ 14, 8, 15, 9 ], "texture": "#front_2" }, + "east": { "uv": [ 9, 8, 10, 9 ], "texture": "#front_2" } + } +}, +{ + "from": [ 9.5, 8, 0 ], + "to": [ 13.5, 11, 1 ], + "faces": { + "down": { "uv": [ 6, 8, 2, 7 ], "rotation": 180, "texture": "#front_2" }, + "up": { "uv": [ 2, 5, 6, 6 ], "rotation": 180, "texture": "#front_2" }, + "north": { "uv": [ 2, 5, 6, 8 ], "texture": "#front_2" }, + "south": { "uv": [ 2, 5, 6, 8 ], "texture": "#front_2" }, + "west": { "uv": [ 5, 5, 6, 8 ], "texture": "#front_2" }, + "east": { "uv": [ 2, 5, 3, 8 ], "texture": "#front_2" } + } +}, +{ + "from": [ 3.5, 11, 0 ], + "to": [ 5.5, 12, 1 ], + "faces": { + "down": { "uv": [ 13, 5, 11, 4 ], "rotation": 270, "texture": "#front_2" }, + "up": { "uv": [ 11, 4, 13, 5 ], "rotation": 270, "texture": "#front_2" }, + "north": { "uv": [ 11, 4, 13, 5 ], "texture": "#front_2" }, + "south": { "uv": [ 11, 4, 13, 5 ], "texture": "#front_2" }, + "west": { "uv": [ 12, 4, 13, 5 ], "texture": "#front_2" }, + "east": { "uv": [ 11, 4, 12, 5 ], "texture": "#front_2" } + } +}, +{ + "from": [ 10.5, 6, 0 ], + "to": [ 11.5, 7, 1 ], + "faces": { + "down": { "uv": [ 5, 10, 4, 9 ], "rotation": 270, "texture": "#front_2" }, + "up": { "uv": [ 4, 9, 5, 10 ], "rotation": 270, "texture": "#front_2" }, + "north": { "uv": [ 4, 9, 5, 10 ], "texture": "#front_2" }, + "south": { "uv": [ 4, 9, 5, 10 ], "texture": "#front_2" }, + "west": { "uv": [ 4, 9, 5, 10 ], "texture": "#front_2" }, + "east": { "uv": [ 4, 9, 5, 10 ], "texture": "#front_2" } } } +] +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/apiculture_bee_house.json b/src/main/resources/assets/forestry/models/block/apiculture_bee_house.json deleted file mode 100644 index 49f9ae61c..000000000 --- a/src/main/resources/assets/forestry/models/block/apiculture_bee_house.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "forestry:blocks/beehouse.4", - "down": "forestry:blocks/beehouse.0", - "up": "forestry:blocks/beehouse.1", - "north": "forestry:blocks/beehouse.2", - "east": "forestry:blocks/beehouse.4", - "south": "forestry:blocks/beehouse.4", - "west": "forestry:blocks/beehouse.4" - } -}