From 2539ca18837a131dccff49db735dfa65a5d29ca8 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Sat, 22 Apr 2017 14:56:41 -0400 Subject: [PATCH] abstract bloomery input --- 1.11/To-Dos | 9 +++++---- .../nmd/primal/forgecraft/blocks/Bloomery.java | 5 ++++- .../nmd/primal/forgecraft/init/ModBlocks.java | 18 +++++++++--------- .../nmd/primal/forgecraft/init/ModItems.java | 6 ++++++ .../renders/blocks/TileAnvilRender.java | 9 +++++---- .../primal/forgecraft/tiles/TileBloomery.java | 4 +++- .../models/item/ironcleaningotballhot.json | 2 +- 7 files changed, 33 insertions(+), 20 deletions(-) diff --git a/1.11/To-Dos b/1.11/To-Dos index 19f8dc6e..75d60be8 100644 --- a/1.11/To-Dos +++ b/1.11/To-Dos @@ -4,10 +4,7 @@ To-Dos *** Priority *** -- [ ] StoneTongs for all tool heads - - [x] ItemNBT - - [ ] ItemRender - - [ ] JSON +- [ ] Bloomery not accepting raw clean crucible - [ ] Move Ingot break into chunks logic out of the block and into the ForgeHammer - [ ] Add Yew @@ -41,6 +38,10 @@ rm *.json-- rename s/iron/steel/ iron* *** Completed *** +- [x] StoneTongs for all tool heads + - [x] ItemNBT + - [x] ItemRender + - [x] JSON - [x] Change how bloomery does recipe cookTime - [x] Duplication Bug for Tool Repair - [x] Fix Breaker Render to rotate correctly diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Bloomery.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Bloomery.java index 600a90f1..7d87d540 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Bloomery.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Bloomery.java @@ -121,7 +121,10 @@ public class Bloomery extends CustomContainerFacing implements ITileEntityProvid } } if(tile.getSlotStack(0) != ItemStack.EMPTY) { - if((pItem.getItem() == Items.FLINT_AND_STEEL) || (pItem.getItem() == PrimalItems.FIRE_BOW) || pItem.getItem() == PrimalItems.TORCH_WOOD_LIT || pItem.getItem() == PrimalItems.TORCH_NETHER_LIT ) { + if((pItem.getItem() == Items.FLINT_AND_STEEL) || + (pItem.getItem() == PrimalItems.FIRE_BOW) || + pItem.getItem() == PrimalItems.TORCH_WOOD_LIT || + pItem.getItem() == PrimalItems.TORCH_NETHER_LIT ) { world.setBlockState(pos, state.withProperty(ACTIVE, true), 2); tile.setHeat(100); tile.markDirty(); 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 3466b69c..7275cdb0 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 @@ -334,15 +334,15 @@ public class ModBlocks { ) { player.swingArm(hand); world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); - tile.setSlotStack(6, new ItemStack(ModItems.ironchunkhot, 1)); - tile.setSlotStack(7, new ItemStack(ModItems.ironchunkhot, 1)); - tile.setSlotStack(8, new ItemStack(ModItems.ironchunkhot, 1)); - tile.setSlotStack(11, new ItemStack(ModItems.ironchunkhot, 1)); - tile.setSlotStack(12, new ItemStack(ModItems.ironchunkhot, 1)); - tile.setSlotStack(13, new ItemStack(ModItems.ironchunkhot, 1)); - tile.setSlotStack(16, new ItemStack(ModItems.ironchunkhot, 1)); - tile.setSlotStack(17, new ItemStack(ModItems.ironchunkhot, 1)); - tile.setSlotStack(18, new ItemStack(ModItems.ironchunkhot, 1)); + tile.setSlotStack(6, new ItemStack(ModItems.wootzchunkhot, 1)); + tile.setSlotStack(7, new ItemStack(ModItems.wootzchunkhot, 1)); + tile.setSlotStack(8, new ItemStack(ModItems.wootzchunkhot, 1)); + tile.setSlotStack(11, new ItemStack(ModItems.wootzchunkhot, 1)); + tile.setSlotStack(12, new ItemStack(ModItems.wootzchunkhot, 1)); + tile.setSlotStack(13, new ItemStack(ModItems.wootzchunkhot, 1)); + tile.setSlotStack(16, new ItemStack(ModItems.wootzchunkhot, 1)); + tile.setSlotStack(17, new ItemStack(ModItems.wootzchunkhot, 1)); + tile.setSlotStack(18, new ItemStack(ModItems.wootzchunkhot, 1)); world.playEvent(1031, pos, 0); return true; } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java index 69e3a043..4e60ca9d 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -187,6 +187,12 @@ public class ModItems { GameRegistry.register(forgehammer); GameRegistry.register(ironingotballhot); GameRegistry.register(ironchunkhot); + GameRegistry.register(ironcleaningotballhot); + GameRegistry.register(ironcleanchunkhot); + GameRegistry.register(steelingotballhot); + GameRegistry.register(steelchunkhot); + GameRegistry.register(wootzingotballhot); + GameRegistry.register(wootzchunkhot); //GameRegistry.register(test); /********** diff --git a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java index 153b7201..03e7cf76 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java @@ -21,6 +21,7 @@ import nmd.primal.forgecraft.blocks.Anvil; import nmd.primal.forgecraft.blocks.IngotBall; import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModItems; +import nmd.primal.forgecraft.items.BaseMultiItem; import nmd.primal.forgecraft.tiles.TileAnvil; import nmd.primal.forgecraft.tiles.TileBloomery; import org.lwjgl.opengl.GL11; @@ -151,7 +152,7 @@ public class TileAnvilRender extends TileEntitySpecialRenderer renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); GL11.glPopMatrix(); } - if(tile.getSlotStack(counter).getItem() == ModItems.ironchunkhot || tile.getSlotStack(counter).getItem() == ModItems.ironingotballhot){ + if(tile.getSlotStack(counter).getItem() instanceof BaseMultiItem){ GL11.glPushMatrix(); double scale = 1.0D; GL11.glScaled(scale, scale, scale); @@ -228,7 +229,7 @@ public class TileAnvilRender extends TileEntitySpecialRenderer renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); GL11.glPopMatrix(); } - if(tile.getSlotStack(counter).getItem() == ModItems.ironchunkhot || tile.getSlotStack(counter).getItem() == ModItems.ironingotballhot){ + if(tile.getSlotStack(counter).getItem() instanceof BaseMultiItem){ GL11.glPushMatrix(); double scale = 1.0D; GL11.glScaled(scale, scale, scale); @@ -307,7 +308,7 @@ public class TileAnvilRender extends TileEntitySpecialRenderer renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); GL11.glPopMatrix(); } - if(tile.getSlotStack(counter).getItem() == ModItems.ironchunkhot || tile.getSlotStack(counter).getItem() == ModItems.ironingotballhot){ + if(tile.getSlotStack(counter).getItem() instanceof BaseMultiItem){ GL11.glPushMatrix(); double scale = 1.0D; GL11.glScaled(scale, scale, scale); @@ -387,7 +388,7 @@ public class TileAnvilRender extends TileEntitySpecialRenderer renderItem.renderItem(tile.getSlotStack(counter), ItemCameraTransforms.TransformType.FIXED); GL11.glPopMatrix(); } - if(tile.getSlotStack(counter).getItem() == ModItems.ironchunkhot || tile.getSlotStack(counter).getItem() == ModItems.ironingotballhot){ + if(tile.getSlotStack(counter).getItem() instanceof BaseMultiItem){ GL11.glPushMatrix(); double scale = 1.0D; GL11.glScaled(scale, scale, scale); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java index 0b373176..ee541d6b 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java @@ -1,5 +1,6 @@ package nmd.primal.forgecraft.tiles; +import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -10,6 +11,7 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import nmd.primal.forgecraft.blocks.Bloomery; +import nmd.primal.forgecraft.blocks.Crucible; import nmd.primal.forgecraft.blocks.Forge; import nmd.primal.forgecraft.crafting.BloomeryCrafting; import nmd.primal.forgecraft.init.ModBlocks; @@ -177,7 +179,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable { if (stack.getItem() == ModItems.softcrucible) { return true; } - if(stack.getItem() == Item.getItemFromBlock(ModBlocks.rawironcrucible)){ + if(Block.getBlockFromItem(stack.getItem()) instanceof Crucible ){ return true; } } diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironcleaningotballhot.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironcleaningotballhot.json index a675b2a1..171ad17c 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/item/ironcleaningotballhot.json +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironcleaningotballhot.json @@ -4,5 +4,5 @@ "particle": "forgecraft:blocks/clean_iron_ingot_hot", "texture": "forgecraft:blocks/clean_iron_ingot_hot" }, - "parent": "forgecraft:block/ironchunk" + "parent": "forgecraft:item/ironball" } \ No newline at end of file