diff --git a/kfc/To-Dos.md b/kfc/To-Dos.md index 632be4bc..7f9378fd 100644 --- a/kfc/To-Dos.md +++ b/kfc/To-Dos.md @@ -7,7 +7,10 @@ ## Current Feature - [x] Update nbt Crucible Models with open top -- [ ] Update Tongs Models +- [x] Update all slotted tong models +- [ ] Need to update nbtCrucible models when hot and in bloomery +- [ ] Need to update hot tongs model +- [ ] CT Support - [ ] Update Casting recipes to use new slotted tongs and nbtCrucible - [ ] Config Usage - [ ] Steel Plate Recipe #37 diff --git a/kfc/gradle.properties b/kfc/gradle.properties index 9e3376d7..c575cb59 100644 --- a/kfc/gradle.properties +++ b/kfc/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx3G mod_group=nmd.primal.forgecraft mod_name=ForgeCraft -mod_version=1.4.11 +mod_version=1.5.0 forge_version=14.23.4.2744 mcp_mappings=snapshot_20171003 mc_version=1.12.2 diff --git a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java index ec5a3d97..703e33d8 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -18,7 +18,7 @@ public class ModInfo { //public static final String MOD_PREFIX = MOD_ID + ":"; public static final String MOD_CHANNEL = MOD_ID; - public static final String MOD_VERSION = "1.4.11"; + public static final String MOD_VERSION = "1.5.0"; public static final String MC_VERSIONS = "[1.12.0, 1.13.0)"; public static final String DEPENDENCIES = "required-after:forge@[14.21.1.2400,);" + "required-after:primal@[0.6.69,);"; 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 18638e48..ed24ce0c 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java @@ -56,40 +56,39 @@ 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 + /***Render Empty Crucible***/ if(item.getSlotList().get(0).getSubCompound("BlockEntityTag").getInteger("hot") == 0){ return 0.0f; } - //Render Level 1 + /***Render Level 1***/ if(item.getSlotList().get(0).getSubCompound("BlockEntityTag").getInteger("hot") == 1){ return 0.011f; } - //Render Level 2 + /***Render Level 2***/ if(item.getSlotList().get(0).getSubCompound("BlockEntityTag").getInteger("hot") == 2){ return 0.012f; } - //Render Level 3 + /***Render Level 3***/ if(item.getSlotList().get(0).getSubCompound("BlockEntityTag").getInteger("hot") == 3){ return 0.013f; } - //Render Level 4 + /***Render Level 4***/ if(item.getSlotList().get(0).getSubCompound("BlockEntityTag").getInteger("hot") == 4){ return 0.014f; } - //Render Level 5 + /***Render Level 5***/ if(item.getSlotList().get(0).getSubCompound("BlockEntityTag").getInteger("hot") == 5){ return 0.015f; } - //Render Cooked + /***Render Level Cooked***/ if(item.getSlotList().get(0).getSubCompound("BlockEntityTag").getInteger("hot") == 6){ return 0.016f; } - //Render Slagged + /***Render Failed***/ if(item.getSlotList().get(0).getSubCompound("BlockEntityTag").getInteger("hot") == 7){ return 0.017f; } - //Render Hot + /***Render Hot***/ if(item.getSlotList().get(0).getSubCompound("BlockEntityTag").getInteger("hot") == 15){ return 0.025f; } 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 66daed11..5237a067 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs.json @@ -14,8 +14,8 @@ {"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.025},"model": "forgecraft:item/slottedtongs/slottedtongs_025"}, {"predicate": {"type": 0.03},"model": "forgecraft:item/slottedtongs/slottedtongs_3"}, {"predicate": {"type": 0.04},"model": "forgecraft:item/slottedtongs/slottedtongs_4"}, {"predicate": {"type": 0.05},"model": "forgecraft:item/slottedtongs/slottedtongs_5"}, diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_012.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_012.json new file mode 100644 index 00000000..45868ff4 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_012.json @@ -0,0 +1,10 @@ +{ + "parent": "forgecraft:item/slottedtongs_crucible2", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/stone_slab", + "texture3": "forgecraft:blocks/dirty_sand" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_013.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_013.json new file mode 100644 index 00000000..e1b0818c --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_013.json @@ -0,0 +1,10 @@ +{ + "parent": "forgecraft:item/slottedtongs_crucible3", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/stone_slab", + "texture3": "forgecraft:blocks/dirty_sand" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_014.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_014.json new file mode 100644 index 00000000..49e66b2c --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_014.json @@ -0,0 +1,10 @@ +{ + "parent": "forgecraft:item/slottedtongs_crucible4", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/stone_slab", + "texture3": "forgecraft:blocks/dirty_sand" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_015.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_015.json index 169b0173..fe97eaf4 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_015.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_015.json @@ -1,12 +1,10 @@ { - "parent": "forgecraft:item/stonetongs_hotbronze", + "parent": "forgecraft:item/slottedtongs_crucible5", "textures": { "particle": "blocks/planks_oak", "texture": "blocks/planks_oak", "texture1": "forgecraft:blocks/stone_slab", - "texture2": "forgecraft:blocks/stone_slab_hot", - "texture3": "forgecraft:items/hot_bronze" + "texture2": "forgecraft:blocks/stone_slab", + "texture3": "forgecraft:blocks/dirty_sand" } -} - - +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_016.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_016.json new file mode 100644 index 00000000..11e173a3 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_016.json @@ -0,0 +1,10 @@ +{ + "parent": "forgecraft:item/slottedtongs_crucible3", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/stone_slab", + "texture3": "forgecraft:blocks/dirty_sand_cooked" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_017.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_017.json new file mode 100644 index 00000000..4a82e158 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_017.json @@ -0,0 +1,10 @@ +{ + "parent": "forgecraft:item/slottedtongs_crucible3", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/stone_slab", + "texture3": "forgecraft:blocks/dirty_sand_burnt" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_025.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_025.json new file mode 100644 index 00000000..f02e1dad --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_025.json @@ -0,0 +1,10 @@ +{ + "parent": "forgecraft:item/slottedtongs_crucible4", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "blocks/stone_slab", + "texture2": "blocks/stone_slab_hot", + "texture3": "blocks/molten_crucible" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/textures/blocks/dirty_sand_burnt.png b/kfc/src/main/resources/assets/forgecraft/textures/blocks/dirty_sand_burnt.png new file mode 100644 index 00000000..9001042b Binary files /dev/null and b/kfc/src/main/resources/assets/forgecraft/textures/blocks/dirty_sand_burnt.png differ diff --git a/kfc/src/main/resources/assets/forgecraft/textures/blocks/dirty_sand_cooked.png b/kfc/src/main/resources/assets/forgecraft/textures/blocks/dirty_sand_cooked.png new file mode 100644 index 00000000..3d9ccb0a Binary files /dev/null and b/kfc/src/main/resources/assets/forgecraft/textures/blocks/dirty_sand_cooked.png differ diff --git a/kfc/src/main/resources/mcmod.info b/kfc/src/main/resources/mcmod.info index 23f4fe85..9a24e199 100644 --- a/kfc/src/main/resources/mcmod.info +++ b/kfc/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ "modid": "forgecraft", "name": "Kitsu's Forgecraft", "description": "Forged with sweat and blood", - "version": "1.4.11", + "version": "1.5.0", "mcversion": "1.12.2", "url": "", "updateUrl": "",