From dce6429ee1ad89f11c2f6bdaf395556555fe42f4 Mon Sep 17 00:00:00 2001 From: ACGaming <4818419+ACGaming@users.noreply.github.com> Date: Fri, 2 Jul 2021 16:10:41 +0200 Subject: [PATCH] Tongs, TFC is optional --- CHANGELOG.md | 4 + README.md | 1 - gradle.properties | 4 +- .../java/com/buuz135/hotornot/HotOrNot.java | 135 ++++++++++++++---- .../com/buuz135/hotornot/HotOrNotTab.java | 22 +++ .../buuz135/hotornot/config/HotConfig.java | 10 +- .../buuz135/hotornot/item/IronTongsItem.java | 41 ++++++ .../com/buuz135/hotornot/item/MittsItem.java | 8 +- .../hotornot/item/WoodenTongsItem.java | 41 ++++++ .../buuz135/hotornot/proxy/ClientProxy.java | 2 + .../buuz135/hotornot/proxy/CommonProxy.java | 6 + .../resources/assets/hotornot/lang/en_us.lang | 16 ++- .../hotornot/models/item/iron_tongs.json | 25 ++++ .../hotornot/models/item/wooden_tongs.json | 25 ++++ .../assets/hotornot/recipes/iron_tongs.json | 21 +++ .../hotornot/recipes/iron_tongs_tfc.json | 25 ++++ .../assets/hotornot/recipes/mitts.json | 4 +- .../assets/hotornot/recipes/mitts_tfc.json | 25 ++++ .../assets/hotornot/recipes/wooden_tongs.json | 17 +++ .../hotornot/textures/items/iron_tongs.png | Bin 0 -> 14651 bytes .../hotornot/textures/items/wooden_tongs.png | Bin 0 -> 14885 bytes src/main/resources/mcmod.info | 3 +- 22 files changed, 392 insertions(+), 43 deletions(-) delete mode 100644 README.md create mode 100644 src/main/java/com/buuz135/hotornot/HotOrNotTab.java create mode 100644 src/main/java/com/buuz135/hotornot/item/IronTongsItem.java create mode 100644 src/main/java/com/buuz135/hotornot/item/WoodenTongsItem.java create mode 100644 src/main/resources/assets/hotornot/models/item/iron_tongs.json create mode 100644 src/main/resources/assets/hotornot/models/item/wooden_tongs.json create mode 100644 src/main/resources/assets/hotornot/recipes/iron_tongs.json create mode 100644 src/main/resources/assets/hotornot/recipes/iron_tongs_tfc.json create mode 100644 src/main/resources/assets/hotornot/recipes/mitts_tfc.json create mode 100644 src/main/resources/assets/hotornot/recipes/wooden_tongs.json create mode 100644 src/main/resources/assets/hotornot/textures/items/iron_tongs.png create mode 100644 src/main/resources/assets/hotornot/textures/items/wooden_tongs.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 2523b77..d4d92ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Hot Or Not ========== +TFC-1.1.5 (2021-06-12 16:06:55 +0200) +------------------------------------- +* Addable/removable items via config (ACGaming) + TFC-1.1.4 (2021-03-27 16:42:13 +0100) ------------------------------------- * Item tooltips + configurable temperatures (ACGaming) diff --git a/README.md b/README.md deleted file mode 100644 index 4478756..0000000 --- a/README.md +++ /dev/null @@ -1 +0,0 @@ -# HotOrNot diff --git a/gradle.properties b/gradle.properties index 69bc15e..8f49aad 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ modGroup=com.buuz135 minecraftVersion=1.12.2 -modVersion=1.1.5 -modBaseName=HotOrNotTFC +modVersion=1.1.6 +modBaseName=HotOrNotPlus forgeVersion=1.12.2-14.23.5.2847 mcpVersion=stable_39 \ No newline at end of file diff --git a/src/main/java/com/buuz135/hotornot/HotOrNot.java b/src/main/java/com/buuz135/hotornot/HotOrNot.java index 115543e..a27bd64 100644 --- a/src/main/java/com/buuz135/hotornot/HotOrNot.java +++ b/src/main/java/com/buuz135/hotornot/HotOrNot.java @@ -24,6 +24,7 @@ import java.util.function.Consumer; import java.util.function.Predicate; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.MobEffects; import net.minecraft.item.Item; @@ -38,6 +39,7 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandlerItem; import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; @@ -60,13 +62,15 @@ modid = HotOrNot.MOD_ID, name = HotOrNot.MOD_NAME, version = HotOrNot.VERSION, - dependencies = "required-after:tfc" + dependencies = "after:tfc" ) public class HotOrNot { public static final String MOD_ID = "hotornot"; - public static final String MOD_NAME = "HotOrNot for TFC"; - public static final String VERSION = "1.1.5"; + public static final String MOD_NAME = "HotOrNot+"; + public static final String VERSION = "1.1.6"; + + public static final CreativeTabs HOTORNOT_TAB = new HotOrNotTab(); @SidedProxy(clientSide = "com.buuz135.hotornot.proxy.ClientProxy", serverSide = "com.buuz135.hotornot.proxy.CommonProxy") public static CommonProxy proxy; @@ -161,7 +165,24 @@ public static void onTick(TickEvent.WorldTickEvent event) ItemStack offHand = entityPlayerMP.getHeldItemOffhand(); if (offHand.getItem().equals(CommonProxy.MITTS)) { - offHand.damageItem(1, entityPlayerMP); + if (HotConfig.MITTS_DURABILITY != 0) + { + offHand.damageItem(1, entityPlayerMP); + } + } + else if (offHand.getItem().equals(CommonProxy.WOODEN_TONGS)) + { + if (HotConfig.WOODEN_TONGS_DURABILITY != 0) + { + offHand.damageItem(1, entityPlayerMP); + } + } + else if (offHand.getItem().equals(CommonProxy.IRON_TONGS)) + { + if (HotConfig.IRON_TONGS_DURABILITY != 0) + { + offHand.damageItem(1, entityPlayerMP); + } } else if (event.world.getTotalWorldTime() % 20 == 0) { @@ -179,36 +200,72 @@ else if (event.world.getTotalWorldTime() % 20 == 0) if (HotConfig.HOT_ITEMS && !stack.isEmpty() && !HotLists.isRemoved(stack)) { - // TFC ITEMS - if (stack.hasCapability(CapabilityItemHeat.ITEM_HEAT_CAPABILITY, null)) + if (Loader.isModLoaded("tfc")) { - IItemHeat heatHandlerItem = stack.getCapability(CapabilityItemHeat.ITEM_HEAT_CAPABILITY, null); - if (heatHandlerItem.getTemperature() >= HotConfig.HOT_ITEM) + // TFC ITEMS + if (stack.hasCapability(CapabilityItemHeat.ITEM_HEAT_CAPABILITY, null)) { - ItemStack offHand = entityPlayerMP.getHeldItemOffhand(); - if (offHand.getItem().equals(CommonProxy.MITTS)) - { - offHand.damageItem(1, entityPlayerMP); - } - else if (event.world.getTotalWorldTime() % 10 == 0) + IItemHeat heatHandlerItem = stack.getCapability(CapabilityItemHeat.ITEM_HEAT_CAPABILITY, null); + if (heatHandlerItem.getTemperature() >= HotConfig.HOT_ITEM) { - entityPlayerMP.setFire(1); - if (HotConfig.YEET) + ItemStack offHand = entityPlayerMP.getHeldItemOffhand(); + if (offHand.getItem().equals(CommonProxy.MITTS)) { - entityPlayerMP.dropItem(stack, false, true); - entityPlayerMP.inventory.deleteStack(stack); + if (HotConfig.MITTS_DURABILITY != 0) + { + offHand.damageItem(1, entityPlayerMP); + } + } + else if (offHand.getItem().equals(CommonProxy.WOODEN_TONGS)) + { + if (HotConfig.WOODEN_TONGS_DURABILITY != 0) + { + offHand.damageItem(1, entityPlayerMP); + } + } + else if (offHand.getItem().equals(CommonProxy.IRON_TONGS)) + { + if (HotConfig.IRON_TONGS_DURABILITY != 0) + { + offHand.damageItem(1, entityPlayerMP); + } + } + else if (event.world.getTotalWorldTime() % 10 == 0) + { + entityPlayerMP.setFire(1); + if (HotConfig.YEET) + { + entityPlayerMP.dropItem(stack, false, true); + entityPlayerMP.inventory.deleteStack(stack); + } } } } } - // MANUALLY ADDED ITEMS else if (HotLists.isHot(stack)) { ItemStack offHand = entityPlayerMP.getHeldItemOffhand(); if (offHand.getItem().equals(CommonProxy.MITTS)) { - offHand.damageItem(1, entityPlayerMP); + if (HotConfig.MITTS_DURABILITY != 0) + { + offHand.damageItem(1, entityPlayerMP); + } + } + else if (offHand.getItem().equals(CommonProxy.WOODEN_TONGS)) + { + if (HotConfig.WOODEN_TONGS_DURABILITY != 0) + { + offHand.damageItem(1, entityPlayerMP); + } + } + else if (offHand.getItem().equals(CommonProxy.IRON_TONGS)) + { + if (HotConfig.IRON_TONGS_DURABILITY != 0) + { + offHand.damageItem(1, entityPlayerMP); + } } else if (event.world.getTotalWorldTime() % 10 == 0) { @@ -225,7 +282,24 @@ else if (HotLists.isCold(stack)) ItemStack offHand = entityPlayerMP.getHeldItemOffhand(); if (offHand.getItem().equals(CommonProxy.MITTS)) { - offHand.damageItem(1, entityPlayerMP); + if (HotConfig.MITTS_DURABILITY != 0) + { + offHand.damageItem(1, entityPlayerMP); + } + } + else if (offHand.getItem().equals(CommonProxy.WOODEN_TONGS)) + { + if (HotConfig.WOODEN_TONGS_DURABILITY != 0) + { + offHand.damageItem(1, entityPlayerMP); + } + } + else if (offHand.getItem().equals(CommonProxy.IRON_TONGS)) + { + if (HotConfig.IRON_TONGS_DURABILITY != 0) + { + offHand.damageItem(1, entityPlayerMP); + } } else if (event.world.getTotalWorldTime() % 10 == 0) { @@ -273,14 +347,6 @@ public static void onTooltip(ItemTooltipEvent event) } } } - else if (stack.hasCapability(CapabilityItemHeat.ITEM_HEAT_CAPABILITY, null)) - { - IItemHeat heat = stack.getCapability(CapabilityItemHeat.ITEM_HEAT_CAPABILITY, null); - if (heat.getTemperature() >= HotConfig.HOT_ITEM) - { - event.getToolTip().add(FluidEffect.HOT.color + new TextComponentTranslation(FluidEffect.HOT.tooltip).getUnformattedText()); - } - } else if (HotLists.isHot(stack)) { event.getToolTip().add(FluidEffect.HOT.color + new TextComponentTranslation(FluidEffect.HOT.tooltip).getUnformattedText()); @@ -293,6 +359,17 @@ else if (HotLists.isGaseous(stack)) { event.getToolTip().add(FluidEffect.GAS.color + new TextComponentTranslation(FluidEffect.GAS.tooltip).getUnformattedText()); } + else if (Loader.isModLoaded("tfc")) + { + if (stack.hasCapability(CapabilityItemHeat.ITEM_HEAT_CAPABILITY, null)) + { + IItemHeat heat = stack.getCapability(CapabilityItemHeat.ITEM_HEAT_CAPABILITY, null); + if (heat.getTemperature() >= HotConfig.HOT_ITEM) + { + event.getToolTip().add(FluidEffect.HOT.color + new TextComponentTranslation(FluidEffect.HOT.tooltip).getUnformattedText()); + } + } + } } } } diff --git a/src/main/java/com/buuz135/hotornot/HotOrNotTab.java b/src/main/java/com/buuz135/hotornot/HotOrNotTab.java new file mode 100644 index 0000000..1b9f383 --- /dev/null +++ b/src/main/java/com/buuz135/hotornot/HotOrNotTab.java @@ -0,0 +1,22 @@ +package com.buuz135.hotornot; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class HotOrNotTab extends CreativeTabs +{ + public HotOrNotTab() + { + super(HotOrNot.MOD_ID); + } + + @SideOnly(Side.CLIENT) + @Override + public ItemStack createIcon() + { + return new ItemStack(Items.LAVA_BUCKET); + } +} \ No newline at end of file diff --git a/src/main/java/com/buuz135/hotornot/config/HotConfig.java b/src/main/java/com/buuz135/hotornot/config/HotConfig.java index 41bb5b5..62b2c29 100644 --- a/src/main/java/com/buuz135/hotornot/config/HotConfig.java +++ b/src/main/java/com/buuz135/hotornot/config/HotConfig.java @@ -38,8 +38,14 @@ public class HotConfig @Config.Comment("How hot an item should be to start burning the player (in Celsius)") public static int HOT_ITEM = 480; - @Config.Comment("Max durability of the mitts") - public static int MITTS_DURABILITY = 20 * 60 * 10; + @Config.Comment("Max durability of the wooden tongs, 0 for infinite durability") + public static int WOODEN_TONGS_DURABILITY = 1200; + + @Config.Comment("Max durability of the mitts, 0 for infinite durability") + public static int MITTS_DURABILITY = 12000; + + @Config.Comment("Max durability of the tongs, 0 for infinite durability") + public static int IRON_TONGS_DURABILITY = 0; @Config.Comment("Hot items that are included manually") public static String[] HOT_ITEM_ADDITIONS = new String[] {"minecraft:blaze_rod"}; diff --git a/src/main/java/com/buuz135/hotornot/item/IronTongsItem.java b/src/main/java/com/buuz135/hotornot/item/IronTongsItem.java new file mode 100644 index 0000000..d5d6703 --- /dev/null +++ b/src/main/java/com/buuz135/hotornot/item/IronTongsItem.java @@ -0,0 +1,41 @@ +package com.buuz135.hotornot.item; + +import java.util.List; +import javax.annotation.Nullable; + +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.world.World; + +import com.buuz135.hotornot.HotOrNot; +import com.buuz135.hotornot.config.HotConfig; + +public class IronTongsItem extends Item +{ + public IronTongsItem() + { + setRegistryName(HotOrNot.MOD_ID, "iron_tongs"); + setTranslationKey(HotOrNot.MOD_ID + ".iron_tongs"); + setMaxStackSize(1); + if (HotConfig.IRON_TONGS_DURABILITY != 0) + { + setMaxDamage(HotConfig.IRON_TONGS_DURABILITY); + } + setCreativeTab(HotOrNot.HOTORNOT_TAB); + } + + @Override + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) + { + super.addInformation(stack, worldIn, tooltip, flagIn); + tooltip.add(new TextComponentTranslation("item.hotornot.iron_tongs.tooltip").getUnformattedComponentText()); + } + + @Override + public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) + { + return false; + } +} \ No newline at end of file diff --git a/src/main/java/com/buuz135/hotornot/item/MittsItem.java b/src/main/java/com/buuz135/hotornot/item/MittsItem.java index 1b539ab..3a63a54 100644 --- a/src/main/java/com/buuz135/hotornot/item/MittsItem.java +++ b/src/main/java/com/buuz135/hotornot/item/MittsItem.java @@ -17,9 +17,13 @@ public class MittsItem extends Item public MittsItem() { setRegistryName(HotOrNot.MOD_ID, "mitts"); - setMaxStackSize(1); - setMaxDamage(HotConfig.MITTS_DURABILITY); setTranslationKey(HotOrNot.MOD_ID + ".mitts"); + setMaxStackSize(1); + if (HotConfig.MITTS_DURABILITY != 0) + { + setMaxDamage(HotConfig.MITTS_DURABILITY); + } + setCreativeTab(HotOrNot.HOTORNOT_TAB); } @Override diff --git a/src/main/java/com/buuz135/hotornot/item/WoodenTongsItem.java b/src/main/java/com/buuz135/hotornot/item/WoodenTongsItem.java new file mode 100644 index 0000000..940433d --- /dev/null +++ b/src/main/java/com/buuz135/hotornot/item/WoodenTongsItem.java @@ -0,0 +1,41 @@ +package com.buuz135.hotornot.item; + +import java.util.List; +import javax.annotation.Nullable; + +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.world.World; + +import com.buuz135.hotornot.HotOrNot; +import com.buuz135.hotornot.config.HotConfig; + +public class WoodenTongsItem extends Item +{ + public WoodenTongsItem() + { + setRegistryName(HotOrNot.MOD_ID, "wooden_tongs"); + setTranslationKey(HotOrNot.MOD_ID + ".wooden_tongs"); + setMaxStackSize(1); + if (HotConfig.WOODEN_TONGS_DURABILITY != 0) + { + setMaxDamage(HotConfig.WOODEN_TONGS_DURABILITY); + } + setCreativeTab(HotOrNot.HOTORNOT_TAB); + } + + @Override + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) + { + super.addInformation(stack, worldIn, tooltip, flagIn); + tooltip.add(new TextComponentTranslation("item.hotornot.wooden_tongs.tooltip").getUnformattedComponentText()); + } + + @Override + public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) + { + return false; + } +} \ No newline at end of file diff --git a/src/main/java/com/buuz135/hotornot/proxy/ClientProxy.java b/src/main/java/com/buuz135/hotornot/proxy/ClientProxy.java index e365173..1cf41f8 100644 --- a/src/main/java/com/buuz135/hotornot/proxy/ClientProxy.java +++ b/src/main/java/com/buuz135/hotornot/proxy/ClientProxy.java @@ -30,6 +30,8 @@ public void postInit(FMLPostInitializationEvent event) @Override public void modelRegistryEvent(ModelRegistryEvent event) { + ModelLoader.setCustomModelResourceLocation(WOODEN_TONGS, 0, new ModelResourceLocation(WOODEN_TONGS.getRegistryName(), "inventory")); ModelLoader.setCustomModelResourceLocation(MITTS, 0, new ModelResourceLocation(MITTS.getRegistryName(), "inventory")); + ModelLoader.setCustomModelResourceLocation(IRON_TONGS, 0, new ModelResourceLocation(IRON_TONGS.getRegistryName(), "inventory")); } } \ No newline at end of file diff --git a/src/main/java/com/buuz135/hotornot/proxy/CommonProxy.java b/src/main/java/com/buuz135/hotornot/proxy/CommonProxy.java index 06973d0..e9ef59f 100644 --- a/src/main/java/com/buuz135/hotornot/proxy/CommonProxy.java +++ b/src/main/java/com/buuz135/hotornot/proxy/CommonProxy.java @@ -9,11 +9,15 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import com.buuz135.hotornot.item.IronTongsItem; import com.buuz135.hotornot.item.MittsItem; +import com.buuz135.hotornot.item.WoodenTongsItem; public class CommonProxy { + public static WoodenTongsItem WOODEN_TONGS = new WoodenTongsItem(); public static MittsItem MITTS = new MittsItem(); + public static IronTongsItem IRON_TONGS = new IronTongsItem(); public void preInit(FMLPreInitializationEvent event) { @@ -32,7 +36,9 @@ public void postInit(FMLPostInitializationEvent event) public void registerItems(RegistryEvent.Register event) { + event.getRegistry().register(WOODEN_TONGS); event.getRegistry().register(MITTS); + event.getRegistry().register(IRON_TONGS); } @SideOnly(Side.CLIENT) diff --git a/src/main/resources/assets/hotornot/lang/en_us.lang b/src/main/resources/assets/hotornot/lang/en_us.lang index 53d9be4..37aca0c 100644 --- a/src/main/resources/assets/hotornot/lang/en_us.lang +++ b/src/main/resources/assets/hotornot/lang/en_us.lang @@ -1,6 +1,14 @@ -tooltip.hotornot.toohot=Too hot to handle! Wear mitts. -tooltip.hotornot.toocold=Too cold to handle! Wear mitts. -tooltip.hotornot.toolight=Too light to handle! Wear mitts. +tooltip.hotornot.toohot=Too hot to handle! Wear protection. +tooltip.hotornot.toocold=Too cold to handle! Wear protection. +tooltip.hotornot.toolight=Too light to handle! Wear protection. + +item.hotornot.wooden_tongs.name=Wooden Tongs +item.hotornot.wooden_tongs.tooltip=Tier I - Wear in the offhand to avoid bad effects item.hotornot.mitts.name=Mitts -item.hotornot.mitts.tooltip=Wear in the offhand to avoid bad effects \ No newline at end of file +item.hotornot.mitts.tooltip=Tier II - Wear in the offhand to avoid bad effects + +item.hotornot.iron_tongs.name=Tongs +item.hotornot.iron_tongs.tooltip=Tier III - Wear in the offhand to avoid bad effects + +itemGroup.hotornot=Hot or Not \ No newline at end of file diff --git a/src/main/resources/assets/hotornot/models/item/iron_tongs.json b/src/main/resources/assets/hotornot/models/item/iron_tongs.json new file mode 100644 index 0000000..cd99d87 --- /dev/null +++ b/src/main/resources/assets/hotornot/models/item/iron_tongs.json @@ -0,0 +1,25 @@ +{ + "parent": "hotornot:item/item", + "textures": { + "layer0": "hotornot:items/iron_tongs" + }, + "display": { + "firstperson_lefthand": { + "rotation": [ + 0, + 90, + -25 + ], + "translation": [ + 1.13, + 3.2, + 1.13 + ], + "scale": [ + 0.68, + 0.68, + 0.68 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hotornot/models/item/wooden_tongs.json b/src/main/resources/assets/hotornot/models/item/wooden_tongs.json new file mode 100644 index 0000000..0107fc3 --- /dev/null +++ b/src/main/resources/assets/hotornot/models/item/wooden_tongs.json @@ -0,0 +1,25 @@ +{ + "parent": "hotornot:item/item", + "textures": { + "layer0": "hotornot:items/wooden_tongs" + }, + "display": { + "firstperson_lefthand": { + "rotation": [ + 0, + 90, + -25 + ], + "translation": [ + 1.13, + 3.2, + 1.13 + ], + "scale": [ + 0.68, + 0.68, + 0.68 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hotornot/recipes/iron_tongs.json b/src/main/resources/assets/hotornot/recipes/iron_tongs.json new file mode 100644 index 0000000..6cf1759 --- /dev/null +++ b/src/main/resources/assets/hotornot/recipes/iron_tongs.json @@ -0,0 +1,21 @@ +{ + "result": { + "item": "hotornot:iron_tongs" + }, + "pattern": [ + "I I", + " I ", + "W W" + ], + "type": "forge:ore_shaped", + "key": { + "I": { + "type": "forge:ore_dict", + "ore": "ingotIron" + }, + "W": { + "type": "forge:ore_dict", + "ore": "stickWood" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hotornot/recipes/iron_tongs_tfc.json b/src/main/resources/assets/hotornot/recipes/iron_tongs_tfc.json new file mode 100644 index 0000000..79126de --- /dev/null +++ b/src/main/resources/assets/hotornot/recipes/iron_tongs_tfc.json @@ -0,0 +1,25 @@ +{ + "result": { + "item": "hotornot:iron_tongs" + }, + "pattern": [ + "I I", + " S ", + "W W" + ], + "type": "forge:ore_shaped", + "key": { + "I": { + "type": "forge:ore_dict", + "ore": "stickWroughtIron" + }, + "S": { + "type": "forge:ore_dict", + "ore": "screwWroughtIron" + }, + "W": { + "type": "forge:ore_dict", + "ore": "stickWood" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hotornot/recipes/mitts.json b/src/main/resources/assets/hotornot/recipes/mitts.json index b3f3ceb..ac0b7b6 100644 --- a/src/main/resources/assets/hotornot/recipes/mitts.json +++ b/src/main/resources/assets/hotornot/recipes/mitts.json @@ -5,13 +5,13 @@ "pattern": [ " W ", "WLW", - "SW " + " WS" ], "type": "forge:ore_shaped", "key": { "W": { "type": "forge:ore_dict", - "ore": "clothHighQuality" + "ore": "wool" }, "L": { "type": "forge:ore_dict", diff --git a/src/main/resources/assets/hotornot/recipes/mitts_tfc.json b/src/main/resources/assets/hotornot/recipes/mitts_tfc.json new file mode 100644 index 0000000..9f2b1ad --- /dev/null +++ b/src/main/resources/assets/hotornot/recipes/mitts_tfc.json @@ -0,0 +1,25 @@ +{ + "result": { + "item": "hotornot:mitts" + }, + "pattern": [ + " C ", + "CLC", + " CS" + ], + "type": "forge:ore_shaped", + "key": { + "C": { + "type": "forge:ore_dict", + "ore": "clothHighQuality" + }, + "L": { + "type": "forge:ore_dict", + "ore": "leather" + }, + "S": { + "type": "forge:ore_dict", + "ore": "string" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hotornot/recipes/wooden_tongs.json b/src/main/resources/assets/hotornot/recipes/wooden_tongs.json new file mode 100644 index 0000000..2af6a0a --- /dev/null +++ b/src/main/resources/assets/hotornot/recipes/wooden_tongs.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "hotornot:wooden_tongs" + }, + "pattern": [ + "W W", + " W ", + "W W" + ], + "type": "forge:ore_shaped", + "key": { + "W": { + "type": "forge:ore_dict", + "ore": "stickWood" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hotornot/textures/items/iron_tongs.png b/src/main/resources/assets/hotornot/textures/items/iron_tongs.png new file mode 100644 index 0000000000000000000000000000000000000000..b22f9c228249c72d16bbeb87b25c3d9782a33238 GIT binary patch literal 14651 zcmeI3OKclO7{`Yem0~pk35fs|u(&Ov6nh_zlkCcN6XFzG!Xe5-O%A2q?2eOF?A>K| zQ#%nV6u49%kyeUSZd|FVmID%0r96vNi4z401P3@!^>Kg$Cy-E>-F58Gj-6>yk7LQ+ zFEjuD_s#z1k-hARvC$X0B9BE7LS6Y>cAQ)v^uOD;k>4l(T2sm8emghgBGi4^|K78@ zuX`s#1G|mMX>YplqM}*lxT;&TI9@H=M2%2tf7MpC1?+LNc+N1>(LXPK9_0)@9X*&V z2nBl>&l|aA2Tv@IPHM{wnyg3nXCkSpLK2j*r*hSD$#j)!IvV6vNbEQBQ7({p3+d>P zUyz$FjB&%3gSlk9FQ$o!0j^(;i%EGv>V1xr1hJ17WM1rz38Es%iXd{ePc#!DQOePa z%6RrbtsMC)9i8_)TjBXir4p|s;+8YVi?S^9g2YQwj3{F6lIf|{nCb2cldR{-Vpnqv z+cPYa^Yf~+)}oh=M*TwdPwl?ScD<14*4Pn>d{wo1F)r}!OuAP0*o#gn7@Dr}xP;5t z^jzW-+xqNz%d^~ht3%0pcgMnHP6~y3?Y84Bm)n+hy^*5?K@DkJr#rc1V}2aF)}o`~ zk)z~RcD1{E&nPw~rzw-)({b#$YILyqJ)tdF3gHZ;$h|7V4pu$OnY64@CR}A>>j=5w zVSiQibI%+!Ox>!udsBR?r7_=)Y&ffWI3o#?7!&$qf;1`iDw3om`}PTvA_yQ!sBFnm zuymui)FwwlP!jzx2T-==Ap1vGJ@vM-KrP6lYf8~_%Bq(!%IX~EZF4TgHyVMmzN(aA zt7JK3SU8hN@$H&{D_Cht-gG_H)NnqVAq{cE&=nbr39Je@rVkX8F`>72HZ~yl>M<=T z>8hL*WHF%!5DNup-;g?MX^Z}DsioHMFg37mNd1yykdsa=0gXTUJ1x;B&4yAr!zJr; z39MVPdV{lU0>9GSy53PTf-}ih9T)pME*)Lpa`i*3en$D8VCO2T=AUL6&EF810B&k+ z46E*}*^K`?fnk1N?_8rYkIl_CRG2DIbxz`1MX#bdcxaBSiQC!hVb*3_Yx)%LpZ+DI zc_PBr=J{D)u^Z)Is2u92{W&cy270+qARk`ze`{9Q-D;iL z+zPu}tqtdtX?Pi_R;{HOxcrkhJQgO%Ljun9C6kF{if?Uhb&MHRT$;`rWdFMUsucTb zp4N`G#+gn=&`~pnQw9E=2QwMAl7|KIoWj>1RGKHbz7g(n(72@=BX;5Q^i;4&e7%oVI8Z%r}L{PwRK^oMU;i4jf0)`9HpvDXr6%iCLT#yDeX1J(` zpn&0mG^jDdMMVS!3>Tz9jTtT~A}C8Ps4>GuMFa&57oVaL6LJ$omvKXh~J+sEE_4zH}eHhcb5K3h8U+b6R-zkO%V*{44^q!p#ag^Rgo ze{`RC;8*VJuRgx=(WSv$_sL@M%*ss9zpIf)xBPJ~^4^x+Q%_9{j-NoMw;tDT{Ihy| z<%bLB)BUmd@94&M^!P7Vzdtk8^~e|Hx7M~?|LoRJ4_|uu+K%k8$gA5B|K+=L^Vh8V Q$ly?ZWHfv3`6F-q2jKYPxc~qF literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hotornot/textures/items/wooden_tongs.png b/src/main/resources/assets/hotornot/textures/items/wooden_tongs.png new file mode 100644 index 0000000000000000000000000000000000000000..5d238b7a1f175082723463f697a8c990b06c85c2 GIT binary patch literal 14885 zcmeI3UuYaf9LFaj{c}<&TCpTZx7!LWc5naOUG8?hyPD)u6ZK+9t~NozZg%IAZSHo@ z-A(Tjgw__sJ}G??sftDMPoZF;TJfO}&=J310XQiZSv(ROx;Iv_;*xx@r%QA+Z zV)w+dLbfyjXN;i*8;&oG}g(MW*fQNj<;BBo7!;)_ag)~q-`Ue+r;7u4U&etB|g)ve7z1 zW?;ZuRdHt99>dhFva>zO;~~v@H`QQ9bzxc(B#{&1oFL`Im?A}$NbDg&QUoC&QtgRp zWG&su&$rQtqGcToY6N=X8fgFMs;l0VO0aK0N7t0RWfxU9Z4}jM$d}CNB;RZd^lYpu zWxy&}HX0U8N0NNI=C)B8OPlkSb)Tt02NlB!6bY5e-?;tibZcwfQ83b|C}G{u6&Z>V zs0xtN6Zse?M59w&LXPU37L#;UjtR0D(UZKlT~SbTB%YGr+L|Lc0n!M)!e_I}u<5ue zn!s?zACG~?lb=#yRFHeofh5RWd@3q%2^f!XQB8_y(Rd;*L}UJHXbo?UtR`L0UX%8w zdMna_@Dhzj1)+8h=hX8hj*R`mnnopY3Dph-Fzs#1Qh&LWPL zcgv~``=-&JxtT+&s@fWc%ais+Ykle~c4a-2-s!BMwSdN@`ZW-f{ED__=4$^5ucn1L zzkgg3(8Y`1cP%vN#zQB`p+Pqu+Kk+78g5#uWy6{SQQluj^?VygPdhN(8;eEI?!}w& zh*6^g3lkXwoo|k}D#hMf4DM(fIN2#M;HU*w3mAAV@wZg96+QK!2QI$x#I<6#HTJ^o z{L!4z?Nr6IXc7zv*`&D0d@wJ?g#jU(6c?Ef=B2nWAY_x`BJ;t#6c+}BY*JigKA4x{ z!hn!Xii^w#^HN+G5VA>ek@;X=iVFimHYqMLAIwW}VL-?x#YN_Wc_}Uo2-&2#$b2v_ z#f1SOn-mwB59Xz~Fd$@;;v)0Gyc8D(gltk=WImXe;=+KCO^S=m2lG-~7!a~aagq68 zUWy9?LN+NbG9S!KabZBnCdEbOgLx?~3<%kzxX64kFU5rcA)6EznGfcrxG*4Olj0)t z!Mqd~283)9afO=iFhUc(xL8JSDDGN);0AiTkg9hfJ#gsE zzDJJyaHjji)7wA)_vbH{{#e#GM1C57{lrFa?EK8WMPVe=a~%G-v?&Chf9cG3Z(M%* zi^+q}ta+#VZ2x=CeUJaPVe7+-_psroy3Sp`_@^_N&2D?)YhmPrJC85Da^u3OrR$r| zy?E^W)y