From e7abf799469d4019261663464dc852a1247f9004 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Tue, 4 Sep 2018 22:07:45 -0400 Subject: [PATCH] updates to rendering and models, need more --- kfc/To-Dos.md | 5 ++++- kfc/gradle.properties | 2 +- .../java/nmd/primal/forgecraft/ModInfo.java | 2 +- .../primal/forgecraft/items/SlottedTongs.java | 19 +++++++++--------- .../forgecraft/models/item/slottedtongs.json | 2 +- .../item/slottedtongs/slottedtongs_012.json | 10 +++++++++ .../item/slottedtongs/slottedtongs_013.json | 10 +++++++++ .../item/slottedtongs/slottedtongs_014.json | 10 +++++++++ .../item/slottedtongs/slottedtongs_015.json | 10 ++++----- .../item/slottedtongs/slottedtongs_016.json | 10 +++++++++ .../item/slottedtongs/slottedtongs_017.json | 10 +++++++++ .../item/slottedtongs/slottedtongs_025.json | 10 +++++++++ .../textures/blocks/dirty_sand_burnt.png | Bin 0 -> 691 bytes .../textures/blocks/dirty_sand_cooked.png | Bin 0 -> 713 bytes kfc/src/main/resources/mcmod.info | 2 +- 15 files changed, 81 insertions(+), 21 deletions(-) create mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_012.json create mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_013.json create mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_014.json create mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_016.json create mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_017.json create mode 100644 kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_025.json create mode 100644 kfc/src/main/resources/assets/forgecraft/textures/blocks/dirty_sand_burnt.png create mode 100644 kfc/src/main/resources/assets/forgecraft/textures/blocks/dirty_sand_cooked.png 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 0000000000000000000000000000000000000000..9001042b0cee5771073cfdb9dc790fe4e1cada44 GIT binary patch literal 691 zcmV;k0!;mhP)PY=D7d>0zgSb zK~y-)CD2=r<35#|(qGm50>@Lu&vyd1+yLBgT;j` zl~|o!E44pRg+kEg6Ah?ewy{4u@MN=&>`z!%+!c?8J3t{fp$rA@N%x92#iyCtt+Q_{ z+hUL#)(vn}9B|Tta8OCamBl)t4KXQf5$rBx!Y*)}Aa)_y5icwyxy&#q46@MD(9KamZnr!8YWTWwnP4h# ze}WdsfN~Hb0snn4ji41ug8PPOu3(+mo+R)x!g&D6otFv1oVmf<3!G=DhXJHvo3q+Z z6}!>miKt^MxWL;h{BO8MTZFwAV=D=AOguiWZ~h)c|1~EZInq#GrU7+#Ulx6)S@sb5{YZW95$485G>&y Z#{Y?WTR4cs;9UR!002ovPDHLkV1j#hH6Q>0 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3d9ccb0a3c0abd8d17fd2c2f1db5203d1563cd90 GIT binary patch literal 713 zcmV;)0yh1LP)}t=n?<`0#->x zK~y-)1;Nd3B{dL$(a%+G-|qBHu85LIfEY0wgv2Avd(30AKtf`}0@xsCq}+eE%PyO9 z!spMQhV1t&!+GDX;Ld2q`Ftbxfe^Um%w!GSADHJvniDYu_UlS~UK02G&Q`8WwQ$)s z%o^T0n+qdEdU2XYV!ojYflgZYBp{xw((W0!Q!OLy4yE9(cu%+k1V$CY6!1LA9?_)u zvJ$gpS}oMgU{ov{;6!!68P@3zDg$w4v&Wz5{XwO)#^lE(lIyk*MfByq7&%bcIgB!Smd8fK^^@8LL ziC0iyKRN4MsP~S%Jo4wiPzwC|+wYuDa5L}@eI%^!sLY&~6_I7dxy9hJk|iNiMWhh?5t*d<81k%pnw zQ9v%2E3Ft_Dr!*m&{K;z}quC>_F25lCbI&YecaNsoxQGT7|7bm%#V05aZzEE9`cFLhVpW#4Ip| z(6>U26uNY}K{4f`TY?2k8)0&<-h0M5{YgpfvC?APiD+Kv7kyCSoXn zgDPnn*yg0Pk_SYYS8SVboUVpYu>l$soff