From cd8365533aff558adab7651024d426404c8e247d Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Sun, 2 Apr 2017 22:16:04 -0400 Subject: [PATCH] added clean iron block, textures, and hot --- 1.11/To-Dos | 1 + .../nmd/primal/forgecraft/blocks/Forge.java | 24 ++++------------ .../forgecraft/blockstates/ironball.json | 3 -- .../forgecraft/blockstates/ironcleanball.json | 26 ++++++++++++++++++ .../forgecraft/models/item/e_particle.png | Bin 159 -> 0 bytes .../forgecraft/models/item/e_texture.png | Bin 141 -> 0 bytes .../forgecraft/models/item/ironcleanball.json | 8 ++++++ .../textures/blocks/clean_iron_ingot.png | Bin 0 -> 385 bytes .../textures/blocks/clean_iron_ingot_hot.png | Bin 0 -> 598 bytes .../forgecraft/textures/blocks/iron_ingot.png | Bin 741 -> 601 bytes .../forgecraft/textures/items/iron_ingot.png | Bin 741 -> 601 bytes 11 files changed, 40 insertions(+), 22 deletions(-) create mode 100644 1.11/src/main/resources/assets/forgecraft/blockstates/ironcleanball.json delete mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/e_particle.png delete mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/e_texture.png create mode 100644 1.11/src/main/resources/assets/forgecraft/models/item/ironcleanball.json create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/blocks/clean_iron_ingot.png create mode 100644 1.11/src/main/resources/assets/forgecraft/textures/blocks/clean_iron_ingot_hot.png 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 e557878f9b0081df0e6c571ed915f4780bf1a2fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|X`U{QAsV7vCj@daC~~-LPd)$i z?$?xTj^-IIp9ACFK7V={aJAiXe!J@v0mIGT4Z3dBCY+nlAN}mLRowa~J3GYg{eRVX zXUUaN&3PXSznt{pUt?*oMTj?KX|GSjMcIr5t;EiVqsx9UI;{|T9DHPlG0;W^Pgg&e IbxsLQ03WwL?f?J) 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 7291f2ea2b524eccecb6678f7bd40262c849bf2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|A)YRdAsV8|HWeQfm^B+%SKK&v zuFpfaoliDNDM&L$@~vsZp9Y?WbuQ1CZf4l2-1K~5=5VI@Msu3kk+ey<5-m~}Y8ZA*V1_nkxPZ!4!i_@`_0@t+~aJaCqDF5GG zBAliB{%|=*R#J|ZEsycm+WW@Fs-9_K@1wk*SH7~~b8Xp{J9*~GyP|?!9G;gh{GU8C zDqB-&%Qc}3_uspFHdfyG%b2ok-D|B0yS0tIdD~S*WlYa0?%N}B|NGi?pQ5c7xE|ql zSh)N3zV|_g-z=TxI^Ftt&5L9Wr8wnMey$6?i(ZEx-Ilvv%B^Op!b%k*`-zECuNo@P z&y}xTvtGYJ>zJId>lx4V2Z9R?-DIbIsc6_8qr`B)dPj9~T2V@={DSX$<1SzA%b&PA zoNI5ge7jnj+VNaHZgH-FaF@lecV*eWVA(kP_`|K&qQ9;9GGF9|LXgOYXL%{hp3O1M bN_)ls`;?rK$OR=EP)K^Z`njxgN@xNA-v^Zh literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e8e4defc23291fa3c7bcf65753b3f93e163faebb GIT binary patch literal 598 zcmV-c0;&CpP)S?I z7xeg`3G4YFXUKh_DkzirLUWTd+&{ip1~@mY!frAbb3yH5zAgx)Lto!yhP4OP7iT_L zuMbvV|3ZQ_$icekF`Nrm)AxcH%|ODO5Pm|n;rYbS)M`)=Vn!5$7-*9TndZ3;k{Aqn zvYwyR^Mh57O->_)p`e8}IB@r30v3E9kql*{8baeTi+Yi6ps{WO%n_;mMsq=lv|-*i zJ2%(W48;lyZJ`b(NQXX)IfK^%!b69Wwz&F#49l|2nNKaIS2bhGY2t^|7n=%AIMfXMu znL!rMN5E!my!K}8cdINiqWi`7StLLTX#ueJ51irqE&#kY3xwR*jcCFq1WWWe0F;}| zaL(&3F@gJ_4y*4At6BSI&StOS&W7QCnR%n|_9PWfP?_`hpZF~bMxXF_aPT@nGXMYp literal 0 HcmV?d00001 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 e371011d9d833a1137de181f6bf63a67c5a68139..2b6609de68d025f6a7a22e5f6e75e5f50a92de7d 100644 GIT binary patch delta 570 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