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 00000000..a5cba185 Binary files /dev/null and b/kfc/src/main/resources/assets/forgecraft/textures/blocks/crucible_cooked.png differ diff --git a/kfc/src/main/resources/assets/forgecraft/textures/blocks/dirty_sand.png b/kfc/src/main/resources/assets/forgecraft/textures/blocks/dirty_sand.png new file mode 100644 index 00000000..af79323f Binary files /dev/null and b/kfc/src/main/resources/assets/forgecraft/textures/blocks/dirty_sand.png differ