diff --git a/1.11/To-Dos b/1.11/To-Dos index 2339ac12..bfbf2411 100644 --- a/1.11/To-Dos +++ b/1.11/To-Dos @@ -2,6 +2,7 @@ To-Dos *** Bugs *** - [ ] Duplication Bug for Tool Repair +- [ ] Can't remove cool ingots from Forge *** Priority *** - [ ] Make an Iron Anvil diff --git a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Forge.java b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Forge.java index 412d1dbe..66df9c73 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/blocks/Forge.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/blocks/Forge.java @@ -1,5 +1,6 @@ package nmd.primal.forgecraft.blocks; +import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -156,16 +157,11 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ ***********************/ //REMOVE COOL INGOT if(facing == EnumFacing.UP ) { - if (pItem.isEmpty()) { + /*if (pItem.isEmpty()) { for (int i = 2; i < tile.getSlotListSize(); i++) { //System.out.println(i); if (!tile.getSlotStack(i).isEmpty()) { - if (tile.getSlotStack(i).getItem().equals(new ItemStack(ModBlocks.ironchunk).getItem())) { - CommonUtils.spawnItemEntity(world, player, tile.getSlotStack(i)); - tile.setSlotStack(i, ItemStack.EMPTY); - return true; - } - if (tile.getSlotStack(i).getItem().equals(new ItemStack(ModBlocks.ironball).getItem())) { + if (Block.getBlockFromItem(tile.getSlotStack(i).getItem()) instanceof IngotBall) { CommonUtils.spawnItemEntity(world, player, tile.getSlotStack(i)); tile.setSlotStack(i, ItemStack.EMPTY); return true; @@ -177,13 +173,12 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ return true; } } - } } - } + }*/ - if (pItem.getItem().equals(new ItemStack(ModBlocks.ironchunk).getItem())) { + if (Block.getBlockFromItem(pItem.getItem()) instanceof IngotBall) { //System.out.println("Activating"); for (int i = 2; i <= tile.getSlotListSize(); i++) { if (tile.getSlotStack(i).isEmpty()) { @@ -193,15 +188,6 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/ } } } - if (pItem.getItem().equals(new ItemStack(ModBlocks.ironball).getItem())) { - for (int i = 2; i < tile.getSlotListSize(); i++) { - if (tile.getSlotStack(i).isEmpty()) { - tile.setSlotStack(i, new ItemStack(pItem.getItem(), 1)); - pItem.shrink(1); - return true; - } - } - } //Needs Ore Dictionary Compat if (pItem.getItem().equals(new ItemStack(Items.IRON_INGOT).getItem())) { for (int i = 2; i < 7; i++) { diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/ironball.json b/1.11/src/main/resources/assets/forgecraft/blockstates/ironball.json index 28eb34c0..7428d1b9 100644 --- a/1.11/src/main/resources/assets/forgecraft/blockstates/ironball.json +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/ironball.json @@ -1,6 +1,3 @@ - - - { "forge_marker":1, "defaults": { diff --git a/1.11/src/main/resources/assets/forgecraft/blockstates/ironcleanball.json b/1.11/src/main/resources/assets/forgecraft/blockstates/ironcleanball.json new file mode 100644 index 00000000..713163d6 --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/blockstates/ironcleanball.json @@ -0,0 +1,26 @@ +{ + "forge_marker":1, + "defaults": { + "textures": { + "particle": "forgecraft:blocks/clean_iron_ingot", + "texture": "forgecraft:blocks/clean_iron_ingot" + }, + "parent": "forgecraft:ironball" + }, + "variants": { + "active=false": { + "model": "forgecraft:ironball", + "textures": { + "particle": "forgecraft:blocks/clean_iron_ingot", + "texture": "forgecraft:blocks/clean_iron_ingot" + } + }, + "active=true": { + "model": "forgecraft:ironball", + "textures": { + "particle": "forgecraft:blocks/clean_iron_ingot_hot", + "texture": "forgecraft:blocks/clean_iron_ingot_hot" + } + } + } +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/e_particle.png b/1.11/src/main/resources/assets/forgecraft/models/item/e_particle.png deleted file mode 100644 index e557878f..00000000 Binary files a/1.11/src/main/resources/assets/forgecraft/models/item/e_particle.png and /dev/null differ diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/e_texture.png b/1.11/src/main/resources/assets/forgecraft/models/item/e_texture.png deleted file mode 100644 index 7291f2ea..00000000 Binary files a/1.11/src/main/resources/assets/forgecraft/models/item/e_texture.png and /dev/null differ diff --git a/1.11/src/main/resources/assets/forgecraft/models/item/ironcleanball.json b/1.11/src/main/resources/assets/forgecraft/models/item/ironcleanball.json new file mode 100644 index 00000000..9a1c123b --- /dev/null +++ b/1.11/src/main/resources/assets/forgecraft/models/item/ironcleanball.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/clean_iron_ingot", + "texture": "forgecraft:blocks/clean_iron_ingot" + }, + "parent": "forgecraft:block/ironball" +} \ No newline at end of file diff --git a/1.11/src/main/resources/assets/forgecraft/textures/blocks/clean_iron_ingot.png b/1.11/src/main/resources/assets/forgecraft/textures/blocks/clean_iron_ingot.png new file mode 100644 index 00000000..a57a40d1 Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/blocks/clean_iron_ingot.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/blocks/clean_iron_ingot_hot.png b/1.11/src/main/resources/assets/forgecraft/textures/blocks/clean_iron_ingot_hot.png new file mode 100644 index 00000000..e8e4defc Binary files /dev/null and b/1.11/src/main/resources/assets/forgecraft/textures/blocks/clean_iron_ingot_hot.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/blocks/iron_ingot.png b/1.11/src/main/resources/assets/forgecraft/textures/blocks/iron_ingot.png index e371011d..2b6609de 100644 Binary files a/1.11/src/main/resources/assets/forgecraft/textures/blocks/iron_ingot.png and b/1.11/src/main/resources/assets/forgecraft/textures/blocks/iron_ingot.png differ diff --git a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot.png b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot.png index 3ce063f0..07f1086e 100644 Binary files a/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot.png and b/1.11/src/main/resources/assets/forgecraft/textures/items/iron_ingot.png differ