From 3e98f3998c7105a6feb71cc7f0d716b1d2209278 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Tue, 21 Aug 2018 17:41:18 -0400 Subject: [PATCH] updated models, addted to todo.md --- kfc/To-Dos.md | 1 + .../primal/forgecraft/items/SlottedTongs.java | 7 ++++--- .../forgecraft/blockstates/nbtcrucible.json | 16 ++++++++-------- .../forgecraft/models/item/slottedtongs.json | 9 ++++++++- .../models/item/slottedtongs_crucible1.json | 8 ++++---- .../models/item/slottedtongs_crucible2.json | 6 +++--- .../models/item/slottedtongs_crucible3.json | 2 +- .../models/item/slottedtongs_crucible4.json | 2 +- .../models/item/slottedtongs_crucible5.json | 2 +- .../textures/blocks/crucible_cooked.png | Bin 0 -> 548 bytes .../forgecraft/textures/blocks/dirty_sand.png | Bin 0 -> 640 bytes 11 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 kfc/src/main/resources/assets/forgecraft/textures/blocks/crucible_cooked.png create mode 100644 kfc/src/main/resources/assets/forgecraft/textures/blocks/dirty_sand.png diff --git a/kfc/To-Dos.md b/kfc/To-Dos.md index e42f20f4..8b9b9925 100644 --- a/kfc/To-Dos.md +++ b/kfc/To-Dos.md @@ -1,6 +1,7 @@ # To-Dos ## Bugs +- [ ] Slotted Tongs loses slotted Item after shutting down the client - [ ] Unable to place Vanilla Iron Nuggets on Forge #42 - [ ] JEI not showing full crafting recipe for Tools #38 diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java b/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java index 06d70f82..18638e48 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java @@ -56,17 +56,18 @@ public class SlottedTongs extends Item implements IPickup, AnvilHandler{ if (stack.getItem() instanceof SlottedTongs) { //System.out.println(slotStack.getTagCompound()); if (slotStack.getItem() instanceof ItemNBTCrucible){ + //System.out.println(item.getSlotList().get(0).getSubCompound("BlockEntityTag").getInteger("hot")); //Render Empty Crucible if(item.getSlotList().get(0).getSubCompound("BlockEntityTag").getInteger("hot") == 0){ - return 0.011f; + return 0.0f; } //Render Level 1 if(item.getSlotList().get(0).getSubCompound("BlockEntityTag").getInteger("hot") == 1){ - return 0.012f; + return 0.011f; } //Render Level 2 if(item.getSlotList().get(0).getSubCompound("BlockEntityTag").getInteger("hot") == 2){ - return 0.013f; + return 0.012f; } //Render Level 3 if(item.getSlotList().get(0).getSubCompound("BlockEntityTag").getInteger("hot") == 3){ diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/nbtcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/nbtcrucible.json index 25f62481..ca3aff6d 100644 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/nbtcrucible.json +++ b/kfc/src/main/resources/assets/forgecraft/blockstates/nbtcrucible.json @@ -13,7 +13,7 @@ "textures": { "particle": "forgecraft:blocks/stone_slab", "texture": "forgecraft:blocks/stone_slab", - "texture1": "blocks/sand" + "texture1": "forgecraft:blocks/dirty_sand" }, "model": "forgecraft:castingcrucible1" }, @@ -21,7 +21,7 @@ "textures": { "particle": "forgecraft:blocks/stone_slab", "texture": "forgecraft:blocks/stone_slab", - "texture1": "blocks/sand" + "texture1": "forgecraft:blocks/dirty_sand" }, "model": "forgecraft:castingcrucible2" }, @@ -29,7 +29,7 @@ "textures": { "particle": "forgecraft:blocks/stone_slab", "texture": "forgecraft:blocks/stone_slab", - "texture1": "blocks/sand" + "texture1": "forgecraft:blocks/dirty_sand" }, "model": "forgecraft:castingcrucible3" }, @@ -37,7 +37,7 @@ "textures": { "particle": "forgecraft:blocks/stone_slab", "texture": "forgecraft:blocks/stone_slab", - "texture1": "blocks/sand" + "texture1": "forgecraft:blocks/dirty_sand" }, "model": "forgecraft:castingcrucible4" }, @@ -45,7 +45,7 @@ "textures": { "particle": "forgecraft:blocks/stone_slab", "texture": "forgecraft:blocks/stone_slab", - "texture1": "blocks/sand" + "texture1": "forgecraft:blocks/dirty_sand" }, "model": "forgecraft:castingcrucible5" }, @@ -53,9 +53,9 @@ "textures": { "particle": "forgecraft:blocks/stone_slab_hot", "texture": "forgecraft:blocks/stone_slab_hot", - "texture1": "forgecraft:items/hot_bronze" + "texture1": "forgecraft:blocks/crucible_cooked" }, - "model": "forgecraft:castingcrucible" + "model": "forgecraft:castingcrucible4" }, "7": { "textures": { @@ -127,7 +127,7 @@ "texture": "forgecraft:blocks/stone_slab_hot", "texture1": "forgecraft:items/hot_bronze" }, - "model": "forgecraft:castingcrucible" + "model": "forgecraft:castingcrucible4" } } } diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs.json index a9e3753a..66daed11 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs.json @@ -7,7 +7,14 @@ }, "overrides": [ {"predicate": {"type": 0.0},"model": "forgecraft:item/slottedtongs/slottedtongs_0"}, - {"predicate": {"type": 0.025},"model": "forgecraft:item/slottedtongs/slottedtongs_015"}, + {"predicate": {"type": 0.011},"model": "forgecraft:item/slottedtongs/slottedtongs_011"}, + {"predicate": {"type": 0.012},"model": "forgecraft:item/slottedtongs/slottedtongs_012"}, + {"predicate": {"type": 0.013},"model": "forgecraft:item/slottedtongs/slottedtongs_013"}, + {"predicate": {"type": 0.014},"model": "forgecraft:item/slottedtongs/slottedtongs_014"}, + {"predicate": {"type": 0.015},"model": "forgecraft:item/slottedtongs/slottedtongs_015"}, + {"predicate": {"type": 0.016},"model": "forgecraft:item/slottedtongs/slottedtongs_016"}, + {"predicate": {"type": 0.017},"model": "forgecraft:item/slottedtongs/slottedtongs_017"}, + {"predicate": {"type": 0.025},"model": "forgecraft:item/slottedtongs/slottedtongs_025"}, {"predicate": {"type": 0.02},"model": "forgecraft:item/slottedtongs/slottedtongs_2"}, {"predicate": {"type": 0.03},"model": "forgecraft:item/slottedtongs/slottedtongs_3"}, {"predicate": {"type": 0.04},"model": "forgecraft:item/slottedtongs/slottedtongs_4"}, diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs_crucible1.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs_crucible1.json index 00065f26..002a4ce9 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs_crucible1.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs_crucible1.json @@ -222,12 +222,12 @@ }, { "__comment": "Cube25", - "from": [ 5.5, -1.5, -2.5 ], - "to": [ 10.5, -0.5, 2.5 ], + "from": [ 6, -1.5, -2 ], + "to": [ 10, -1.499, 2 ], "shade": false, "faces": { - "down": { "uv": [ 5.5, 9.5, 10.5, 14.5 ], "texture": "#texture3" }, - "up": { "uv": [ 5.5, 0.5, 10.5, 5.5 ], "texture": "#texture3" }, + "down": { "uv": [ 5.5, 5.5, 10.5, 10.5 ], "texture": "#texture3" }, + "up": { "uv": [ 5.5, 5.5, 10.5, 10.5 ], "texture": "#texture3" }, "north": { "uv": [ 5.5, 12, 10.5, 13 ], "texture": "#texture3" }, "south": { "uv": [ 5.5, 12, 10.5, 13 ], "texture": "#texture3" }, "west": { "uv": [ 0.5, 12, 5.5, 13 ], "texture": "#texture3" }, diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs_crucible2.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs_crucible2.json index 4bd734b5..c83564c3 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs_crucible2.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs_crucible2.json @@ -222,12 +222,12 @@ }, { "__comment": "Cube25", - "from": [ 5.5, -0.5, -2.5 ], - "to": [ 10.5, 0.5, 2.5 ], + "from": [ 6, -0.5, -2 ], + "to": [ 10, -0.499, 2 ], "shade": false, "faces": { "down": { "uv": [ 5.5, 9.5, 10.5, 14.5 ], "texture": "#texture3" }, - "up": { "uv": [ 5.5, 0.5, 10.5, 5.5 ], "texture": "#texture3" }, + "up": { "uv": [ 5.5, 5.5, 10.5, 10.5 ], "texture": "#texture3" }, "north": { "uv": [ 5.5, 12, 10.5, 13 ], "texture": "#texture3" }, "south": { "uv": [ 5.5, 12, 10.5, 13 ], "texture": "#texture3" }, "west": { "uv": [ 0.5, 12, 5.5, 13 ], "texture": "#texture3" }, diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs_crucible3.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs_crucible3.json index 2be4636f..2319f72d 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs_crucible3.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs_crucible3.json @@ -227,7 +227,7 @@ "shade": false, "faces": { "down": { "uv": [ 5.5, 9.5, 10.5, 14.5 ], "texture": "#texture3" }, - "up": { "uv": [ 5.5, 0.5, 10.5, 5.5 ], "texture": "#texture3" }, + "up": { "uv": [ 5.5, 5.5, 10.5, 10.5 ], "texture": "#texture3" }, "north": { "uv": [ 5.5, 12, 10.5, 13 ], "texture": "#texture3" }, "south": { "uv": [ 5.5, 12, 10.5, 13 ], "texture": "#texture3" }, "west": { "uv": [ 0.5, 12, 5.5, 13 ], "texture": "#texture3" }, diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs_crucible4.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs_crucible4.json index 291cba23..7798fe37 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs_crucible4.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs_crucible4.json @@ -227,7 +227,7 @@ "shade": false, "faces": { "down": { "uv": [ 5.5, 9.5, 10.5, 14.5 ], "texture": "#texture3" }, - "up": { "uv": [ 5.5, 0.5, 10.5, 5.5 ], "texture": "#texture3" }, + "up": { "uv": [ 5.5, 5.5, 10.5, 10.5 ], "texture": "#texture3" }, "north": { "uv": [ 5.5, 12, 10.5, 13 ], "texture": "#texture3" }, "south": { "uv": [ 5.5, 12, 10.5, 13 ], "texture": "#texture3" }, "west": { "uv": [ 0.5, 12, 5.5, 13 ], "texture": "#texture3" }, diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs_crucible5.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs_crucible5.json index 91a8b57d..8df48412 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs_crucible5.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs_crucible5.json @@ -227,7 +227,7 @@ "shade": false, "faces": { "down": { "uv": [ 5.5, 9.5, 10.5, 14.5 ], "texture": "#texture3" }, - "up": { "uv": [ 5.5, 0.5, 10.5, 5.5 ], "texture": "#texture3" }, + "up": { "uv": [ 5.5, 5.5, 10.5, 10.5 ], "texture": "#texture3" }, "north": { "uv": [ 5.5, 12, 10.5, 13 ], "texture": "#texture3" }, "south": { "uv": [ 5.5, 12, 10.5, 13 ], "texture": "#texture3" }, "west": { "uv": [ 0.5, 12, 5.5, 13 ], "texture": "#texture3" }, diff --git a/kfc/src/main/resources/assets/forgecraft/textures/blocks/crucible_cooked.png b/kfc/src/main/resources/assets/forgecraft/textures/blocks/crucible_cooked.png new file mode 100644 index 0000000000000000000000000000000000000000..a5cba18566714cd4053349ce44b3907a232cef72 GIT binary patch literal 548 zcmV+<0^9wGP)A-8K+IADYx3SGjVG93r{@k&^Kri49~y+Kx7oiq!%h8q(i?{h5D1Kl%LU z2g?S9eirLl#DM@Y-=5Haytwah%`mRw`|BICdoeV)ULSDZe0|+?2V6LzJ0wM4p?)+f z(Mw!&vhFa~(^SD6Vtl*+@qXWQ7Fi(yQg{VQDB_x;AG0uXt;HCHN;qK*G3SH`R|Ab( z1aQJtK*GIDcQc=70dw13=6S+eX0=Hmh$=`7z*?aJ$E+3R{k0HV;aR5J*yf}MhIXI# z?II2#l#2PRMU4Rxwn+j48`_4mh;3(Q(hd@6h>66r_FxjaP0l*2ijDzs2sTOp6+>dS zO|r1T&Vdo`oR4Zxs)!pKkbr$Y-|vS}Mb$X$APF6e*hrfIX>aQk%+4+n9=Nvh&uedB ztJwLaxT6R{fSKbJ)_YMNNcydGo_F^7m62_5Kp{8GnZjDMLDbRL4vvkGLv%$F(n}dAIAUNCLuluF5>piZIY5wh#dl8*&ORZC`TgVKt3&zxc?e=g mfizfcs){VA+J%&IT)=;aOPK8|xo+1000007Jd0u4z- zK~y-)C6U{4<46oePXl0^TB&BLCY{a0`DZX|TN0b-2CyFt;J(gnpP&DhJRaOC_&c5u zK`rO|`-Np8G+xKS<_mrNX5Tw~?^tU*?sx3Zt@A$qGR`O4Joy;|_eHE^giy`MGgxZa z@j?|ENxwhnfPML7y$|5c^aELMI8P#!$W8=6qo&ZdMjXWvhIS=xckJ+kHBaVnsEHpA z1f~H5Cq#fpGDCUBi5vs7C+H53EeJg*55|H>5Fmh9SAzsvbv!>% zcD`>LCbv5tPr5ZaK`H10pD@=Y&IAByAWaYi5yiA)E{!!42|*Q9fCeof9AbhfYybkP zgI)@=qYC!(^JFW>Vp4Y1#aZ zsuoQz4jCW`O$ANpeZzcypaSQDsDf7X9)O~%Ozl`ZuR~SoTj3+<{mxNfvfuHs5d^7@ zF!2Iyif%U|f!gU~AOgikR^t`Uul*maTc_QWawiT*H6n|Yjx~i%kt{+x9xze*hu{Uz abp8kHY*-&$K7c6z0000