diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/BaseMultiItem.java b/kfc/src/main/java/nmd/primal/forgecraft/items/BaseMultiItem.java index f6464f15..48c4fedc 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/BaseMultiItem.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/BaseMultiItem.java @@ -50,6 +50,38 @@ public class BaseMultiItem extends BaseItem { return 0.01f; } } + if(itemStack.equals(ModItems.bronzeingotball)) { + if (!stack.getTagCompound().getBoolean("hot")) { + return 0.02f; + } + if (stack.getTagCompound().getBoolean("hot")) { + return 0.03f; + } + } + if(itemStack.equals(ModItems.ironcleaningotball)) { + if (!stack.getTagCompound().getBoolean("hot")) { + return 0.04f; + } + if (stack.getTagCompound().getBoolean("hot")) { + return 0.05f; + } + } + if(itemStack.equals(ModItems.steelingotball)) { + if (!stack.getTagCompound().getBoolean("hot")) { + return 0.06f; + } + if (stack.getTagCompound().getBoolean("hot")) { + return 0.07f; + } + } + if(itemStack.equals(ModItems.wootzingotball)) { + if (!stack.getTagCompound().getBoolean("hot")) { + return 0.08f; + } + if (stack.getTagCompound().getBoolean("hot")) { + return 0.09f; + } + } } } return 0.0f; 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 afb9d9a9..009a31ae 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java @@ -177,7 +177,6 @@ public class SlottedTongs extends Item implements IPickup, AnvilHandler{ return 0.27f; } if (slotItem.equals(ModItems.ironingotball)) { - System.out.println("Rendering ingot ball"); return 0.28f; } if (slotItem.equals(ModItems.ironcleaningotball)) { diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/bronzeingotball.json b/kfc/src/main/resources/assets/forgecraft/models/item/bronzeingotball.json new file mode 100644 index 00000000..ae469ff7 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/bronzeingotball.json @@ -0,0 +1,11 @@ +{ + "parent": "forgecraft:item/ironball", + "textures": { + "particle": "forgecraft:blocks/bronze_ingot", + "texture": "forgecraft:blocks/bronze_ingot" + }, + "overrides": [ + {"predicate": {"type": 0.02},"model": "forgecraft:item/ingots/bronze/ingot_02"}, + {"predicate": {"type": 0.03},"model": "forgecraft:item/ingots/bronze/ingot_03"} + ] +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/ingots/bronze/ingot_02.json b/kfc/src/main/resources/assets/forgecraft/models/item/ingots/bronze/ingot_02.json new file mode 100644 index 00000000..a61bea82 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/ingots/bronze/ingot_02.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/ironball", + "textures": { + "particle": "forgecraft:blocks/bronze_ingot", + "texture": "forgecraft:blocks/bronze_ingot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/ingots/bronze/ingot_03.json b/kfc/src/main/resources/assets/forgecraft/models/item/ingots/bronze/ingot_03.json new file mode 100644 index 00000000..8b713cf0 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/ingots/bronze/ingot_03.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/ironball", + "textures": { + "particle": "forgecraft:blocks/bronze_ingot_hot", + "texture": "forgecraft:blocks/bronze_ingot_hot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_29.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_29.json new file mode 100644 index 00000000..b1c5547b --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_29.json @@ -0,0 +1,9 @@ +{ + "parent": "forgecraft:item/stonetongs_ingot_default", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/clean_iron_ingot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_30.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_30.json new file mode 100644 index 00000000..5a06b4ed --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_30.json @@ -0,0 +1,9 @@ +{ + "parent": "forgecraft:item/stonetongs_ingot_default", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/steel_ingot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_31.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_31.json new file mode 100644 index 00000000..f05d8c58 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_31.json @@ -0,0 +1,9 @@ +{ + "parent": "forgecraft:item/stonetongs_ingot_default", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/wootz_ingot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_32.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_32.json new file mode 100644 index 00000000..966bc5f7 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_32.json @@ -0,0 +1,9 @@ +{ + "parent": "forgecraft:item/stonetongs_chunk_default", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:items/finished_bronze" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_33.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_33.json new file mode 100644 index 00000000..25b637f4 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_33.json @@ -0,0 +1,9 @@ +{ + "parent": "forgecraft:item/stonetongs_chunk_default", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/iron_ingot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_34.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_34.json new file mode 100644 index 00000000..15d54987 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_34.json @@ -0,0 +1,9 @@ +{ + "parent": "forgecraft:item/stonetongs_chunk_default", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/clean_iron_ingot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_35.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_35.json new file mode 100644 index 00000000..207c945a --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_35.json @@ -0,0 +1,9 @@ +{ + "parent": "forgecraft:item/stonetongs_chunk_default", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/steel_ingot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_36.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_36.json new file mode 100644 index 00000000..a11f0eaf --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_36.json @@ -0,0 +1,9 @@ +{ + "parent": "forgecraft:item/stonetongs_chunk_default", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/wootz_ingot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_37.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_37.json new file mode 100644 index 00000000..0bf2e179 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_37.json @@ -0,0 +1,9 @@ +{ + "parent": "forgecraft:item/stonetongs_ingot_default", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:items/finished_bronze_hot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_38.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_38.json new file mode 100644 index 00000000..a9a20e37 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_38.json @@ -0,0 +1,9 @@ +{ + "parent": "forgecraft:item/stonetongs_ingot_default", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/iron_ingot_hot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_39.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_39.json new file mode 100644 index 00000000..a848348e --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_39.json @@ -0,0 +1,9 @@ +{ + "parent": "forgecraft:item/stonetongs_ingot_default", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/clean_iron_ingot_hot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_40.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_40.json new file mode 100644 index 00000000..a1323f79 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_40.json @@ -0,0 +1,9 @@ +{ + "parent": "forgecraft:item/stonetongs_ingot_default", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/steel_ingot_hot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_41.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_41.json new file mode 100644 index 00000000..0ea7d41a --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_41.json @@ -0,0 +1,9 @@ +{ + "parent": "forgecraft:item/stonetongs_ingot_default", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/wootz_ingot_hot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_42.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_42.json new file mode 100644 index 00000000..26491148 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_42.json @@ -0,0 +1,9 @@ +{ + "parent": "forgecraft:item/stonetongs_chunk_default", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:items/finished_bronze_hot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_43.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_43.json new file mode 100644 index 00000000..6e61d4ea --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_43.json @@ -0,0 +1,9 @@ +{ + "parent": "forgecraft:item/stonetongs_chunk_default", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/iron_ingot_hot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_44.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_44.json new file mode 100644 index 00000000..7f36e20d --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_44.json @@ -0,0 +1,9 @@ +{ + "parent": "forgecraft:item/stonetongs_chunk_default", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/clean_iron_ingot_hot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_45.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_45.json new file mode 100644 index 00000000..bcbe7a44 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_45.json @@ -0,0 +1,9 @@ +{ + "parent": "forgecraft:item/stonetongs_chunk_default", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/steel_ingot_hot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_46.json b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_46.json new file mode 100644 index 00000000..3901041d --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/slottedtongs/slottedtongs_46.json @@ -0,0 +1,9 @@ +{ + "parent": "forgecraft:item/stonetongs_chunk_default", + "textures": { + "particle": "blocks/planks_oak", + "texture": "blocks/planks_oak", + "texture1": "forgecraft:blocks/stone_slab", + "texture2": "forgecraft:blocks/wootz_ingot_hot" + } +} \ No newline at end of file