From 5b33204e072f965dc755356353d0c110f65e7486 Mon Sep 17 00:00:00 2001 From: Sunskimmer82 <92886026+Sunskimmer822@users.noreply.github.com> Date: Sat, 11 Jun 2022 11:43:54 -0500 Subject: [PATCH] stuff --- .../java/net/serenas/shitmod/Shitmod.java | 30 ++++++++++---- .../net/serenas/shitmod/blazeMetalHoe.java | 8 ++-- .../net/serenas/shitmod/copperMaterial.java | 41 +++++++++++++++++++ .../net/serenas/shitmod/kingsoulEffect.java | 25 ----------- .../resources/assets/shitmod/lang/en_us.json | 15 +++++-- .../shitmod/models/item/fabric_block.json | 3 -- .../assets/shitmod/models/item/gay_block.json | 3 ++ .../models/item/{fabric_item.json => pp.json} | 2 +- .../{fabric_block.json => gay_block.json} | 2 +- .../data/shitmod/portals/gayportal.json | 11 ----- .../data/shitmod/recipes/bedrock.json | 2 +- .../data/shitmod/recipes/fabric_item.json | 4 +- .../{fabric_block.json => gay_block.json} | 2 +- .../data/shitmod/recipes/hausbommer.json | 4 +- .../data/shitmod/tags/items/pickaxes.json | 3 +- 15 files changed, 92 insertions(+), 63 deletions(-) create mode 100644 src/main/java/net/serenas/shitmod/copperMaterial.java delete mode 100644 src/main/java/net/serenas/shitmod/kingsoulEffect.java delete mode 100644 src/main/resources/assets/shitmod/models/item/fabric_block.json create mode 100644 src/main/resources/assets/shitmod/models/item/gay_block.json rename src/main/resources/assets/shitmod/models/item/{fabric_item.json => pp.json} (55%) rename src/main/resources/data/shitmod/loot_tables/blocks/{fabric_block.json => gay_block.json} (88%) delete mode 100644 src/main/resources/data/shitmod/portals/gayportal.json rename src/main/resources/data/shitmod/recipes/{fabric_block.json => gay_block.json} (87%) diff --git a/src/main/java/net/serenas/shitmod/Shitmod.java b/src/main/java/net/serenas/shitmod/Shitmod.java index a702062..544677c 100644 --- a/src/main/java/net/serenas/shitmod/Shitmod.java +++ b/src/main/java/net/serenas/shitmod/Shitmod.java @@ -51,8 +51,6 @@ public class Shitmod implements ModInitializer { public static final Item KINGSOUL_CHARM = new kingsoul(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxDamage(500).fireproof()); - public static final StatusEffect KINGSOUL_CHARM_EFFECT = new kingsoulEffect(); - public static final Item STALWART_SHELL_CHARM = new stalwartShell(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxDamage(500).fireproof()); public static final Item FRAGILE_HEART_CHARM = new fragileHeartCharm(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxDamage(100).fireproof()); @@ -79,7 +77,7 @@ public class Shitmod implements ModInitializer { public static final ToolItem BLAZE_METAL_SHOVEL = new ShovelItem(blazeMetalMaterial.INSTANCE, 1f, 3.0f, new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(8000)); - public static final ToolItem BLAZE_METAL_HOE = new blazeMetalHoe(blazeMetalMaterial.INSTANCE, new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(8000)); + public static final ToolItem BLAZE_METAL_HOE = new blazeMetalHoe(blazeMetalMaterial.INSTANCE, -4, 1f, new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(8000)); public static final Item BLAZE_METAL_INGOT = new blazeMetalIngot(new Item.Settings().group(Shitmod.GENERAL_GROUP)); @@ -107,12 +105,22 @@ public class Shitmod implements ModInitializer { public static final Item PULVERIZED_NETHERITE = new pulverizedNetherite(new Item.Settings().fireproof().group(Shitmod.GENERAL_GROUP)); + public static final ToolItem COPPER_SWORD = new copperSword(copperMaterial.INSTANCE, 2, -2.4f, new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(250)); + + public static final ToolItem COPPER_PICKAXE = new copperPickaxe(copperMaterial.INSTANCE, 0, -2.8f, new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(250)); + + public static final ToolItem COPPER_AXE = new copperAxe(copperMaterial.INSTANCE, 5, -3.1f, new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(250)); + + public static final ToolItem COPPER_SHOVEL = new copperShovel(copperMaterial.INSTANCE, 0.5f, -3f, new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(250)); + + public static final ToolItem COPPER_HOE = new copperHoe(copperMaterial.INSTANCE, -3, -1f, new Item.Settings().group(Shitmod.TOOLS_GROUP).maxDamage(250)); + @Override public void onInitialize() { - Registry.register(Registry.ITEM, new Identifier("shitmod", "fabric_item"), FABRIC_ITEM); + Registry.register(Registry.ITEM, new Identifier("shitmod", "pp"), FABRIC_ITEM); - Registry.register(Registry.BLOCK, new Identifier("shitmod", "fabric_block"), FABRIC_BLOCK); + Registry.register(Registry.BLOCK, new Identifier("shitmod", "gay_block"), FABRIC_BLOCK); Registry.register(Registry.ITEM, new Identifier("shitmod", "fabric_block"), new BlockItem(FABRIC_BLOCK, new FabricItemSettings().group(ItemGroup.MISC))); Registry.register(Registry.ITEM, new Identifier("shitmod", "hausbommer"), HAUSBOMMER_ITEM); @@ -127,8 +135,6 @@ public class Shitmod implements ModInitializer { Registry.register(Registry.ITEM, new Identifier("shitmod", "kingsoul_charm"), KINGSOUL_CHARM); - Registry.register(Registry.STATUS_EFFECT, new Identifier("shitmod", "kingsoul_charm"), KINGSOUL_CHARM_EFFECT); - Registry.register(Registry.ITEM, new Identifier("shitmod", "stalwart_shell_charm"), STALWART_SHELL_CHARM); Registry.register(Registry.ITEM, new Identifier("shitmod", "fragile_heart_charm"), FRAGILE_HEART_CHARM); @@ -182,6 +188,16 @@ public class Shitmod implements ModInitializer { Registry.register(Registry.ITEM, new Identifier("shitmod", "pulverized_netherite"), PULVERIZED_NETHERITE); Registry.register(Registry.ITEM, new Identifier("shitmod", "seared_gold_ingot"), SEARED_GOLD_INGOT); + + Registry.register(Registry.ITEM, new Identifier("shitmod", "copper_sword"), COPPER_SWORD); + + Registry.register(Registry.ITEM, new Identifier("shitmod", "copper_pickaxe"), COPPER_PICKAXE); + + Registry.register(Registry.ITEM, new Identifier("shitmod", "copper_axe"), COPPER_AXE); + + Registry.register(Registry.ITEM, new Identifier("shitmod", "copper_shovel"), COPPER_SHOVEL); + + Registry.register(Registry.ITEM, new Identifier("shitmod", "copper_hoe"), COPPER_HOE); } diff --git a/src/main/java/net/serenas/shitmod/blazeMetalHoe.java b/src/main/java/net/serenas/shitmod/blazeMetalHoe.java index f8ab060..a2dc80b 100644 --- a/src/main/java/net/serenas/shitmod/blazeMetalHoe.java +++ b/src/main/java/net/serenas/shitmod/blazeMetalHoe.java @@ -1,12 +1,12 @@ package net.serenas.shitmod; -import net.minecraft.item.ToolItem; +import net.minecraft.item.HoeItem; import net.minecraft.item.ToolMaterial; -public class blazeMetalHoe extends ToolItem { +public class blazeMetalHoe extends HoeItem { - public blazeMetalHoe(ToolMaterial material, Settings settings) { - super(material, settings); + public blazeMetalHoe(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) { + super(material, attackDamage, attackSpeed, settings); } } diff --git a/src/main/java/net/serenas/shitmod/copperMaterial.java b/src/main/java/net/serenas/shitmod/copperMaterial.java new file mode 100644 index 0000000..62c0971 --- /dev/null +++ b/src/main/java/net/serenas/shitmod/copperMaterial.java @@ -0,0 +1,41 @@ +package net.serenas.shitmod; + +import net.minecraft.item.Items; +import net.minecraft.item.ToolMaterial; +import net.minecraft.recipe.Ingredient; + +public class copperMaterial implements ToolMaterial { + + public static final copperMaterial INSTANCE = new copperMaterial(); + + @Override + public int getDurability() { + return 250; + } + + @Override + public float getMiningSpeedMultiplier() { + return 6.0f; + } + + @Override + public float getAttackDamage() { + return 3.0f; + } + + @Override + public int getMiningLevel() { + return 2; + } + + @Override + public int getEnchantability() { + return 44; + } + + @Override + public Ingredient getRepairIngredient() { + return Ingredient.ofItems(Items.COPPER_INGOT); + } + +} diff --git a/src/main/java/net/serenas/shitmod/kingsoulEffect.java b/src/main/java/net/serenas/shitmod/kingsoulEffect.java deleted file mode 100644 index f282fdc..0000000 --- a/src/main/java/net/serenas/shitmod/kingsoulEffect.java +++ /dev/null @@ -1,25 +0,0 @@ -package net.serenas.shitmod; - -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.effect.StatusEffect; -import net.minecraft.entity.effect.StatusEffectCategory; -import net.minecraft.entity.player.PlayerEntity; - -public class kingsoulEffect extends StatusEffect{ - - public kingsoulEffect() { - super(StatusEffectCategory.BENEFICIAL, 0x98D982); - - } - @Override - public boolean canApplyUpdateEffect(int duration, int amplifier) { - return true; - } - PlayerEntity playerentity; - @Override - public void applyUpdateEffect(LivingEntity entity, int amplifier) { - if (entity instanceof PlayerEntity) { - playerentity.getHungerManager().add(1, 1); - } - } -} diff --git a/src/main/resources/assets/shitmod/lang/en_us.json b/src/main/resources/assets/shitmod/lang/en_us.json index 3a705ba..9cca8fc 100644 --- a/src/main/resources/assets/shitmod/lang/en_us.json +++ b/src/main/resources/assets/shitmod/lang/en_us.json @@ -1,13 +1,13 @@ { - "item.shitmod.fabric_item": "Penis", - "block.shitmod.fabric_block": "Gay Block", + "item.shitmod.pp": "Penis", + "block.shitmod.gay_block": "Gay Block", "item.shitmod.hausbommer": "Hausbommer", "effect.shitmod.exp": "Experience", "effect.shitmod.lean": "Lean", "item.shitmod.lean": "Lean", "item.shitmod.orange_juice": "Orange Juice", "item.shitmod.kingsoul_charm": "Kingsoul Charm", - "itemGroup.shitmod.charms": "Charms", + "itemGroup.shitmod.charms": "Shitmod Charms", "item.shitmod.stalwart_shell_charm": "Stalwart Shell Charm", "entity.minecraft.mooshroom": "Drug Cow", "item.shitmod.potato_chip": "Potato Chips", @@ -33,5 +33,12 @@ "item.shitmod.blaze_metal_pickaxe": "Blaze Metal Pickaxe", "item.shitmod.blaze_metal_axe": "Blaze Metal Axe", "item.shitmod.blaze_metal_shovel": "Blaze Metal Shovel", - "item.shitmod.blaze_metal_hoe": "Blaze Metal Hoe" + "item.shitmod.blaze_metal_hoe": "Blaze Metal Hoe", + "item.shitmod.copper_sword": "Copper Sword", + "item.shitmod.copper_pickaxe": "Copper Pickaxe", + "item.shitmod.copper_axe": "Copper Axe", + "item.shitmod.copper_shovel": "Copper Shovel", + "item.shitmod.copper_hoe": "Copper Hoe", + "itemGroup.shitmod.general": "Shitmod Misc", + "itemGroup.shitmod.tools": "Shitmod Tools" } \ No newline at end of file diff --git a/src/main/resources/assets/shitmod/models/item/fabric_block.json b/src/main/resources/assets/shitmod/models/item/fabric_block.json deleted file mode 100644 index cefb92b..0000000 --- a/src/main/resources/assets/shitmod/models/item/fabric_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "shitmod:block/fabric_block" -} \ No newline at end of file diff --git a/src/main/resources/assets/shitmod/models/item/gay_block.json b/src/main/resources/assets/shitmod/models/item/gay_block.json new file mode 100644 index 0000000..fb4feb9 --- /dev/null +++ b/src/main/resources/assets/shitmod/models/item/gay_block.json @@ -0,0 +1,3 @@ +{ + "parent": "shitmod:block/gay_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/shitmod/models/item/fabric_item.json b/src/main/resources/assets/shitmod/models/item/pp.json similarity index 55% rename from src/main/resources/assets/shitmod/models/item/fabric_item.json rename to src/main/resources/assets/shitmod/models/item/pp.json index cff27d5..10fc00a 100644 --- a/src/main/resources/assets/shitmod/models/item/fabric_item.json +++ b/src/main/resources/assets/shitmod/models/item/pp.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "shitmod:item/fabric_item" + "layer0": "shitmod:item/pp" } } \ No newline at end of file diff --git a/src/main/resources/data/shitmod/loot_tables/blocks/fabric_block.json b/src/main/resources/data/shitmod/loot_tables/blocks/gay_block.json similarity index 88% rename from src/main/resources/data/shitmod/loot_tables/blocks/fabric_block.json rename to src/main/resources/data/shitmod/loot_tables/blocks/gay_block.json index 703df4f..1120476 100644 --- a/src/main/resources/data/shitmod/loot_tables/blocks/fabric_block.json +++ b/src/main/resources/data/shitmod/loot_tables/blocks/gay_block.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "shitmod:fabric_block", + "name": "shitmod:gay_block", "functions": [ { "function": "minecraft:set_count", diff --git a/src/main/resources/data/shitmod/portals/gayportal.json b/src/main/resources/data/shitmod/portals/gayportal.json deleted file mode 100644 index 9483c02..0000000 --- a/src/main/resources/data/shitmod/portals/gayportal.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "block": "shitmod:fabric_block", - "dim": "minecraft:the_end", - "ignitionType": "ITEM", - "ignitionSource": "shitmod:fabric_item", - "r": 255, - "g": 192, - "b": 203 - } - - \ No newline at end of file diff --git a/src/main/resources/data/shitmod/recipes/bedrock.json b/src/main/resources/data/shitmod/recipes/bedrock.json index 864e5c4..3e317cc 100644 --- a/src/main/resources/data/shitmod/recipes/bedrock.json +++ b/src/main/resources/data/shitmod/recipes/bedrock.json @@ -7,7 +7,7 @@ ], "key": { "X": { - "item": "shitmod:fabric_block" + "item": "shitmod:gay_block" }, "R": { "item": "shitmod:hausbommer" diff --git a/src/main/resources/data/shitmod/recipes/fabric_item.json b/src/main/resources/data/shitmod/recipes/fabric_item.json index f396445..736cfa6 100644 --- a/src/main/resources/data/shitmod/recipes/fabric_item.json +++ b/src/main/resources/data/shitmod/recipes/fabric_item.json @@ -10,14 +10,14 @@ "item": "minecraft:dragon_head" }, "R": { - "item": "shitmod:fabric_block" + "item": "shitmod:gay_block" }, "W": { "item": "minecraft:netherite_block" } }, "result": { - "item": "shitmod:fabric_item", + "item": "shitmod:pp", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/shitmod/recipes/fabric_block.json b/src/main/resources/data/shitmod/recipes/gay_block.json similarity index 87% rename from src/main/resources/data/shitmod/recipes/fabric_block.json rename to src/main/resources/data/shitmod/recipes/gay_block.json index 35458e9..ed44ebb 100644 --- a/src/main/resources/data/shitmod/recipes/fabric_block.json +++ b/src/main/resources/data/shitmod/recipes/gay_block.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "shitmod:fabric_block", + "item": "shitmod:gay_block", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/shitmod/recipes/hausbommer.json b/src/main/resources/data/shitmod/recipes/hausbommer.json index 840cdbc..11d06bb 100644 --- a/src/main/resources/data/shitmod/recipes/hausbommer.json +++ b/src/main/resources/data/shitmod/recipes/hausbommer.json @@ -7,10 +7,10 @@ ], "key": { "X": { - "item": "shitmod:fabric_item" + "item": "shitmod:pp" }, "R": { - "item": "shitmod:fabric_block" + "item": "shitmod:gay_block" }, "W": { "item": "minecraft:iron_block" diff --git a/src/main/resources/data/shitmod/tags/items/pickaxes.json b/src/main/resources/data/shitmod/tags/items/pickaxes.json index e565f14..7cdad0e 100644 --- a/src/main/resources/data/shitmod/tags/items/pickaxes.json +++ b/src/main/resources/data/shitmod/tags/items/pickaxes.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "shitmod:blaze_metal_pickaxe" + "shitmod:blaze_metal_pickaxe", + "shitmod:copper_pickaxe" ] } \ No newline at end of file