From f56d8818dc18801f390576cf9f0c92c86cbfad0a Mon Sep 17 00:00:00 2001 From: Me <135455255+IcarussOne@users.noreply.github.com> Date: Fri, 9 Aug 2024 01:25:00 -0500 Subject: [PATCH] Adjust attributes of most materials --- .../emt/balkonsexpansion/BEItemBuilder.java | 4 ++ .../GalacticraftRegistration.java | 44 +++++++++---------- .../ic2classic/IC2ClassicRegistration.java | 14 +++--- .../railcraft/RailcraftRegistration.java | 14 +++--- .../thaumcraft/ThaumcraftRegistration.java | 18 ++++---- 5 files changed, 49 insertions(+), 45 deletions(-) diff --git a/src/main/java/mod/emt/balkonsexpansion/BEItemBuilder.java b/src/main/java/mod/emt/balkonsexpansion/BEItemBuilder.java index 693cee6..ab1b38b 100644 --- a/src/main/java/mod/emt/balkonsexpansion/BEItemBuilder.java +++ b/src/main/java/mod/emt/balkonsexpansion/BEItemBuilder.java @@ -69,6 +69,10 @@ public static ItemMelee createCustomBoomerang(String id, @Nonnull Item.ToolMater return createCustomItemMelee(BalkonsExpansion.MOD_ID, id, new MeleeCompBoomerangCustom(material, knockbackAmount), rarity); } + public static ItemFlail createCustomFlail(String id, @Nonnull Item.ToolMaterial material, EnumRarity rarity) { + return createCustomItemFlail(BalkonsExpansion.MOD_ID, id, new MeleeCompNone(material), rarity); + } + public static ItemMelee createCustomHalberd(String id, @Nonnull Item.ToolMaterial material, float knockbackAmount, float reachAmount, EnumRarity rarity) { return createCustomItemMelee(BalkonsExpansion.MOD_ID, id, new MeleeCompHalberdCustom(material, knockbackAmount, reachAmount), rarity); } diff --git a/src/main/java/mod/emt/balkonsexpansion/compat/galacticraft/GalacticraftRegistration.java b/src/main/java/mod/emt/balkonsexpansion/compat/galacticraft/GalacticraftRegistration.java index 7337fdd..91746c2 100644 --- a/src/main/java/mod/emt/balkonsexpansion/compat/galacticraft/GalacticraftRegistration.java +++ b/src/main/java/mod/emt/balkonsexpansion/compat/galacticraft/GalacticraftRegistration.java @@ -52,39 +52,39 @@ public static void registerItems(RegistryEvent.Register event) { IForgeRegistry registry = event.getRegistry(); if (BEConfig.galacticraft_settings.GC_HEAVY_DUTY_MATERIAL) { - registry.register(spearHeavyDuty = BEItemBuilder.createCustomSpear("spear.heavy_duty", GCItems.TOOL_STEEL)); - registry.register(halberdHeavyDuty = BEItemBuilder.createCustomHalberd("halberd.heavy_duty", GCItems.TOOL_STEEL)); - registry.register(battleaxeHeavyDuty = BEItemBuilder.createCustomBattleaxe("battleaxe.heavy_duty", GCItems.TOOL_STEEL, 0.2F, 1.0F)); - registry.register(knifeHeavyDuty = BEItemBuilder.createCustomKnife("knife.heavy_duty", GCItems.TOOL_STEEL)); - registry.register(warhammerHeavyDuty = BEItemBuilder.createCustomWarhammer("warhammer.heavy_duty", GCItems.TOOL_STEEL)); + registry.register(spearHeavyDuty = BEItemBuilder.createCustomSpear("spear.heavy_duty", GCItems.TOOL_STEEL, -0.15F, 1.0F)); + registry.register(halberdHeavyDuty = BEItemBuilder.createCustomHalberd("halberd.heavy_duty", GCItems.TOOL_STEEL, 0.4F, 1.0F)); + registry.register(battleaxeHeavyDuty = BEItemBuilder.createCustomBattleaxe("battleaxe.heavy_duty", GCItems.TOOL_STEEL, 0.25F, 1.0F)); + registry.register(knifeHeavyDuty = BEItemBuilder.createCustomKnife("knife.heavy_duty", GCItems.TOOL_STEEL, -0.15F)); + registry.register(warhammerHeavyDuty = BEItemBuilder.createCustomWarhammer("warhammer.heavy_duty", GCItems.TOOL_STEEL, 0.55F)); registry.register(flailHeavyDuty = BEItemBuilder.createCustomFlail("flail.heavy_duty", GCItems.TOOL_STEEL)); registry.register(katanaHeavyDuty = BEItemBuilder.createCustomKatana("katana.heavy_duty", GCItems.TOOL_STEEL)); - registry.register(boomerangHeavyDuty = BEItemBuilder.createCustomBoomerang("boomerang.heavy_duty", GCItems.TOOL_STEEL)); - registry.register(bayonetHeavyDuty = BEItemBuilder.createCustomMusketBayonet("musketbayonet.heavy_duty", GCItems.TOOL_STEEL, knifeHeavyDuty)); + registry.register(boomerangHeavyDuty = BEItemBuilder.createCustomBoomerang("boomerang.heavy_duty", GCItems.TOOL_STEEL, 0.1F)); + registry.register(bayonetHeavyDuty = BEItemBuilder.createCustomMusketBayonet("musketbayonet.heavy_duty", GCItems.TOOL_STEEL, knifeHeavyDuty, -0.15F)); } if (BEConfig.galacticraft_settings.GC_DESH_MATERIAL) { - registry.register(spearDesh = BEItemBuilder.createCustomSpear("spear.desh", MarsItems.TOOLDESH)); - registry.register(halberdDesh = BEItemBuilder.createCustomHalberd("halberd.desh", MarsItems.TOOLDESH)); - registry.register(battleaxeDesh = BEItemBuilder.createCustomBattleaxe("battleaxe.desh", MarsItems.TOOLDESH, 0.3F, 1.0F)); - registry.register(knifeDesh = BEItemBuilder.createCustomKnife("knife.desh", MarsItems.TOOLDESH)); - registry.register(warhammerDesh = BEItemBuilder.createCustomWarhammer("warhammer.desh", MarsItems.TOOLDESH)); + registry.register(spearDesh = BEItemBuilder.createCustomSpear("spear.desh", MarsItems.TOOLDESH, -0.1F, 1.0F)); + registry.register(halberdDesh = BEItemBuilder.createCustomHalberd("halberd.desh", MarsItems.TOOLDESH, 0.5F, 1.0F)); + registry.register(battleaxeDesh = BEItemBuilder.createCustomBattleaxe("battleaxe.desh", MarsItems.TOOLDESH, 0.35F, 1.0F)); + registry.register(knifeDesh = BEItemBuilder.createCustomKnife("knife.desh", MarsItems.TOOLDESH, -0.1F)); + registry.register(warhammerDesh = BEItemBuilder.createCustomWarhammer("warhammer.desh", MarsItems.TOOLDESH, 0.65F)); registry.register(flailDesh = BEItemBuilder.createCustomFlail("flail.desh", MarsItems.TOOLDESH)); - registry.register(katanaDesh = BEItemBuilder.createCustomKatana("katana.desh", MarsItems.TOOLDESH)); - registry.register(boomerangDesh = BEItemBuilder.createCustomBoomerang("boomerang.desh", MarsItems.TOOLDESH)); - registry.register(bayonetDesh = BEItemBuilder.createCustomMusketBayonet("musketbayonet.desh", MarsItems.TOOLDESH, knifeDesh)); + registry.register(katanaDesh = BEItemBuilder.createCustomKatana("katana.desh", MarsItems.TOOLDESH, -0.5F)); + registry.register(boomerangDesh = BEItemBuilder.createCustomBoomerang("boomerang.desh", MarsItems.TOOLDESH, 0.2F)); + registry.register(bayonetDesh = BEItemBuilder.createCustomMusketBayonet("musketbayonet.desh", MarsItems.TOOLDESH, knifeDesh, -0.1F)); } if (BEConfig.galacticraft_settings.GC_TITANIUM_MATERIAL) { - registry.register(spearTitanium = BEItemBuilder.createCustomSpear("spear.titanium", AsteroidsItems.TOOL_TITANIUM)); - registry.register(halberdTitanium = BEItemBuilder.createCustomHalberd("halberd.titanium", AsteroidsItems.TOOL_TITANIUM)); + registry.register(spearTitanium = BEItemBuilder.createCustomSpear("spear.titanium", AsteroidsItems.TOOL_TITANIUM, -0.1F, 1.5F)); + registry.register(halberdTitanium = BEItemBuilder.createCustomHalberd("halberd.titanium", AsteroidsItems.TOOL_TITANIUM, 0.6F, 1.5F)); registry.register(battleaxeTitanium = BEItemBuilder.createCustomBattleaxe("battleaxe.titanium", AsteroidsItems.TOOL_TITANIUM, 0.45F, 1.0F)); - registry.register(knifeTitanium = BEItemBuilder.createCustomKnife("knife.titanium", AsteroidsItems.TOOL_TITANIUM)); - registry.register(warhammerTitanium = BEItemBuilder.createCustomWarhammer("warhammer.titanium", AsteroidsItems.TOOL_TITANIUM)); + registry.register(knifeTitanium = BEItemBuilder.createCustomKnife("knife.titanium", AsteroidsItems.TOOL_TITANIUM, -0.1F)); + registry.register(warhammerTitanium = BEItemBuilder.createCustomWarhammer("warhammer.titanium", AsteroidsItems.TOOL_TITANIUM, 0.7F)); registry.register(flailTitanium = BEItemBuilder.createCustomFlail("flail.titanium", AsteroidsItems.TOOL_TITANIUM)); - registry.register(katanaTitanium = BEItemBuilder.createCustomKatana("katana.titanium", AsteroidsItems.TOOL_TITANIUM)); - registry.register(boomerangTitanium = BEItemBuilder.createCustomBoomerang("boomerang.titanium", AsteroidsItems.TOOL_TITANIUM)); - registry.register(bayonetTitanium = BEItemBuilder.createCustomMusketBayonet("musketbayonet.titanium", AsteroidsItems.TOOL_TITANIUM, knifeTitanium)); + registry.register(katanaTitanium = BEItemBuilder.createCustomKatana("katana.titanium", AsteroidsItems.TOOL_TITANIUM, -0.5F)); + registry.register(boomerangTitanium = BEItemBuilder.createCustomBoomerang("boomerang.titanium", AsteroidsItems.TOOL_TITANIUM, 0.3F)); + registry.register(bayonetTitanium = BEItemBuilder.createCustomMusketBayonet("musketbayonet.titanium", AsteroidsItems.TOOL_TITANIUM, knifeTitanium, -0.1F)); } } diff --git a/src/main/java/mod/emt/balkonsexpansion/compat/ic2classic/IC2ClassicRegistration.java b/src/main/java/mod/emt/balkonsexpansion/compat/ic2classic/IC2ClassicRegistration.java index f41f98a..b5092b8 100644 --- a/src/main/java/mod/emt/balkonsexpansion/compat/ic2classic/IC2ClassicRegistration.java +++ b/src/main/java/mod/emt/balkonsexpansion/compat/ic2classic/IC2ClassicRegistration.java @@ -31,15 +31,15 @@ public static void registerItems(RegistryEvent.Register event) { IForgeRegistry registry = event.getRegistry(); if (BEConfig.ic2_classic_settings.IC2C_BRONZE_MATERIAL) { - registry.register(spearBronze = BEItemBuilder.createCustomSpear("spear.bronze.ic2c", ToolHelper.bronzeToolMaterial)); - registry.register(halberdBronze = BEItemBuilder.createCustomHalberd("halberd.bronze.ic2c", ToolHelper.bronzeToolMaterial)); - registry.register(battleaxeBronze = BEItemBuilder.createCustomBattleaxe("battleaxe.bronze.ic2c", ToolHelper.bronzeToolMaterial, 0.2F, 1.0F)); - registry.register(knifeBronze = BEItemBuilder.createCustomKnife("knife.bronze.ic2c", ToolHelper.bronzeToolMaterial)); - registry.register(warhammerBronze = BEItemBuilder.createCustomWarhammer("warhammer.bronze.ic2c", ToolHelper.bronzeToolMaterial)); + registry.register(spearBronze = BEItemBuilder.createCustomSpear("spear.bronze.ic2c", ToolHelper.bronzeToolMaterial, -0.15F, 1.0F)); + registry.register(halberdBronze = BEItemBuilder.createCustomHalberd("halberd.bronze.ic2c", ToolHelper.bronzeToolMaterial, 0.4F, 1.0F)); + registry.register(battleaxeBronze = BEItemBuilder.createCustomBattleaxe("battleaxe.bronze.ic2c", ToolHelper.bronzeToolMaterial, 0.25F, 1.0F)); + registry.register(knifeBronze = BEItemBuilder.createCustomKnife("knife.bronze.ic2c", ToolHelper.bronzeToolMaterial, -0.15F)); + registry.register(warhammerBronze = BEItemBuilder.createCustomWarhammer("warhammer.bronze.ic2c", ToolHelper.bronzeToolMaterial, 0.55F)); registry.register(flailBronze = BEItemBuilder.createCustomFlail("flail.bronze.ic2c", ToolHelper.bronzeToolMaterial)); registry.register(katanaBronze = BEItemBuilder.createCustomKatana("katana.bronze.ic2c", ToolHelper.bronzeToolMaterial)); - registry.register(boomerangBronze = BEItemBuilder.createCustomBoomerang("boomerang.bronze.ic2c", ToolHelper.bronzeToolMaterial)); - registry.register(bayonetBronze = BEItemBuilder.createCustomMusketBayonet("musketbayonet.bronze.ic2c", ToolHelper.bronzeToolMaterial, knifeBronze)); + registry.register(boomerangBronze = BEItemBuilder.createCustomBoomerang("boomerang.bronze.ic2c", ToolHelper.bronzeToolMaterial, 0.1F)); + registry.register(bayonetBronze = BEItemBuilder.createCustomMusketBayonet("musketbayonet.bronze.ic2c", ToolHelper.bronzeToolMaterial, knifeBronze, -0.15F)); } } diff --git a/src/main/java/mod/emt/balkonsexpansion/compat/railcraft/RailcraftRegistration.java b/src/main/java/mod/emt/balkonsexpansion/compat/railcraft/RailcraftRegistration.java index 95b165c..1f9fae0 100644 --- a/src/main/java/mod/emt/balkonsexpansion/compat/railcraft/RailcraftRegistration.java +++ b/src/main/java/mod/emt/balkonsexpansion/compat/railcraft/RailcraftRegistration.java @@ -34,15 +34,15 @@ public static void registerItems(RegistryEvent.Register event) { IForgeRegistry registry = event.getRegistry(); if (BEConfig.railcraft_settings.RC_STEEL_MATERIAL) { - registry.register(spearSteel = BEItemBuilder.createCustomSpear("spear.steel.rc", ItemMaterials.STEEL_TOOL)); - registry.register(halberdSteel = BEItemBuilder.createCustomHalberd("halberd.steel.rc", ItemMaterials.STEEL_TOOL)); - registry.register(battleaxeSteel = BEItemBuilder.createCustomBattleaxe("battleaxe.steel.rc", ItemMaterials.STEEL_TOOL, 0.2F, 1.0F)); - registry.register(knifeSteel = BEItemBuilder.createCustomKnife("knife.steel.rc", ItemMaterials.STEEL_TOOL)); - registry.register(warhammerSteel = BEItemBuilder.createCustomWarhammer("warhammer.steel.rc", ItemMaterials.STEEL_TOOL)); + registry.register(spearSteel = BEItemBuilder.createCustomSpear("spear.steel.rc", ItemMaterials.STEEL_TOOL, -0.15F, 1.0F)); + registry.register(halberdSteel = BEItemBuilder.createCustomHalberd("halberd.steel.rc", ItemMaterials.STEEL_TOOL, 0.4F, 1.0F)); + registry.register(battleaxeSteel = BEItemBuilder.createCustomBattleaxe("battleaxe.steel.rc", ItemMaterials.STEEL_TOOL, 0.25F, 1.0F)); + registry.register(knifeSteel = BEItemBuilder.createCustomKnife("knife.steel.rc", ItemMaterials.STEEL_TOOL, -0.15F)); + registry.register(warhammerSteel = BEItemBuilder.createCustomWarhammer("warhammer.steel.rc", ItemMaterials.STEEL_TOOL, 0.55F)); registry.register(flailSteel = BEItemBuilder.createCustomFlail("flail.steel.rc", ItemMaterials.STEEL_TOOL)); registry.register(katanaSteel = BEItemBuilder.createCustomKatana("katana.steel.rc", ItemMaterials.STEEL_TOOL)); - registry.register(boomerangSteel = BEItemBuilder.createCustomBoomerang("boomerang.steel.rc", ItemMaterials.STEEL_TOOL)); - registry.register(bayonetSteel = BEItemBuilder.createCustomMusketBayonet("musketbayonet.steel.rc", ItemMaterials.STEEL_TOOL, knifeSteel)); + registry.register(boomerangSteel = BEItemBuilder.createCustomBoomerang("boomerang.steel.rc", ItemMaterials.STEEL_TOOL, 0.1F)); + registry.register(bayonetSteel = BEItemBuilder.createCustomMusketBayonet("musketbayonet.steel.rc", ItemMaterials.STEEL_TOOL, knifeSteel, -0.15F)); } } diff --git a/src/main/java/mod/emt/balkonsexpansion/compat/thaumcraft/ThaumcraftRegistration.java b/src/main/java/mod/emt/balkonsexpansion/compat/thaumcraft/ThaumcraftRegistration.java index 4cd4e65..85b5f27 100644 --- a/src/main/java/mod/emt/balkonsexpansion/compat/thaumcraft/ThaumcraftRegistration.java +++ b/src/main/java/mod/emt/balkonsexpansion/compat/thaumcraft/ThaumcraftRegistration.java @@ -44,15 +44,15 @@ public static void registerItems(RegistryEvent.Register event) { IForgeRegistry registry = event.getRegistry(); if (BEConfig.thaumcraft_settings.TC_THAUMIUM_MATERIAL) { - registry.register(spearThaumium = BEItemBuilder.createCustomSpear("spear.thaumium", ThaumcraftMaterials.TOOLMAT_THAUMIUM)); - registry.register(halberdThaumium = BEItemBuilder.createCustomHalberd("halberd.thaumium", ThaumcraftMaterials.TOOLMAT_THAUMIUM)); - registry.register(battleaxeThaumium = BEItemBuilder.createCustomBattleaxe("battleaxe.thaumium", ThaumcraftMaterials.TOOLMAT_THAUMIUM, 0.2F, 1.0F, EnumRarity.UNCOMMON)); - registry.register(knifeThaumium = BEItemBuilder.createCustomKnife("knife.thaumium", ThaumcraftMaterials.TOOLMAT_THAUMIUM)); - registry.register(warhammerThaumium = BEItemBuilder.createCustomWarhammer("warhammer.thaumium", ThaumcraftMaterials.TOOLMAT_THAUMIUM)); - registry.register(flailThaumium = BEItemBuilder.createCustomFlail("flail.thaumium", ThaumcraftMaterials.TOOLMAT_THAUMIUM)); - registry.register(katanaThaumium = BEItemBuilder.createCustomKatana("katana.thaumium", ThaumcraftMaterials.TOOLMAT_THAUMIUM)); - registry.register(boomerangThaumium = BEItemBuilder.createCustomBoomerang("boomerang.thaumium", ThaumcraftMaterials.TOOLMAT_THAUMIUM)); - registry.register(bayonetThaumium = BEItemBuilder.createCustomMusketBayonet("musketbayonet.thaumium", ThaumcraftMaterials.TOOLMAT_THAUMIUM, knifeThaumium)); + registry.register(spearThaumium = BEItemBuilder.createCustomSpear("spear.thaumium", ThaumcraftMaterials.TOOLMAT_THAUMIUM, -0.15F, 1.0F, EnumRarity.UNCOMMON)); + registry.register(halberdThaumium = BEItemBuilder.createCustomHalberd("halberd.thaumium", ThaumcraftMaterials.TOOLMAT_THAUMIUM, 0.4F, 1.0F, EnumRarity.UNCOMMON)); + registry.register(battleaxeThaumium = BEItemBuilder.createCustomBattleaxe("battleaxe.thaumium", ThaumcraftMaterials.TOOLMAT_THAUMIUM, 0.25F, 1.0F, EnumRarity.UNCOMMON)); + registry.register(knifeThaumium = BEItemBuilder.createCustomKnife("knife.thaumium", ThaumcraftMaterials.TOOLMAT_THAUMIUM, -0.15F, EnumRarity.UNCOMMON)); + registry.register(warhammerThaumium = BEItemBuilder.createCustomWarhammer("warhammer.thaumium", ThaumcraftMaterials.TOOLMAT_THAUMIUM, 0.55F, EnumRarity.UNCOMMON)); + registry.register(flailThaumium = BEItemBuilder.createCustomFlail("flail.thaumium", ThaumcraftMaterials.TOOLMAT_THAUMIUM, EnumRarity.UNCOMMON)); + registry.register(katanaThaumium = BEItemBuilder.createCustomKatana("katana.thaumium", ThaumcraftMaterials.TOOLMAT_THAUMIUM, -0.4F, EnumRarity.UNCOMMON)); + registry.register(boomerangThaumium = BEItemBuilder.createCustomBoomerang("boomerang.thaumium", ThaumcraftMaterials.TOOLMAT_THAUMIUM, 0.1F, EnumRarity.UNCOMMON)); + registry.register(bayonetThaumium = BEItemBuilder.createCustomMusketBayonet("musketbayonet.thaumium", ThaumcraftMaterials.TOOLMAT_THAUMIUM, knifeThaumium, -0.15F, EnumRarity.UNCOMMON)); } }