diff --git a/kfc/To-Dos.md b/kfc/To-Dos.md index 4868151a..1680c351 100644 --- a/kfc/To-Dos.md +++ b/kfc/To-Dos.md @@ -6,26 +6,28 @@ - [ ] JEI not showing full crafting recipe for Tools #38 ## Current Feature -- [x] Update nbt Crucible Models with open top -- [x] Update all slotted tong models -- [ ] Need to update nbtCrucible models when hot and in bloomery -- [ ] Need to update hot tongs model - - [ ] How to cook Soft Crucible https://git.nmd.so/nmd/PrimalCore/src/branch/tile-factory/src/main/java/nmd/primal/core/common/init/recipes/custom/RecipesHibachi.java make a copy of it somewhere, it doenst need to be instantiated or anything, the event annotation will automatically load it for your setRecipeName include your mod id like .setRecipeName(KFC.MOD_ID, "soft_crucible")); you'll need to update the annotation @GameRegistry.ObjectHolder(ModInfo.MOD_ID) with your mod id also -- [ ] Chunk and Ball stacking -- [ ] Adobe Bloomery Texture -- [ ] Adobe Forge Texture -- [ ] Casting Mud Texture -- [ ] Wootz Chunk Model - [ ] Leather Helmet Inventory Model -- [ ] CT Support - [ ] Config Usage - [ ] Steel Plate Recipe #37 +- [ ] Bronze Plate Cast - [ ] Craft Tweaker Support +- [ ] Need Recipe for Soft Crucible +- [x] Make Wootz Weapons +- [x] Crucible is not resetting after iron is removed. +- [x] Chunk and Ball stacking +- [x] Delete unused models, blockstates, and textures +- [x] Inventory version of balls have the same texture +- [x] Wootz Chunk Model +- [x] Casting Mud Texture +- [x] Adobe Bloomery Texture +- [x] Adobe Forge Texture +- [x] Update nbt Crucible Models with open top +- [x] Update all slotted tong models - [x] Inventory model for nbtCrucible - [x] Tongs hot Texture - [x] Casting Block line 103 diff --git a/kfc/gradle.properties b/kfc/gradle.properties index c5ca627b..83844159 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.5.1 +mod_version=1.5.2 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 afd81a67..12144b62 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.5.1"; + public static final String MOD_VERSION = "1.5.2"; 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/blocks/Anvil/AnvilStone.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilStone.java index dbcecd2e..1632ed63 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilStone.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Anvil/AnvilStone.java @@ -31,22 +31,31 @@ public class AnvilStone extends AnvilBase { if (!world.isRemote) { ItemStack pItem = player.inventory.getCurrentItem(); TileAnvil tile = (TileAnvil) world.getTileEntity(pos); - ItemStack stack12 = tile.getSlotStack(12).copy(); - if (hand.equals(player.swingingHand)) { + if (hand.equals(hand.MAIN_HAND)) { if (!stack12.isEmpty()) { if (tile != null) { if ((pItem.getItem() instanceof Gallagher) || (pItem.getItem() == ModItems.forgehammer)) { - NBTTagCompound nbt12 = stack12.getTagCompound(); + NBTTagCompound tempTag = new NBTTagCompound(); - ItemStack tempironchunk = new ItemStack(ModItems.ironchunk, 1); + ItemStack tempironchunk = new ItemStack(ModItems.wroughtironchunk, 1); + tempironchunk.setTagCompound(tempTag); tempironchunk.getTagCompound().setBoolean("hot", true); + ItemStack tempironcleanchunk = new ItemStack(ModItems.ironcleanchunk, 1); + tempironcleanchunk.setTagCompound(tempTag); tempironcleanchunk.getTagCompound().setBoolean("hot", true); + ItemStack tempsteelchunk = new ItemStack(ModItems.steelchunk, 1); + tempsteelchunk.setTagCompound(tempTag); tempsteelchunk.getTagCompound().setBoolean("hot", true); + ItemStack tempwootzchunk = new ItemStack(ModItems.wootzchunk, 1); + tempwootzchunk.setTagCompound(tempTag); tempwootzchunk.getTagCompound().setBoolean("hot", true); + + System.out.println(stack12.getTagCompound()); + if (stack12.getItem().equals(ModItems.ironingotball) && stack12.getTagCompound().getBoolean("hot")) { tile.setSlotStack(6, tempironchunk); tile.setSlotStack(7, tempironchunk); @@ -58,6 +67,7 @@ public class AnvilStone extends AnvilBase { tile.setSlotStack(17, tempironchunk); tile.setSlotStack(18, tempironchunk); world.playEvent(1031, pos, 0); + return true; } if (stack12.getItem().equals(ModItems.ironcleaningotball) && stack12.getTagCompound().getBoolean("hot")) { tile.setSlotStack(6, tempironcleanchunk); @@ -70,6 +80,7 @@ public class AnvilStone extends AnvilBase { tile.setSlotStack(17, tempironcleanchunk); tile.setSlotStack(18, tempironcleanchunk); world.playEvent(1031, pos, 0); + return true; } if (stack12.getItem().equals(ModItems.steelingotball) && stack12.getTagCompound().getBoolean("hot")) { tile.setSlotStack(6, tempsteelchunk); @@ -81,6 +92,7 @@ public class AnvilStone extends AnvilBase { tile.setSlotStack(16, tempsteelchunk); tile.setSlotStack(17, tempsteelchunk); tile.setSlotStack(18, tempsteelchunk); + return true; } if (stack12.getItem().equals(ModItems.wootzingotball) && stack12.getTagCompound().getBoolean("hot")) { tile.setSlotStack(6, tempwootzchunk); @@ -92,6 +104,7 @@ public class AnvilStone extends AnvilBase { tile.setSlotStack(16, tempwootzchunk); tile.setSlotStack(17, tempwootzchunk); tile.setSlotStack(18, tempwootzchunk); + return true; } } } diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java index 79329a35..1ebcc003 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java @@ -62,7 +62,6 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider { ItemStack pItem = player.inventory.getCurrentItem(); ItemStack pItem1 = new ItemStack(pItem.getItem(), 1); - //System.out.println(tile.getStatus()); /**PICKS UP THE CRUCIBLE**/ if (player.isSneaking() == false) { if (pItem.isEmpty()) { @@ -99,7 +98,7 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider { /**CLEARS THE INVENTORY**/ if (player.isSneaking() == true) { if (pItem.isEmpty()) { - if (!tile.getStatus()) { + if (tile.getHot()!=15) { for (int i = 0; i < tile.ingList.size(); i++) { if (!tile.ingList.get(i).isEmpty()) { PlayerHelper.spawnItemOnPlayer(world, player, tile.ingList.get(i)); @@ -108,6 +107,7 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider { } world.setBlockState(pos, state.withProperty(PrimalAPI.States.LAYERS, 0), 2); tile.setHot(0); + tile.setStatus(false); tile.update(); tile.markDirty(); return true; @@ -119,9 +119,9 @@ public class NBTCrucible extends BlockContainer implements ITileEntityProvider { if (pItem.isEmpty()) { if (tile.getStatus()) { PlayerHelper.spawnItemOnPlayer(world, player, tile.getDrops()); - tile.setStatus(false); world.setBlockState(pos, state.withProperty(PrimalAPI.States.LAYERS, 0), 2); tile.setHot(0); + tile.setStatus(false); tile.update(); tile.markDirty(); return true; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/ModDictionary.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/ModDictionary.java index 77d6c5c9..a61705ae 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/compat/ModDictionary.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/ModDictionary.java @@ -20,7 +20,7 @@ public class ModDictionary {/*************************************************** //if (ModConfig.COMPATIBILITY_DICTIONARY_MAGMACREAM_AS_SLIME) //OreDictionary.registerOre("clayball", Items.CLAY_BALL); OreDictionary.registerOre("ingotIron", ModItems.ironingotball); - OreDictionary.registerOre("nuggetIron", ModItems.ironchunk); + OreDictionary.registerOre("nuggetIron", ModItems.wroughtironchunk); OreDictionary.registerOre("ingotIron", ModItems.ironcleaningotball); OreDictionary.registerOre("nuggetIron", ModItems.ironcleanchunk); OreDictionary.registerOre("ingotSteel", ModItems.steelingotball); diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java index 16f8b24d..6e4a10d3 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java @@ -887,8 +887,8 @@ public class ModCrafting{ //Makes a Hot Iron Chunk ForgeCrafting.addRecipe( - ModItems.ironchunk, - new ItemStack(ModItems.ironchunk,1), + ModItems.wroughtironchunk, + new ItemStack(ModItems.wroughtironchunk,1), 800, 160, 400, @@ -1063,7 +1063,7 @@ public class ModCrafting{ ******************************************************************************/ //String empty = ItemStack.EMPTY.getItem().getRegistryName().toString(); - String hotChunk = ModItems.ironchunk.getRegistryName().toString(); + String hotChunk = ModItems.wroughtironchunk.getRegistryName().toString(); String hotCleanChunk = ModItems.ironcleanchunk.getRegistryName().toString(); String hotSteelChunk = ModItems.steelchunk.getRegistryName().toString(); String hotWootzChunk = ModItems.wootzchunk.getRegistryName().toString(); diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java index 338cc50a..4d3fd7d7 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java @@ -39,7 +39,7 @@ public class ModItems { public static Item bronzeingotball; public static Item bronzechunk; public static Item ironingotball; - public static Item ironchunk; + public static Item wroughtironchunk; public static Item ironcleaningotball; public static Item ironcleanchunk; public static Item steelingotball; @@ -109,13 +109,16 @@ public class ModItems { public static Item wroughtirongladius; public static Item cleanirongladius; public static Item steelgladius; + public static Item wootzgladius; public static Item cleanironlongsword; public static Item steellongsword; + public static Item wootzlongsword; public static Item wroughtironslayer; public static Item cleanironslayer; public static Item steelslayer; + public static Item wootzslayer; public static Item brokenbronzetool; public static Item brokenwroughtirontool; @@ -224,17 +227,20 @@ public class ModItems { /********** WEAPONS **********/ - bronzegladius = new CustomSword("bronzegladius", PrimalAPI.ToolMaterials.TOOL_BRONZE, 5D, 2D); + bronzegladius = new CustomSword("bronzegladius", PrimalAPI.ToolMaterials.TOOL_BRONZE, 5.5D, 2D); wroughtirongladius = new CustomSword("wroughtirongladius", PrimalAPI.ToolMaterials.TOOL_WROUGHT_IRON, 4.5D, -1.85D); cleanirongladius = new CustomSword("cleanirongladius", PrimalAPI.ToolMaterials.TOOL_CLEAN_IRON, 5D, -1.85D); steelgladius = new CustomSword("steelgladius", PrimalAPI.ToolMaterials.TOOL_BASIC_STEEL,6D, -1.85D); + wootzgladius = new CustomSword("wootzgladius", PrimalAPI.ToolMaterials.TOOL_WOOTZ_STEEL, 7D, -1.75D); cleanironlongsword = new CustomSword("cleanironlongsword", PrimalAPI.ToolMaterials.TOOL_CLEAN_IRON, 7D, -2.5D); steellongsword = new CustomSword("steellongsword", PrimalAPI.ToolMaterials.TOOL_BASIC_STEEL,8D, -2.25D); + wootzlongsword = new CustomSword("wootzlongsword", PrimalAPI.ToolMaterials.TOOL_WOOTZ_STEEL,9D, -2D); wroughtironslayer = new SlayerSword("wroughtironslayer", PrimalAPI.ToolMaterials.TOOL_WROUGHT_IRON, 11.5D, -3.7D); cleanironslayer = new SlayerSword("cleanironslayer", PrimalAPI.ToolMaterials.TOOL_CLEAN_IRON, 10D, -3.5D); steelslayer = new SlayerSword("steelslayer", PrimalAPI.ToolMaterials.TOOL_BASIC_STEEL,11D, -3.3D); + wootzslayer = new SlayerSword("steelslayer", PrimalAPI.ToolMaterials.TOOL_BASIC_STEEL,11D, -3.1D); wroughtironshield = new CustomShield("wroughtironshield", PrimalAPI.ToolMaterials.TOOL_WROUGHT_IRON); @@ -245,7 +251,7 @@ public class ModItems { bronzeingotball = new BaseMultiItem("bronzeingotball", PrimalAPI.ToolMaterials.TOOL_BRONZE); bronzechunk = new BaseMultiItem("bronzechunk", PrimalAPI.ToolMaterials.TOOL_BRONZE); ironingotball = new BaseMultiItem("ironingotball", PrimalAPI.ToolMaterials.TOOL_WROUGHT_IRON); - ironchunk = new BaseMultiItem("ironchunk", PrimalAPI.ToolMaterials.TOOL_WROUGHT_IRON); + wroughtironchunk = new BaseMultiItem("wroughtironchunk", PrimalAPI.ToolMaterials.TOOL_WROUGHT_IRON); ironcleaningotball= new BaseMultiItem("ironcleaningotball", PrimalAPI.ToolMaterials.TOOL_CLEAN_IRON); ironcleanchunk= new BaseMultiItem("ironcleanchunk", PrimalAPI.ToolMaterials.TOOL_CLEAN_IRON); steelingotball= new BaseMultiItem("steelingotball", PrimalAPI.ToolMaterials.TOOL_BASIC_STEEL); @@ -282,7 +288,7 @@ public class ModItems { ForgeRegistries.ITEMS.register(forgehammer); ForgeRegistries.ITEMS.register(ironingotball); - ForgeRegistries.ITEMS.register(ironchunk); + ForgeRegistries.ITEMS.register(wroughtironchunk); ForgeRegistries.ITEMS.register(ironcleaningotball); ForgeRegistries.ITEMS.register(ironcleanchunk); ForgeRegistries.ITEMS.register(steelingotball); @@ -407,7 +413,7 @@ public class ModItems { registerRender(bronzeingotball); registerRender(bronzechunk); registerRender(ironingotball); - registerRender(ironchunk); + registerRender(wroughtironchunk); registerRender(ironcleaningotball); registerRender(ironcleanchunk); registerRender(steelingotball); @@ -520,186 +526,6 @@ public class ModItems { } - /*@SideOnly(Side.CLIENT) - public static void registerCustomRenders(){ - ModelBakery.registerItemVariants(ModItems.stonetongs, ModItems.stonetongs.getRegistryName(), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_default"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_emptyhot"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_emptyhotcracked"), - - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotiron"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotironcooked"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotironfailed"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_ingot"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_chunk"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_pickaxe_hot"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_axe_hot"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_shovel_hot"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hoe_hot"), - - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotcleaniron"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotcleanironcooked"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotcleanironfailed"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_cleanironingot"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_cleanironchunk"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_cleaniron_pickaxe_hot"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_cleaniron_axe_hot"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_cleaniron_shovel_hot"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_cleaniron_hoe_hot"), - - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotsteel"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotsteelcooked"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotsteelfailed"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_steelingot"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_steelchunk"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_steel_pickaxe_hot"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_steel_axe_hot"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_steel_shovel_hot"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_steel_hoe_hot"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronze"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronzecooked"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronze_lapis"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronzecooked_lapis"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronze_redstone"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronzecooked_redstone"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronze_emerald"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronzecooked_emerald"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronze_diamond"), - new ResourceLocation(ModInfo.MOD_ID, "stonetongs_hotbronzecooked_diamond") - ); - ModelLoader.setCustomMeshDefinition(ModItems.stonetongs, new ItemMeshDefinition() { - - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - if (stack.hasTagCompound()) { - if (stack.getTagCompound().getInteger("type") == 0 ){ - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_default", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 1 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_emptyhot", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 2 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_emptyhotcracked", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 3 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotiron", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 4 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotironcooked", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 5 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotironfailed", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 6 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_ingot", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 7 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_chunk", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 8 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_pickaxe_hot", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 9 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_axe_hot", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 10 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_shovel_hot", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 11 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hoe_hot", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 12 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotcleaniron", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 13 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotcleanironcooked", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 14 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotcleanironfailed", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 15 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_cleanironingot", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 16 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_cleanironchunk", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 17 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_cleaniron_pickaxe_hot", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 18 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_cleaniron_axe_hot", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 19 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_cleaniron_shovel_hot", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 20 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_cleaniron_hoe_hot", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 21 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotsteel", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 22 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotsteelcooked", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 23 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotsteelfailed", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 24 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_steelingot", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 25 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_steelchunk", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 26 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_steel_pickaxe_hot", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 27 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_steel_axe_hot", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 28 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_steel_shovel_hot", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 29 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_steel_hoe_hot", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 39 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronze", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 40 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronzecooked", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 45 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronze_emerald", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 46 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronzecooked_emerald", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 47 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronze_diamond", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 48 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronzecooked_diamond", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 49 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronze_redstone", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 50 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronzecooked_redstone", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 51 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronze_lapis", "inventory"); - } - else if (stack.getTagCompound().getInteger("type") == 52 ) { - return new ModelResourceLocation(stack.getItem().getRegistryName() + "_hotbronzecooked_lapis", "inventory"); - } - else return new ModelResourceLocation(stack.getItem().getRegistryName(), "inventory"); - } - return new ModelResourceLocation(stack.getItem().getRegistryName(), "inventory"); - } - }); - }*/ - private static void registerRender(Item item) { Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new ModelResourceLocation(item.getRegistryName(), "inventory")); } 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 181cbc53..84ff659a 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/BaseMultiItem.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/BaseMultiItem.java @@ -4,6 +4,7 @@ import com.mojang.realmsclient.gui.ChatFormatting; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; @@ -28,7 +29,7 @@ public class BaseMultiItem extends BaseItem { public BaseMultiItem( String name, Item.ToolMaterial material) { super(name); mat = material; - this.setMaxStackSize(1); + //this.setMaxStackSize(1); this.setNoRepair(); this.addPropertyOverride(new ResourceLocation("type"), new IItemPropertyGetter() { @@ -40,6 +41,7 @@ public class BaseMultiItem extends BaseItem { //TODO get the item name if (stack.getItem() instanceof BaseMultiItem) { if(stack.getTagCompound() != null) { + /***INGOTS***/ if(itemStack.equals(ModItems.ironingotball)) { if (!stack.getTagCompound().getBoolean("hot")) { return 0.0f; @@ -80,6 +82,47 @@ public class BaseMultiItem extends BaseItem { return 0.09f; } } + /***CHUNKS***/ + if(itemStack.equals(ModItems.wroughtironchunk)) { + if (!stack.getTagCompound().getBoolean("hot")) { + return 0.10f; + } + if (stack.getTagCompound().getBoolean("hot")) { + return 0.11f; + } + } + if(itemStack.equals(ModItems.bronzechunk)) { + if (!stack.getTagCompound().getBoolean("hot")) { + return 0.12f; + } + if (stack.getTagCompound().getBoolean("hot")) { + return 0.13f; + } + } + if(itemStack.equals(ModItems.ironcleanchunk)) { + if (!stack.getTagCompound().getBoolean("hot")) { + return 0.14f; + } + if (stack.getTagCompound().getBoolean("hot")) { + return 0.15f; + } + } + if(itemStack.equals(ModItems.steelchunk)) { + if (!stack.getTagCompound().getBoolean("hot")) { + return 0.16f; + } + if (stack.getTagCompound().getBoolean("hot")) { + return 0.17f; + } + } + if(itemStack.equals(ModItems.wootzchunk)) { + if (!stack.getTagCompound().getBoolean("hot")) { + return 0.18f; + } + if (stack.getTagCompound().getBoolean("hot")) { + return 0.19f; + } + } } } return 0.0f; @@ -130,12 +173,27 @@ public class BaseMultiItem extends BaseItem { } @Override - public void onUpdate(ItemStack item, World world, Entity player, int itemSlot, boolean isSelected) { + public void onUpdate(ItemStack stack, World world, Entity player, int itemSlot, boolean isSelected) { //System.out.println(item.getTagCompound()); - if (!item.hasTagCompound()) { - item.setTagCompound(new NBTTagCompound()); - item.getTagCompound().setBoolean("hot", false); + if (!stack.hasTagCompound()) { + stack.setTagCompound(new NBTTagCompound()); + stack.getTagCompound().setBoolean("hot", false); } } + + @Override + public boolean onEntityItemUpdate(net.minecraft.entity.item.EntityItem entityItem) + { + if(entityItem.isWet()){ + if(entityItem.getItem().hasTagCompound()) { + if(entityItem.getItem().getTagCompound().getBoolean("hot")){ + entityItem.getItem().getTagCompound().setBoolean("hot", false); + return true; + } + } + } + return false; + } + } 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 ed24ce0c..59ac07b6 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/SlottedTongs.java @@ -4,6 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; @@ -13,12 +14,15 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalAPI; import nmd.primal.core.api.interfaces.IPickup; +import nmd.primal.core.common.PrimalCore; import nmd.primal.core.common.helper.NBTHelper; import nmd.primal.core.common.helper.PlayerHelper; +import nmd.primal.core.common.tiles.AbstractTileTank; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.blocks.Anvil.AnvilBase; import nmd.primal.forgecraft.blocks.Anvil.AnvilStone; @@ -214,7 +218,7 @@ public class SlottedTongs extends Item implements IPickup, AnvilHandler{ if (slotItem.equals(ModItems.bronzechunk)) { return 0.32f; } - if (slotItem.equals(ModItems.ironchunk)) { + if (slotItem.equals(ModItems.wroughtironchunk)) { return 0.33f; } if (slotItem.equals(ModItems.ironcleanchunk)) { @@ -246,7 +250,7 @@ public class SlottedTongs extends Item implements IPickup, AnvilHandler{ if (slotItem.equals(ModItems.bronzechunk)) { return 0.42f; } - if (slotItem.equals(ModItems.ironchunk)) { + if (slotItem.equals(ModItems.wroughtironchunk)) { return 0.43f; } if (slotItem.equals(ModItems.ironcleanchunk)) { @@ -380,6 +384,28 @@ public class SlottedTongs extends Item implements IPickup, AnvilHandler{ } } } + if (!slotList.get(0).isEmpty()) { + if ((block.equals(Blocks.HOPPER))) { + if (slotList.get(0).getItem() instanceof BaseMultiItem) { + ItemStack tempStack = slotList.get(0).copy(); + PlayerHelper.spawnItemOnGround(world, pos, tempStack); + slotList.set(0, ItemStack.EMPTY); + return EnumActionResult.SUCCESS; + } + } + } + /***** + Cools the Ingots on the Tongs + *****/ + /*if (!slotList.get(0).isEmpty()) { + System.out.println(world.getBlockState(pos).getBlock()); + if (world.getBlockState(pos).getBlock() == PrimalAPI.Blocks.BARREL) { + AbstractTileTank tileTank = (AbstractTileTank) world.getTileEntity(pos); + System.out.println(tileTank.getContainedFluid()); + return EnumActionResult.SUCCESS; + } + } + */ /***** DROPS the Ingots into the World *****/ @@ -393,14 +419,13 @@ public class SlottedTongs extends Item implements IPickup, AnvilHandler{ } } } - //} + return EnumActionResult.FAIL; } return EnumActionResult.FAIL; } - public ItemStack getItem(World world, BlockPos pos, IBlockState state, Block block) { block = world.getBlockState(pos).getBlock(); diff --git a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java index 221ef359..27e3e968 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileAnvilRender.java @@ -517,7 +517,7 @@ public class TileAnvilRender extends TileEntitySpecialRenderer GL11.glPopMatrix(); } //ModItems.ironchunkhot - if(item == ModItems.ironchunk){ + if(item == ModItems.wroughtironchunk){ GL11.glPushMatrix(); double scale = 1.0D; GL11.glScaled(scale, scale, scale); diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/forge_adobe.json b/kfc/src/main/resources/assets/forgecraft/blockstates/forge_adobe.json index 15ced0e0..da73d9c1 100644 --- a/kfc/src/main/resources/assets/forgecraft/blockstates/forge_adobe.json +++ b/kfc/src/main/resources/assets/forgecraft/blockstates/forge_adobe.json @@ -4,16 +4,16 @@ "active": { "true": { "textures": { - "particle": "primal:blocks/adobebrick", - "texture": "primal:blocks/adobebrick", + "particle": "primal:blocks/adobe_brick", + "texture": "primal:blocks/adobe_brick", "texture1": "forgecraft:blocks/adobebrick_lit" }, "model": "forgecraft:forge_lit" }, "false": { "textures": { - "particle": "primal:blocks/adobebrick", - "texture": "primal:blocks/adobebrick" + "particle": "primal:blocks/adobe_brick", + "texture": "primal:blocks/adobe_brick" }, "model": "forgecraft:forge" } @@ -25,6 +25,4 @@ "west":{"y": 270} } } -} - - +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/coolcleanironcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolcleanironcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/coolcleanironcrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolcleanironcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/coolironcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolironcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/coolironcrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolironcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/coolsteelcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolsteelcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/coolsteelcrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolsteelcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/coolwootzcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolwootzcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/coolwootzcrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/coolwootzcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/failedcleanironcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedcleanironcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/failedcleanironcrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedcleanironcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/failedcleanironcruciblehot.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedcleanironcruciblehot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/failedcleanironcruciblehot.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedcleanironcruciblehot.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/failedironcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedironcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/failedironcrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedironcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/failedironcruciblehot.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedironcruciblehot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/failedironcruciblehot.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedironcruciblehot.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/failedsteelcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedsteelcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/failedsteelcrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedsteelcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/failedsteelcruciblehot.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedsteelcruciblehot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/failedsteelcruciblehot.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedsteelcruciblehot.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/failedwootzcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedwootzcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/failedwootzcrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedwootzcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/failedwootzcruciblehot.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedwootzcruciblehot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/failedwootzcruciblehot.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/failedwootzcruciblehot.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_diamond.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_diamond.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_diamond.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_diamond.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_emerald.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_emerald.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_emerald.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_emerald.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_lapis.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_lapis.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_lapis.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_lapis.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_redstone.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_redstone.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/hotbronzecrucible_redstone.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotbronzecrucible_redstone.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/hotcleanironcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcleanironcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/hotcleanironcrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcleanironcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_diamond.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_diamond.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_diamond.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_diamond.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_emerald.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_emerald.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_emerald.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_emerald.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_lapis.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_lapis.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_lapis.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_lapis.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_redstone.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_redstone.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/hotcookedbronzecrucible_redstone.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedbronzecrucible_redstone.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/hotcookedcleanironcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedcleanironcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/hotcookedcleanironcrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedcleanironcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/hotcookedironcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedironcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/hotcookedironcrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedironcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/hotcookedsteelcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedsteelcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/hotcookedsteelcrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedsteelcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/hotcookedwootzcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedwootzcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/hotcookedwootzcrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotcookedwootzcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/hotironcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotironcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/hotironcrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotironcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/hotsteelcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotsteelcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/hotsteelcrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotsteelcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/hotwootzcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotwootzcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/hotwootzcrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/hotwootzcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/ironball.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironball.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/ironball.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironball.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/ironchunk.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironchunk.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/ironchunk.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironchunk.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/ironcleanball.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironcleanball.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/ironcleanball.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironcleanball.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/ironcleanchunk.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironcleanchunk.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/ironcleanchunk.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/ironcleanchunk.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_diamond.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_diamond.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_diamond.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_diamond.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_emerald.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_emerald.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_emerald.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_emerald.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_lapis.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_lapis.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_lapis.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_lapis.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_redstone.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_redstone.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/rawbronzecrucible_redstone.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawbronzecrucible_redstone.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/rawcleanironcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawcleanironcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/rawcleanironcrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawcleanironcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/rawironcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawironcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/rawironcrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawironcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/rawsteelcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawsteelcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/rawsteelcrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawsteelcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/rawwootzcrucible.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawwootzcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/rawwootzcrucible.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/rawwootzcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/steelball.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/steelball.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/steelball.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/steelball.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/steelchunk.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/steelchunk.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/steelchunk.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/steelchunk.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/wootzball.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/wootzball.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/wootzball.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/wootzball.json diff --git a/kfc/src/main/resources/assets/forgecraft/blockstates/wootzchunk.json b/kfc/src/main/resources/assets/forgecraft/blockstates/trash/wootzchunk.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/blockstates/wootzchunk.json rename to kfc/src/main/resources/assets/forgecraft/blockstates/trash/wootzchunk.json diff --git a/kfc/src/main/resources/assets/forgecraft/lang/en_us.lang b/kfc/src/main/resources/assets/forgecraft/lang/en_us.lang index ecb62089..cd41b1c4 100644 --- a/kfc/src/main/resources/assets/forgecraft/lang/en_us.lang +++ b/kfc/src/main/resources/assets/forgecraft/lang/en_us.lang @@ -11,7 +11,7 @@ tile.blockbreaker.name= Block Breaker tile.stoneanvil.name=Stone Anvil tile.ironanvil.name=Iron Anvil tile.yewstave.name=Yew Stave - +tile.nbtcrucible.name=Crucible tile.pistonbellowsoak.name=Oak Piston Bellows tile.pistonbellowsjungle.name=Jungle Piston Bellows @@ -26,65 +26,15 @@ tile.emptycruciblehit.name=Hot Empty Crucible tile.emptycruciblecracked.name= Cracked Empty Crucible tile.emptycruciblecrackedhot.name=Cracked Hot Empty Crucible -tile.rawbronzecrucible.name=Raw Bronze Crucible -tile.hotbronzecrucible.name=Hot Bronze Crucible -tile.hotcookedbronzecrucible.name=Finished Bronze Crucible -tile.rawbronzecrucible_emerald.name=Raw Emerald Bronze Crucible -tile.hotbronzecrucible_emerald.name=Hot Emerald Bronze Crucible -tile.hotcookedbronzecrucible_emerald.name=Finished Emerald Bronze Crucible - -tile.rawbronzecrucible_diamond.name=Raw Diamond Bronze Crucible -tile.hotbronzecrucible_diamond.name=Hot Diamond Bronze Crucible -tile.hotcookedbronzecrucible_diamond.name=Finished Diamond Bronze Crucible - -tile.rawbronzecrucible_lapis.name=Raw Lapis Bronze Crucible -tile.hotbronzecrucible_lapis.name=Hot Lapis Bronze Crucible -tile.hotcookedbronzecrucible_lapis.name=Finished Lapis Bronze Crucible - -tile.rawbronzecrucible_redstone.name=Raw Redstone Bronze Crucible -tile.hotbronzecrucible_redstone.name=Hot Redstone Bronze Crucible -tile.hotcookedbronzecrucible_redstone.name=Finished Redstone Bronze Crucible - - - -tile.rawironcrucible.name=Filled Iron Crucible -tile.hotironcrucible.name=Hot Iron Crucible -tile.hotcookedironcrucible.name=Hot Cooked Iron Crucible -tile.coolironcrucible.name=Cool Iron Crucible -tile.failedironcrucible.name=Failed Iron Crucible -tile.failedironcruciblehot.name=Failed Iron Crucible Hot - -tile.rawcleanironcrucible.name=Filled Clean Iron Crucible -tile.hotcleanironcrucible.name=Hot Clean Iron Crucible -tile.hotcookedcleanironcrucible.name=Hot Cooked Clean Iron Crucible -tile.coolcleanironcrucible.name=Cool Clean Iron Crucible -tile.failedcleanironcrucible.name=Failed Clean Iron Crucible -tile.failedcleanironcrucible.name=Failed Clean Iron Crucible Hot - -tile.rawsteelcrucible.name=Filled Steel Crucible -tile.hotsteelcrucible.name=Hot Steel Crucible -tile.hotcookedsteelcrucible.name=Hot Cooked Steel Crucible -tile.coolsteelcrucible.name=Cool Steel Crucible -tile.failedsteelcrucible.name=Failed Steel Crucible -tile.failedsteelcruciblehot.name=Failed Steel Crucible Hot - -tile.rawwootzcrucible.name=Filled Wootz Crucible -tile.hotwootzcrucible.name=Hot Wootz Crucible -tile.hotcookedwootzcrucible.name=Hot Cooked Wootz Crucible -tile.coolwootzcrucible.name=Cool Wootz Crucible -tile.failedwootzcrucible.name=Failed Wootz Crucible -tile.failedwootzcruciblehot.name=Failed Wootz Crucible Hot - - -tile.ironball.name=Wrought Iron Ingot -tile.ironchunk.name=Wrought Iron Chunk -tile.ironcleanball.name=Clean Iron Ingot -tile.ironcleanchunk.name=Clean Iron Chunk -tile.steelball.name=Steel Ingot -tile.steelchunk.name=Steel Chunk -tile.wootzball.name=Damascus Steel Ingot -tile.wootzchunk.name=Damascus Steel Chunk +item.ironingotball.name=Wrought Iron Ingot +item.wroughtironchunk.name=Wrought Iron Chunk +item.ironcleaningotball.name=Clean Iron Ingot +item.ironcleanchunk.name=Clean Iron Chunk +item.steelingotball.name=Steel Ingot +item.steelchunk.name=Steel Chunk +item.wootzingotball.name=Damascus Steel Ingot +item.wootzchunk.name=Damascus Steel Chunk item.brokenbronzetool.name=Broken Bronze Tool item.brokenwroughtirontool.name=Broken Wrought Iron Tool @@ -120,18 +70,6 @@ item.wroughtironslayer.name=Wrought Iron Slayer item.cleanironslayer.name=Clean Iron Slayer item.steelslayer.name=Steel Slayer -item.ironingothot.name=Hot Iron Ingot -item.ironchunkhot.name=Hot Iron Chunk - -item.ironcleaningotballhot.name=Hot Clean Iron Ingot -item.ironcleanchunkhot.name=Hot Clean Iron Chunk - -item.steelingotballhot.name=Hot Steel Ingot -item.steelchunkhot.name=Hot Steel Chunk - -item.wootzingothot.name=Hot Damascus Steel Ingot -item.wootzchunkhot.name=Hot Damascus Steel Chunk - item.bronzepickaxehead.name=Bronze Pickaxe Head item.bronzeaxehead.name=Bronze Axe Head item.bronzeshovelhead.name=Bronze Shovel Head @@ -181,6 +119,8 @@ item.wootzshovel.name=Damascus Steel Shovel item.wootzhoe.name=Damascus Steel Hoe #item.wootzsword.name=Damascus Steel Sword +item.leatherhelmet.name=Hardened Leather Helmet + # -- configuration -- # forgecraft.config.title=ForgeCraft Config diff --git a/kfc/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json b/kfc/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json index 86f87413..3b5baeb6 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json +++ b/kfc/src/main/resources/assets/forgecraft/models/block/bloomery_adobe.json @@ -3,8 +3,8 @@ "textures": { "particle": "blocks/stone_slab", "texture": "blocks/stone_slab", - "texture1": "primal:items/bricks/adobebrick_dry", - "texture2": "primal:blocks/adobebrick_mortar" + "texture1": "primal:blocks/adobe_brick", + "texture2": "primal:blocks/adobe_brick_mortar" }, "elements": [ { diff --git a/kfc/src/main/resources/assets/forgecraft/models/block/bloomery_adobe_lit.json b/kfc/src/main/resources/assets/forgecraft/models/block/bloomery_adobe_lit.json index 2d1d5f74..77a6fbbf 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/block/bloomery_adobe_lit.json +++ b/kfc/src/main/resources/assets/forgecraft/models/block/bloomery_adobe_lit.json @@ -3,8 +3,8 @@ "textures": { "particle": "forgecraft:blocks/stone_slab", "texture": "forgecraft:blocks/stone_slab", - "texture1": "primal:items/bricks/adobebrick_dry", - "texture2": "primal:blocks/adobebrick_mortar", + "texture1": "primal:blocks/adobe_brick", + "texture2": "primal:blocks/adobe_brick_mortar", "texture3": "forgecraft:blocks/adobebrick_lit" }, "elements": [ diff --git a/kfc/src/main/resources/assets/forgecraft/models/block/ironball.json b/kfc/src/main/resources/assets/forgecraft/models/block/ironball.json index 979584ce..d8f8d65b 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/block/ironball.json +++ b/kfc/src/main/resources/assets/forgecraft/models/block/ironball.json @@ -27,8 +27,8 @@ "translation": [ 0, 7.35, 0 ] }, "gui": { - "translation": [ 0, 2, 0 ], "rotation": [ 30, 225, 0 ], + "translation": [ 0, 6.3, 0 ], "scale": [ 1.25, 1.25, 1.25 ] }, "ground": { diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/bloomery_adobe.json b/kfc/src/main/resources/assets/forgecraft/models/item/bloomery_adobe.json index 7e9805cb..052c6cba 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/bloomery_adobe.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/bloomery_adobe.json @@ -3,8 +3,8 @@ "textures": { "particle": "forgecraft:blocks/brick", "texture": "forgecraft:blocks/brick", - "texture1": "primal:items/adobebrick_dry", - "texture2": "primal:blocks/adobebrick_mortar" + "texture1": "primal:blocks/adobe_brick", + "texture2": "primal:blocks/adobe_brick_mortar" }, "parent": "forgecraft:block/bloomery_adobe" } \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/bronzechunk.json b/kfc/src/main/resources/assets/forgecraft/models/item/bronzechunk.json new file mode 100644 index 00000000..41530023 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/bronzechunk.json @@ -0,0 +1,11 @@ +{ + "parent": "forgecraft:item/ironchunk", + "textures": { + "particle": "forgecraft:blocks/bronze_ingot", + "texture": "forgecraft:blocks/bronze_ingot" + }, + "overrides": [ + {"predicate": {"type": 0.12},"model": "forgecraft:item/chunks/bronze/chunk_04"}, + {"predicate": {"type": 0.13},"model": "forgecraft:item/chunks/bronze/chunk_05"} + ] +} diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/castingmud.json b/kfc/src/main/resources/assets/forgecraft/models/item/castingmud.json index b824e63c..709a352b 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/castingmud.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/castingmud.json @@ -1,8 +1,8 @@ { "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio", "textures": { - "particle": "primal:items/parts/adobebrick_mix", - "texture": "primal:items/parts/adobebrick_mix" + "particle": "primal:items/adobe_clump", + "texture": "primal:items/adobe_clump" }, "elements": [ { diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/chunks/bronze/chunk_02.json b/kfc/src/main/resources/assets/forgecraft/models/item/chunks/bronze/chunk_02.json new file mode 100644 index 00000000..228246f1 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/chunks/bronze/chunk_02.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/ironchunk", + "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/chunks/bronze/chunk_03.json b/kfc/src/main/resources/assets/forgecraft/models/item/chunks/bronze/chunk_03.json new file mode 100644 index 00000000..1f446b75 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/chunks/bronze/chunk_03.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/ironchunk", + "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/chunks/cleaniron/chunk_04.json b/kfc/src/main/resources/assets/forgecraft/models/item/chunks/cleaniron/chunk_04.json new file mode 100644 index 00000000..350f5e8b --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/chunks/cleaniron/chunk_04.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/ironchunk", + "textures": { + "particle": "forgecraft:blocks/clean_iron_ingot", + "texture": "forgecraft:blocks/clean_iron_ingot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/chunks/cleaniron/chunk_05.json b/kfc/src/main/resources/assets/forgecraft/models/item/chunks/cleaniron/chunk_05.json new file mode 100644 index 00000000..01b98f8e --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/chunks/cleaniron/chunk_05.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/ironchunk", + "textures": { + "particle": "forgecraft:blocks/clean_iron_ingot_hot", + "texture": "forgecraft:blocks/clean_iron_ingot_hot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/chunks/steel/chunk_06.json b/kfc/src/main/resources/assets/forgecraft/models/item/chunks/steel/chunk_06.json new file mode 100644 index 00000000..bf3eded8 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/chunks/steel/chunk_06.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/ironchunk", + "textures": { + "particle": "forgecraft:blocks/steel_ingot", + "texture": "forgecraft:blocks/steel_ingot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/chunks/steel/chunk_07.json b/kfc/src/main/resources/assets/forgecraft/models/item/chunks/steel/chunk_07.json new file mode 100644 index 00000000..572b49af --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/chunks/steel/chunk_07.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/ironchunk", + "textures": { + "particle": "forgecraft:blocks/steel_ingot_hot", + "texture": "forgecraft:blocks/steel_ingot_hot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/chunks/wootz/chunk_08.json b/kfc/src/main/resources/assets/forgecraft/models/item/chunks/wootz/chunk_08.json new file mode 100644 index 00000000..4ecd0fe8 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/chunks/wootz/chunk_08.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/ironchunk", + "textures": { + "particle": "forgecraft:blocks/wootz_ingot", + "texture": "forgecraft:blocks/wootz_ingot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/chunks/wootz/chunk_09.json b/kfc/src/main/resources/assets/forgecraft/models/item/chunks/wootz/chunk_09.json new file mode 100644 index 00000000..8f101235 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/chunks/wootz/chunk_09.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/ironchunk", + "textures": { + "particle": "forgecraft:blocks/wootz_ingot_hot", + "texture": "forgecraft:blocks/wootz_ingot_hot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/chunks/wroughtiron/chunk_0.json b/kfc/src/main/resources/assets/forgecraft/models/item/chunks/wroughtiron/chunk_0.json new file mode 100644 index 00000000..3ea90d21 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/chunks/wroughtiron/chunk_0.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/ironchunk", + "textures": { + "particle": "forgecraft:blocks/iron_ingot", + "texture": "forgecraft:blocks/iron_ingot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/chunks/wroughtiron/chunk_01.json b/kfc/src/main/resources/assets/forgecraft/models/item/chunks/wroughtiron/chunk_01.json new file mode 100644 index 00000000..a432b7b6 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/chunks/wroughtiron/chunk_01.json @@ -0,0 +1,7 @@ +{ + "parent": "forgecraft:item/ironchunk", + "textures": { + "particle": "forgecraft:blocks/iron_ingot_hot", + "texture": "forgecraft:blocks/iron_ingot_hot" + } +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/forge_adobe.json b/kfc/src/main/resources/assets/forgecraft/models/item/forge_adobe.json index 06754e40..a0c9b5cf 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/forge_adobe.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/forge_adobe.json @@ -1,8 +1,8 @@ { "forge_marker":1, "textures": { - "particle": "primal:blocks/adobebrick", - "texture": "primal:blocks/adobebrick" + "particle": "primal:blocks/adobe_brick", + "texture": "primal:blocks/adobe_brick" }, "parent": "forgecraft:block/forge" } \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/ironcleanchunk.json b/kfc/src/main/resources/assets/forgecraft/models/item/ironcleanchunk.json index f0ff101e..db4524fd 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/ironcleanchunk.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/ironcleanchunk.json @@ -1,8 +1,11 @@ { - "forge_marker":1, + "parent": "forgecraft:item/ironchunk", "textures": { "particle": "forgecraft:blocks/clean_iron_ingot", "texture": "forgecraft:blocks/clean_iron_ingot" }, - "parent": "forgecraft:block/ironchunk" + "overrides": [ + {"predicate": {"type": 0.14},"model": "forgecraft:item/chunks/cleaniron/chunk_04"}, + {"predicate": {"type": 0.15},"model": "forgecraft:item/chunks/cleaniron/chunk_05"} + ] } \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/ironcleaningotball.json b/kfc/src/main/resources/assets/forgecraft/models/item/ironcleaningotball.json index f45c98e6..aae65c97 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/ironcleaningotball.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/ironcleaningotball.json @@ -1,8 +1,8 @@ { "parent": "forgecraft:item/ironball", "textures": { - "particle": "forgecraft:blocks/iron_ingot", - "texture": "forgecraft:blocks/iron_ingot" + "particle": "forgecraft:blocks/clean_iron_ingot", + "texture": "forgecraft:blocks/clean_iron_ingot" }, "overrides": [ {"predicate": {"type": 0.04},"model": "forgecraft:item/ingots/cleaniron/ingot_04"}, diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/steelchunk.json b/kfc/src/main/resources/assets/forgecraft/models/item/steelchunk.json index db2b459f..e35b319d 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/steelchunk.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/steelchunk.json @@ -1,8 +1,11 @@ { - "forge_marker":1, + "parent": "forgecraft:item/ironchunk", "textures": { "particle": "forgecraft:blocks/steel_ingot", "texture": "forgecraft:blocks/steel_ingot" }, - "parent": "forgecraft:block/ironchunk" + "overrides": [ + {"predicate": {"type": 0.16},"model": "forgecraft:item/chunks/steel/chunk_06"}, + {"predicate": {"type": 0.17},"model": "forgecraft:item/chunks/steel/chunk_07"} + ] } \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/steelingotball.json b/kfc/src/main/resources/assets/forgecraft/models/item/steelingotball.json index e91fae7a..bec18982 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/steelingotball.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/steelingotball.json @@ -1,8 +1,8 @@ { "parent": "forgecraft:item/ironball", "textures": { - "particle": "forgecraft:blocks/iron_ingot", - "texture": "forgecraft:blocks/iron_ingot" + "particle": "forgecraft:blocks/steel_ingot", + "texture": "forgecraft:blocks/steel_ingot" }, "overrides": [ {"predicate": {"type": 0.06},"model": "forgecraft:item/ingots/steel/ingot_06"}, diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/castingmud2.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/castingmud2.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/castingmud2.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/castingmud2.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/coolcleanironcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/coolcleanironcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/coolcleanironcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/coolcleanironcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/coolironcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/coolironcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/coolironcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/coolironcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/coolsteelcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/coolsteelcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/coolsteelcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/coolsteelcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/coolwootzcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/coolwootzcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/coolwootzcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/coolwootzcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/emptycrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/emptycrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/emptycruciblecracked.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycruciblecracked.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/emptycruciblecracked.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycruciblecracked.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/emptycruciblecrackedhot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycruciblecrackedhot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/emptycruciblecrackedhot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycruciblecrackedhot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/emptycruciblehot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycruciblehot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/emptycruciblehot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/emptycruciblehot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/failedcleanironcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedcleanironcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/failedcleanironcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/failedcleanironcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/failedcleanironcruciblehot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedcleanironcruciblehot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/failedcleanironcruciblehot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/failedcleanironcruciblehot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/failedironcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedironcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/failedironcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/failedironcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/failedironcruciblehot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedironcruciblehot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/failedironcruciblehot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/failedironcruciblehot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/failedsteelcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedsteelcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/failedsteelcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/failedsteelcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/failedsteelcruciblehot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedsteelcruciblehot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/failedsteelcruciblehot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/failedsteelcruciblehot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/failedwootzcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedwootzcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/failedwootzcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/failedwootzcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/failedwootzcruciblehot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/failedwootzcruciblehot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/failedwootzcruciblehot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/failedwootzcruciblehot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_diamond.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_diamond.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_diamond.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_diamond.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_emerald.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_emerald.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_emerald.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_emerald.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_lapis.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_lapis.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_lapis.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_lapis.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_redstone.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_redstone.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/hotbronzecrucible_redstone.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/hotbronzecrucible_redstone.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/hotcleanironcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcleanironcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/hotcleanironcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcleanironcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_diamond.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_diamond.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_diamond.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_diamond.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_emerald.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_emerald.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_emerald.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_emerald.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_lapis.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_lapis.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_lapis.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_lapis.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_redstone.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_redstone.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/hotcookedbronzecrucible_redstone.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedbronzecrucible_redstone.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/hotcookedcleanironcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedcleanironcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/hotcookedcleanironcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedcleanironcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/hotcookedironcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedironcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/hotcookedironcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedironcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/hotcookedsteelcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedsteelcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/hotcookedsteelcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedsteelcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/hotcookedwootzcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedwootzcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/hotcookedwootzcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/hotcookedwootzcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/hotironcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotironcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/hotironcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/hotironcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/hotsteelcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotsteelcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/hotsteelcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/hotsteelcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/hotwootzcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/hotwootzcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/hotwootzcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/hotwootzcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/ironchunkhot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironchunkhot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/ironchunkhot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/ironchunkhot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/ironcleanball.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleanball.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/ironcleanball.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleanball.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleanchunk.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleanchunk.json new file mode 100644 index 00000000..f0ff101e --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleanchunk.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/clean_iron_ingot", + "texture": "forgecraft:blocks/clean_iron_ingot" + }, + "parent": "forgecraft:block/ironchunk" +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/ironcleanchunkhot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleanchunkhot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/ironcleanchunkhot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleanchunkhot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleaningotball.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleaningotball.json new file mode 100644 index 00000000..f45c98e6 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleaningotball.json @@ -0,0 +1,11 @@ +{ + "parent": "forgecraft:item/ironball", + "textures": { + "particle": "forgecraft:blocks/iron_ingot", + "texture": "forgecraft:blocks/iron_ingot" + }, + "overrides": [ + {"predicate": {"type": 0.04},"model": "forgecraft:item/ingots/cleaniron/ingot_04"}, + {"predicate": {"type": 0.05},"model": "forgecraft:item/ingots/cleaniron/ingot_05"} + ] +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/ironcleaningotballhot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleaningotballhot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/ironcleaningotballhot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/ironcleaningotballhot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_diamond.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_diamond.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_diamond.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_diamond.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_emerald.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_emerald.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_emerald.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_emerald.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_lapis.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_lapis.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_lapis.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_lapis.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_redstone.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_redstone.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/rawbronzecrucible_redstone.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/rawbronzecrucible_redstone.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/rawcleanironcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawcleanironcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/rawcleanironcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/rawcleanironcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/rawironcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawironcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/rawironcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/rawironcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/rawsteelcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawsteelcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/rawsteelcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/rawsteelcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/rawwootzcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/rawwootzcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/rawwootzcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/rawwootzcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/steelball.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/steelball.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/steelball.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/steelball.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/trash/steelchunk.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/steelchunk.json new file mode 100644 index 00000000..db2b459f --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/trash/steelchunk.json @@ -0,0 +1,8 @@ +{ + "forge_marker":1, + "textures": { + "particle": "forgecraft:blocks/steel_ingot", + "texture": "forgecraft:blocks/steel_ingot" + }, + "parent": "forgecraft:block/ironchunk" +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/steelchunkhot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/steelchunkhot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/steelchunkhot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/steelchunkhot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/steelingotballhot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/steelingotballhot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/steelingotballhot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/steelingotballhot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_axe_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_axe_hot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_axe_hot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_axe_hot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_chunk.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_chunk.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_chunk.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_chunk.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_cleaniron_axe_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_axe_hot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_cleaniron_axe_hot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_axe_hot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_cleaniron_hoe_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_hoe_hot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_cleaniron_hoe_hot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_hoe_hot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_cleaniron_pickaxe_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_pickaxe_hot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_cleaniron_pickaxe_hot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_pickaxe_hot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_cleaniron_shovel_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_shovel_hot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_cleaniron_shovel_hot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleaniron_shovel_hot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_cleanironchunk.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleanironchunk.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_cleanironchunk.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleanironchunk.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_cleanironingot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleanironingot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_cleanironingot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_cleanironingot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hoe_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hoe_hot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hoe_hot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hoe_hot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_diamond.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_diamond.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_diamond.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_diamond.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_emerald.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_emerald.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_emerald.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_emerald.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_lapis.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_lapis.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_lapis.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_lapis.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_redstone.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_redstone.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronze_redstone.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronze_redstone.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_diamond.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_diamond.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_diamond.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_diamond.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_emerald.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_emerald.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_emerald.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_emerald.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_lapis.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_lapis.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_lapis.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_lapis.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_redstone.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_redstone.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotbronzecooked_redstone.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotbronzecooked_redstone.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotcleaniron.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotcleaniron.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotcleaniron.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotcleaniron.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotcleanironcooked.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotcleanironcooked.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotcleanironcooked.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotcleanironcooked.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotcleanironfailed.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotcleanironfailed.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotcleanironfailed.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotcleanironfailed.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotiron.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotiron.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotiron.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotiron.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotironcooked.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotironcooked.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotironcooked.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotironcooked.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotironfailed.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotironfailed.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotironfailed.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotironfailed.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotsteel.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotsteel.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotsteel.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotsteel.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotsteelcooked.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotsteelcooked.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotsteelcooked.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotsteelcooked.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotsteelfailed.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotsteelfailed.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_hotsteelfailed.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_hotsteelfailed.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_pickaxe_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_pickaxe_hot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_pickaxe_hot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_pickaxe_hot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_shovel_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_shovel_hot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_shovel_hot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_shovel_hot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_steel_axe_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_axe_hot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_steel_axe_hot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_axe_hot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_steel_hoe_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_hoe_hot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_steel_hoe_hot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_hoe_hot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_steel_pickaxe_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_pickaxe_hot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_steel_pickaxe_hot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_pickaxe_hot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_steel_shovel_hot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_shovel_hot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_steel_shovel_hot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steel_shovel_hot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_steelchunk.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steelchunk.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_steelchunk.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steelchunk.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_steelingot.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steelingot.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/stonetongs_steelingot.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/stonetongs_steelingot.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/testnbtcrucible.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/testnbtcrucible.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/testnbtcrucible.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/testnbtcrucible.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/wootzball_delete.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzball_delete.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/wootzball_delete.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzball_delete.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/wootzballhot_delete.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzballhot_delete.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/wootzballhot_delete.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzballhot_delete.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/wootzchunk_delete.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzchunk_delete.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/wootzchunk_delete.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzchunk_delete.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/wootzchunkhot_delete.json b/kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzchunkhot_delete.json similarity index 100% rename from kfc/src/main/resources/assets/forgecraft/models/item/wootzchunkhot_delete.json rename to kfc/src/main/resources/assets/forgecraft/models/item/trash/wootzchunkhot_delete.json diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/wootzchunk.json b/kfc/src/main/resources/assets/forgecraft/models/item/wootzchunk.json new file mode 100644 index 00000000..72cf5c80 --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/wootzchunk.json @@ -0,0 +1,11 @@ +{ + "parent": "forgecraft:item/ironchunk", + "textures": { + "particle": "forgecraft:blocks/wootz_ingot", + "texture": "forgecraft:blocks/wootz_ingot" + }, + "overrides": [ + {"predicate": {"type": 0.18},"model": "forgecraft:item/chunks/wootz/chunk_08"}, + {"predicate": {"type": 0.19},"model": "forgecraft:item/chunks/wootz/chunk_09"} + ] +} \ No newline at end of file diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/wootzingotball.json b/kfc/src/main/resources/assets/forgecraft/models/item/wootzingotball.json index 1562179c..21a353e7 100644 --- a/kfc/src/main/resources/assets/forgecraft/models/item/wootzingotball.json +++ b/kfc/src/main/resources/assets/forgecraft/models/item/wootzingotball.json @@ -1,8 +1,8 @@ { "parent": "forgecraft:item/ironball", "textures": { - "particle": "forgecraft:blocks/iron_ingot", - "texture": "forgecraft:blocks/iron_ingot" + "particle": "forgecraft:blocks/wootz_ingot", + "texture": "forgecraft:blocks/wootz_ingot" }, "overrides": [ {"predicate": {"type": 0.08},"model": "forgecraft:item/ingots/wootz/ingot_08"}, diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/wroughtironchunk.json b/kfc/src/main/resources/assets/forgecraft/models/item/wroughtironchunk.json new file mode 100644 index 00000000..67b40c3b --- /dev/null +++ b/kfc/src/main/resources/assets/forgecraft/models/item/wroughtironchunk.json @@ -0,0 +1,11 @@ +{ + "parent": "forgecraft:item/ironchunk", + "textures": { + "particle": "forgecraft:blocks/iron_ingot", + "texture": "forgecraft:blocks/iron_ingot" + }, + "overrides": [ + {"predicate": {"type": 0.10},"model": "forgecraft:item/chunks/wroughtiron/chunk_0"}, + {"predicate": {"type": 0.11},"model": "forgecraft:item/chunks/wroughtiron/chunk_01"} + ] +} \ No newline at end of file diff --git a/kfc/src/main/resources/mcmod.info b/kfc/src/main/resources/mcmod.info index c0c8ef51..09842133 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.5.1", + "version": "1.5.2", "mcversion": "1.12.2", "url": "", "updateUrl": "",