diff --git a/gradle.properties b/gradle.properties index 985e089..84f8c9a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx6G loader_version=0.12.12 # Mod Properties - mod_version = 1.4.0 + mod_version = 1.5.0 maven_group = com.serenas.shitmod archives_base_name = serenas-shitmod diff --git a/src/main/java/net/serenas/shitmod/Shitmod.java b/src/main/java/net/serenas/shitmod/Shitmod.java index 80edca6..d76240e 100644 --- a/src/main/java/net/serenas/shitmod/Shitmod.java +++ b/src/main/java/net/serenas/shitmod/Shitmod.java @@ -15,6 +15,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; +import net.minecraft.item.ShovelItem; +import net.minecraft.item.SwordItem; +import net.minecraft.item.ToolItem; import net.minecraft.util.Identifier; import net.minecraft.util.Rarity; import net.minecraft.util.registry.Registry; @@ -42,6 +45,10 @@ public class Shitmod implements ModInitializer { public static final ItemGroup GENERAL_GROUP = FabricItemGroupBuilder.build( new Identifier("shitmod", "general"), () -> new ItemStack(Shitmod.FABRIC_ITEM)); + + public static final ItemGroup TOOLS_GROUP = FabricItemGroupBuilder.build( + new Identifier("shitmod", "tools"), + () -> new ItemStack(Shitmod.BLAZE_METAL_SHOVEL)); public static final Item KINGSOUL_CHARM = new kingsoul(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxDamage(500).fireproof()); @@ -65,6 +72,16 @@ public class Shitmod implements ModInitializer { public static final Item KINGSOUL_RIGHT = new kingsoulRight(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxCount(1)); + public static final ToolItem BLAZE_METAL_SWORD = new SwordItem(blazeMetalMaterial.INSTANCE, 5, 3f, new Item.Settings().group(Shitmod.TOOLS_GROUP)); + + public static final ToolItem BLAZE_METAL_PICKAXE = new blazeMetalPickaxe(blazeMetalMaterial.INSTANCE, 1, -0.5f, new Item.Settings().group(Shitmod.TOOLS_GROUP)); + + public static final ToolItem BLAZE_METAL_AXE = new blazeMetalAxe(blazeMetalMaterial.INSTANCE, 8.0f, -1.0f, new Item.Settings().group(Shitmod.TOOLS_GROUP)); + + public static final ToolItem BLAZE_METAL_SHOVEL = new ShovelItem(blazeMetalMaterial.INSTANCE, 1f, 3.0f, new Item.Settings().group(Shitmod.TOOLS_GROUP)); + + public static final ToolItem BLAZE_METAL_HOE = new blazeMetalHoe(blazeMetalMaterial.INSTANCE, new Item.Settings().group(Shitmod.TOOLS_GROUP)); + @Override public void onInitialize() { @@ -105,6 +122,16 @@ public class Shitmod implements ModInitializer { Registry.register(Registry.ITEM, new Identifier("shitmod", "kingsoul_right_fragment"), KINGSOUL_RIGHT); + Registry.register(Registry.ITEM, new Identifier("shitmod", "blaze_metal_sword"), BLAZE_METAL_SWORD); + + Registry.register(Registry.ITEM, new Identifier("shitmod", "blaze_metal_pickaxe"), BLAZE_METAL_PICKAXE); + + Registry.register(Registry.ITEM, new Identifier("shitmod", "blaze_metal_axe"), BLAZE_METAL_AXE); + + Registry.register(Registry.ITEM, new Identifier("shitmod", "blaze_metal_shovel"), BLAZE_METAL_SHOVEL); + + Registry.register(Registry.ITEM, new Identifier("shitmod", "blaze_metal_hoe"), BLAZE_METAL_HOE); + CustomPortalBuilder.beginPortal() .frameBlock(Blocks.DIAMOND_BLOCK) .lightWithItem(Items.ENDER_EYE) diff --git a/src/main/java/net/serenas/shitmod/blazeMetalAxe.java b/src/main/java/net/serenas/shitmod/blazeMetalAxe.java new file mode 100644 index 0000000..2e815e3 --- /dev/null +++ b/src/main/java/net/serenas/shitmod/blazeMetalAxe.java @@ -0,0 +1,11 @@ +package net.serenas.shitmod; + +import net.minecraft.item.AxeItem; +import net.minecraft.item.ToolMaterial; + +public class blazeMetalAxe extends AxeItem { + public blazeMetalAxe(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) { + super(material, attackDamage, attackSpeed, settings); + } + +} diff --git a/src/main/java/net/serenas/shitmod/blazeMetalHoe.java b/src/main/java/net/serenas/shitmod/blazeMetalHoe.java new file mode 100644 index 0000000..f8ab060 --- /dev/null +++ b/src/main/java/net/serenas/shitmod/blazeMetalHoe.java @@ -0,0 +1,12 @@ +package net.serenas.shitmod; + +import net.minecraft.item.ToolItem; +import net.minecraft.item.ToolMaterial; + +public class blazeMetalHoe extends ToolItem { + + public blazeMetalHoe(ToolMaterial material, Settings settings) { + super(material, settings); + } + +} diff --git a/src/main/java/net/serenas/shitmod/blazeMetalMaterial.java b/src/main/java/net/serenas/shitmod/blazeMetalMaterial.java new file mode 100644 index 0000000..22ff3c3 --- /dev/null +++ b/src/main/java/net/serenas/shitmod/blazeMetalMaterial.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 blazeMetalMaterial implements ToolMaterial { + + public static final blazeMetalMaterial INSTANCE = new blazeMetalMaterial(); + + @Override + public int getDurability() { + return 500; + } + + @Override + public float getMiningSpeedMultiplier() { + return 12.0f; + } + + @Override + public float getAttackDamage() { + return 4.0f; + } + + @Override + public int getMiningLevel() { + return 7; + } + + @Override + public int getEnchantability() { + return 40; + } + + @Override + public Ingredient getRepairIngredient() { + return Ingredient.ofItems(Items.BLAZE_ROD); + } + +} diff --git a/src/main/java/net/serenas/shitmod/blazeMetalPickaxe.java b/src/main/java/net/serenas/shitmod/blazeMetalPickaxe.java new file mode 100644 index 0000000..4b97918 --- /dev/null +++ b/src/main/java/net/serenas/shitmod/blazeMetalPickaxe.java @@ -0,0 +1,10 @@ +package net.serenas.shitmod; + +import net.minecraft.item.PickaxeItem; +import net.minecraft.item.ToolMaterial; + +public class blazeMetalPickaxe extends PickaxeItem { + public blazeMetalPickaxe(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) { + super(material, attackDamage, attackSpeed, settings); + } +} \ No newline at end of file diff --git a/src/main/java/net/serenas/shitmod/dash.java b/src/main/java/net/serenas/shitmod/dash.java deleted file mode 100644 index 3b65e84..0000000 --- a/src/main/java/net/serenas/shitmod/dash.java +++ /dev/null @@ -1,5 +0,0 @@ -package net.serenas.shitmod; - -public class dash{ - -} diff --git a/src/main/resources/data/shitmod/tags/items/pickaxes.json b/src/main/resources/data/shitmod/tags/items/pickaxes.json new file mode 100644 index 0000000..e565f14 --- /dev/null +++ b/src/main/resources/data/shitmod/tags/items/pickaxes.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "shitmod:blaze_metal_pickaxe" + ] + } \ No newline at end of file