From 29da96001d4e7e1df4f30d71136e6d621aa941cb Mon Sep 17 00:00:00 2001 From: AzulConspirator Date: Thu, 7 Sep 2023 03:22:56 +0800 Subject: [PATCH 1/6] added readme --- readme.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 readme.md diff --git a/readme.md b/readme.md new file mode 100644 index 0000000..4eca3c3 --- /dev/null +++ b/readme.md @@ -0,0 +1,5 @@ +# [HOOKSHOT](https://modrinth.com/mod/hookshot) + +## Description + +adds hookshot to Minecraft, This is an attempt to update to 1.20.1 From ff1bdd2de650f02302c937adfe909f07f3be6884 Mon Sep 17 00:00:00 2001 From: AzulConspirator Date: Thu, 7 Sep 2023 12:31:22 +0800 Subject: [PATCH 2/6] initial Move to 1.20, smithing and bleed dont work --- gradle.properties | 14 +++++------ .../common/entity/HookshotEntity.java | 11 ++++---- .../core/mixin/SmithingRecipeAccessor.java | 11 +++++--- .../core/registry/ModDamageSource.java | 16 ++++++------ .../util/recipe/HookshotShapelessRecipe.java | 8 +++--- .../util/recipe/HookshotSmithingRecipe.java | 25 +++++++++++-------- src/main/resources/fabric.mod.json | 2 +- src/main/resources/hookshot.mixins.json | 3 +-- 8 files changed, 50 insertions(+), 40 deletions(-) diff --git a/gradle.properties b/gradle.properties index 40b78af..7a7119e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,16 +2,16 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties -minecraft_version=1.19.3 -yarn_mappings=1.19.3+build.5 -loader_version=0.14.14 +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.10 +loader_version=0.14.22 # Mod Properties -mod_version=1.27 +mod_version=1.28 maven_group=dev.cammiescorner archives_base_name=hookshot # Dependencies -fabric_version=0.75.1+1.19.3 -midnightlib_version=1.1.0-fabric -modmenu_version=5.0.2 +fabric_version=0.88.1+1.20.1 +midnightlib_version=1.4.1-fabric +modmenu_version=7.2.1 \ No newline at end of file diff --git a/src/main/java/dev/cammiescorner/hookshot/common/entity/HookshotEntity.java b/src/main/java/dev/cammiescorner/hookshot/common/entity/HookshotEntity.java index b0374ae..d9857ea 100644 --- a/src/main/java/dev/cammiescorner/hookshot/common/entity/HookshotEntity.java +++ b/src/main/java/dev/cammiescorner/hookshot/common/entity/HookshotEntity.java @@ -3,7 +3,7 @@ import dev.cammiescorner.hookshot.Hookshot; import dev.cammiescorner.hookshot.common.item.HookshotItem; import dev.cammiescorner.hookshot.core.integration.HookshotConfig; -import dev.cammiescorner.hookshot.core.registry.ModDamageSource; +//import dev.cammiescorner.hookshot.core.registry.ModDamageSource; import dev.cammiescorner.hookshot.core.registry.ModEntities; import dev.cammiescorner.hookshot.core.registry.ModSoundEvents; import dev.cammiescorner.hookshot.core.util.PlayerProperties; @@ -40,6 +40,7 @@ public class HookshotEntity extends PersistentProjectileEntity { private Entity hookedEntity; private ItemStack stack; + World world = this.getWorld(); public HookshotEntity(EntityType type, PlayerEntity owner, World world) { super(type, owner, world); this.setNoGravity(true); @@ -82,8 +83,8 @@ public void tick() { onRemoved(); } else { - if(UpgradesHelper.hasBleedUpgrade(stack) && age % 20 == 0) - hookedEntity.damage(ModDamageSource.bleed(this, owner), 1); + //if(UpgradesHelper.hasBleedUpgrade(stack) && age % 20 == 0) + // hookedEntity.damage(ModDamageSource.bleed(this, owner), 1); this.updatePosition(this.hookedEntity.getX(), this.hookedEntity.getBodyY(0.8D), this.hookedEntity.getZ()); } @@ -221,8 +222,8 @@ protected void onEntityHit(EntityHitResult entityHitResult) { isPulling = true; } - if(hookedEntity != null && UpgradesHelper.hasBleedUpgrade(stack)) - hookedEntity.damage(ModDamageSource.bleed(this, owner), 1); + //if(hookedEntity != null && UpgradesHelper.hasBleedUpgrade(stack)) + // hookedEntity.damage(ModDamageSource.bleed(this, owner), 1); if(UpgradesHelper.hasEndericUpgrade(stack)) { owner.requestTeleport(getX(), getY(), getZ()); diff --git a/src/main/java/dev/cammiescorner/hookshot/core/mixin/SmithingRecipeAccessor.java b/src/main/java/dev/cammiescorner/hookshot/core/mixin/SmithingRecipeAccessor.java index 6d63a79..4de1b71 100644 --- a/src/main/java/dev/cammiescorner/hookshot/core/mixin/SmithingRecipeAccessor.java +++ b/src/main/java/dev/cammiescorner/hookshot/core/mixin/SmithingRecipeAccessor.java @@ -3,17 +3,20 @@ import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.SmithingRecipe; +import net.minecraft.recipe.SmithingTransformRecipe; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; -@Mixin(SmithingRecipe.class) +@Mixin(SmithingTransformRecipe.class) public interface SmithingRecipeAccessor { + @Accessor("base") - Ingredient getBase(); + Ingredient testBase(); @Accessor("addition") - Ingredient getAddition(); + Ingredient testAddition(); @Accessor("result") - ItemStack getResult(); + ItemStack getOutput(); } diff --git a/src/main/java/dev/cammiescorner/hookshot/core/registry/ModDamageSource.java b/src/main/java/dev/cammiescorner/hookshot/core/registry/ModDamageSource.java index 642dc49..e3dc815 100644 --- a/src/main/java/dev/cammiescorner/hookshot/core/registry/ModDamageSource.java +++ b/src/main/java/dev/cammiescorner/hookshot/core/registry/ModDamageSource.java @@ -2,20 +2,22 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.damage.DamageSource; -import net.minecraft.entity.damage.ProjectileDamageSource; +import net.minecraft.entity.damage.DamageType; import net.minecraft.entity.projectile.PersistentProjectileEntity; +import net.minecraft.registry.entry.RegistryEntry; + import org.jetbrains.annotations.Nullable; public class ModDamageSource { public static DamageSource bleed(PersistentProjectileEntity projectile, Entity attacker) { - return new BleedingDamageSource("hookshotBleeding", projectile, attacker); + return new BleedingDamageSource(projectile, attacker); } - public static class BleedingDamageSource extends ProjectileDamageSource { - public BleedingDamageSource(String name, Entity projectile, @Nullable Entity attacker) { - super(name, projectile, attacker); - setBypassesArmor(); - setUnblockable(); + public static class BleedingDamageSource extends DamageSource { + public BleedingDamageSource(Entity projectile, @Nullable Entity attacker) { + super((RegistryEntry) projectile, attacker); + //setBypassesArmor(); + //setUnblockable(); } } } diff --git a/src/main/java/dev/cammiescorner/hookshot/core/util/recipe/HookshotShapelessRecipe.java b/src/main/java/dev/cammiescorner/hookshot/core/util/recipe/HookshotShapelessRecipe.java index 6e82900..a308524 100644 --- a/src/main/java/dev/cammiescorner/hookshot/core/util/recipe/HookshotShapelessRecipe.java +++ b/src/main/java/dev/cammiescorner/hookshot/core/util/recipe/HookshotShapelessRecipe.java @@ -5,6 +5,7 @@ import com.google.gson.JsonParseException; import dev.cammiescorner.hookshot.common.item.HookshotItem; import net.minecraft.inventory.CraftingInventory; +import net.minecraft.inventory.RecipeInputInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.network.PacketByteBuf; @@ -13,6 +14,7 @@ import net.minecraft.recipe.ShapedRecipe; import net.minecraft.recipe.ShapelessRecipe; import net.minecraft.recipe.book.CraftingRecipeCategory; +import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.util.Identifier; import net.minecraft.util.JsonHelper; import net.minecraft.util.collection.DefaultedList; @@ -23,8 +25,8 @@ public HookshotShapelessRecipe(Identifier id, String group, CraftingRecipeCatego } @Override - public ItemStack craft(CraftingInventory inv) { - ItemStack stack = this.getOutput().copy(); + public ItemStack craft(RecipeInputInventory inv, DynamicRegistryManager dynamicRegistryManager){ + ItemStack stack = this.getOutput(dynamicRegistryManager).copy(); NbtCompound tag = null; for(int i = 0; i < inv.size(); ++i) { @@ -93,7 +95,7 @@ public void write(PacketByteBuf packetByteBuf, HookshotShapelessRecipe shapeless for(Ingredient ingredient : shapelessRecipe.getIngredients()) ingredient.write(packetByteBuf); - packetByteBuf.writeItemStack(shapelessRecipe.getOutput()); + packetByteBuf.writeItemStack(shapelessRecipe.getOutput(null)); } } } diff --git a/src/main/java/dev/cammiescorner/hookshot/core/util/recipe/HookshotSmithingRecipe.java b/src/main/java/dev/cammiescorner/hookshot/core/util/recipe/HookshotSmithingRecipe.java index 13012fe..8ca6b77 100644 --- a/src/main/java/dev/cammiescorner/hookshot/core/util/recipe/HookshotSmithingRecipe.java +++ b/src/main/java/dev/cammiescorner/hookshot/core/util/recipe/HookshotSmithingRecipe.java @@ -11,22 +11,23 @@ import net.minecraft.network.PacketByteBuf; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.RecipeSerializer; -import net.minecraft.recipe.SmithingRecipe; +import net.minecraft.recipe.SmithingTransformRecipe; +import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; import net.minecraft.util.JsonHelper; -public class HookshotSmithingRecipe extends SmithingRecipe { - public HookshotSmithingRecipe(Identifier id, Ingredient base, Ingredient addition, ItemStack result) { - super(id, base, addition, result); +public class HookshotSmithingRecipe extends SmithingTransformRecipe { + public HookshotSmithingRecipe(Identifier id, Ingredient template, Ingredient base, Ingredient addition, ItemStack result) { + super(id,template,base,addition,result); } // I don't know why, I don't want to know why, I shouldn't // have to wonder why, but for whatever reason this stupid // NBT data won't add new tags unless we do this terribleness. @Override - public ItemStack craft(Inventory inv) { - ItemStack stack = ((SmithingRecipeAccessor) this).getResult().copy(); + public ItemStack craft(Inventory inv, DynamicRegistryManager registryManager) { + ItemStack stack = ((SmithingRecipeAccessor) this).getOutput().copy(); NbtCompound tag = inv.getStack(0).getNbt(); if(tag != null) @@ -58,26 +59,28 @@ public static class Serializer implements RecipeSerializer=0.14.14", "fabric": "*", - "minecraft": "1.19.3", + "minecraft": ">1.19.3", "midnightlib": ">=1.1.0" }, "suggests": diff --git a/src/main/resources/hookshot.mixins.json b/src/main/resources/hookshot.mixins.json index ef41b8b..1b4f511 100644 --- a/src/main/resources/hookshot.mixins.json +++ b/src/main/resources/hookshot.mixins.json @@ -5,8 +5,7 @@ "compatibilityLevel": "JAVA_17", "mixins": [ "ItemStackMixin", - "PlayerEntityMixin", - "SmithingRecipeAccessor" + "PlayerEntityMixin" ], "client": [ ], From 4321ed07970911cafdc6c412b3e50544b87870d9 Mon Sep 17 00:00:00 2001 From: AzulConspirator Date: Thu, 7 Sep 2023 15:46:06 +0800 Subject: [PATCH 3/6] added crafting (sorta), fix losing NBT on Recolor --- .../core/mixin/SmithingRecipeAccessor.java | 4 +++- .../core/util/recipe/HookshotShapelessRecipe.java | 6 ++---- .../core/util/recipe/HookshotSmithingRecipe.java | 15 ++++++++------- src/main/resources/hookshot.mixins.json | 3 ++- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/dev/cammiescorner/hookshot/core/mixin/SmithingRecipeAccessor.java b/src/main/java/dev/cammiescorner/hookshot/core/mixin/SmithingRecipeAccessor.java index 4de1b71..63dfb1c 100644 --- a/src/main/java/dev/cammiescorner/hookshot/core/mixin/SmithingRecipeAccessor.java +++ b/src/main/java/dev/cammiescorner/hookshot/core/mixin/SmithingRecipeAccessor.java @@ -2,7 +2,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; -import net.minecraft.recipe.SmithingRecipe; import net.minecraft.recipe.SmithingTransformRecipe; import org.spongepowered.asm.mixin.Mixin; @@ -11,6 +10,9 @@ @Mixin(SmithingTransformRecipe.class) public interface SmithingRecipeAccessor { + @Accessor("template") + Ingredient testTemplate(); + @Accessor("base") Ingredient testBase(); diff --git a/src/main/java/dev/cammiescorner/hookshot/core/util/recipe/HookshotShapelessRecipe.java b/src/main/java/dev/cammiescorner/hookshot/core/util/recipe/HookshotShapelessRecipe.java index a308524..61cafc9 100644 --- a/src/main/java/dev/cammiescorner/hookshot/core/util/recipe/HookshotShapelessRecipe.java +++ b/src/main/java/dev/cammiescorner/hookshot/core/util/recipe/HookshotShapelessRecipe.java @@ -4,7 +4,6 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import dev.cammiescorner.hookshot.common.item.HookshotItem; -import net.minecraft.inventory.CraftingInventory; import net.minecraft.inventory.RecipeInputInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; @@ -37,8 +36,8 @@ public ItemStack craft(RecipeInputInventory inv, DynamicRegistryManager dynamicR } if(tag != null && stack.hasNbt()) - tag.copyFrom(tag); - + stack.getOrCreateNbt().copyFrom(tag); + return stack; } @@ -60,7 +59,6 @@ private static DefaultedList getIngredients(JsonArray json) { public HookshotShapelessRecipe read(Identifier identifier, JsonObject jsonObject) { String string = JsonHelper.getString(jsonObject, "group", ""); DefaultedList defaultedList = getIngredients(JsonHelper.getArray(jsonObject, "ingredients")); - if(defaultedList.isEmpty()) { throw new JsonParseException("No ingredients for shapeless recipe"); } diff --git a/src/main/java/dev/cammiescorner/hookshot/core/util/recipe/HookshotSmithingRecipe.java b/src/main/java/dev/cammiescorner/hookshot/core/util/recipe/HookshotSmithingRecipe.java index 8ca6b77..2ca537b 100644 --- a/src/main/java/dev/cammiescorner/hookshot/core/util/recipe/HookshotSmithingRecipe.java +++ b/src/main/java/dev/cammiescorner/hookshot/core/util/recipe/HookshotSmithingRecipe.java @@ -18,8 +18,8 @@ import net.minecraft.util.JsonHelper; public class HookshotSmithingRecipe extends SmithingTransformRecipe { - public HookshotSmithingRecipe(Identifier id, Ingredient template, Ingredient base, Ingredient addition, ItemStack result) { - super(id,template,base,addition,result); + public HookshotSmithingRecipe(Identifier id,Ingredient template, Ingredient base, Ingredient addition, ItemStack result) { + super(id,template, base, addition, result); } // I don't know why, I don't want to know why, I shouldn't @@ -58,29 +58,30 @@ public static ItemStack getItemStack(JsonObject json) { public static class Serializer implements RecipeSerializer { @Override public HookshotSmithingRecipe read(Identifier identifier, JsonObject jsonObject) { - Ingredient base = Ingredient.fromJson(JsonHelper.getObject(jsonObject, "base")); Ingredient template = Ingredient.fromJson(JsonHelper.getObject(jsonObject, "template")); + Ingredient base = Ingredient.fromJson(JsonHelper.getObject(jsonObject, "base")); Ingredient addition = Ingredient.fromJson(JsonHelper.getObject(jsonObject, "addition")); ItemStack result = HookshotSmithingRecipe.getItemStack(JsonHelper.getObject(jsonObject, "result")); - return new HookshotSmithingRecipe(identifier,template,base,addition,result); + return new HookshotSmithingRecipe(identifier,template, base, addition, result); } @Override public HookshotSmithingRecipe read(Identifier identifier, PacketByteBuf packetByteBuf) { - Ingredient base = Ingredient.fromPacket(packetByteBuf); Ingredient template = Ingredient.fromPacket(packetByteBuf); + Ingredient base = Ingredient.fromPacket(packetByteBuf); Ingredient addition = Ingredient.fromPacket(packetByteBuf); ItemStack result = packetByteBuf.readItemStack(); - return new HookshotSmithingRecipe(identifier,template,base,addition,result); + return new HookshotSmithingRecipe(identifier,template, base, addition, result); } @Override public void write(PacketByteBuf packetByteBuf, HookshotSmithingRecipe smithingRecipe) { + ((SmithingRecipeAccessor) smithingRecipe).testTemplate().write(packetByteBuf); ((SmithingRecipeAccessor) smithingRecipe).testBase().write(packetByteBuf); ((SmithingRecipeAccessor) smithingRecipe).testAddition().write(packetByteBuf); packetByteBuf.writeItemStack(((SmithingRecipeAccessor) smithingRecipe).getOutput()); } } -} +} \ No newline at end of file diff --git a/src/main/resources/hookshot.mixins.json b/src/main/resources/hookshot.mixins.json index 1b4f511..ef41b8b 100644 --- a/src/main/resources/hookshot.mixins.json +++ b/src/main/resources/hookshot.mixins.json @@ -5,7 +5,8 @@ "compatibilityLevel": "JAVA_17", "mixins": [ "ItemStackMixin", - "PlayerEntityMixin" + "PlayerEntityMixin", + "SmithingRecipeAccessor" ], "client": [ ], From 2cff41faa4ac4cfd1ad85a0570958215cc66e9e9 Mon Sep 17 00:00:00 2001 From: AzulConspirator Date: Thu, 7 Sep 2023 15:46:57 +0800 Subject: [PATCH 4/6] recipe addtions, now iron required as template --- .../recipes/upgrades/black/hookshot_aquatic_upgrade.json | 4 ++++ .../recipes/upgrades/black/hookshot_automatic_upgrade.json | 4 ++++ .../recipes/upgrades/black/hookshot_bleed_upgrade.json | 4 ++++ .../recipes/upgrades/black/hookshot_durability_upgrade.json | 4 ++++ .../recipes/upgrades/black/hookshot_enderic_upgrade.json | 4 ++++ .../recipes/upgrades/black/hookshot_quick_upgrade.json | 4 ++++ .../recipes/upgrades/black/hookshot_range_upgrade.json | 4 ++++ .../recipes/upgrades/blue/hookshot_aquatic_upgrade.json | 4 ++++ .../recipes/upgrades/blue/hookshot_automatic_upgrade.json | 4 ++++ .../recipes/upgrades/blue/hookshot_bleed_upgrade.json | 4 ++++ .../recipes/upgrades/blue/hookshot_durability_upgrade.json | 4 ++++ .../recipes/upgrades/blue/hookshot_enderic_upgrade.json | 4 ++++ .../recipes/upgrades/blue/hookshot_quick_upgrade.json | 4 ++++ .../recipes/upgrades/blue/hookshot_range_upgrade.json | 4 ++++ .../recipes/upgrades/brown/hookshot_aquatic_upgrade.json | 4 ++++ .../recipes/upgrades/brown/hookshot_automatic_upgrade.json | 4 ++++ .../recipes/upgrades/brown/hookshot_bleed_upgrade.json | 4 ++++ .../recipes/upgrades/brown/hookshot_durability_upgrade.json | 4 ++++ .../recipes/upgrades/brown/hookshot_enderic_upgrade.json | 4 ++++ .../recipes/upgrades/brown/hookshot_quick_upgrade.json | 4 ++++ .../recipes/upgrades/brown/hookshot_range_upgrade.json | 4 ++++ .../recipes/upgrades/cyan/hookshot_aquatic_upgrade.json | 4 ++++ .../recipes/upgrades/cyan/hookshot_automatic_upgrade.json | 4 ++++ .../recipes/upgrades/cyan/hookshot_bleed_upgrade.json | 4 ++++ .../recipes/upgrades/cyan/hookshot_durability_upgrade.json | 4 ++++ .../recipes/upgrades/cyan/hookshot_enderic_upgrade.json | 4 ++++ .../recipes/upgrades/cyan/hookshot_quick_upgrade.json | 4 ++++ .../recipes/upgrades/cyan/hookshot_range_upgrade.json | 4 ++++ .../recipes/upgrades/gray/hookshot_aquatic_upgrade.json | 4 ++++ .../recipes/upgrades/gray/hookshot_automatic_upgrade.json | 4 ++++ .../recipes/upgrades/gray/hookshot_bleed_upgrade.json | 4 ++++ .../recipes/upgrades/gray/hookshot_durability_upgrade.json | 4 ++++ .../recipes/upgrades/gray/hookshot_enderic_upgrade.json | 4 ++++ .../recipes/upgrades/gray/hookshot_quick_upgrade.json | 4 ++++ .../recipes/upgrades/gray/hookshot_range_upgrade.json | 4 ++++ .../recipes/upgrades/green/hookshot_aquatic_upgrade.json | 4 ++++ .../recipes/upgrades/green/hookshot_automatic_upgrade.json | 4 ++++ .../recipes/upgrades/green/hookshot_bleed_upgrade.json | 4 ++++ .../recipes/upgrades/green/hookshot_durability_upgrade.json | 4 ++++ .../recipes/upgrades/green/hookshot_enderic_upgrade.json | 4 ++++ .../recipes/upgrades/green/hookshot_quick_upgrade.json | 4 ++++ .../recipes/upgrades/green/hookshot_range_upgrade.json | 4 ++++ .../recipes/upgrades/light_blue/hookshot_aquatic_upgrade.json | 4 ++++ .../upgrades/light_blue/hookshot_automatic_upgrade.json | 4 ++++ .../recipes/upgrades/light_blue/hookshot_bleed_upgrade.json | 4 ++++ .../upgrades/light_blue/hookshot_durability_upgrade.json | 4 ++++ .../recipes/upgrades/light_blue/hookshot_enderic_upgrade.json | 4 ++++ .../recipes/upgrades/light_blue/hookshot_quick_upgrade.json | 4 ++++ .../recipes/upgrades/light_blue/hookshot_range_upgrade.json | 4 ++++ .../recipes/upgrades/light_gray/hookshot_aquatic_upgrade.json | 4 ++++ .../upgrades/light_gray/hookshot_automatic_upgrade.json | 4 ++++ .../recipes/upgrades/light_gray/hookshot_bleed_upgrade.json | 4 ++++ .../upgrades/light_gray/hookshot_durability_upgrade.json | 4 ++++ .../recipes/upgrades/light_gray/hookshot_enderic_upgrade.json | 4 ++++ .../recipes/upgrades/light_gray/hookshot_quick_upgrade.json | 4 ++++ .../recipes/upgrades/light_gray/hookshot_range_upgrade.json | 4 ++++ .../recipes/upgrades/lime/hookshot_aquatic_upgrade.json | 4 ++++ .../recipes/upgrades/lime/hookshot_automatic_upgrade.json | 4 ++++ .../recipes/upgrades/lime/hookshot_bleed_upgrade.json | 4 ++++ .../recipes/upgrades/lime/hookshot_durability_upgrade.json | 4 ++++ .../recipes/upgrades/lime/hookshot_enderic_upgrade.json | 4 ++++ .../recipes/upgrades/lime/hookshot_quick_upgrade.json | 4 ++++ .../recipes/upgrades/lime/hookshot_range_upgrade.json | 4 ++++ .../recipes/upgrades/magenta/hookshot_aquatic_upgrade.json | 4 ++++ .../recipes/upgrades/magenta/hookshot_automatic_upgrade.json | 4 ++++ .../recipes/upgrades/magenta/hookshot_bleed_upgrade.json | 4 ++++ .../recipes/upgrades/magenta/hookshot_durability_upgrade.json | 4 ++++ .../recipes/upgrades/magenta/hookshot_enderic_upgrade.json | 4 ++++ .../recipes/upgrades/magenta/hookshot_quick_upgrade.json | 4 ++++ .../recipes/upgrades/magenta/hookshot_range_upgrade.json | 4 ++++ .../recipes/upgrades/orange/hookshot_aquatic_upgrade.json | 4 ++++ .../recipes/upgrades/orange/hookshot_automatic_upgrade.json | 4 ++++ .../recipes/upgrades/orange/hookshot_bleed_upgrade.json | 4 ++++ .../recipes/upgrades/orange/hookshot_durability_upgrade.json | 4 ++++ .../recipes/upgrades/orange/hookshot_enderic_upgrade.json | 4 ++++ .../recipes/upgrades/orange/hookshot_quick_upgrade.json | 4 ++++ .../recipes/upgrades/orange/hookshot_range_upgrade.json | 4 ++++ .../recipes/upgrades/pink/hookshot_aquatic_upgrade.json | 4 ++++ .../recipes/upgrades/pink/hookshot_automatic_upgrade.json | 4 ++++ .../recipes/upgrades/pink/hookshot_bleed_upgrade.json | 4 ++++ .../recipes/upgrades/pink/hookshot_durability_upgrade.json | 4 ++++ .../recipes/upgrades/pink/hookshot_enderic_upgrade.json | 4 ++++ .../recipes/upgrades/pink/hookshot_quick_upgrade.json | 4 ++++ .../recipes/upgrades/pink/hookshot_range_upgrade.json | 4 ++++ .../recipes/upgrades/purple/hookshot_aquatic_upgrade.json | 4 ++++ .../recipes/upgrades/purple/hookshot_automatic_upgrade.json | 4 ++++ .../recipes/upgrades/purple/hookshot_bleed_upgrade.json | 4 ++++ .../recipes/upgrades/purple/hookshot_durability_upgrade.json | 4 ++++ .../recipes/upgrades/purple/hookshot_enderic_upgrade.json | 4 ++++ .../recipes/upgrades/purple/hookshot_quick_upgrade.json | 4 ++++ .../recipes/upgrades/purple/hookshot_range_upgrade.json | 4 ++++ .../recipes/upgrades/red/hookshot_aquatic_upgrade.json | 4 ++++ .../recipes/upgrades/red/hookshot_automatic_upgrade.json | 4 ++++ .../hookshot/recipes/upgrades/red/hookshot_bleed_upgrade.json | 4 ++++ .../recipes/upgrades/red/hookshot_durability_upgrade.json | 4 ++++ .../recipes/upgrades/red/hookshot_enderic_upgrade.json | 4 ++++ .../hookshot/recipes/upgrades/red/hookshot_quick_upgrade.json | 4 ++++ .../hookshot/recipes/upgrades/red/hookshot_range_upgrade.json | 4 ++++ .../recipes/upgrades/white/hookshot_aquatic_upgrade.json | 4 ++++ .../recipes/upgrades/white/hookshot_automatic_upgrade.json | 4 ++++ .../recipes/upgrades/white/hookshot_bleed_upgrade.json | 4 ++++ .../recipes/upgrades/white/hookshot_durability_upgrade.json | 4 ++++ .../recipes/upgrades/white/hookshot_enderic_upgrade.json | 4 ++++ .../recipes/upgrades/white/hookshot_quick_upgrade.json | 4 ++++ .../recipes/upgrades/white/hookshot_range_upgrade.json | 4 ++++ .../recipes/upgrades/yellow/hookshot_aquatic_upgrade.json | 4 ++++ .../recipes/upgrades/yellow/hookshot_automatic_upgrade.json | 4 ++++ .../recipes/upgrades/yellow/hookshot_bleed_upgrade.json | 4 ++++ .../recipes/upgrades/yellow/hookshot_durability_upgrade.json | 4 ++++ .../recipes/upgrades/yellow/hookshot_enderic_upgrade.json | 4 ++++ .../recipes/upgrades/yellow/hookshot_quick_upgrade.json | 4 ++++ .../recipes/upgrades/yellow/hookshot_range_upgrade.json | 4 ++++ 112 files changed, 448 insertions(+) diff --git a/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_aquatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_aquatic_upgrade.json index 085b72e..5505f0a 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_aquatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_aquatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:black_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_automatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_automatic_upgrade.json index f934d1e..0077523 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_automatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_automatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:black_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_bleed_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_bleed_upgrade.json index 7de520d..6488b01 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_bleed_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_bleed_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:black_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_durability_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_durability_upgrade.json index 0a4a328..d15b56e 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_durability_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_durability_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:black_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_enderic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_enderic_upgrade.json index 86ee66e..d946aea 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_enderic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_enderic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:black_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_quick_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_quick_upgrade.json index 066ddcf..5d61ec7 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_quick_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_quick_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:black_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_range_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_range_upgrade.json index 72dd7fd..a881f06 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_range_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/black/hookshot_range_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:black_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_aquatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_aquatic_upgrade.json index 6140761..eadf5dc 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_aquatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_aquatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:blue_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_automatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_automatic_upgrade.json index 9cd5ef5..28201bb 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_automatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_automatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:blue_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_bleed_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_bleed_upgrade.json index 46fa347..ea5e2bf 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_bleed_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_bleed_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:blue_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_durability_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_durability_upgrade.json index 4c00476..0c33b17 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_durability_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_durability_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:blue_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_enderic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_enderic_upgrade.json index 4eadf40..b54bb28 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_enderic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_enderic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:blue_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_quick_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_quick_upgrade.json index 9acc21a..6e1314b 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_quick_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_quick_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:blue_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_range_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_range_upgrade.json index 18bc856..2b747ec 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_range_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/blue/hookshot_range_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:blue_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_aquatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_aquatic_upgrade.json index ed68023..2fe0819 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_aquatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_aquatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:brown_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_automatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_automatic_upgrade.json index 8d3f169..333cdb5 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_automatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_automatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:brown_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_bleed_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_bleed_upgrade.json index a16e30e..28bf119 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_bleed_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_bleed_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:brown_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_durability_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_durability_upgrade.json index 486e345..31a096c 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_durability_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_durability_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:brown_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_enderic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_enderic_upgrade.json index ec467a4..4d07567 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_enderic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_enderic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:brown_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_quick_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_quick_upgrade.json index 6e9aa49..f332610 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_quick_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_quick_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:brown_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_range_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_range_upgrade.json index 1b748b4..0310a27 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_range_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/brown/hookshot_range_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:brown_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_aquatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_aquatic_upgrade.json index b8fec0e..b8b957a 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_aquatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_aquatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:cyan_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_automatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_automatic_upgrade.json index 6767d54..a91dddf 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_automatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_automatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:cyan_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_bleed_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_bleed_upgrade.json index 282f969..3e8e34f 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_bleed_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_bleed_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:cyan_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_durability_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_durability_upgrade.json index 1cabddf..4b1b575 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_durability_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_durability_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:cyan_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_enderic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_enderic_upgrade.json index 36ee727..ca86f80 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_enderic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_enderic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:cyan_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_quick_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_quick_upgrade.json index b274e46..7072678 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_quick_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_quick_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:cyan_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_range_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_range_upgrade.json index 7f8d8da..353ba8a 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_range_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/cyan/hookshot_range_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:cyan_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_aquatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_aquatic_upgrade.json index bf85f98..2d3d676 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_aquatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_aquatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:gray_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_automatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_automatic_upgrade.json index 162f8a2..c12f7ea 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_automatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_automatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:gray_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_bleed_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_bleed_upgrade.json index 01c95a0..bb7d7f7 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_bleed_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_bleed_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:gray_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_durability_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_durability_upgrade.json index 465f31d..49d7348 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_durability_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_durability_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:gray_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_enderic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_enderic_upgrade.json index 65226ec..efa8481 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_enderic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_enderic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:gray_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_quick_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_quick_upgrade.json index 6eff82c..513479b 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_quick_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_quick_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:gray_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_range_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_range_upgrade.json index 7afb10e..cf17b31 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_range_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/gray/hookshot_range_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:gray_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_aquatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_aquatic_upgrade.json index c8e5788..e25dcee 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_aquatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_aquatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:green_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_automatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_automatic_upgrade.json index f77f629..7457c24 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_automatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_automatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:green_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_bleed_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_bleed_upgrade.json index 6571f24..26f46ff 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_bleed_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_bleed_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:green_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_durability_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_durability_upgrade.json index 6ea8b2c..e506575 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_durability_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_durability_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:green_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_enderic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_enderic_upgrade.json index 179a8ba..869d89f 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_enderic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_enderic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:green_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_quick_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_quick_upgrade.json index 06dc16a..634dc11 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_quick_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_quick_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:green_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_range_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_range_upgrade.json index 80a8a4b..7f913d8 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_range_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/green/hookshot_range_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:green_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_aquatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_aquatic_upgrade.json index e89cff4..48a5fda 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_aquatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_aquatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:light_blue_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_automatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_automatic_upgrade.json index 230064b..dcf2458 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_automatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_automatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:light_blue_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_bleed_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_bleed_upgrade.json index 00d0f34..e69c0f5 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_bleed_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_bleed_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:light_blue_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_durability_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_durability_upgrade.json index 26ec244..b3f8457 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_durability_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_durability_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:light_blue_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_enderic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_enderic_upgrade.json index b54cae6..ce70b32 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_enderic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_enderic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:light_blue_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_quick_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_quick_upgrade.json index 64b0279..0403c54 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_quick_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_quick_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:light_blue_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_range_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_range_upgrade.json index 7211126..1038203 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_range_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/light_blue/hookshot_range_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:light_blue_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_aquatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_aquatic_upgrade.json index f6f3b9c..df44c0d 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_aquatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_aquatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:light_gray_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_automatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_automatic_upgrade.json index 4d1c938..384fb92 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_automatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_automatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:light_gray_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_bleed_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_bleed_upgrade.json index c1962a4..bdb2807 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_bleed_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_bleed_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:light_gray_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_durability_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_durability_upgrade.json index 0e4edc7..4aed902 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_durability_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_durability_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:light_gray_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_enderic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_enderic_upgrade.json index 153296f..1e6116a 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_enderic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_enderic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:light_gray_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_quick_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_quick_upgrade.json index 6f57356..0fc15f4 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_quick_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_quick_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:light_gray_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_range_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_range_upgrade.json index cfa52b8..6570e94 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_range_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/light_gray/hookshot_range_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:light_gray_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_aquatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_aquatic_upgrade.json index c39a90c..be870f9 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_aquatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_aquatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:lime_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_automatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_automatic_upgrade.json index 5815a51..3bf3a2b 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_automatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_automatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:lime_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_bleed_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_bleed_upgrade.json index bee0606..7ee394e 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_bleed_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_bleed_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:lime_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_durability_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_durability_upgrade.json index 913f7b7..fcff251 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_durability_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_durability_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:lime_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_enderic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_enderic_upgrade.json index b44247d..a279be0 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_enderic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_enderic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:lime_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_quick_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_quick_upgrade.json index 6e83933..d96bdd9 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_quick_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_quick_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:lime_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_range_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_range_upgrade.json index 153e43b..64315fd 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_range_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/lime/hookshot_range_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:lime_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_aquatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_aquatic_upgrade.json index 70a9efa..9b1cd50 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_aquatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_aquatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:magenta_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_automatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_automatic_upgrade.json index de37f32..d044ef4 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_automatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_automatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:magenta_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_bleed_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_bleed_upgrade.json index be36e8e..960ffa4 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_bleed_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_bleed_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:magenta_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_durability_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_durability_upgrade.json index 4c03783..ec4fb05 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_durability_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_durability_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:magenta_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_enderic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_enderic_upgrade.json index 2ef5e4a..9cef9ac 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_enderic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_enderic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:magenta_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_quick_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_quick_upgrade.json index 865591c..03b14f7 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_quick_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_quick_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:magenta_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_range_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_range_upgrade.json index 86074fd..92c3f78 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_range_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/magenta/hookshot_range_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:magenta_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_aquatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_aquatic_upgrade.json index b61b18c..f0c8f13 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_aquatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_aquatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:orange_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_automatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_automatic_upgrade.json index ebf1e59..99d6c06 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_automatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_automatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:orange_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_bleed_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_bleed_upgrade.json index 9dd6c11..8086e91 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_bleed_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_bleed_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:orange_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_durability_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_durability_upgrade.json index 6b9c89c..cf8243a 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_durability_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_durability_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:orange_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_enderic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_enderic_upgrade.json index 3a34845..19cf74a 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_enderic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_enderic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:orange_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_quick_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_quick_upgrade.json index f2b5781..09370a7 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_quick_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_quick_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:orange_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_range_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_range_upgrade.json index 96e9453..bfe94aa 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_range_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/orange/hookshot_range_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:orange_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_aquatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_aquatic_upgrade.json index 1aec387..7b41177 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_aquatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_aquatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:pink_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_automatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_automatic_upgrade.json index 2b21a9d..d96a24b 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_automatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_automatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:pink_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_bleed_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_bleed_upgrade.json index 6192083..718bfa7 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_bleed_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_bleed_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:pink_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_durability_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_durability_upgrade.json index a631c4b..03c9052 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_durability_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_durability_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:pink_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_enderic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_enderic_upgrade.json index 98ebd9e..4095f4c 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_enderic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_enderic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:pink_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_quick_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_quick_upgrade.json index 22bd950..4c30d31 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_quick_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_quick_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:pink_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_range_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_range_upgrade.json index dde1862..7ca1cb6 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_range_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/pink/hookshot_range_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:pink_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_aquatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_aquatic_upgrade.json index 58c9915..cb9cd46 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_aquatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_aquatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:purple_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_automatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_automatic_upgrade.json index 3a981be..16d063f 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_automatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_automatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:purple_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_bleed_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_bleed_upgrade.json index 5a061ca..7b3601f 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_bleed_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_bleed_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:purple_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_durability_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_durability_upgrade.json index 321d75b..ab70291 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_durability_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_durability_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:purple_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_enderic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_enderic_upgrade.json index 04afcae..a351da2 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_enderic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_enderic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:purple_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_quick_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_quick_upgrade.json index e905bf9..b721e6d 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_quick_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_quick_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:purple_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_range_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_range_upgrade.json index a9f5394..7e5e8ab 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_range_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/purple/hookshot_range_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:purple_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_aquatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_aquatic_upgrade.json index e798c91..61f2380 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_aquatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_aquatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:red_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_automatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_automatic_upgrade.json index 7b502d4..7eb1f38 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_automatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_automatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:red_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_bleed_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_bleed_upgrade.json index 7efe8e6..f4ff241 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_bleed_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_bleed_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:red_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_durability_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_durability_upgrade.json index 7161c04..6769017 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_durability_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_durability_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:red_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_enderic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_enderic_upgrade.json index 80e3a42..7cda4ce 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_enderic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_enderic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:red_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_quick_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_quick_upgrade.json index abb403e..7132b72 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_quick_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_quick_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:red_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_range_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_range_upgrade.json index dd6f26e..cf12b70 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_range_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/red/hookshot_range_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:red_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_aquatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_aquatic_upgrade.json index 3005f16..b5ad257 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_aquatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_aquatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:white_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_automatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_automatic_upgrade.json index 4b40a14..6e8f766 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_automatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_automatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:white_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_bleed_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_bleed_upgrade.json index cdab79b..b296e5d 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_bleed_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_bleed_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:white_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_durability_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_durability_upgrade.json index 280878f..4aa0a0c 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_durability_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_durability_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:white_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_enderic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_enderic_upgrade.json index f93991e..a6d2077 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_enderic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_enderic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:white_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_quick_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_quick_upgrade.json index 694fd58..39963d4 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_quick_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_quick_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:white_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_range_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_range_upgrade.json index 21e4f8f..c855073 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_range_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/white/hookshot_range_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:white_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_aquatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_aquatic_upgrade.json index 1152d8b..1a75338 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_aquatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_aquatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:yellow_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_automatic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_automatic_upgrade.json index b5c7b94..b7466b5 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_automatic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_automatic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:yellow_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_bleed_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_bleed_upgrade.json index c031708..80fb1b2 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_bleed_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_bleed_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:yellow_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_durability_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_durability_upgrade.json index 4923853..8d50c50 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_durability_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_durability_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:yellow_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_enderic_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_enderic_upgrade.json index 6c8c79f..78f6de3 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_enderic_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_enderic_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:yellow_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_quick_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_quick_upgrade.json index 6ff6de3..d3c4865 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_quick_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_quick_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:yellow_hookshot" diff --git a/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_range_upgrade.json b/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_range_upgrade.json index d1117f1..6be434c 100644 --- a/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_range_upgrade.json +++ b/src/main/resources/data/hookshot/recipes/upgrades/yellow/hookshot_range_upgrade.json @@ -1,5 +1,9 @@ { "type": "hookshot:smithing", + "template": + { + "item": "minecraft:iron_ingot" + }, "base": { "item": "hookshot:yellow_hookshot" From b83f66b7825f6c0045d36bc7cf911ab53144de52 Mon Sep 17 00:00:00 2001 From: AzulConspirator Date: Thu, 7 Sep 2023 17:31:18 +0800 Subject: [PATCH 5/6] Smithing Upgrade fix, works as intended --- .../hookshot/core/util/recipe/HookshotSmithingRecipe.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/dev/cammiescorner/hookshot/core/util/recipe/HookshotSmithingRecipe.java b/src/main/java/dev/cammiescorner/hookshot/core/util/recipe/HookshotSmithingRecipe.java index 2ca537b..d9fb97a 100644 --- a/src/main/java/dev/cammiescorner/hookshot/core/util/recipe/HookshotSmithingRecipe.java +++ b/src/main/java/dev/cammiescorner/hookshot/core/util/recipe/HookshotSmithingRecipe.java @@ -28,11 +28,12 @@ public HookshotSmithingRecipe(Identifier id,Ingredient template, Ingredient base @Override public ItemStack craft(Inventory inv, DynamicRegistryManager registryManager) { ItemStack stack = ((SmithingRecipeAccessor) this).getOutput().copy(); - NbtCompound tag = inv.getStack(0).getNbt(); + NbtCompound tag = inv.getStack(1).getNbt(); if(tag != null) - stack.getOrCreateNbt().copyFrom(tag); - + { + stack.getOrCreateNbt().copyFrom(tag).copy(); + } return stack; } From f95c100b40b06ce686a669aaa153b48568bed42d Mon Sep 17 00:00:00 2001 From: AzulConspirator Date: Fri, 8 Sep 2023 05:53:41 +0800 Subject: [PATCH 6/6] Bleed Upgrade fix --- .../common/entity/HookshotEntity.java | 10 +++++--- .../core/registry/ModDamageSource.java | 23 ------------------- .../core/registry/ModDamageTypes.java | 18 +++++++++++++++ .../hookshot/damage_type/hookbleeding.json | 5 ++++ .../tags/damage_type/bypasses_armor.json | 6 +++++ .../tags/damage_type/bypasses_shield.json | 6 +++++ 6 files changed, 42 insertions(+), 26 deletions(-) delete mode 100644 src/main/java/dev/cammiescorner/hookshot/core/registry/ModDamageSource.java create mode 100644 src/main/java/dev/cammiescorner/hookshot/core/registry/ModDamageTypes.java create mode 100644 src/main/resources/data/hookshot/damage_type/hookbleeding.json create mode 100644 src/main/resources/data/minecraft/tags/damage_type/bypasses_armor.json create mode 100644 src/main/resources/data/minecraft/tags/damage_type/bypasses_shield.json diff --git a/src/main/java/dev/cammiescorner/hookshot/common/entity/HookshotEntity.java b/src/main/java/dev/cammiescorner/hookshot/common/entity/HookshotEntity.java index d9857ea..e994b18 100644 --- a/src/main/java/dev/cammiescorner/hookshot/common/entity/HookshotEntity.java +++ b/src/main/java/dev/cammiescorner/hookshot/common/entity/HookshotEntity.java @@ -3,6 +3,7 @@ import dev.cammiescorner.hookshot.Hookshot; import dev.cammiescorner.hookshot.common.item.HookshotItem; import dev.cammiescorner.hookshot.core.integration.HookshotConfig; +import dev.cammiescorner.hookshot.core.registry.ModDamageTypes; //import dev.cammiescorner.hookshot.core.registry.ModDamageSource; import dev.cammiescorner.hookshot.core.registry.ModEntities; import dev.cammiescorner.hookshot.core.registry.ModSoundEvents; @@ -13,6 +14,7 @@ import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.boss.dragon.EnderDragonPart; +import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.data.DataTracker; import net.minecraft.entity.data.TrackedData; import net.minecraft.entity.data.TrackedDataHandlerRegistry; @@ -83,8 +85,9 @@ public void tick() { onRemoved(); } else { - //if(UpgradesHelper.hasBleedUpgrade(stack) && age % 20 == 0) - // hookedEntity.damage(ModDamageSource.bleed(this, owner), 1); + if(UpgradesHelper.hasBleedUpgrade(stack) && age % 20 == 0) + hookedEntity.damage(ModDamageTypes.of(world, ModDamageTypes.HOOKBLEEDING), 1.0f); + //hookedEntity.damage(ModDamageSource.bleed(this, owner), 1); this.updatePosition(this.hookedEntity.getX(), this.hookedEntity.getBodyY(0.8D), this.hookedEntity.getZ()); } @@ -222,7 +225,8 @@ protected void onEntityHit(EntityHitResult entityHitResult) { isPulling = true; } - //if(hookedEntity != null && UpgradesHelper.hasBleedUpgrade(stack)) + if(hookedEntity != null && UpgradesHelper.hasBleedUpgrade(stack)) + hookedEntity.damage(ModDamageTypes.of(world, ModDamageTypes.HOOKBLEEDING), 1.0f); // hookedEntity.damage(ModDamageSource.bleed(this, owner), 1); if(UpgradesHelper.hasEndericUpgrade(stack)) { diff --git a/src/main/java/dev/cammiescorner/hookshot/core/registry/ModDamageSource.java b/src/main/java/dev/cammiescorner/hookshot/core/registry/ModDamageSource.java deleted file mode 100644 index e3dc815..0000000 --- a/src/main/java/dev/cammiescorner/hookshot/core/registry/ModDamageSource.java +++ /dev/null @@ -1,23 +0,0 @@ -package dev.cammiescorner.hookshot.core.registry; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.damage.DamageSource; -import net.minecraft.entity.damage.DamageType; -import net.minecraft.entity.projectile.PersistentProjectileEntity; -import net.minecraft.registry.entry.RegistryEntry; - -import org.jetbrains.annotations.Nullable; - -public class ModDamageSource { - public static DamageSource bleed(PersistentProjectileEntity projectile, Entity attacker) { - return new BleedingDamageSource(projectile, attacker); - } - - public static class BleedingDamageSource extends DamageSource { - public BleedingDamageSource(Entity projectile, @Nullable Entity attacker) { - super((RegistryEntry) projectile, attacker); - //setBypassesArmor(); - //setUnblockable(); - } - } -} diff --git a/src/main/java/dev/cammiescorner/hookshot/core/registry/ModDamageTypes.java b/src/main/java/dev/cammiescorner/hookshot/core/registry/ModDamageTypes.java new file mode 100644 index 0000000..d7796d3 --- /dev/null +++ b/src/main/java/dev/cammiescorner/hookshot/core/registry/ModDamageTypes.java @@ -0,0 +1,18 @@ +package dev.cammiescorner.hookshot.core.registry; + +import dev.cammiescorner.hookshot.*; +import net.minecraft.entity.damage.DamageSource; +import net.minecraft.entity.damage.DamageType; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; +import net.minecraft.world.World; + +public interface ModDamageTypes +{ + public static final RegistryKey HOOKBLEEDING = RegistryKey.of(RegistryKeys.DAMAGE_TYPE, new Identifier(Hookshot.MOD_ID, "hookbleeding")); + + public static DamageSource of(World world, RegistryKey key) { + return new DamageSource(world.getRegistryManager().get(RegistryKeys.DAMAGE_TYPE).entryOf(key)); + } +} \ No newline at end of file diff --git a/src/main/resources/data/hookshot/damage_type/hookbleeding.json b/src/main/resources/data/hookshot/damage_type/hookbleeding.json new file mode 100644 index 0000000..166fe49 --- /dev/null +++ b/src/main/resources/data/hookshot/damage_type/hookbleeding.json @@ -0,0 +1,5 @@ +{ + "exhaustion": 0.1, + "message_id": "hookshot", + "scaling": "when_caused_by_living_non_player" +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/damage_type/bypasses_armor.json b/src/main/resources/data/minecraft/tags/damage_type/bypasses_armor.json new file mode 100644 index 0000000..86605c7 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/damage_type/bypasses_armor.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "hookshot:hookbleeding" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/damage_type/bypasses_shield.json b/src/main/resources/data/minecraft/tags/damage_type/bypasses_shield.json new file mode 100644 index 0000000..86605c7 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/damage_type/bypasses_shield.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "hookshot:hookbleeding" + ] +} \ No newline at end of file