diff --git a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java index 22da2b78..52a70e4c 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -54,7 +54,7 @@ public class ModInfo { public enum ForgecraftBlocks { FIREBOX("firebox", "firebox"), - PISTONBELLOWSJUNGLE("pistonbellowsjungle", "pistonbellowsjungle"), + //PISTONBELLOWSJUNGLE("pistonbellowsjungle", "pistonbellowsjungle"), PISTONBELLOWS("pistonbellows", "pistonbellows"); private String unlocalizedName; diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java index 12f40073..a3e926a0 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java @@ -44,11 +44,12 @@ public class PistonBellows extends CustomContainerFacing { protected static final AxisAlignedBB boundBoxEast = new AxisAlignedBB(0.0D, 0.0D, 0.1875D, 1.0D, 12 / 16D, 1.0D); protected static final AxisAlignedBB boundBoxWest = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 12 / 16D, 0.8125D); - public PistonBellows(Material material) { + public PistonBellows(Material material, String registryName) { super(material); setUnlocalizedName(ModInfo.ForgecraftBlocks.PISTONBELLOWS.getUnlocalizedName()); - setRegistryName(ModInfo.ForgecraftBlocks.PISTONBELLOWS.getRegistryName()); + //setRegistryName(ModInfo.ForgecraftBlocks.PISTONBELLOWS.getRegistryName()); + setRegistryName(registryName); setCreativeTab(ModInfo.TAB_FORGECRAFT); setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(ACTIVE, Boolean.valueOf(false))); setHardness(3.0f); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java index 1ab6bb2b..a74fd426 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java @@ -16,26 +16,44 @@ import nmd.primal.forgecraft.blocks.PistonBellows; public class ModBlocks { public static Block firebox; - public static Block pistonbellows; + //public static Block pistonbellows; + public static Block pistonbellowsoak; public static Block pistonbellowsjungle; + public static Block pistonbellowsbirch; + public static Block pistonbellowsspruce; + public static Block pistonbellowsdarkoak; + public static Block pistonbellowsacacia; + public static void init() { firebox = new Firebox(Material.ROCK); - pistonbellows = new PistonBellows(Material.WOOD); - pistonbellowsjungle = new PistonBellows(Material.WOOD); + pistonbellowsoak = new PistonBellows(Material.WOOD, "pistonbellowsoak"); + pistonbellowsjungle = new PistonBellows(Material.WOOD, "pistonbellowsjungle"); + pistonbellowsbirch = new PistonBellows(Material.WOOD, "pistonbellowsbirch"); + pistonbellowsspruce = new PistonBellows(Material.WOOD, "pistonbellowsspruce"); + pistonbellowsdarkoak = new PistonBellows(Material.WOOD, "pistonbellowsdarkoak"); + pistonbellowsacacia = new PistonBellows(Material.WOOD, "pistonbellowsacacia"); } public static void register() { registerBlock(firebox); - registerBlock(pistonbellows); + registerBlock(pistonbellowsoak); registerBlock(pistonbellowsjungle); + registerBlock(pistonbellowsbirch); + registerBlock(pistonbellowsspruce); + registerBlock(pistonbellowsdarkoak); + registerBlock(pistonbellowsacacia); } public static void registerRenders() { registerRender(firebox); - registerRender(pistonbellows); + registerRender(pistonbellowsoak); registerRender(pistonbellowsjungle); + registerRender(pistonbellowsbirch); + registerRender(pistonbellowsspruce); + registerRender(pistonbellowsdarkoak); + registerRender(pistonbellowsacacia); } private static void registerBlock(Block block) { diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java index e7553efd..46c1814b 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java @@ -16,7 +16,19 @@ public class ModCrafting { GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.firebox), "X X", "XYX", "X X", 'X', Items.BRICK, 'Y', Blocks.FURNACE); /***Wooden PistonBellows***/ - GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.pistonbellows), "XXX", "X Y", "XXX", 'X', Blocks.PLANKS, 'Y', ModItems.pistonbellows); + GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.pistonbellowsoak), "XXX", "X Y", "XXX", + 'X', new ItemStack(Blocks.PLANKS, 1, 0), 'Y', ModItems.pistonbellows); + GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.pistonbellowsspruce), "XXX", "X Y", "XXX", + 'X', new ItemStack(Blocks.PLANKS, 1, 1), 'Y', ModItems.pistonbellows); + GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.pistonbellowsbirch), "XXX", "X Y", "XXX", + 'X', new ItemStack(Blocks.PLANKS, 1, 2), 'Y', ModItems.pistonbellows); + GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.pistonbellowsjungle), "XXX", "X Y", "XXX", + 'X', new ItemStack(Blocks.PLANKS, 1, 3), 'Y', ModItems.pistonbellows); + GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.pistonbellowsacacia), "XXX", "X Y", "XXX", + 'X', new ItemStack(Blocks.PLANKS, 1, 4), 'Y', ModItems.pistonbellows); + GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.pistonbellowsdarkoak), "XXX", "X Y", "XXX", + 'X', new ItemStack(Blocks.PLANKS, 1, 5), 'Y', ModItems.pistonbellows); + GameRegistry.addShapedRecipe(new ItemStack(ModItems.pistonbellows), "X X", "X X", " X ", 'X', Items.STICK); } } diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsacacia.json b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsacacia.json new file mode 100644 index 00000000..756f30f5 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsacacia.json @@ -0,0 +1,21 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "blocks/checker_test", + "texture_test": "blocks/checker_test", + "texture": "blocks/planks_acacia" + }, + "parent": "forgecraft:block/pistonbellows" + }, + "variants": { + "active=false,facing=north": { "model": "forgecraft:pistonbellows" }, + "active=true,facing=north": { "model": "forgecraft:pistonbellows" }, + "active=false,facing=east": { "model": "forgecraft:pistonbellows", "y": 90 }, + "active=true,facing=east": { "model": "forgecraft:pistonbellows", "y": 90 }, + "active=false,facing=south": { "model": "forgecraft:pistonbellows", "y": 180 }, + "active=true,facing=south": { "model": "forgecraft:pistonbellows", "y": 180 }, + "active=false,facing=west": { "model": "forgecraft:pistonbellows", "y": 270 }, + "active=true,facing=west": { "model": "forgecraft:pistonbellows", "y": 270 } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsbirch.json b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsbirch.json new file mode 100644 index 00000000..48e895fd --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsbirch.json @@ -0,0 +1,21 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "blocks/checker_test", + "texture_test": "blocks/checker_test", + "texture": "blocks/planks_birch" + }, + "parent": "forgecraft:block/pistonbellows" + }, + "variants": { + "active=false,facing=north": { "model": "forgecraft:pistonbellows" }, + "active=true,facing=north": { "model": "forgecraft:pistonbellows" }, + "active=false,facing=east": { "model": "forgecraft:pistonbellows", "y": 90 }, + "active=true,facing=east": { "model": "forgecraft:pistonbellows", "y": 90 }, + "active=false,facing=south": { "model": "forgecraft:pistonbellows", "y": 180 }, + "active=true,facing=south": { "model": "forgecraft:pistonbellows", "y": 180 }, + "active=false,facing=west": { "model": "forgecraft:pistonbellows", "y": 270 }, + "active=true,facing=west": { "model": "forgecraft:pistonbellows", "y": 270 } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsdarkoak.json b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsdarkoak.json new file mode 100644 index 00000000..07d58f20 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsdarkoak.json @@ -0,0 +1,21 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "blocks/checker_test", + "texture_test": "blocks/checker_test", + "texture": "blocks/planks_big_oak" + }, + "parent": "forgecraft:block/pistonbellows" + }, + "variants": { + "active=false,facing=north": { "model": "forgecraft:pistonbellows" }, + "active=true,facing=north": { "model": "forgecraft:pistonbellows" }, + "active=false,facing=east": { "model": "forgecraft:pistonbellows", "y": 90 }, + "active=true,facing=east": { "model": "forgecraft:pistonbellows", "y": 90 }, + "active=false,facing=south": { "model": "forgecraft:pistonbellows", "y": 180 }, + "active=true,facing=south": { "model": "forgecraft:pistonbellows", "y": 180 }, + "active=false,facing=west": { "model": "forgecraft:pistonbellows", "y": 270 }, + "active=true,facing=west": { "model": "forgecraft:pistonbellows", "y": 270 } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsjungle.json b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsjungle.json index ecbb42a5..f0b7d20c 100644 --- a/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsjungle.json +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsjungle.json @@ -6,6 +6,7 @@ "texture_test": "blocks/checker_test", "texture": "blocks/planks_jungle" }, + "parent": "forgecraft:block/pistonbellows" }, "variants": { "active=false,facing=north": { "model": "forgecraft:pistonbellows" }, diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellows.json b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsoak.json similarity index 73% rename from 1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellows.json rename to 1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsoak.json index 343d3aef..d5fbd503 100644 --- a/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellows.json +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsoak.json @@ -1,4 +1,13 @@ { + "forge_marker":1, + "defaults": { + "textures": { + "particle": "blocks/checker_test", + "texture_test": "blocks/checker_test", + "texture": "blocks/planks_oak" + }, + "parent": "forgecraft:block/pistonbellows" + }, "variants": { "active=false,facing=north": { "model": "forgecraft:pistonbellows" }, "active=true,facing=north": { "model": "forgecraft:pistonbellows" }, diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsspruce.json b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsspruce.json new file mode 100644 index 00000000..1a84fc23 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/pistonbellowsspruce.json @@ -0,0 +1,21 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "blocks/checker_test", + "texture_test": "blocks/checker_test", + "texture": "blocks/planks_spruce" + }, + "parent": "forgecraft:block/pistonbellows" + }, + "variants": { + "active=false,facing=north": { "model": "forgecraft:pistonbellows" }, + "active=true,facing=north": { "model": "forgecraft:pistonbellows" }, + "active=false,facing=east": { "model": "forgecraft:pistonbellows", "y": 90 }, + "active=true,facing=east": { "model": "forgecraft:pistonbellows", "y": 90 }, + "active=false,facing=south": { "model": "forgecraft:pistonbellows", "y": 180 }, + "active=true,facing=south": { "model": "forgecraft:pistonbellows", "y": 180 }, + "active=false,facing=west": { "model": "forgecraft:pistonbellows", "y": 270 }, + "active=true,facing=west": { "model": "forgecraft:pistonbellows", "y": 270 } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/pistonbellowsacacia.json b/1.11/src/main/resources/assets/forgecraft/models/item/pistonbellowsacacia.json new file mode 100644 index 00000000..4b5ac892 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/pistonbellowsacacia.json @@ -0,0 +1,9 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/checker_test", + "texture_test": "blocks/checker_test", + "texture": "blocks/planks_acacia" + }, + "parent": "forgecraft:block/pistonbellows" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/pistonbellowsbirch.json b/1.11/src/main/resources/assets/forgecraft/models/item/pistonbellowsbirch.json new file mode 100644 index 00000000..95bfbc08 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/pistonbellowsbirch.json @@ -0,0 +1,9 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/checker_test", + "texture_test": "blocks/checker_test", + "texture": "blocks/planks_birch" + }, + "parent": "forgecraft:block/pistonbellows" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/pistonbellowsdarkoak.json b/1.11/src/main/resources/assets/forgecraft/models/item/pistonbellowsdarkoak.json new file mode 100644 index 00000000..55096e6d --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/pistonbellowsdarkoak.json @@ -0,0 +1,9 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/checker_test", + "texture_test": "blocks/checker_test", + "texture": "blocks/planks_big_oak" + }, + "parent": "forgecraft:block/pistonbellows" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/pistonbellowsjungle.json b/1.11/src/main/resources/assets/forgecraft/models/item/pistonbellowsjungle.json new file mode 100644 index 00000000..bb640fda --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/pistonbellowsjungle.json @@ -0,0 +1,9 @@ +{ + "forge_marker":1, + "textures": { + "particle": "blocks/checker_test", + "texture_test": "blocks/checker_test", + "texture": "blocks/planks_jungle" + }, + "parent": "forgecraft:block/pistonbellows" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/pistonbellowsoak.json b/1.11/src/main/resources/assets/forgecraft/models/item/pistonbellowsoak.json new file mode 100644 index 00000000..89839a12 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/pistonbellowsoak.json @@ -0,0 +1,10 @@ + +{ + "forge_marker":1, + "textures": { + "particle": "blocks/checker_test", + "texture_test": "blocks/checker_test", + "texture": "blocks/planks_oak" + }, + "parent": "forgecraft:block/pistonbellows" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/pistonbellowsspruce.json b/1.11/src/main/resources/assets/forgecraft/models/item/pistonbellowsspruce.json new file mode 100644 index 00000000..441c764b --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/pistonbellowsspruce.json @@ -0,0 +1,10 @@ + +{ + "forge_marker":1, + "textures": { + "particle": "blocks/checker_test", + "texture_test": "blocks/checker_test", + "texture": "blocks/planks_spruce" + }, + "parent": "forgecraft:block/pistonbellows" +} \ No newline at end of file