From f6d06346b7a3907a2d8183b4d000e6525dc8a1ad Mon Sep 17 00:00:00 2001 From: Sunskimmer822 <92886026+Sunskimmer822@users.noreply.github.com> Date: Sat, 19 Mar 2022 00:55:14 -0500 Subject: [PATCH] blaze metal stuff --- .../java/net/serenas/shitmod/Shitmod.java | 14 ++++++++++- .../net/serenas/shitmod/searedGoldIngot.java | 11 +++++++++ .../serenas/shitmod/totemOfEquivalency.java | 3 ++- .../data/shitmod/recipes/gold_axe.json | 2 +- .../data/shitmod/recipes/gold_hoe.json | 2 +- .../data/shitmod/recipes/gold_pickaxe.json | 2 +- .../data/shitmod/recipes/gold_shovel.json | 2 +- .../data/shitmod/recipes/gold_sword.json | 2 +- .../shitmod/recipes/gold_to_diamond_axe.json | 2 +- .../shitmod/recipes/gold_to_diamond_hoe.json | 2 +- .../recipes/gold_to_diamond_pickaxe.json | 2 +- .../recipes/gold_to_diamond_shovel.json | 2 +- .../recipes/gold_to_diamond_sword.json | 2 +- .../recipes/pulverized_blaze_metal.json | 20 ++++++++++++++++ .../data/shitmod/recipes/pulverized_gold.json | 9 +++++++ .../shitmod/recipes/pulverized_netherite.json | 9 +++++++ .../recipes/reinforced_blaze_metal_ingot.json | 24 +++++++++++++++++++ 17 files changed, 98 insertions(+), 12 deletions(-) create mode 100644 src/main/java/net/serenas/shitmod/searedGoldIngot.java create mode 100644 src/main/resources/data/shitmod/recipes/pulverized_blaze_metal.json create mode 100644 src/main/resources/data/shitmod/recipes/pulverized_gold.json create mode 100644 src/main/resources/data/shitmod/recipes/pulverized_netherite.json create mode 100644 src/main/resources/data/shitmod/recipes/reinforced_blaze_metal_ingot.json diff --git a/src/main/java/net/serenas/shitmod/Shitmod.java b/src/main/java/net/serenas/shitmod/Shitmod.java index c2b9435..a5daf4b 100644 --- a/src/main/java/net/serenas/shitmod/Shitmod.java +++ b/src/main/java/net/serenas/shitmod/Shitmod.java @@ -103,7 +103,13 @@ public class Shitmod implements ModInitializer { public static final Item BLAZE_METAL_HOE_CASING = new blazeMetalHoeCasing(new Item.Settings().fireproof().group(Shitmod.GENERAL_GROUP)); - public static final Item POTATO_CHIPS = new potatoChips(new Item.Settings().group(ItemGroup.FOOD)); + public static final Item POTATO_CHIPS = new potatoChips(new Item.Settings().group(ItemGroup.FOOD).maxCount(69)); + + public static final Item PULVERIZED_BLAZE_METAL = new pulverizedBlazeMetal(new Item.Settings().fireproof().group(Shitmod.GENERAL_GROUP)); + + public static final Item SEARED_GOLD_INGOT = new searedGoldIngot(new Item.Settings().fireproof().group(Shitmod.GENERAL_GROUP)); + + public static final Item PULVERIZED_NETHERITE = new pulverizedNetherite(new Item.Settings().fireproof().group(Shitmod.GENERAL_GROUP)); @Override public void onInitialize() { @@ -177,6 +183,12 @@ public class Shitmod implements ModInitializer { Registry.register(Registry.ITEM, new Identifier("shitmod", "potato_chip"), POTATO_CHIPS); + Registry.register(Registry.ITEM, new Identifier("shitmod", "pulverized_blaze_metal"), PULVERIZED_BLAZE_METAL); + + Registry.register(Registry.ITEM, new Identifier("shitmod", "pulverized_netherite"), PULVERIZED_NETHERITE); + + Registry.register(Registry.ITEM, new Identifier("shitmod", "seared_gold_ingot"), SEARED_GOLD_INGOT); + CustomPortalBuilder.beginPortal() .frameBlock(Shitmod.FABRIC_BLOCK) .lightWithItem(Shitmod.BLAZE_METAL_INGOT) diff --git a/src/main/java/net/serenas/shitmod/searedGoldIngot.java b/src/main/java/net/serenas/shitmod/searedGoldIngot.java new file mode 100644 index 0000000..b96afa7 --- /dev/null +++ b/src/main/java/net/serenas/shitmod/searedGoldIngot.java @@ -0,0 +1,11 @@ +package net.serenas.shitmod; + +import net.minecraft.item.Item; + +public class searedGoldIngot extends Item{ + + public searedGoldIngot(Settings settings) { + super(settings); + } + +} diff --git a/src/main/java/net/serenas/shitmod/totemOfEquivalency.java b/src/main/java/net/serenas/shitmod/totemOfEquivalency.java index 14dfb12..d4a2196 100644 --- a/src/main/java/net/serenas/shitmod/totemOfEquivalency.java +++ b/src/main/java/net/serenas/shitmod/totemOfEquivalency.java @@ -15,7 +15,8 @@ public class totemOfEquivalency extends Item { public totemOfEquivalency(Settings settings) { super(settings); } - + + @Override public TypedActionResult use(World World, PlayerEntity PlayerEntity, Hand Hand) { PlayerEntity.kill(); diff --git a/src/main/resources/data/shitmod/recipes/gold_axe.json b/src/main/resources/data/shitmod/recipes/gold_axe.json index e9afca7..1981aa6 100644 --- a/src/main/resources/data/shitmod/recipes/gold_axe.json +++ b/src/main/resources/data/shitmod/recipes/gold_axe.json @@ -2,5 +2,5 @@ "type": "minecraft:smithing", "base": {"item":"minecraft:stone_axe"}, "addition": {"item":"minecraft:gold_ingot"}, - "result": {"item":"minecraft:gold_axe"} + "result": {"item":"minecraft:golden_axe"} } \ No newline at end of file diff --git a/src/main/resources/data/shitmod/recipes/gold_hoe.json b/src/main/resources/data/shitmod/recipes/gold_hoe.json index 45d80fe..4e0866d 100644 --- a/src/main/resources/data/shitmod/recipes/gold_hoe.json +++ b/src/main/resources/data/shitmod/recipes/gold_hoe.json @@ -2,5 +2,5 @@ "type": "minecraft:smithing", "base": {"item":"minecraft:stone_hoe"}, "addition": {"item":"minecraft:gold_ingot"}, - "result": {"item":"minecraft:gold_hoe"} + "result": {"item":"minecraft:golden_hoe"} } \ No newline at end of file diff --git a/src/main/resources/data/shitmod/recipes/gold_pickaxe.json b/src/main/resources/data/shitmod/recipes/gold_pickaxe.json index 192892d..1e1eaaf 100644 --- a/src/main/resources/data/shitmod/recipes/gold_pickaxe.json +++ b/src/main/resources/data/shitmod/recipes/gold_pickaxe.json @@ -2,5 +2,5 @@ "type": "minecraft:smithing", "base": {"item":"minecraft:stone_pickaxe"}, "addition": {"item":"minecraft:gold_ingot"}, - "result": {"item":"minecraft:gold_pickaxe"} + "result": {"item":"minecraft:golden_pickaxe"} } \ No newline at end of file diff --git a/src/main/resources/data/shitmod/recipes/gold_shovel.json b/src/main/resources/data/shitmod/recipes/gold_shovel.json index 28aec71..c1e90af 100644 --- a/src/main/resources/data/shitmod/recipes/gold_shovel.json +++ b/src/main/resources/data/shitmod/recipes/gold_shovel.json @@ -2,5 +2,5 @@ "type": "minecraft:smithing", "base": {"item":"minecraft:stone_shovel"}, "addition": {"item":"minecraft:gold_ingot"}, - "result": {"item":"minecraft:gold_shovel"} + "result": {"item":"minecraft:golden_shovel"} } \ No newline at end of file diff --git a/src/main/resources/data/shitmod/recipes/gold_sword.json b/src/main/resources/data/shitmod/recipes/gold_sword.json index 3811a8d..3720cbc 100644 --- a/src/main/resources/data/shitmod/recipes/gold_sword.json +++ b/src/main/resources/data/shitmod/recipes/gold_sword.json @@ -2,5 +2,5 @@ "type": "minecraft:smithing", "base": {"item":"minecraft:stone_sword"}, "addition": {"item":"minecraft:gold_ingot"}, - "result": {"item":"minecraft:gold_sword"} + "result": {"item":"minecraft:golden_sword"} } \ No newline at end of file diff --git a/src/main/resources/data/shitmod/recipes/gold_to_diamond_axe.json b/src/main/resources/data/shitmod/recipes/gold_to_diamond_axe.json index 776ef80..ce2878f 100644 --- a/src/main/resources/data/shitmod/recipes/gold_to_diamond_axe.json +++ b/src/main/resources/data/shitmod/recipes/gold_to_diamond_axe.json @@ -1,6 +1,6 @@ { "type": "minecraft:smithing", - "base": {"item":"minecraft:gold_axe"}, + "base": {"item":"minecraft:golden_axe"}, "addition": {"item":"minecraft:diamond"}, "result": {"item":"minecraft:diamond_axe"} } diff --git a/src/main/resources/data/shitmod/recipes/gold_to_diamond_hoe.json b/src/main/resources/data/shitmod/recipes/gold_to_diamond_hoe.json index 8642bf5..2f6eefc 100644 --- a/src/main/resources/data/shitmod/recipes/gold_to_diamond_hoe.json +++ b/src/main/resources/data/shitmod/recipes/gold_to_diamond_hoe.json @@ -1,6 +1,6 @@ { "type": "minecraft:smithing", - "base": {"item":"minecraft:gold_hoe"}, + "base": {"item":"minecraft:golden_hoe"}, "addition": {"item":"minecraft:diamond"}, "result": {"item":"minecraft:diamond_hoe"} } diff --git a/src/main/resources/data/shitmod/recipes/gold_to_diamond_pickaxe.json b/src/main/resources/data/shitmod/recipes/gold_to_diamond_pickaxe.json index 93a5f42..a689279 100644 --- a/src/main/resources/data/shitmod/recipes/gold_to_diamond_pickaxe.json +++ b/src/main/resources/data/shitmod/recipes/gold_to_diamond_pickaxe.json @@ -1,6 +1,6 @@ { "type": "minecraft:smithing", - "base": {"item":"minecraft:gold_pickaxe"}, + "base": {"item":"minecraft:golden_pickaxe"}, "addition": {"item":"minecraft:diamond"}, "result": {"item":"minecraft:diamond_pickaxe"} } diff --git a/src/main/resources/data/shitmod/recipes/gold_to_diamond_shovel.json b/src/main/resources/data/shitmod/recipes/gold_to_diamond_shovel.json index 2bb6082..063b453 100644 --- a/src/main/resources/data/shitmod/recipes/gold_to_diamond_shovel.json +++ b/src/main/resources/data/shitmod/recipes/gold_to_diamond_shovel.json @@ -1,6 +1,6 @@ { "type": "minecraft:smithing", - "base": {"item":"minecraft:gold_shovel"}, + "base": {"item":"minecraft:golden_shovel"}, "addition": {"item":"minecraft:diamond"}, "result": {"item":"minecraft:diamond_shovel"} } diff --git a/src/main/resources/data/shitmod/recipes/gold_to_diamond_sword.json b/src/main/resources/data/shitmod/recipes/gold_to_diamond_sword.json index d5af960..6fcbf76 100644 --- a/src/main/resources/data/shitmod/recipes/gold_to_diamond_sword.json +++ b/src/main/resources/data/shitmod/recipes/gold_to_diamond_sword.json @@ -1,6 +1,6 @@ { "type": "minecraft:smithing", - "base": {"item":"minecraft:gold_sword"}, + "base": {"item":"minecraft:golden_sword"}, "addition": {"item":"minecraft:diamond"}, "result": {"item":"minecraft:diamond_sword"} } diff --git a/src/main/resources/data/shitmod/recipes/pulverized_blaze_metal.json b/src/main/resources/data/shitmod/recipes/pulverized_blaze_metal.json new file mode 100644 index 0000000..3a3d1d8 --- /dev/null +++ b/src/main/resources/data/shitmod/recipes/pulverized_blaze_metal.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "RX ", + " ", + " " + ], + "key": { + "X": { + "item": "shitmod:pulverized_netherite" + }, + "R": { + "item": "shitmod:seared_gold_ingot" + } + }, + "result": { + "item": "shitmod:pulverized_blaze_metal", + "count": 1 + } + } \ No newline at end of file diff --git a/src/main/resources/data/shitmod/recipes/pulverized_gold.json b/src/main/resources/data/shitmod/recipes/pulverized_gold.json new file mode 100644 index 0000000..6e2a452 --- /dev/null +++ b/src/main/resources/data/shitmod/recipes/pulverized_gold.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "minecraft:gold_ingot" + }, + "result": "shitmod:seared_gold_ingot", + "experience": 0.1, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/main/resources/data/shitmod/recipes/pulverized_netherite.json b/src/main/resources/data/shitmod/recipes/pulverized_netherite.json new file mode 100644 index 0000000..73dcaf5 --- /dev/null +++ b/src/main/resources/data/shitmod/recipes/pulverized_netherite.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "minecraft:netherite_ingot" + }, + "result": "shitmod:pulverized_netherite", + "experience": 0.1, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/main/resources/data/shitmod/recipes/reinforced_blaze_metal_ingot.json b/src/main/resources/data/shitmod/recipes/reinforced_blaze_metal_ingot.json new file mode 100644 index 0000000..f42a1c8 --- /dev/null +++ b/src/main/resources/data/shitmod/recipes/reinforced_blaze_metal_ingot.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "shitmod:blaze_metal_ingot" + }, + { + "item": "shitmod:blaze_metal_ingot" + }, + { + "item": "shitmod:blaze_metal_ingot" + }, + { + "item": "shitmod:blaze_metal_ingot" + }, + { + "item": "shitmod:pulverized_blaze_metal" + } + ], + "result": { + "item": "shitmod:reinforced_blaze_metal_ingot", + "count": 1 + } +} \ No newline at end of file