diff --git a/src/main/java/nmd/primal/forgecraft/ModInfo.java b/src/main/java/nmd/primal/forgecraft/ModInfo.java index ba8e797f..e93bb4b3 100644 --- a/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -48,7 +48,7 @@ public class ModInfo { } public enum ForgecraftBlocks { - TEST_BLOCK("test_block", "test_block"); + FIREBOX("firebox", "firebox"); private String unlocalizedName; private String registryName; diff --git a/src/main/java/nmd/primal/forgecraft/blocks/TestBlock.java b/src/main/java/nmd/primal/forgecraft/blocks/Firebox.java similarity index 80% rename from src/main/java/nmd/primal/forgecraft/blocks/TestBlock.java rename to src/main/java/nmd/primal/forgecraft/blocks/Firebox.java index 8eaf4e20..eec34cdb 100644 --- a/src/main/java/nmd/primal/forgecraft/blocks/TestBlock.java +++ b/src/main/java/nmd/primal/forgecraft/blocks/Firebox.java @@ -13,12 +13,12 @@ import nmd.primal.forgecraft.ModInfo; /** * Created by kitsu on 11/26/2016. */ -public class TestBlock extends Block { +public class Firebox extends Block { - public TestBlock(Material material) { + public Firebox(Material material) { super(material); - setUnlocalizedName(ModInfo.ForgecraftBlocks.TEST_BLOCK.getUnlocalizedName()); - setRegistryName(ModInfo.ForgecraftBlocks.TEST_BLOCK.getRegistryName()); + setUnlocalizedName(ModInfo.ForgecraftBlocks.FIREBOX.getUnlocalizedName()); + setRegistryName(ModInfo.ForgecraftBlocks.FIREBOX.getRegistryName()); setCreativeTab(ModInfo.TAB_FORGECRAFT); } diff --git a/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java b/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java index 46442188..b04e0ced 100644 --- a/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java +++ b/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java @@ -7,36 +7,38 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraftforge.fml.common.registry.GameRegistry; -import nmd.primal.forgecraft.blocks.TestBlock; -import nmd.primal.forgecraft.items.ItemTest; +import nmd.primal.forgecraft.blocks.Firebox; /** * Created by kitsu on 11/26/2016. */ public class ModBlocks { - public static Block testBlock; + public static Block firebox; public static void init() { - testBlock = new TestBlock(Material.CACTUS); + firebox = new Firebox(Material.ROCK); } public static void register() { - registerBlock(testBlock); + registerBlock(firebox); } + public static void registerRenders() { + + registerRender(firebox); + } + private static void registerBlock(Block block) { - GameRegistry.register(testBlock); + GameRegistry.register(block); ItemBlock item = new ItemBlock(block); item.setRegistryName(block.getRegistryName()); GameRegistry.register(item); } - public static void registerRenders() { - registerRender(testBlock); - } + private static void registerRender(Block block) { Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(Item.getItemFromBlock(block), 0, new ModelResourceLocation(block.getRegistryName(), "inventory")); diff --git a/src/main/resources/assets/forgecraft/blockstates/firebox.json b/src/main/resources/assets/forgecraft/blockstates/firebox.json new file mode 100644 index 00000000..b54aaf59 --- /dev/null +++ b/src/main/resources/assets/forgecraft/blockstates/firebox.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "forgecraft:firebox"} + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forgecraft/blockstates/test_block.json b/src/main/resources/assets/forgecraft/blockstates/test_block.json deleted file mode 100644 index ed9f9be6..00000000 --- a/src/main/resources/assets/forgecraft/blockstates/test_block.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forgecraft:test_block"} - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forgecraft/lang/en_US.lang b/src/main/resources/assets/forgecraft/lang/en_US.lang index 5f085778..90ccf536 100644 --- a/src/main/resources/assets/forgecraft/lang/en_US.lang +++ b/src/main/resources/assets/forgecraft/lang/en_US.lang @@ -1 +1,2 @@ -item.test.name=test \ No newline at end of file +item.test.name=test +tile.firebox.name=Firebox \ No newline at end of file diff --git a/src/main/resources/assets/forgecraft/models/block/firebox.json b/src/main/resources/assets/forgecraft/models/block/firebox.json new file mode 100644 index 00000000..d416f2fa --- /dev/null +++ b/src/main/resources/assets/forgecraft/models/block/firebox.json @@ -0,0 +1,238 @@ +{ + "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", + "textures": { + "texture": "forgecraft:blocks/checker_test", + "texture2": "forgecraft:blocks/firebox_racks", + "firebox_leg": "forgecraft:blocks/firebox_legs", + "texture4": "forgecraft:blocks/brick" + }, + "elements": [ + { + "__comment": "Back", + "from": [ 0, 8, 0 ], + "to": [ 16, 16, 2 ], + "faces": { + "down": { "uv": [ 0, 14.5, 16, 16 ], "texture": "#texture4" }, + "up": { "uv": [ 0, 0, 16, 2 ], "texture": "#texture4" }, + "north": { "uv": [ 0, 0, 16, 8 ], "texture": "#texture4" }, + "south": { "uv": [ 0, 0, 16, 8 ], "texture": "#texture4" }, + "west": { "uv": [ 0, 0, 2, 8 ], "texture": "#texture4" }, + "east": { "uv": [ 14, 0, 16, 8 ], "texture": "#texture4" } + } + }, + { + "__comment": "Bot", + "from": [ 0, 5, 0 ], + "to": [ 16, 8, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture4" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture4" }, + "north": { "uv": [ 0, 8, 16, 11 ], "texture": "#texture4" }, + "south": { "uv": [ 0, 8, 16, 11 ], "texture": "#texture4" }, + "west": { "uv": [ 0, 8, 16, 11 ], "texture": "#texture4" }, + "east": { "uv": [ 0, 8, 16, 11 ], "texture": "#texture4" } + } + }, + { + "__comment": "AirSideLeft", + "from": [ 0, 8, 2 ], + "to": [ 2, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 2, 16 ], "texture": "#texture4" }, + "up": { "uv": [ 0, 0, 2, 15 ], "texture": "#texture4" }, + "north": { "uv": [ 0, 0, 2, 8 ], "texture": "#texture4" }, + "south": { "uv": [ 0, 0, 2, 8 ], "texture": "#texture4" }, + "west": { "uv": [ 0, 0, 14, 8 ], "texture": "#texture4" }, + "east": { "uv": [ 0, 0, 14, 8 ], "texture": "#texture4" } + } + }, + { + "__comment": "AirSideRight", + "from": [ 14, 8, 2 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 2, 16 ], "texture": "#texture4" }, + "up": { "uv": [ 0, 0, 2, 15 ], "texture": "#texture4" }, + "north": { "uv": [ 0, 0, 2, 8 ], "texture": "#texture4" }, + "south": { "uv": [ 0, 0, 2, 8 ], "texture": "#texture4" }, + "west": { "uv": [ 0, 0, 14, 8 ], "texture": "#texture4" }, + "east": { "uv": [ 0, 0, 14, 8 ], "texture": "#texture4" } + } + }, + { + "__comment": "Front0", + "from": [ 2, 8, 14 ], + "to": [ 4, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture4" }, + "up": { "uv": [ 0, 14, 2, 12 ], "texture": "#texture4" }, + "north": { "uv": [ 13, 0, 15, 8 ], "texture": "#texture4" }, + "south": { "uv": [ 13, 0, 15, 8 ], "texture": "#texture4" }, + "west": { "uv": [ 13, 0, 15, 8 ], "texture": "#texture4" }, + "east": { "uv": [ 13, 0, 15, 8 ], "texture": "#texture4" } + } + }, + { + "__comment": "Front1", + "from": [ 12, 8, 14 ], + "to": [ 14, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture4" }, + "up": { "uv": [ 0, 14, 2, 12 ], "texture": "#texture4" }, + "north": { "uv": [ 13, 0, 15, 8 ], "texture": "#texture4" }, + "south": { "uv": [ 13, 0, 15, 8 ], "texture": "#texture4" }, + "west": { "uv": [ 13, 0, 15, 8 ], "texture": "#texture4" }, + "east": { "uv": [ 13, 0, 15, 8 ], "texture": "#texture4" } + } + }, + { + "__comment": "Front2", + "from": [ 4, 13, 14 ], + "to": [ 12, 16, 16 ], + "faces": { + "down": { "uv": [ 4, 5, 12, 7 ], "texture": "#texture4" }, + "up": { "uv": [ 4, 5, 12, 7 ], "texture": "#texture4" }, + "north": { "uv": [ 4, 4, 12, 7 ], "texture": "#texture4" }, + "south": { "uv": [ 4, 4, 12, 7 ], "texture": "#texture4" }, + "west": { "uv": [ 15, 0, 16, 4 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 1, 4 ], "texture": "#texture4" } + } + }, + { + "__comment": "Holder0", + "from": [ 6.5, 15, 2 ], + "to": [ 7.3, 15.8, 14 ], + "rotation": { "origin": [ 6.5, 15, 2 ], "axis": "z", "angle": -45 }, + "faces": { + "down": { "uv": [ 0, 0, 1, 12 ], "texture": "#texture2", "tintindex": 0 }, + "up": { "uv": [ 0, 0, 1, 12 ], "texture": "#texture2", "tintindex": 0 }, + "north": { "uv": [ 0, 0, 1, 1 ], "texture": "#texture2", "tintindex": 0 }, + "south": { "uv": [ 0, 16, 1, 15 ], "texture": "#texture2", "tintindex": 0 }, + "west": { "uv": [ 0, 16, 12, 15 ], "texture": "#texture2", "tintindex": 0 }, + "east": { "uv": [ 16, 16, 4, 15 ], "texture": "#texture2", "tintindex": 0 } + } + }, + { + "__comment": "Leg0", + "from": [ 12, 0, 0 ], + "to": [ 16, 5, 4 ], + "faces": { + "down": { "uv": [ 0, 12, 4, 16 ], "texture": "#firebox_leg" }, + "up": { "uv": [ 0, 12, 4, 16 ], "texture": "#firebox_leg" }, + "north": { "uv": [ 0, 10.5, 4, 15.5 ], "texture": "#firebox_leg" }, + "south": { "uv": [ 0, 10.5, 4, 15.5 ], "texture": "#firebox_leg" }, + "west": { "uv": [ 0, 10.5, 4, 15.5 ], "texture": "#firebox_leg" }, + "east": { "uv": [ 0, 10.5, 4, 15.5 ], "texture": "#firebox_leg" } + } + }, + { + "__comment": "Leg1", + "from": [ 0, 0, 12 ], + "to": [ 4, 5, 16 ], + "faces": { + "down": { "uv": [ 0, 12, 4, 16 ], "texture": "#firebox_leg" }, + "up": { "uv": [ 0, 12, 4, 16 ], "texture": "#firebox_leg" }, + "north": { "uv": [ 0, 10.5, 4, 15.5 ], "texture": "#firebox_leg" }, + "south": { "uv": [ 0, 10.5, 4, 15.5 ], "texture": "#firebox_leg" }, + "west": { "uv": [ 0, 10.5, 4, 15.5 ], "texture": "#firebox_leg" }, + "east": { "uv": [ 0, 10.5, 4, 15.5 ], "texture": "#firebox_leg" } + } + }, + { + "__comment": "Leg2", + "from": [ 0, 0, 0 ], + "to": [ 4, 5, 4 ], + "faces": { + "down": { "uv": [ 0, 12, 4, 16 ], "texture": "#firebox_leg" }, + "up": { "uv": [ 0, 12, 4, 16 ], "texture": "#firebox_leg" }, + "north": { "uv": [ 0, 10.5, 4, 15.5 ], "texture": "#firebox_leg" }, + "south": { "uv": [ 0, 10.5, 4, 15.5 ], "texture": "#firebox_leg" }, + "west": { "uv": [ 0, 10.5, 4, 15.5 ], "texture": "#firebox_leg" }, + "east": { "uv": [ 0, 10.5, 4, 15.5 ], "texture": "#firebox_leg" } + } + }, + { + "__comment": "Leg3", + "from": [ 12, 0, 12 ], + "to": [ 16, 5, 16 ], + "faces": { + "down": { "uv": [ 0, 12, 4, 16 ], "texture": "#firebox_leg" }, + "up": { "uv": [ 0, 12, 4, 16 ], "texture": "#firebox_leg" }, + "north": { "uv": [ 0, 10.5, 4, 15.5 ], "texture": "#firebox_leg" }, + "south": { "uv": [ 0, 10.5, 4, 15.5 ], "texture": "#firebox_leg" }, + "west": { "uv": [ 0, 10.5, 4, 15.5 ], "texture": "#firebox_leg" }, + "east": { "uv": [ 0, 10.5, 4, 15.5 ], "texture": "#firebox_leg" } + } + }, + { + "__comment": "Holder1", + "from": [ 10.5, 15, 2 ], + "to": [ 11.3, 15.8, 14 ], + "rotation": { "origin": [ 10.5, 15, 2 ], "axis": "z", "angle": -45 }, + "faces": { + "down": { "uv": [ 0, 0, 1, 12 ], "texture": "#texture2", "tintindex": 0 }, + "up": { "uv": [ 0, 0, 1, 12 ], "texture": "#texture2", "tintindex": 0 }, + "north": { "uv": [ 0, 0, 1, 1 ], "texture": "#texture2", "tintindex": 0 }, + "south": { "uv": [ 0, 16, 1, 15 ], "texture": "#texture2", "tintindex": 0 }, + "west": { "uv": [ 0, 16, 12, 15 ], "texture": "#texture2", "tintindex": 0 }, + "east": { "uv": [ 16, 16, 4, 15 ], "texture": "#texture2", "tintindex": 0 } + } + }, + { + "__comment": "Holder2", + "from": [ 12.5, 15, 2 ], + "to": [ 13.3, 15.8, 14 ], + "rotation": { "origin": [ 12.5, 15, 2 ], "axis": "z", "angle": -45 }, + "faces": { + "down": { "uv": [ 0, 0, 1, 12 ], "texture": "#texture2", "tintindex": 0 }, + "up": { "uv": [ 0, 0, 1, 12 ], "texture": "#texture2", "tintindex": 0 }, + "north": { "uv": [ 0, 0, 1, 1 ], "texture": "#texture2", "tintindex": 0 }, + "south": { "uv": [ 0, 16, 1, 15 ], "texture": "#texture2", "tintindex": 0 }, + "west": { "uv": [ 0, 16, 12, 15 ], "texture": "#texture2", "tintindex": 0 }, + "east": { "uv": [ 16, 16, 4, 15 ], "texture": "#texture2", "tintindex": 0 } + } + }, + { + "__comment": "Holder3", + "from": [ 2.5, 15, 2 ], + "to": [ 3.3, 15.8, 14 ], + "rotation": { "origin": [ 2.5, 15, 2 ], "axis": "z", "angle": -45 }, + "faces": { + "down": { "uv": [ 0, 0, 1, 12 ], "texture": "#texture2", "tintindex": 0 }, + "up": { "uv": [ 0, 0, 1, 12 ], "texture": "#texture2", "tintindex": 0 }, + "north": { "uv": [ 0, 0, 1, 1 ], "texture": "#texture2", "tintindex": 0 }, + "south": { "uv": [ 0, 16, 1, 15 ], "texture": "#texture2", "tintindex": 0 }, + "west": { "uv": [ 0, 16, 12, 15 ], "texture": "#texture2", "tintindex": 0 }, + "east": { "uv": [ 16, 16, 4, 15 ], "texture": "#texture2", "tintindex": 0 } + } + }, + { + "__comment": "Holder4", + "from": [ 4.5, 15, 2 ], + "to": [ 5.3, 15.8, 14 ], + "rotation": { "origin": [ 4.5, 15, 2 ], "axis": "z", "angle": -45 }, + "faces": { + "down": { "uv": [ 0, 0, 1, 12 ], "texture": "#texture2", "tintindex": 0 }, + "up": { "uv": [ 0, 0, 1, 12 ], "texture": "#texture2", "tintindex": 0 }, + "north": { "uv": [ 0, 0, 1, 1 ], "texture": "#texture2", "tintindex": 0 }, + "south": { "uv": [ 0, 16, 1, 15 ], "texture": "#texture2", "tintindex": 0 }, + "west": { "uv": [ 0, 16, 12, 15 ], "texture": "#texture2", "tintindex": 0 }, + "east": { "uv": [ 16, 16, 4, 15 ], "texture": "#texture2", "tintindex": 0 } + } + }, + { + "__comment": "Holder5", + "from": [ 8.5, 15, 2 ], + "to": [ 9.3, 15.8, 14 ], + "rotation": { "origin": [ 8.5, 15, 2 ], "axis": "z", "angle": -45 }, + "faces": { + "down": { "uv": [ 0, 0, 1, 12 ], "texture": "#texture2", "tintindex": 0 }, + "up": { "uv": [ 0, 0, 1, 12 ], "texture": "#texture2", "tintindex": 0 }, + "north": { "uv": [ 0, 0, 1, 1 ], "texture": "#texture2", "tintindex": 0 }, + "south": { "uv": [ 0, 16, 1, 15 ], "texture": "#texture2", "tintindex": 0 }, + "west": { "uv": [ 0, 16, 12, 15 ], "texture": "#texture2", "tintindex": 0 }, + "east": { "uv": [ 16, 16, 4, 15 ], "texture": "#texture2", "tintindex": 0 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/forgecraft/models/block/test_block.json b/src/main/resources/assets/forgecraft/models/block/test_block.json deleted file mode 100644 index 7722fdc7..00000000 --- a/src/main/resources/assets/forgecraft/models/block/test_block.json +++ /dev/null @@ -1,208 +0,0 @@ -{ - "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", - "textures": { - "texture": "forgecraft:blocks/firebox_pins", - "texture2": "forgecraft:blocks/firebox_racks" - }, - "elements": [ - { - "__comment": "Back", - "from": [ 0, 8, 0 ], - "to": [ 16, 16, 2 ], - "faces": { - "down": { "uv": [ 0, 14.5, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 16, 2 ], "texture": "#texture" }, - "north": { "uv": [ 0, 0, 16, 8 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 16, 8 ], "texture": "#texture" }, - "west": { "uv": [ 0, 0, 1, 8 ], "texture": "#texture" }, - "east": { "uv": [ 15, 0, 16, 8 ], "texture": "#texture" } - } - }, - { - "__comment": "Bot", - "from": [ 0, 5, 0 ], - "to": [ 16, 8, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 8, 16, 9 ], "texture": "#texture" }, - "south": { "uv": [ 0, 8, 16, 9 ], "texture": "#texture" }, - "west": { "uv": [ 0, 8, 16, 9 ], "texture": "#texture" }, - "east": { "uv": [ 0, 8, 16, 9 ], "texture": "#texture" } - } - }, - { - "__comment": "AirSideLeft", - "from": [ 0, 8, 2 ], - "to": [ 2, 16, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 2, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 1.5, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "AirSideRight", - "from": [ 14, 8, 2 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 14, 0, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 15, 1, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 0, 1, 8 ], "texture": "#texture" }, - "south": { "uv": [ 15, 0, 16, 8 ], "texture": "#texture" }, - "west": { "uv": [ 1, 0, 16, 8 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 15, 8 ], "texture": "#texture" } - } - }, - { - "__comment": "Front0", - "from": [ 2, 8, 14 ], - "to": [ 4, 16, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 16, 6, 10 ], "texture": "#texture" }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "south": { "uv": [ 13, 8, 16, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Front1", - "from": [ 12, 8, 14 ], - "to": [ 14, 16, 16 ], - "faces": { - "down": { "uv": [ 13, 2, 16, 6.5 ], "texture": "#texture" }, - "up": { "uv": [ 11, 15, 15, 16 ], "texture": "#texture" }, - "north": { "uv": [ 1, 0, 5, 8 ], "texture": "#texture" }, - "south": { "uv": [ 5, 0, 9.5, 8 ], "texture": "#texture" }, - "west": { "uv": [ 15, 0, 16, 8 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 1, 8 ], "texture": "#texture" } - } - }, - { - "__comment": "Front2", - "from": [ 4, 13, 14 ], - "to": [ 12, 16, 16 ], - "faces": { - "down": { "uv": [ 5, 0, 11, 1 ], "texture": "#texture" }, - "up": { "uv": [ 4.5, 12.5, 15.5, 16 ], "texture": "#texture" }, - "north": { "uv": [ 5, 0, 11, 4 ], "texture": "#texture" }, - "south": { "uv": [ 5, 0, 11, 4 ], "texture": "#texture" }, - "west": { "uv": [ 15, 0, 16, 4 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 1, 4 ], "texture": "#texture" } - } - }, - { - "__comment": "Holder0", - "from": [ 6, 15, 2 ], - "to": [ 7, 16, 14 ], - "rotation": { "origin": [ 6, 15, 2 ], "axis": "z", "angle": -45 }, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2" }, - "up": { "uv": [ 0, 0, 3, 16 ], "texture": "#texture2" }, - "north": { "uv": [ 0, 0, 4.5, 16 ], "texture": "#texture2" }, - "south": { "uv": [ 0, 15, 3.5, 0 ], "texture": "#texture2" }, - "west": { "uv": [ 0, 15, 3.5, 0 ], "texture": "#texture2" }, - "east": { "uv": [ 16, 15, 12, 0 ], "texture": "#texture2" } - } - }, - { - "__comment": "Holder1", - "from": [ 11.5, 15, 2 ], - "to": [ 12.5, 16, 14 ], - "rotation": { "origin": [ 11.5, 15, 2 ], "axis": "z", "angle": -45 }, - "faces": { - "down": { "uv": [ 0, 16, 0, 16 ], "texture": "#texture2" }, - "up": { "uv": [ 0, 0, 0, 0 ], "texture": "#texture2" }, - "north": { "uv": [ 16, 15, 16, 16 ], "texture": "#texture2" }, - "south": { "uv": [ 0, 15, 0, 16 ], "texture": "#texture2" }, - "west": { "uv": [ 0, 15, 0, 16 ], "texture": "#texture2" }, - "east": { "uv": [ 16, 15, 16, 16 ], "texture": "#texture2" } - } - }, - { - "__comment": "Holder2", - "from": [ 3, 15, 2 ], - "to": [ 4, 16, 14 ], - "rotation": { "origin": [ 3, 15, 2 ], "axis": "z", "angle": -45 }, - "faces": { - "down": { "uv": [ 0, 16, 0, 16 ], "texture": "#texture2" }, - "up": { "uv": [ 0, 0, 0, 0 ], "texture": "#texture2" }, - "north": { "uv": [ 16, 15, 16, 16 ], "texture": "#texture2" }, - "south": { "uv": [ 0, 15, 0, 16 ], "texture": "#texture2" }, - "west": { "uv": [ 0, 15, 0, 16 ], "texture": "#texture2" }, - "east": { "uv": [ 16, 15, 16, 16 ], "texture": "#texture2" } - } - }, - { - "__comment": "Holder3", - "from": [ 9, 15, 2 ], - "to": [ 10, 16, 14 ], - "rotation": { "origin": [ 9, 15, 2 ], "axis": "z", "angle": -45 }, - "faces": { - "down": { "uv": [ 7, 16, 10, 0 ], "texture": "#texture2" }, - "up": { "uv": [ 0, 0, 5, 16 ], "texture": "#texture2" }, - "north": { "uv": [ 10, 16, 8.5, 0 ], "texture": "#texture2" }, - "south": { "uv": [ 8, 16, 9.5, 0 ], "texture": "#texture2" }, - "west": { "uv": [ 5, 16, 6.5, 0 ], "texture": "#texture2" }, - "east": { "uv": [ 16, 16, 14.5, 0 ], "texture": "#texture2" } - } - }, - { - "__comment": "Leg0", - "from": [ 12, 0, 0 ], - "to": [ 16, 5, 4 ], - "faces": { - "down": { "uv": [ 12, 12, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 12, 0, 16, 4 ], "texture": "#texture" }, - "north": { "uv": [ 0, 11, 4, 16 ], "texture": "#texture" }, - "south": { "uv": [ 12, 11, 16, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 11, 4, 16 ], "texture": "#texture" }, - "east": { "uv": [ 12, 11, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Leg1", - "from": [ 0, 0, 12 ], - "to": [ 4, 5, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 4, 4 ], "texture": "#texture" }, - "up": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "north": { "uv": [ 12, 11, 16, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 11, 4, 16 ], "texture": "#texture" }, - "west": { "uv": [ 12, 11, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 11, 4, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Leg2", - "from": [ 0, 0, 0 ], - "to": [ 4, 5, 4 ], - "faces": { - "down": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 4, 4 ], "texture": "#texture" }, - "north": { "uv": [ 12, 11, 16, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 11, 4, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 11, 4, 16 ], "texture": "#texture" }, - "east": { "uv": [ 12, 11, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Leg3", - "from": [ 12, 0, 12 ], - "to": [ 16, 5, 16 ], - "faces": { - "down": { "uv": [ 12, 0, 16, 4 ], "texture": "#texture" }, - "up": { "uv": [ 12, 12, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 11, 4, 16 ], "texture": "#texture" }, - "south": { "uv": [ 12, 11, 16, 16 ], "texture": "#texture" }, - "west": { "uv": [ 12, 11, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 11, 4, 16 ], "texture": "#texture" } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/forgecraft/models/item/firebox.json b/src/main/resources/assets/forgecraft/models/item/firebox.json new file mode 100644 index 00000000..88b2ddb6 --- /dev/null +++ b/src/main/resources/assets/forgecraft/models/item/firebox.json @@ -0,0 +1,3 @@ +{ + "parent": "forgecraft:/block/firebox" +} \ No newline at end of file diff --git a/src/main/resources/assets/forgecraft/models/item/test_block.json b/src/main/resources/assets/forgecraft/models/item/test_block.json deleted file mode 100644 index ead2ad72..00000000 --- a/src/main/resources/assets/forgecraft/models/item/test_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forgecraft:blocks/test_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forgecraft/textures/blocks/anvil_top_damaged_0.png b/src/main/resources/assets/forgecraft/textures/blocks/anvil_top_damaged_0.png deleted file mode 100644 index 395dea47..00000000 Binary files a/src/main/resources/assets/forgecraft/textures/blocks/anvil_top_damaged_0.png and /dev/null differ diff --git a/src/main/resources/assets/forgecraft/textures/blocks/brick.png b/src/main/resources/assets/forgecraft/textures/blocks/brick.png new file mode 100644 index 00000000..267da887 Binary files /dev/null and b/src/main/resources/assets/forgecraft/textures/blocks/brick.png differ diff --git a/src/main/resources/assets/forgecraft/textures/blocks/checker_test.png b/src/main/resources/assets/forgecraft/textures/blocks/checker_test.png new file mode 100644 index 00000000..c0a52687 Binary files /dev/null and b/src/main/resources/assets/forgecraft/textures/blocks/checker_test.png differ diff --git a/src/main/resources/assets/forgecraft/textures/blocks/firebox_legs.png b/src/main/resources/assets/forgecraft/textures/blocks/firebox_legs.png new file mode 100644 index 00000000..4850311a Binary files /dev/null and b/src/main/resources/assets/forgecraft/textures/blocks/firebox_legs.png differ