From b108567d3ffe2ed6d0d353f5394b6c44f4cfdd9a Mon Sep 17 00:00:00 2001 From: Leronus Date: Mon, 1 Jul 2024 05:33:47 +0200 Subject: [PATCH] Updated to 1.20.6 ItemSwordMixin disabled (vanilla sword tooltips) TODO: Some armor pieces are missing (night vision needs checking) Swords do not have damage Check armor durability Fix bonus effect tooltips and tooltips for tools Fix ItemGroups & food items Check if autosmelt still works Fix horse armor --- MORES TODO.txt | 4 + build.gradle | 4 +- gradle.properties | 28 +- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/java/mod/leronus/mores/Mores.java | 4 +- .../mod/leronus/mores/block/ModBlocks.java | 129 ++- .../mores/datagen/ModModelProvider.java | 54 +- .../leronus/mores/item/ModArmorMaterials.java | 218 +++-- .../leronus/mores/item/ModFoodComponents.java | 22 +- .../mod/leronus/mores/item/ModItemGroups.java | 888 +++++++++--------- .../java/mod/leronus/mores/item/ModItems.java | 719 +++++++------- .../leronus/mores/item/ModToolMaterials.java | 91 +- .../mores/item/custom/ModArmorItem.java | 277 ++---- .../leronus/mores/item/custom/ModAxeItem.java | 39 +- .../mores/item/custom/ModBattleAxeItem.java | 38 +- .../leronus/mores/item/custom/ModHoeItem.java | 38 +- .../mores/item/custom/ModPickaxeItem.java | 29 +- .../mores/item/custom/ModShovelItem.java | 38 +- .../mores/item/custom/ModSwordItem.java | 47 +- .../leronus/mores/mixin/SwordItemMixin.java | 34 +- src/main/resources/mores.mixins.json | 1 - 21 files changed, 1324 insertions(+), 1380 deletions(-) create mode 100644 MORES TODO.txt diff --git a/MORES TODO.txt b/MORES TODO.txt new file mode 100644 index 0000000..0740e28 --- /dev/null +++ b/MORES TODO.txt @@ -0,0 +1,4 @@ +check block xp values +fix horse armor +fix armor +fix foods \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8b2b971..f4fe9b6 100644 --- a/build.gradle +++ b/build.gradle @@ -79,10 +79,10 @@ dependencies { // //Bobby // modImplementation "maven.modrinth:M08ruV16:2cuVyTav" //Nvidium - modImplementation "maven.modrinth:SfMw2IZN:${project.nvidium_version}" +// modImplementation "maven.modrinth:SfMw2IZN:${project.nvidium_version}" //Custom Shields - modImplementation "maven.modrinth:7SDalH12:xY16zX6k" +// modImplementation "maven.modrinth:7SDalH12:xY16zX6k" modImplementation "maven.modrinth:modmenu:${project.mod_menu_version}" modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}" modImplementation "com.github.Chocohead:Fabric-ASM:v${project.fabricasm_version}" diff --git a/gradle.properties b/gradle.properties index a4db9ab..d7efce5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,28 +4,28 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.4 -yarn_mappings=1.20.4+build.3 +minecraft_version=1.20.6 +yarn_mappings=1.20.6+build.3 loader_version=0.15.11 # Mod Properties -mod_version=1.4.0 +mod_version=1.6.0 maven_group=mod.leronus.mores archives_base_name=mores # Dependencies -fabric_version=0.97.1+1.20.4 -sodium_version=mc1.20.4-0.5.8 -lithium_version=mc1.20.4-0.12.1 +fabric_version=0.100.4+1.20.6 +sodium_version=mc1.20.6-0.5.9 +lithium_version=mc1.20.6-0.12.5 -iris_version=gPXdh2Es -indium_version=VlLxDisa +iris_version=keLlmlCc +indium_version=XPsoVC5n -entity_culling_version=cj8nR3eG -continuity_version=Ox1racg8 -nvidium_version=J2fuM58R +entity_culling_version=6U5rh26a +continuity_version=hI13Vg85 +nvidium_version=Di2JxVAQ -fabric_shield_lib_version=1.7.2-1.20.4 -midnightlib_version=1.5.3-fabric -mod_menu_version=9.2.0 +fabric_shield_lib_version=1.7.2-1.20.6 +midnightlib_version=1.5.5-fabric +mod_menu_version=10.0.0 fabricasm_version=2.3 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22c..a441313 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/mod/leronus/mores/Mores.java b/src/main/java/mod/leronus/mores/Mores.java index 9469b96..83d7173 100644 --- a/src/main/java/mod/leronus/mores/Mores.java +++ b/src/main/java/mod/leronus/mores/Mores.java @@ -1,7 +1,7 @@ package mod.leronus.mores; import mod.leronus.mores.block.ModBlocks; -import mod.leronus.mores.item.ModItemGroups; +//import mod.leronus.mores.item.ModItemGroups; import mod.leronus.mores.item.ModItems; import mod.leronus.mores.sound.ModSounds; import mod.leronus.mores.world.gen.ModWorldGeneration; @@ -18,7 +18,7 @@ public class Mores implements ModInitializer { @Override public void onInitialize() { - ModItemGroups.registerItemGroups(); +// ModItemGroups.registerItemGroups(); ModItems.registerModItems(); ModBlocks.registerModBlocks(); diff --git a/src/main/java/mod/leronus/mores/block/ModBlocks.java b/src/main/java/mod/leronus/mores/block/ModBlocks.java index d700621..dadbc29 100644 --- a/src/main/java/mod/leronus/mores/block/ModBlocks.java +++ b/src/main/java/mod/leronus/mores/block/ModBlocks.java @@ -1,13 +1,8 @@ package mod.leronus.mores.block; import mod.leronus.mores.Mores; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroupEntries; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; -import net.minecraft.block.ExperienceDroppingBlock; -import net.minecraft.block.MapColor; +import net.minecraft.block.*; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.registry.Registries; @@ -26,66 +21,66 @@ public class ModBlocks { * Fills the registry with blocks */ //.strength(destroyTime, blastResistance) - public static final Block ANTHRACITE_ORE = registerBlock("anthracite_ore", new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), FabricBlockSettings.copyOf(Blocks.COAL_ORE).strength(3.0F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); - public static final Block NETHER_ANTHRACITE_ORE = registerBlock("nether_anthracite_ore", new ExperienceDroppingBlock(UniformIntProvider.create(1, 3), FabricBlockSettings.copyOf(Blocks.NETHER_GOLD_ORE).mapColor(MapColor.BLACK).strength(3.0F, 3.0F).sounds(BlockSoundGroup.NETHER_GOLD_ORE).requiresTool())); - public static final Block DEEPSLATE_ANTHRACITE_ORE = registerBlock("deepslate_anthracite_ore", new ExperienceDroppingBlock(UniformIntProvider.create(1, 3), FabricBlockSettings.copyOf(Blocks.DEEPSLATE_COAL_ORE).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE).requiresTool())); - - public static final Block TIN_ORE = registerBlock("tin_ore", new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), FabricBlockSettings.copyOf(Blocks.COPPER_ORE).strength(3.0F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); - public static final Block TIN_BLOCK = registerBlock("tin_block", new Block(FabricBlockSettings.copyOf(Blocks.COPPER_BLOCK).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); - public static final Block RAW_TIN_BLOCK = registerBlock("raw_tin_block", new Block(FabricBlockSettings.copyOf(Blocks.RAW_COPPER_BLOCK).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); - public static final Block DEEPSLATE_TIN_ORE = registerBlock("deepslate_tin_ore", new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), FabricBlockSettings.copyOf(Blocks.DEEPSLATE_COPPER_ORE).strength(4.5F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); - public static final Block SILVER_ORE = registerBlock("silver_ore", new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), FabricBlockSettings.copyOf(Blocks.IRON_ORE).strength(3.0F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); - public static final Block SILVER_BLOCK = registerBlock("silver_block", new Block(FabricBlockSettings.copyOf(Blocks.IRON_BLOCK).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); - public static final Block RAW_SILVER_BLOCK = registerBlock("raw_silver_block", new Block(FabricBlockSettings.copyOf(Blocks.RAW_IRON_BLOCK).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); - public static final Block DEEPSLATE_SILVER_ORE = registerBlock("deepslate_silver_ore", new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), FabricBlockSettings.copyOf(Blocks.DEEPSLATE_IRON_ORE).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE).requiresTool())); - public static final Block NETHER_SILVER_ORE = registerBlock("nether_silver_ore", new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), FabricBlockSettings.copyOf(Blocks.NETHER_GOLD_ORE).mapColor(MapColor.LIGHT_GRAY).strength(3.0F, 3.0F).sounds(BlockSoundGroup.NETHER_GOLD_ORE).requiresTool())); - - public static final Block COBALT_ORE = registerBlock("cobalt_ore", new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), FabricBlockSettings.copyOf(Blocks.IRON_ORE).mapColor(MapColor.LIGHT_BLUE).strength(3.0F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); - public static final Block COBALT_BLOCK = registerBlock("cobalt_block", new Block(FabricBlockSettings.copyOf(Blocks.IRON_BLOCK).mapColor(MapColor.LIGHT_BLUE).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); - public static final Block RAW_COBALT_BLOCK = registerBlock("raw_cobalt_block", new Block(FabricBlockSettings.copyOf(Blocks.RAW_IRON_BLOCK).mapColor(MapColor.LIGHT_BLUE).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); - public static final Block DEEPSLATE_COBALT_ORE = registerBlock("deepslate_cobalt_ore", new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), FabricBlockSettings.copyOf(Blocks.DEEPSLATE_IRON_ORE).mapColor(MapColor.LIGHT_BLUE).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE).requiresTool())); - - public static final Block BRONZE_BLOCK = registerBlock("bronze_block", new Block(FabricBlockSettings.copyOf(Blocks.IRON_BLOCK).mapColor(MapColor.BROWN).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); - - public static final Block STERLING_BLOCK = registerBlock("sterling_block", new Block(FabricBlockSettings.copyOf(Blocks.IRON_BLOCK).mapColor(MapColor.LIGHT_GRAY).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); - - public static final Block AMETHYST_BLOCK = registerBlock("amethyst_block", new Block(FabricBlockSettings.copyOf(Blocks.AMETHYST_BLOCK).strength(5.0F, 6.0F).sounds(BlockSoundGroup.AMETHYST_BLOCK).requiresTool())); - - public static final Block STEEL_BLOCK = registerBlock("steel_block", new Block(FabricBlockSettings.copyOf(Blocks.IRON_BLOCK).mapColor(MapColor.GRAY).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); - public static final Block TOPAZ_ORE = registerBlock("topaz_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 6), FabricBlockSettings.copyOf(Blocks.DIAMOND_ORE).mapColor(MapColor.LIGHT_BLUE).strength(3.0F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); - public static final Block TOPAZ_BLOCK = registerBlock("topaz_block", new Block(FabricBlockSettings.copyOf(Blocks.DIAMOND_BLOCK).mapColor(MapColor.LIGHT_BLUE).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); - public static final Block DEEPSLATE_TOPAZ_ORE = registerBlock("deepslate_topaz_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 6), FabricBlockSettings.copyOf(Blocks.DEEPSLATE_DIAMOND_ORE).mapColor(MapColor.LIGHT_BLUE).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE).requiresTool())); - - public static final Block TOURMALINE_ORE = registerBlock("tourmaline_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 7), FabricBlockSettings.copyOf(Blocks.DIAMOND_ORE).mapColor(MapColor.PINK).strength(3.0F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); - public static final Block TOURMALINE_BLOCK = registerBlock("tourmaline_block", new Block(FabricBlockSettings.copyOf(Blocks.DIAMOND_BLOCK).mapColor(MapColor.PINK).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); - public static final Block DEEPSLATE_TOURMALINE_ORE = registerBlock("deepslate_tourmaline_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 7), FabricBlockSettings.copyOf(Blocks.DEEPSLATE_DIAMOND_ORE).mapColor(MapColor.PINK).strength(4.5F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); - - public static final Block NETHER_TANZANITE_ORE = registerBlock("nether_tanzanite_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 7), FabricBlockSettings.copyOf(Blocks.NETHER_GOLD_ORE).mapColor(MapColor.PURPLE).strength(3.0F, 3.0F).sounds(BlockSoundGroup.NETHER_ORE).requiresTool())); - public static final Block TANZANITE_BLOCK = registerBlock("tanzanite_block", new Block(FabricBlockSettings.copyOf(Blocks.DIAMOND_BLOCK).mapColor(MapColor.PURPLE).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); - - public static final Block SAPPHIRE_ORE = registerBlock("sapphire_ore", new ExperienceDroppingBlock(UniformIntProvider.create(2, 5), FabricBlockSettings.copyOf(Blocks.DIAMOND_ORE).mapColor(MapColor.BLUE).strength(3.0F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); - public static final Block SAPPHIRE_BLOCK = registerBlock("sapphire_block", new Block(FabricBlockSettings.copyOf(Blocks.DIAMOND_ORE).mapColor(MapColor.BLUE).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); - public static final Block DEEPSLATE_SAPPHIRE_ORE = registerBlock("deepslate_sapphire_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 8), FabricBlockSettings.copyOf(Blocks.DEEPSLATE_DIAMOND_ORE).mapColor(MapColor.BLUE).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE).requiresTool())); - public static final Block NETHER_SAPPHIRE_ORE = registerBlock("nether_sapphire_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 8), FabricBlockSettings.copyOf(Blocks.NETHER_GOLD_ORE).mapColor(MapColor.BLUE).strength(4.0F, 3.0F).sounds(BlockSoundGroup.NETHER_ORE).requiresTool())); - - public static final Block TURQUOISE_ORE = registerBlock("turquoise_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 9), FabricBlockSettings.copyOf(Blocks.DIAMOND_ORE).mapColor(MapColor.CYAN).strength(4.0F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); - public static final Block TURQUOISE_BLOCK = registerBlock("turquoise_block", new Block(FabricBlockSettings.copyOf(Blocks.DIAMOND_BLOCK).mapColor(MapColor.CYAN).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); - public static final Block DEEPSLATE_TURQUOISE_ORE = registerBlock("deepslate_turquoise_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 9), FabricBlockSettings.copyOf(Blocks.DEEPSLATE_DIAMOND_ORE).mapColor(MapColor.CYAN).strength(5.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE).requiresTool())); - public static final Block RUBY_ORE = registerBlock("ruby_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 8), FabricBlockSettings.copyOf(Blocks.DIAMOND_ORE).mapColor(MapColor.RED).strength(3.0F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); - public static final Block RUBY_BLOCK = registerBlock("ruby_block", new Block(FabricBlockSettings.copyOf(Blocks.DIAMOND_BLOCK).mapColor(MapColor.RED).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); - public static final Block NETHER_RUBY_ORE = registerBlock("nether_ruby_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 8), FabricBlockSettings.copyOf(Blocks.NETHER_GOLD_ORE).mapColor(MapColor.RED).strength(4.0F, 3.0F).sounds(BlockSoundGroup.NETHER_ORE).requiresTool())); - public static final Block DEEPSLATE_RUBY_ORE = registerBlock("deepslate_ruby_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 8), FabricBlockSettings.copyOf(Blocks.DEEPSLATE_DIAMOND_ORE).mapColor(MapColor.RED).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE).requiresTool())); - - public static final Block MOISSANITE_ORE = registerBlock("moissanite_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 8), FabricBlockSettings.copyOf(Blocks.DIAMOND_ORE).mapColor(MapColor.LICHEN_GREEN).strength(3.0F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); - public static final Block MOISSANITE_BLOCK = registerBlock("moissanite_block", new Block(FabricBlockSettings.copyOf(Blocks.DIAMOND_BLOCK).mapColor(MapColor.LICHEN_GREEN).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); - public static final Block NETHER_MOISSANITE_ORE = registerBlock("nether_moissanite_ore", new ExperienceDroppingBlock(UniformIntProvider.create(2, 8), FabricBlockSettings.copyOf(Blocks.NETHER_GOLD_ORE).mapColor(MapColor.LICHEN_GREEN).strength(5.0F, 3.0F).sounds(BlockSoundGroup.NETHER_ORE).requiresTool())); - public static final Block DEEPSLATE_MOISSANITE_ORE = registerBlock("deepslate_moissanite_ore", new ExperienceDroppingBlock(UniformIntProvider.create(2, 8), FabricBlockSettings.copyOf(Blocks.DEEPSLATE_DIAMOND_ORE).mapColor(MapColor.LICHEN_GREEN).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE).requiresTool())); - public static final Block ONYX_ORE = registerBlock("onyx_ore", new ExperienceDroppingBlock(UniformIntProvider.create(4, 10), FabricBlockSettings.copyOf(Blocks.ANCIENT_DEBRIS).mapColor(MapColor.BLACK).sounds(BlockSoundGroup.STONE).requiresTool())); - public static final Block ONYX_BLOCK = registerBlock("onyx_block", new Block(FabricBlockSettings.copyOf(Blocks.NETHERITE_BLOCK).mapColor(MapColor.BLACK).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); - - public static final Block GRAPHENE_BLOCK = registerBlock("graphene_block", new Block(FabricBlockSettings.copyOf(Blocks.NETHERITE_BLOCK).mapColor(MapColor.GREEN).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); - -// public static final AlloyFurnaceBlock ALLOY_FURNACE = registerBlock("alloy_furnace", new AlloyFurnaceBlock(FabricBlockSettings.copyOf(Blocks.FURNACE).mapColor(MapColor.LIGHT_GRAY).strength(4.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool().lightLevel(LightUtils.setSwitchedLight(BlockStateProperties.LIT, 13)))); + public static final Block ANTHRACITE_ORE = registerBlock("anthracite_ore", new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), AbstractBlock.Settings.copy(Blocks.COAL_ORE).strength(3.0F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); + public static final Block NETHER_ANTHRACITE_ORE = registerBlock("nether_anthracite_ore", new ExperienceDroppingBlock(UniformIntProvider.create(1, 3), AbstractBlock.Settings.copy(Blocks.NETHER_GOLD_ORE).mapColor(MapColor.BLACK).strength(3.0F, 3.0F).sounds(BlockSoundGroup.NETHER_GOLD_ORE).requiresTool())); + public static final Block DEEPSLATE_ANTHRACITE_ORE = registerBlock("deepslate_anthracite_ore", new ExperienceDroppingBlock(UniformIntProvider.create(1, 3), AbstractBlock.Settings.copy(Blocks.DEEPSLATE_COAL_ORE).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE).requiresTool())); + + public static final Block TIN_ORE = registerBlock("tin_ore", new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), AbstractBlock.Settings.copy(Blocks.COPPER_ORE).strength(3.0F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); + public static final Block TIN_BLOCK = registerBlock("tin_block", new Block(AbstractBlock.Settings.copy(Blocks.COPPER_BLOCK).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); + public static final Block RAW_TIN_BLOCK = registerBlock("raw_tin_block", new Block(AbstractBlock.Settings.copy(Blocks.RAW_COPPER_BLOCK).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); + public static final Block DEEPSLATE_TIN_ORE = registerBlock("deepslate_tin_ore", new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), AbstractBlock.Settings.copy(Blocks.DEEPSLATE_COPPER_ORE).strength(4.5F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); + public static final Block SILVER_ORE = registerBlock("silver_ore", new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), AbstractBlock.Settings.copy(Blocks.IRON_ORE).strength(3.0F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); + public static final Block SILVER_BLOCK = registerBlock("silver_block", new Block(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); + public static final Block RAW_SILVER_BLOCK = registerBlock("raw_silver_block", new Block(AbstractBlock.Settings.copy(Blocks.RAW_IRON_BLOCK).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); + public static final Block DEEPSLATE_SILVER_ORE = registerBlock("deepslate_silver_ore", new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), AbstractBlock.Settings.copy(Blocks.DEEPSLATE_IRON_ORE).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE).requiresTool())); + public static final Block NETHER_SILVER_ORE = registerBlock("nether_silver_ore", new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), AbstractBlock.Settings.copy(Blocks.NETHER_GOLD_ORE).mapColor(MapColor.LIGHT_GRAY).strength(3.0F, 3.0F).sounds(BlockSoundGroup.NETHER_GOLD_ORE).requiresTool())); + + public static final Block COBALT_ORE = registerBlock("cobalt_ore", new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), AbstractBlock.Settings.copy(Blocks.IRON_ORE).mapColor(MapColor.LIGHT_BLUE).strength(3.0F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); + public static final Block COBALT_BLOCK = registerBlock("cobalt_block", new Block(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).mapColor(MapColor.LIGHT_BLUE).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); + public static final Block RAW_COBALT_BLOCK = registerBlock("raw_cobalt_block", new Block(AbstractBlock.Settings.copy(Blocks.RAW_IRON_BLOCK).mapColor(MapColor.LIGHT_BLUE).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); + public static final Block DEEPSLATE_COBALT_ORE = registerBlock("deepslate_cobalt_ore", new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), AbstractBlock.Settings.copy(Blocks.DEEPSLATE_IRON_ORE).mapColor(MapColor.LIGHT_BLUE).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE).requiresTool())); + + public static final Block BRONZE_BLOCK = registerBlock("bronze_block", new Block(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).mapColor(MapColor.BROWN).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); + + public static final Block STERLING_BLOCK = registerBlock("sterling_block", new Block(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).mapColor(MapColor.LIGHT_GRAY).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); + + public static final Block AMETHYST_BLOCK = registerBlock("amethyst_block", new Block(AbstractBlock.Settings.copy(Blocks.AMETHYST_BLOCK).strength(5.0F, 6.0F).sounds(BlockSoundGroup.AMETHYST_BLOCK).requiresTool())); + + public static final Block STEEL_BLOCK = registerBlock("steel_block", new Block(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).mapColor(MapColor.GRAY).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); + public static final Block TOPAZ_ORE = registerBlock("topaz_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 6), AbstractBlock.Settings.copy(Blocks.DIAMOND_ORE).mapColor(MapColor.LIGHT_BLUE).strength(3.0F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); + public static final Block TOPAZ_BLOCK = registerBlock("topaz_block", new Block(AbstractBlock.Settings.copy(Blocks.DIAMOND_BLOCK).mapColor(MapColor.LIGHT_BLUE).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); + public static final Block DEEPSLATE_TOPAZ_ORE = registerBlock("deepslate_topaz_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 6), AbstractBlock.Settings.copy(Blocks.DEEPSLATE_DIAMOND_ORE).mapColor(MapColor.LIGHT_BLUE).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE).requiresTool())); + + public static final Block TOURMALINE_ORE = registerBlock("tourmaline_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 7), AbstractBlock.Settings.copy(Blocks.DIAMOND_ORE).mapColor(MapColor.PINK).strength(3.0F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); + public static final Block TOURMALINE_BLOCK = registerBlock("tourmaline_block", new Block(AbstractBlock.Settings.copy(Blocks.DIAMOND_BLOCK).mapColor(MapColor.PINK).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); + public static final Block DEEPSLATE_TOURMALINE_ORE = registerBlock("deepslate_tourmaline_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 7), AbstractBlock.Settings.copy(Blocks.DEEPSLATE_DIAMOND_ORE).mapColor(MapColor.PINK).strength(4.5F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); + + public static final Block NETHER_TANZANITE_ORE = registerBlock("nether_tanzanite_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 7), AbstractBlock.Settings.copy(Blocks.NETHER_GOLD_ORE).mapColor(MapColor.PURPLE).strength(3.0F, 3.0F).sounds(BlockSoundGroup.NETHER_ORE).requiresTool())); + public static final Block TANZANITE_BLOCK = registerBlock("tanzanite_block", new Block(AbstractBlock.Settings.copy(Blocks.DIAMOND_BLOCK).mapColor(MapColor.PURPLE).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); + + public static final Block SAPPHIRE_ORE = registerBlock("sapphire_ore", new ExperienceDroppingBlock(UniformIntProvider.create(2, 5), AbstractBlock.Settings.copy(Blocks.DIAMOND_ORE).mapColor(MapColor.BLUE).strength(3.0F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); + public static final Block SAPPHIRE_BLOCK = registerBlock("sapphire_block", new Block(AbstractBlock.Settings.copy(Blocks.DIAMOND_ORE).mapColor(MapColor.BLUE).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); + public static final Block DEEPSLATE_SAPPHIRE_ORE = registerBlock("deepslate_sapphire_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 8), AbstractBlock.Settings.copy(Blocks.DEEPSLATE_DIAMOND_ORE).mapColor(MapColor.BLUE).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE).requiresTool())); + public static final Block NETHER_SAPPHIRE_ORE = registerBlock("nether_sapphire_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 8), AbstractBlock.Settings.copy(Blocks.NETHER_GOLD_ORE).mapColor(MapColor.BLUE).strength(4.0F, 3.0F).sounds(BlockSoundGroup.NETHER_ORE).requiresTool())); + + public static final Block TURQUOISE_ORE = registerBlock("turquoise_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 9), AbstractBlock.Settings.copy(Blocks.DIAMOND_ORE).mapColor(MapColor.CYAN).strength(4.0F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); + public static final Block TURQUOISE_BLOCK = registerBlock("turquoise_block", new Block(AbstractBlock.Settings.copy(Blocks.DIAMOND_BLOCK).mapColor(MapColor.CYAN).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); + public static final Block DEEPSLATE_TURQUOISE_ORE = registerBlock("deepslate_turquoise_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 9), AbstractBlock.Settings.copy(Blocks.DEEPSLATE_DIAMOND_ORE).mapColor(MapColor.CYAN).strength(5.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE).requiresTool())); + public static final Block RUBY_ORE = registerBlock("ruby_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 8), AbstractBlock.Settings.copy(Blocks.DIAMOND_ORE).mapColor(MapColor.RED).strength(3.0F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); + public static final Block RUBY_BLOCK = registerBlock("ruby_block", new Block(AbstractBlock.Settings.copy(Blocks.DIAMOND_BLOCK).mapColor(MapColor.RED).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); + public static final Block NETHER_RUBY_ORE = registerBlock("nether_ruby_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 8), AbstractBlock.Settings.copy(Blocks.NETHER_GOLD_ORE).mapColor(MapColor.RED).strength(4.0F, 3.0F).sounds(BlockSoundGroup.NETHER_ORE).requiresTool())); + public static final Block DEEPSLATE_RUBY_ORE = registerBlock("deepslate_ruby_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 8), AbstractBlock.Settings.copy(Blocks.DEEPSLATE_DIAMOND_ORE).mapColor(MapColor.RED).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE).requiresTool())); + + public static final Block MOISSANITE_ORE = registerBlock("moissanite_ore", new ExperienceDroppingBlock(UniformIntProvider.create(3, 8), AbstractBlock.Settings.copy(Blocks.DIAMOND_ORE).mapColor(MapColor.LICHEN_GREEN).strength(3.0F, 3.0F).sounds(BlockSoundGroup.STONE).requiresTool())); + public static final Block MOISSANITE_BLOCK = registerBlock("moissanite_block", new Block(AbstractBlock.Settings.copy(Blocks.DIAMOND_BLOCK).mapColor(MapColor.LICHEN_GREEN).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); + public static final Block NETHER_MOISSANITE_ORE = registerBlock("nether_moissanite_ore", new ExperienceDroppingBlock(UniformIntProvider.create(2, 8), AbstractBlock.Settings.copy(Blocks.NETHER_GOLD_ORE).mapColor(MapColor.LICHEN_GREEN).strength(5.0F, 3.0F).sounds(BlockSoundGroup.NETHER_ORE).requiresTool())); + public static final Block DEEPSLATE_MOISSANITE_ORE = registerBlock("deepslate_moissanite_ore", new ExperienceDroppingBlock(UniformIntProvider.create(2, 8), AbstractBlock.Settings.copy(Blocks.DEEPSLATE_DIAMOND_ORE).mapColor(MapColor.LICHEN_GREEN).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE).requiresTool())); + public static final Block ONYX_ORE = registerBlock("onyx_ore", new ExperienceDroppingBlock(UniformIntProvider.create(4, 10), AbstractBlock.Settings.copy(Blocks.ANCIENT_DEBRIS).mapColor(MapColor.BLACK).sounds(BlockSoundGroup.STONE).requiresTool())); + public static final Block ONYX_BLOCK = registerBlock("onyx_block", new Block(AbstractBlock.Settings.copy(Blocks.NETHERITE_BLOCK).mapColor(MapColor.BLACK).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); + + public static final Block GRAPHENE_BLOCK = registerBlock("graphene_block", new Block(AbstractBlock.Settings.copy(Blocks.NETHERITE_BLOCK).mapColor(MapColor.GREEN).strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool())); + +// public static final AlloyFurnaceBlock ALLOY_FURNACE = registerBlock("alloy_furnace", new AlloyFurnaceBlock(AbstractBlock.Settings.copy(Blocks.FURNACE).mapColor(MapColor.LIGHT_GRAY).strength(4.0F, 6.0F).sounds(BlockSoundGroup.METAL).requiresTool().lightLevel(LightUtils.setSwitchedLight(BlockStateProperties.LIT, 13)))); private static void addItemsToBuildingBlockItemGroup(FabricItemGroupEntries entries) { entries.add(TIN_BLOCK); @@ -152,7 +147,7 @@ private static Block registerBlock(String name, Block block) { private static Item registerBlockItem(String name, Block block) { return Registry.register(Registries.ITEM, new Identifier(Mores.MOD_ID, name), - new BlockItem(block, new FabricItemSettings())); + new BlockItem(block, new Item.Settings())); } public static void registerModBlocks() { diff --git a/src/main/java/mod/leronus/mores/datagen/ModModelProvider.java b/src/main/java/mod/leronus/mores/datagen/ModModelProvider.java index cfb7dcb..17b59b1 100644 --- a/src/main/java/mod/leronus/mores/datagen/ModModelProvider.java +++ b/src/main/java/mod/leronus/mores/datagen/ModModelProvider.java @@ -412,36 +412,36 @@ public void generateItemModels(ItemModelGenerator itemModelGenerator) { // itemModelGenerator.registerArmor(((ArmorItem) ModItems.GRAPHENE_LEGGINGS)); // itemModelGenerator.registerArmor(((ArmorItem) ModItems.GRAPHENE_BOOTS)); - itemModelGenerator.register(ModItems.TIN_HORSE_ARMOR, Models.GENERATED); - itemModelGenerator.register(ModItems.COPPER_HORSE_ARMOR, Models.GENERATED); - itemModelGenerator.register(ModItems.BRONZE_HORSE_ARMOR, Models.GENERATED); - itemModelGenerator.register(ModItems.SILVER_HORSE_ARMOR, Models.GENERATED); - itemModelGenerator.register(ModItems.COBALT_HORSE_ARMOR, Models.GENERATED); - itemModelGenerator.register(ModItems.STERLING_HORSE_ARMOR, Models.GENERATED); - itemModelGenerator.register(ModItems.STEEL_HORSE_ARMOR, Models.GENERATED); - itemModelGenerator.register(ModItems.AMETHYST_HORSE_ARMOR, Models.GENERATED); - itemModelGenerator.register(ModItems.EMERALD_HORSE_ARMOR, Models.GENERATED); - itemModelGenerator.register(ModItems.TOPAZ_HORSE_ARMOR, Models.GENERATED); - itemModelGenerator.register(ModItems.TOURMALINE_HORSE_ARMOR, Models.GENERATED); - itemModelGenerator.register(ModItems.TANZANITE_HORSE_ARMOR, Models.GENERATED); - itemModelGenerator.register(ModItems.RUBY_HORSE_ARMOR, Models.GENERATED); - itemModelGenerator.register(ModItems.SAPPHIRE_HORSE_ARMOR, Models.GENERATED); - itemModelGenerator.register(ModItems.MOISSANITE_HORSE_ARMOR, Models.GENERATED); - itemModelGenerator.register(ModItems.TURQUOISE_HORSE_ARMOR, Models.GENERATED); - itemModelGenerator.register(ModItems.OBSIDIAN_HORSE_ARMOR, Models.GENERATED); - itemModelGenerator.register(ModItems.ONYX_HORSE_ARMOR, Models.GENERATED); - itemModelGenerator.register(ModItems.GRAPHENE_HORSE_ARMOR, Models.GENERATED); - itemModelGenerator.register(ModItems.NETHERITE_HORSE_ARMOR, Models.GENERATED); +// itemModelGenerator.register(ModItems.TIN_HORSE_ARMOR, Models.GENERATED); +// itemModelGenerator.register(ModItems.COPPER_HORSE_ARMOR, Models.GENERATED); +// itemModelGenerator.register(ModItems.BRONZE_HORSE_ARMOR, Models.GENERATED); +// itemModelGenerator.register(ModItems.SILVER_HORSE_ARMOR, Models.GENERATED); +// itemModelGenerator.register(ModItems.COBALT_HORSE_ARMOR, Models.GENERATED); +// itemModelGenerator.register(ModItems.STERLING_HORSE_ARMOR, Models.GENERATED); +// itemModelGenerator.register(ModItems.STEEL_HORSE_ARMOR, Models.GENERATED); +// itemModelGenerator.register(ModItems.AMETHYST_HORSE_ARMOR, Models.GENERATED); +// itemModelGenerator.register(ModItems.EMERALD_HORSE_ARMOR, Models.GENERATED); +// itemModelGenerator.register(ModItems.TOPAZ_HORSE_ARMOR, Models.GENERATED); +// itemModelGenerator.register(ModItems.TOURMALINE_HORSE_ARMOR, Models.GENERATED); +// itemModelGenerator.register(ModItems.TANZANITE_HORSE_ARMOR, Models.GENERATED); +// itemModelGenerator.register(ModItems.RUBY_HORSE_ARMOR, Models.GENERATED); +// itemModelGenerator.register(ModItems.SAPPHIRE_HORSE_ARMOR, Models.GENERATED); +// itemModelGenerator.register(ModItems.MOISSANITE_HORSE_ARMOR, Models.GENERATED); +// itemModelGenerator.register(ModItems.TURQUOISE_HORSE_ARMOR, Models.GENERATED); +// itemModelGenerator.register(ModItems.OBSIDIAN_HORSE_ARMOR, Models.GENERATED); +// itemModelGenerator.register(ModItems.ONYX_HORSE_ARMOR, Models.GENERATED); +// itemModelGenerator.register(ModItems.GRAPHENE_HORSE_ARMOR, Models.GENERATED); +// itemModelGenerator.register(ModItems.NETHERITE_HORSE_ARMOR, Models.GENERATED); itemModelGenerator.register(ModItems.ANTHRACITE, Models.GENERATED); - itemModelGenerator.register(ModItems.BRONZE_APPLE, Models.GENERATED); - itemModelGenerator.register(ModItems.SILVER_APPLE, Models.GENERATED); - itemModelGenerator.register(ModItems.COBALT_APPLE, Models.GENERATED); - - itemModelGenerator.register(ModItems.VELVET, Models.GENERATED); - itemModelGenerator.register(ModItems.CHOCOLATE, Models.GENERATED); - itemModelGenerator.register(ModItems.CARROT_PIE, Models.GENERATED); +// itemModelGenerator.register(ModItems.BRONZE_APPLE, Models.GENERATED); +// itemModelGenerator.register(ModItems.SILVER_APPLE, Models.GENERATED); +// itemModelGenerator.register(ModItems.COBALT_APPLE, Models.GENERATED); +// +// itemModelGenerator.register(ModItems.VELVET, Models.GENERATED); +// itemModelGenerator.register(ModItems.CHOCOLATE, Models.GENERATED); +// itemModelGenerator.register(ModItems.CARROT_PIE, Models.GENERATED); itemModelGenerator.register(ModItems.CHAIN, Models.GENERATED); // itemModelGenerator.register(ModItems.DUCK, Models.GENERATED); // itemModelGenerator.register(ModItems.COOKED_DUCK, Models.GENERATED); diff --git a/src/main/java/mod/leronus/mores/item/ModArmorMaterials.java b/src/main/java/mod/leronus/mores/item/ModArmorMaterials.java index c8eca5b..97bf431 100644 --- a/src/main/java/mod/leronus/mores/item/ModArmorMaterials.java +++ b/src/main/java/mod/leronus/mores/item/ModArmorMaterials.java @@ -5,101 +5,163 @@ import net.minecraft.item.ArmorMaterial; import net.minecraft.item.Items; import net.minecraft.recipe.Ingredient; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.sound.SoundEvent; import net.minecraft.sound.SoundEvents; +import net.minecraft.util.Identifier; +import net.minecraft.util.Util; +import java.util.EnumMap; +import java.util.List; import java.util.function.Supplier; -public enum ModArmorMaterials implements ArmorMaterial { - /** - * Slot[]{Feet, Legs, Chest, Helm} - */ -// LEATHER("leather", 5, new int[]{1, 2, 3, 1}, 15, SoundEvents.ARMOR_EQUIP_LEATHER, 0.0F, 0.0F, () -> Ingredient.ofItems(Items.LEATHER)), - TIN("tin", 5, new int[] {1, 4, 5, 1}, 13, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F, 0.0F, () -> Ingredient.ofItems(ModItems.TIN_INGOT)), - COPPER("copper", 6, new int[] {1, 4, 5, 1}, 9, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F, 0.0F, () -> Ingredient.ofItems(Items.COPPER_INGOT)), -// GOLD("gold", 7, new int[]{1, 3, 5, 2}, 25, SoundEvents.ITEM_ARMOR_EQUIP_GOLD, 0.0F, 0.0F, () -> Ingredient.ofItems(Items.GOLD_INGOT)), - SILVER("silver", 12, new int[] {1, 4, 5, 1}, 24, SoundEvents.ITEM_ARMOR_EQUIP_GOLD, 0.0F, 0.0F, () -> Ingredient.ofItems(ModItems.SILVER_INGOT)), -// CHAIN("chainmail", 15, new int[]{1, 4, 5, 2}, 12, SoundEvents.ARMOR_EQUIP_CHAIN, 0.0F, 0.0F, () -> Ingredient.ofItems(Items.IRON_INGOT)), - BRONZE("bronze", 11, new int[] {2, 5, 6, 2}, 11, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F, 0.0F, () -> Ingredient.ofItems(ModItems.BRONZE_INGOT)), -// IRON("iron", 15, new int[]{2, 5, 6, 2}, 9, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F, 0.0F, () -> Ingredient.ofItems(Items.IRON_INGOT)), - STERLING("sterling", 17, new int[] {2, 5, 6, 2}, 17, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F, 0.0F, () -> Ingredient.ofItems(ModItems.STERLING_INGOT)), - COBALT("cobalt", 18, new int[] {2, 5, 6, 2}, 10, SoundEvents.ITEM_ARMOR_EQUIP_GOLD, 0.0F, 0.0F, () -> Ingredient.ofItems(ModItems.COBALT_INGOT)), - STEEL("steel", 22, new int[] {2, 6, 7, 2}, 15, SoundEvents.ITEM_ARMOR_EQUIP_CHAIN, 1.0F, 0.1F, () -> Ingredient.ofItems(ModItems.STEEL_INGOT)), - AMETHYST("amethyst", 22, new int[] {2, 6, 7, 3}, 16, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 0.0F, 0.0F, () -> Ingredient.ofItems(Items.AMETHYST_SHARD)), - EMERALD("emerald", 26, new int[] {2, 6, 7, 3}, 25, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 1.0F, 0.0F, () -> Ingredient.ofItems(Items.EMERALD)), - TOPAZ("topaz", 22, new int[] {2, 6, 7, 3}, 8, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 1.0F, 0.0F, () -> Ingredient.ofItems(ModItems.TOPAZ_GEM)), - TOURMALINE("tourmaline", 25, new int[] {2, 6, 7, 3}, 12, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 1.0F, 0.0F, () -> Ingredient.ofItems(ModItems.TOURMALINE_GEM)), - // DIAMOND("diamond", 33, new int[]{3, 6, 8, 3}, 10, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 2.0F, 0.0F, () -> Ingredient.ofItems(Items.DIAMOND)), - RUBY("ruby", 35, new int[] {2, 6, 8, 3}, 12, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 2.0F, 0.0F, () -> Ingredient.ofItems(ModItems.RUBY_GEM)), - SAPPHIRE("sapphire", 39, new int[] {3, 6, 8, 3}, 16, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 2.0F, 0.0F, () -> Ingredient.ofItems(ModItems.SAPPHIRE_GEM)), - MOISSANITE("moissanite", 36, new int[] {3, 6, 8, 3}, 10, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 2.0F, 0.0F, () -> Ingredient.ofItems(ModItems.MOISSANITE_GEM)), - TANZANITE("tanzanite", 38, new int[] {3, 7, 8, 4}, 18, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 1.0F, 0.0F, () -> Ingredient.ofItems(ModItems.TANZANITE_GEM)), - OBSIDIAN("obsidian", 44, new int[] {3, 7, 8, 4}, 12, SoundEvents.ITEM_ARMOR_EQUIP_NETHERITE, 2.0F, 0.5F, () -> Ingredient.ofItems(ModItems.OBSIDIAN_INGOT)), - TURQUOISE("turquoise", 38, new int[] {3, 6, 8, 3}, 14, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 2.0F, 0.0F, () -> Ingredient.ofItems(ModItems.TURQUOISE_GEM)), - ONYX("onyx", 51, new int[] {3, 7, 8, 4}, 18, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 3.0F, 0.0F, () -> Ingredient.ofItems(ModItems.ONYX_GEM)), -// NETHERITE("netherite", 37, new int[]{3, 6, 8, 3}, 15, SoundEvents.ITEM_ARMOR_EQUIP_NETHERITE, 3.0F, 0.1F, () -> Ingredient.ofItems(Items.NETHERITE_INGOT)), - GRAPHENE("graphene", 66, new int[] {3, 7, 8, 4}, 16, SoundEvents.ITEM_ARMOR_EQUIP_NETHERITE, 4.0F, 0.2F, () -> Ingredient.ofItems(ModItems.GRAPHENE_GEM)); - private final String name; - private final int durabilityMultiplier; - private final int[] protectionAmounts; - private final int enchantability; - private final SoundEvent equipSound; - private final float toughness; - private final float knockbackResistance; - private final Supplier repairIngredient; +public class ModArmorMaterials +{ + public static final RegistryEntry TIN = register("tin", + Util.make(new EnumMap(ArmorItem.Type.class), + map -> + { + map.put(ArmorItem.Type.BOOTS, 1); + map.put(ArmorItem.Type.LEGGINGS, 4); + map.put(ArmorItem.Type.CHESTPLATE, 5); + map.put(ArmorItem.Type.HELMET, 1); + map.put(ArmorItem.Type.BODY, 4); + }), + 13, SoundEvents.ITEM_ARMOR_EQUIP_IRON, + 0.0f, 0.0f, + () -> Ingredient.ofItems(ModItems.TIN_INGOT)); - private static final int[] BASE_DURABILITY = { 11, 16, 15, 13 }; + public static final RegistryEntry COPPER = register("copper", + Util.make(new EnumMap(ArmorItem.Type.class), + map -> + { + map.put(ArmorItem.Type.BOOTS, 1); + map.put(ArmorItem.Type.LEGGINGS, 4); + map.put(ArmorItem.Type.CHESTPLATE, 5); + map.put(ArmorItem.Type.HELMET, 1); + map.put(ArmorItem.Type.BODY, 5); + }), + 9, SoundEvents.ITEM_ARMOR_EQUIP_IRON, + 0.0f, 0.0f, + () -> Ingredient.ofItems(Items.COPPER_INGOT)); - ModArmorMaterials(String name, int durabilityMultiplier, int[] protectionAmounts, int enchantability, SoundEvent equipSound, - float toughness, float knockbackResistance, Supplier repairIngredient) { - this.name = name; - this.durabilityMultiplier = durabilityMultiplier; - this.protectionAmounts = protectionAmounts; - this.enchantability = enchantability; - this.equipSound = equipSound; - this.toughness = toughness; - this.knockbackResistance = knockbackResistance; - this.repairIngredient = repairIngredient; - } +// SILVER("silver", 12, new int[] {1, 4, 5, 1}, 24, SoundEvents.ITEM_ARMOR_EQUIP_GOLD, 0.0F, 0.0F, () -> Ingredient.ofItems(ModItems.SILVER_INGOT)), +// // CHAIN("chainmail", 15, new int[]{1, 4, 5, 2}, 12, SoundEvents.ARMOR_EQUIP_CHAIN, 0.0F, 0.0F, () -> Ingredient.ofItems(Items.IRON_INGOT)), +// BRONZE("bronze", 11, new int[] {2, 5, 6, 2}, 11, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F, 0.0F, () -> Ingredient.ofItems(ModItems.BRONZE_INGOT)), +// // IRON("iron", 15, new int[]{2, 5, 6, 2}, 9, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F, 0.0F, () -> Ingredient.ofItems(Items.IRON_INGOT)), +// STERLING("sterling", 17, new int[] {2, 5, 6, 2}, 17, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F, 0.0F, () -> Ingredient.ofItems(ModItems.STERLING_INGOT)), +// COBALT("cobalt", 18, new int[] {2, 5, 6, 2}, 10, SoundEvents.ITEM_ARMOR_EQUIP_GOLD, 0.0F, 0.0F, () -> Ingredient.ofItems(ModItems.COBALT_INGOT)), +// STEEL("steel", 22, new int[] {2, 6, 7, 2}, 15, SoundEvents.ITEM_ARMOR_EQUIP_CHAIN, 1.0F, 0.1F, () -> Ingredient.ofItems(ModItems.STEEL_INGOT)), +// AMETHYST("amethyst", 22, new int[] {2, 6, 7, 3}, 16, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 0.0F, 0.0F, () -> Ingredient.ofItems(Items.AMETHYST_SHARD)), +// EMERALD("emerald", 26, new int[] {2, 6, 7, 3}, 25, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 1.0F, 0.0F, () -> Ingredient.ofItems(Items.EMERALD)), +// TOPAZ("topaz", 22, new int[] {2, 6, 7, 3}, 8, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 1.0F, 0.0F, () -> Ingredient.ofItems(ModItems.TOPAZ_GEM)), +// TOURMALINE("tourmaline", 25, new int[] {2, 6, 7, 3}, 12, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 1.0F, 0.0F, () -> Ingredient.ofItems(ModItems.TOURMALINE_GEM)), +// // DIAMOND("diamond", 33, new int[]{3, 6, 8, 3}, 10, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 2.0F, 0.0F, () -> Ingredient.ofItems(Items.DIAMOND)), +// RUBY("ruby", 35, new int[] {2, 6, 8, 3}, 12, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 2.0F, 0.0F, () -> Ingredient.ofItems(ModItems.RUBY_GEM)), +// SAPPHIRE("sapphire", 39, new int[] {3, 6, 8, 3}, 16, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 2.0F, 0.0F, () -> Ingredient.ofItems(ModItems.SAPPHIRE_GEM)), +// MOISSANITE("moissanite", 36, new int[] {3, 6, 8, 3}, 10, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 2.0F, 0.0F, () -> Ingredient.ofItems(ModItems.MOISSANITE_GEM)), +// TANZANITE("tanzanite", 38, new int[] {3, 7, 8, 4}, 18, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 1.0F, 0.0F, () -> Ingredient.ofItems(ModItems.TANZANITE_GEM)), +// OBSIDIAN("obsidian", 44, new int[] {3, 7, 8, 4}, 12, SoundEvents.ITEM_ARMOR_EQUIP_NETHERITE, 2.0F, 0.5F, () -> Ingredient.ofItems(ModItems.OBSIDIAN_INGOT)), +// TURQUOISE("turquoise", 38, new int[] {3, 6, 8, 3}, 14, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 2.0F, 0.0F, () -> Ingredient.ofItems(ModItems.TURQUOISE_GEM)), +// ONYX("onyx", 51, new int[] {3, 7, 8, 4}, 18, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 3.0F, 0.0F, () -> Ingredient.ofItems(ModItems.ONYX_GEM)), +// // NETHERITE("netherite", 37, new int[]{3, 6, 8, 3}, 15, SoundEvents.ITEM_ARMOR_EQUIP_NETHERITE, 3.0F, 0.1F, () -> Ingredient.ofItems(Items.NETHERITE_INGOT)), +// GRAPHENE("graphene", 66, new int[] {3, 7, 8, 4}, 16, SoundEvents.ITEM_ARMOR_EQUIP_NETHERITE, 4.0F, 0.2F, () -> Ingredient.ofItems(ModItems.GRAPHENE_GEM)); - @Override - public int getDurability(ArmorItem.Type type) { - return BASE_DURABILITY[type.ordinal()] * this.durabilityMultiplier; - } + public static final RegistryEntry SILVER = register("silver", + Util.make(new EnumMap(ArmorItem.Type.class), + map -> + { + map.put(ArmorItem.Type.BOOTS, 2); + map.put(ArmorItem.Type.LEGGINGS, 5); + map.put(ArmorItem.Type.CHESTPLATE, 6); + map.put(ArmorItem.Type.HELMET, 2); + map.put(ArmorItem.Type.BODY, 7); + }), + 0, SoundEvents.ITEM_ARMOR_EQUIP_GOLD, + 0.0f, 0.0f, + () -> Ingredient.ofItems(ModItems.SILVER_INGOT)); - @Override - public int getProtection(ArmorItem.Type type) { - return protectionAmounts[type.ordinal()]; - } + public static final RegistryEntry BRONZE = register("bronze", + Util.make(new EnumMap(ArmorItem.Type.class), + map -> + { + map.put(ArmorItem.Type.BOOTS, 1); + map.put(ArmorItem.Type.LEGGINGS, 5); + map.put(ArmorItem.Type.CHESTPLATE, 7); + map.put(ArmorItem.Type.HELMET, 2); + map.put(ArmorItem.Type.BODY, 7); + }), + 0, SoundEvents.ITEM_ARMOR_EQUIP_IRON, + 0.0f, 0.0f, + () -> Ingredient.ofItems(ModItems.BRONZE_INGOT)); - @Override - public int getEnchantability() { - return this.enchantability; - } + public static final RegistryEntry STERLING = register("sterling", + Util.make(new EnumMap(ArmorItem.Type.class), + map -> + { + map.put(ArmorItem.Type.BOOTS, 3); + map.put(ArmorItem.Type.LEGGINGS, 6); + map.put(ArmorItem.Type.CHESTPLATE, 8); + map.put(ArmorItem.Type.HELMET, 3); + map.put(ArmorItem.Type.BODY, 15); + }), + 0, SoundEvents.ITEM_ARMOR_EQUIP_IRON, + 0.0f, 0.0f, + () -> Ingredient.ofItems(ModItems.STERLING_INGOT)); - @Override - public SoundEvent getEquipSound() { - return this.equipSound; - } + public static final RegistryEntry COBALT = register("cobalt", + Util.make(new EnumMap(ArmorItem.Type.class), + map -> + { + map.put(ArmorItem.Type.BOOTS, 3); + map.put(ArmorItem.Type.LEGGINGS, 6); + map.put(ArmorItem.Type.CHESTPLATE, 8); + map.put(ArmorItem.Type.HELMET, 3); + map.put(ArmorItem.Type.BODY, 7); + }), + 0, SoundEvents.ITEM_ARMOR_EQUIP_IRON, + 0.0f, 0.0f, + () -> Ingredient.ofItems(ModItems.COBALT_INGOT)); - @Override - public Ingredient getRepairIngredient() { - return this.repairIngredient.get(); - } + public static final RegistryEntry STEEL = register("steel", + Util.make(new EnumMap(ArmorItem.Type.class), + map -> + { + map.put(ArmorItem.Type.BOOTS, 3); + map.put(ArmorItem.Type.LEGGINGS, 6); + map.put(ArmorItem.Type.CHESTPLATE, 8); + map.put(ArmorItem.Type.HELMET, 3); + map.put(ArmorItem.Type.BODY, 7); + }), + 0, SoundEvents.ITEM_ARMOR_EQUIP_IRON, + 0.0f, 0.0f, + () -> Ingredient.ofItems(ModItems.STEEL_INGOT)); - @Override - public String getName() { - return Mores.MOD_ID + ":" + this.name; + public ModArmorMaterials() + { + throw new AssertionError(); } - @Override - public float getToughness() { - return this.toughness; + //region HELPER METHODS + private static RegistryEntry register(String id, EnumMap defense, int enchantability, RegistryEntry equipSound, float toughness, float knockbackResistance, Supplier repairIngredient) + { + List list = List.of(new ArmorMaterial.Layer(new Identifier(Mores.MOD_ID, id))); + return register(id, defense, enchantability, equipSound, toughness, knockbackResistance, repairIngredient, list); } - @Override - public float getKnockbackResistance() { - return this.knockbackResistance; + private static RegistryEntry register(String id, EnumMap defense, int enchantability, RegistryEntry equipSound, float toughness, float knockbackResistance, Supplier repairIngredient, List layers) + { + EnumMap enumMap = new EnumMap(ArmorItem.Type.class); + for (ArmorItem.Type type : ArmorItem.Type.values()) + { + enumMap.put(type, defense.get(type)); + } + return Registry.registerReference(Registries.ARMOR_MATERIAL, new Identifier(Mores.MOD_ID, id), + new ArmorMaterial(enumMap, enchantability, equipSound, repairIngredient, + layers, toughness, knockbackResistance)); } + //endregion } \ No newline at end of file diff --git a/src/main/java/mod/leronus/mores/item/ModFoodComponents.java b/src/main/java/mod/leronus/mores/item/ModFoodComponents.java index ed2306e..627ed15 100644 --- a/src/main/java/mod/leronus/mores/item/ModFoodComponents.java +++ b/src/main/java/mod/leronus/mores/item/ModFoodComponents.java @@ -2,17 +2,17 @@ import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; -import net.minecraft.item.FoodComponent; +//import net.minecraft.item.FoodComponent; public class ModFoodComponents { - public static final FoodComponent CHOCOLATE = new FoodComponent.Builder().hunger(4).saturationModifier(0.8f).build(); - public static final FoodComponent CARROT_PIE = new FoodComponent.Builder().hunger(5).saturationModifier(0.4f).build(); - public static final FoodComponent VELVET = new FoodComponent.Builder().hunger(5).saturationModifier(0.4f).build(); - - public static final FoodComponent SILVER_APPLE = new FoodComponent.Builder().hunger(5).saturationModifier(0.4f) - .statusEffect(new StatusEffectInstance(StatusEffects.STRENGTH, 200), 0.25f).statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 200), 0.25f).build(); - public static final FoodComponent BRONZE_APPLE = new FoodComponent.Builder().hunger(5).saturationModifier(0.4f) - .statusEffect(new StatusEffectInstance(StatusEffects.SPEED, 200), 0.25f).statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 200), 0.25f).build(); - public static final FoodComponent COBALT_APPLE = new FoodComponent.Builder().hunger(5).saturationModifier(0.4f) - .statusEffect(new StatusEffectInstance(StatusEffects.HASTE, 400), 0.25f).statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 200), 0.25f).build(); +// public static final FoodComponent CHOCOLATE = new FoodComponent.Builder().hunger(4).saturationModifier(0.8f).build(); +// public static final FoodComponent CARROT_PIE = new FoodComponent.Builder().hunger(5).saturationModifier(0.4f).build(); +// public static final FoodComponent VELVET = new FoodComponent.Builder().hunger(5).saturationModifier(0.4f).build(); +// +// public static final FoodComponent SILVER_APPLE = new FoodComponent.Builder().hunger(5).saturationModifier(0.4f) +// .statusEffect(new StatusEffectInstance(StatusEffects.STRENGTH, 200), 0.25f).statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 200), 0.25f).build(); +// public static final FoodComponent BRONZE_APPLE = new FoodComponent.Builder().hunger(5).saturationModifier(0.4f) +// .statusEffect(new StatusEffectInstance(StatusEffects.SPEED, 200), 0.25f).statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 200), 0.25f).build(); +// public static final FoodComponent COBALT_APPLE = new FoodComponent.Builder().hunger(5).saturationModifier(0.4f) +// .statusEffect(new StatusEffectInstance(StatusEffects.HASTE, 400), 0.25f).statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 200), 0.25f).build(); } \ No newline at end of file diff --git a/src/main/java/mod/leronus/mores/item/ModItemGroups.java b/src/main/java/mod/leronus/mores/item/ModItemGroups.java index 3a9604b..4ec4e3f 100644 --- a/src/main/java/mod/leronus/mores/item/ModItemGroups.java +++ b/src/main/java/mod/leronus/mores/item/ModItemGroups.java @@ -1,446 +1,446 @@ -package mod.leronus.mores.item; - -import mod.leronus.mores.Mores; -import mod.leronus.mores.block.ModBlocks; -import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.text.Text; -import net.minecraft.util.Identifier; - -public class ModItemGroups { - public static final ItemGroup MATERIAL_GROUP = Registry.register(Registries.ITEM_GROUP, - new Identifier(Mores.MOD_ID, "materials"), - FabricItemGroup.builder().displayName(Text.translatable("creativemodetab.mores_materials")) - .icon(() -> new ItemStack(ModItems.RUBY_GEM)).entries((displayContext, entries) -> { - entries.add(ModItems.ANTHRACITE); - entries.add(ModItems.RAW_TIN); - entries.add(ModItems.RAW_SILVER); - entries.add(ModItems.RAW_COBALT); - entries.add(ModItems.TIN_NUGGET); - - entries.add(ModItems.BRONZE_NUGGET); - entries.add(ModItems.SILVER_NUGGET); - entries.add(ModItems.COBALT_NUGGET); - entries.add(ModItems.STERLING_NUGGET); - entries.add(ModItems.STEEL_NUGGET); - entries.add(ModItems.TIN_INGOT); - - entries.add(ModItems.BRONZE_INGOT); - entries.add(ModItems.SILVER_INGOT); - entries.add(ModItems.COBALT_INGOT); - entries.add(ModItems.STERLING_INGOT); - - entries.add(ModItems.STEEL_INGOT); - entries.add(ModItems.OBSIDIAN_INGOT); - entries.add(ModItems.TOPAZ_GEM); - entries.add(ModItems.TOURMALINE_GEM); - entries.add(ModItems.TANZANITE_GEM); - - entries.add(ModItems.RUBY_GEM); - entries.add(ModItems.SAPPHIRE_GEM); - entries.add(ModItems.MOISSANITE_GEM); - - entries.add(ModItems.TURQUOISE_GEM); - entries.add(ModItems.ONYX_GEM); - entries.add(ModItems.GRAPHENE_GEM); - }).build()); - public static final ItemGroup BLOCK_GROUP = Registry.register(Registries.ITEM_GROUP, - new Identifier(Mores.MOD_ID, "blocks"), - FabricItemGroup.builder().displayName(Text.translatable("creativemodetab.mores_blocks")) - .icon(() -> new ItemStack(ModBlocks.TURQUOISE_BLOCK)).entries((displayContext, entries) -> { -// entries.add(ModBlocks.ALLOY_FURNACE); - entries.add(ModBlocks.RAW_TIN_BLOCK); - entries.add(ModBlocks.RAW_SILVER_BLOCK); - entries.add(ModBlocks.RAW_COBALT_BLOCK); - entries.add(ModBlocks.TIN_BLOCK); - entries.add(ModBlocks.BRONZE_BLOCK); - entries.add(ModBlocks.SILVER_BLOCK); - entries.add(ModBlocks.COBALT_BLOCK); - entries.add(ModBlocks.STERLING_BLOCK); - entries.add(ModBlocks.STEEL_BLOCK); - entries.add(ModBlocks.TOPAZ_BLOCK); - entries.add(ModBlocks.TOURMALINE_BLOCK); - entries.add(ModBlocks.TANZANITE_BLOCK); - entries.add(ModBlocks.RUBY_BLOCK); - entries.add(ModBlocks.SAPPHIRE_BLOCK); - entries.add(ModBlocks.MOISSANITE_BLOCK); - entries.add(ModBlocks.TURQUOISE_BLOCK); - entries.add(ModBlocks.ONYX_BLOCK); - entries.add(ModBlocks.GRAPHENE_BLOCK); - }).build()); - - public static final ItemGroup ORE_GROUP = Registry.register(Registries.ITEM_GROUP, - new Identifier(Mores.MOD_ID, "ores"), - FabricItemGroup.builder().displayName(Text.translatable("creativemodetab.mores_ores")) - .icon(() -> new ItemStack(ModBlocks.DEEPSLATE_TURQUOISE_ORE)).entries((displayContext, entries) -> { - entries.add(ModBlocks.ANTHRACITE_ORE); - entries.add(ModBlocks.DEEPSLATE_ANTHRACITE_ORE); - entries.add(ModBlocks.NETHER_ANTHRACITE_ORE); - entries.add(ModBlocks.TIN_ORE); - entries.add(ModBlocks.DEEPSLATE_TIN_ORE); - entries.add(ModBlocks.SILVER_ORE); - entries.add(ModBlocks.DEEPSLATE_SILVER_ORE); - entries.add(ModBlocks.NETHER_SILVER_ORE); - entries.add(ModBlocks.COBALT_ORE); - entries.add(ModBlocks.DEEPSLATE_COBALT_ORE); - entries.add(ModBlocks.TOPAZ_ORE); - entries.add(ModBlocks.DEEPSLATE_TOPAZ_ORE); - entries.add(ModBlocks.TOURMALINE_ORE); - entries.add(ModBlocks.DEEPSLATE_TOURMALINE_ORE); - entries.add(ModBlocks.NETHER_TANZANITE_ORE); - entries.add(ModBlocks.RUBY_ORE); - entries.add(ModBlocks.DEEPSLATE_RUBY_ORE); - entries.add(ModBlocks.NETHER_RUBY_ORE); - entries.add(ModBlocks.SAPPHIRE_ORE); - entries.add(ModBlocks.DEEPSLATE_SAPPHIRE_ORE); - entries.add(ModBlocks.NETHER_SAPPHIRE_ORE); - entries.add(ModBlocks.MOISSANITE_ORE); - entries.add(ModBlocks.DEEPSLATE_MOISSANITE_ORE); - entries.add(ModBlocks.TURQUOISE_ORE); - entries.add(ModBlocks.DEEPSLATE_TURQUOISE_ORE); - entries.add(ModBlocks.ONYX_ORE); - }).build()); - - public static final ItemGroup TOOLS_GROUP = Registry.register(Registries.ITEM_GROUP, - new Identifier(Mores.MOD_ID, "tools"), - FabricItemGroup.builder().displayName(Text.translatable("creativemodetab.mores_tools")) - .icon(() -> new ItemStack(ModItems.COBALT_PICKAXE)).entries((displayContext, entries) -> { - entries.add(ModItems.TIN_PICKAXE); - entries.add(ModItems.TIN_AXE); - entries.add(ModItems.TIN_SHOVEL); - entries.add(ModItems.TIN_HOE); - entries.add(ModItems.COPPER_PICKAXE); - entries.add(ModItems.COPPER_AXE); - entries.add(ModItems.COPPER_SHOVEL); - entries.add(ModItems.COPPER_HOE); - entries.add(ModItems.BRONZE_PICKAXE); - entries.add(ModItems.BRONZE_AXE); - entries.add(ModItems.BRONZE_SHOVEL); - entries.add(ModItems.BRONZE_HOE); - entries.add(ModItems.SILVER_PICKAXE); - entries.add(ModItems.SILVER_AXE); - entries.add(ModItems.SILVER_SHOVEL); - entries.add(ModItems.SILVER_HOE); - entries.add(ModItems.COBALT_PICKAXE); - entries.add(ModItems.COBALT_AXE); - entries.add(ModItems.COBALT_SHOVEL); - entries.add(ModItems.COBALT_HOE); - entries.add(ModItems.STERLING_PICKAXE); - entries.add(ModItems.STERLING_AXE); - entries.add(ModItems.STERLING_SHOVEL); - entries.add(ModItems.STERLING_HOE); - entries.add(ModItems.STEEL_PICKAXE); - entries.add(ModItems.STEEL_AXE); - entries.add(ModItems.STEEL_SHOVEL); - entries.add(ModItems.STEEL_HOE); - entries.add(ModItems.AMETHYST_PICKAXE); - entries.add(ModItems.AMETHYST_AXE); - entries.add(ModItems.AMETHYST_SHOVEL); - entries.add(ModItems.AMETHYST_HOE); - entries.add(ModItems.EMERALD_PICKAXE); - entries.add(ModItems.EMERALD_AXE); - entries.add(ModItems.EMERALD_SHOVEL); - entries.add(ModItems.EMERALD_HOE); - entries.add(ModItems.TOPAZ_PICKAXE); - entries.add(ModItems.TOPAZ_AXE); - entries.add(ModItems.TOPAZ_SHOVEL); - entries.add(ModItems.TOPAZ_HOE); - entries.add(ModItems.TOURMALINE_PICKAXE); - entries.add(ModItems.TOURMALINE_AXE); - entries.add(ModItems.TOURMALINE_SHOVEL); - entries.add(ModItems.TOURMALINE_HOE); - entries.add(ModItems.RUBY_PICKAXE); - entries.add(ModItems.RUBY_AXE); - entries.add(ModItems.RUBY_SHOVEL); - entries.add(ModItems.RUBY_HOE); - entries.add(ModItems.SAPPHIRE_PICKAXE); - entries.add(ModItems.SAPPHIRE_AXE); - entries.add(ModItems.SAPPHIRE_SHOVEL); - entries.add(ModItems.SAPPHIRE_HOE); - entries.add(ModItems.TANZANITE_PICKAXE); - entries.add(ModItems.TANZANITE_AXE); - entries.add(ModItems.TANZANITE_SHOVEL); - entries.add(ModItems.TANZANITE_HOE); - entries.add(ModItems.MOISSANITE_PICKAXE); - entries.add(ModItems.MOISSANITE_AXE); - entries.add(ModItems.MOISSANITE_SHOVEL); - entries.add(ModItems.MOISSANITE_HOE); - entries.add(ModItems.TURQUOISE_PICKAXE); - entries.add(ModItems.TURQUOISE_AXE); - entries.add(ModItems.TURQUOISE_SHOVEL); - entries.add(ModItems.TURQUOISE_HOE); - entries.add(ModItems.OBSIDIAN_PICKAXE); - entries.add(ModItems.OBSIDIAN_AXE); - entries.add(ModItems.OBSIDIAN_SHOVEL); - entries.add(ModItems.OBSIDIAN_HOE); - entries.add(ModItems.ONYX_PICKAXE); - entries.add(ModItems.ONYX_AXE); - entries.add(ModItems.ONYX_SHOVEL); - entries.add(ModItems.ONYX_HOE); - entries.add(ModItems.GRAPHENE_PICKAXE); - entries.add(ModItems.GRAPHENE_AXE); - entries.add(ModItems.GRAPHENE_SHOVEL); - entries.add(ModItems.GRAPHENE_HOE); - }).build()); - - public static final ItemGroup WEAPONS_GROUP = Registry.register(Registries.ITEM_GROUP, - new Identifier(Mores.MOD_ID, "weapons"), - FabricItemGroup.builder().displayName(Text.translatable("creativemodetab.mores_weapons")) - .icon(() -> new ItemStack(ModItems.NETHERITE_BATTLEAXE)).entries((displayContext, entries) -> { - entries.add(ModItems.WOOD_BATTLEAXE); - entries.add(ModItems.WOOD_MACE); - entries.add(ModItems.WOOD_DAGGER); - entries.add(ModItems.STONE_BATTLEAXE); - entries.add(ModItems.STONE_MACE); - entries.add(ModItems.STONE_DAGGER); - entries.add(ModItems.TIN_SWORD); - entries.add(ModItems.TIN_BATTLEAXE); - entries.add(ModItems.TIN_MACE); - entries.add(ModItems.TIN_DAGGER); - entries.add(ModItems.COPPER_SWORD); - entries.add(ModItems.COPPER_BATTLEAXE); - entries.add(ModItems.COPPER_MACE); - entries.add(ModItems.COPPER_DAGGER); - entries.add(ModItems.BRONZE_SWORD); - entries.add(ModItems.BRONZE_BATTLEAXE); - entries.add(ModItems.BRONZE_MACE); - entries.add(ModItems.BRONZE_DAGGER); - entries.add(ModItems.SILVER_SWORD); - entries.add(ModItems.SILVER_BATTLEAXE); - entries.add(ModItems.SILVER_MACE); - entries.add(ModItems.SILVER_DAGGER); - entries.add(ModItems.GOLD_BATTLEAXE); - entries.add(ModItems.GOLD_MACE); - entries.add(ModItems.GOLD_DAGGER); - entries.add(ModItems.IRON_BATTLEAXE); - entries.add(ModItems.IRON_MACE); - entries.add(ModItems.IRON_DAGGER); - entries.add(ModItems.COBALT_SWORD); - entries.add(ModItems.COBALT_BATTLEAXE); - entries.add(ModItems.COBALT_MACE); - entries.add(ModItems.COBALT_DAGGER); - entries.add(ModItems.STERLING_SWORD); - entries.add(ModItems.STERLING_BATTLEAXE); - entries.add(ModItems.STERLING_MACE); - entries.add(ModItems.STERLING_DAGGER); - entries.add(ModItems.STEEL_SWORD); - entries.add(ModItems.STEEL_BATTLEAXE); - entries.add(ModItems.STEEL_MACE); - entries.add(ModItems.STEEL_DAGGER); - entries.add(ModItems.AMETHYST_SWORD); - entries.add(ModItems.AMETHYST_BATTLEAXE); - entries.add(ModItems.AMETHYST_MACE); - entries.add(ModItems.AMETHYST_DAGGER); - entries.add(ModItems.EMERALD_SWORD); - entries.add(ModItems.EMERALD_BATTLEAXE); - entries.add(ModItems.EMERALD_MACE); - entries.add(ModItems.EMERALD_DAGGER); - entries.add(ModItems.TOPAZ_SWORD); - entries.add(ModItems.TOPAZ_BATTLEAXE); - entries.add(ModItems.TOPAZ_MACE); - entries.add(ModItems.TOPAZ_DAGGER); - entries.add(ModItems.TOURMALINE_SWORD); - entries.add(ModItems.TOURMALINE_BATTLEAXE); - entries.add(ModItems.TOURMALINE_MACE); - entries.add(ModItems.TOURMALINE_DAGGER); - entries.add(ModItems.DIAMOND_BATTLEAXE); - entries.add(ModItems.DIAMOND_MACE); - entries.add(ModItems.DIAMOND_DAGGER); - entries.add(ModItems.RUBY_SWORD); - entries.add(ModItems.RUBY_BATTLEAXE); - entries.add(ModItems.RUBY_MACE); - entries.add(ModItems.RUBY_DAGGER); - entries.add(ModItems.SAPPHIRE_SWORD); - entries.add(ModItems.SAPPHIRE_BATTLEAXE); - entries.add(ModItems.SAPPHIRE_MACE); - entries.add(ModItems.SAPPHIRE_DAGGER); - entries.add(ModItems.TANZANITE_SWORD); - entries.add(ModItems.TANZANITE_BATTLEAXE); - entries.add(ModItems.TANZANITE_MACE); - entries.add(ModItems.TANZANITE_DAGGER); - entries.add(ModItems.MOISSANITE_SWORD); - entries.add(ModItems.MOISSANITE_BATTLEAXE); - entries.add(ModItems.MOISSANITE_MACE); - entries.add(ModItems.MOISSANITE_DAGGER); - entries.add(ModItems.TURQUOISE_SWORD); - entries.add(ModItems.TURQUOISE_BATTLEAXE); - entries.add(ModItems.TURQUOISE_MACE); - entries.add(ModItems.TURQUOISE_DAGGER); - entries.add(ModItems.OBSIDIAN_SWORD); - entries.add(ModItems.OBSIDIAN_BATTLEAXE); - entries.add(ModItems.OBSIDIAN_MACE); - entries.add(ModItems.OBSIDIAN_DAGGER); - entries.add(ModItems.NETHERITE_BATTLEAXE); - entries.add(ModItems.NETHERITE_MACE); - entries.add(ModItems.NETHERITE_DAGGER); - entries.add(ModItems.ONYX_SWORD); - entries.add(ModItems.ONYX_BATTLEAXE); - entries.add(ModItems.ONYX_MACE); - entries.add(ModItems.ONYX_DAGGER); - entries.add(ModItems.GRAPHENE_SWORD); - entries.add(ModItems.GRAPHENE_BATTLEAXE); - entries.add(ModItems.GRAPHENE_MACE); - entries.add(ModItems.GRAPHENE_DAGGER); - }).build()); - - public static final ItemGroup ARMOR_GROUP = Registry.register(Registries.ITEM_GROUP, - new Identifier(Mores.MOD_ID, "armor"), - FabricItemGroup.builder().displayName(Text.translatable("creativemodetab.mores_armor")) - .icon(() -> new ItemStack(ModItems.GRAPHENE_CHESTPLATE)).entries((displayContext, entries) -> { - entries.add(ModItems.TIN_HELMET); - entries.add(ModItems.TIN_CHESTPLATE); - entries.add(ModItems.TIN_LEGGINGS); - entries.add(ModItems.TIN_BOOTS); - entries.add(ModItems.COPPER_HELMET); - entries.add(ModItems.COPPER_CHESTPLATE); - entries.add(ModItems.COPPER_LEGGINGS); - entries.add(ModItems.COPPER_BOOTS); - entries.add(ModItems.BRONZE_HELMET); - entries.add(ModItems.BRONZE_CHESTPLATE); - entries.add(ModItems.BRONZE_LEGGINGS); - entries.add(ModItems.BRONZE_BOOTS); - entries.add(ModItems.SILVER_HELMET); - entries.add(ModItems.SILVER_CHESTPLATE); - entries.add(ModItems.SILVER_LEGGINGS); - entries.add(ModItems.SILVER_BOOTS); - entries.add(ModItems.COBALT_HELMET); - entries.add(ModItems.COBALT_CHESTPLATE); - entries.add(ModItems.COBALT_LEGGINGS); - entries.add(ModItems.COBALT_BOOTS); - entries.add(ModItems.STERLING_HELMET); - entries.add(ModItems.STERLING_CHESTPLATE); - entries.add(ModItems.STERLING_LEGGINGS); - entries.add(ModItems.STERLING_BOOTS); - entries.add(ModItems.STEEL_HELMET); - entries.add(ModItems.STEEL_CHESTPLATE); - entries.add(ModItems.STEEL_LEGGINGS); - entries.add(ModItems.STEEL_BOOTS); - entries.add(ModItems.AMETHYST_HELMET); - entries.add(ModItems.AMETHYST_CHESTPLATE); - entries.add(ModItems.AMETHYST_LEGGINGS); - entries.add(ModItems.AMETHYST_BOOTS); - entries.add(ModItems.EMERALD_HELMET); - entries.add(ModItems.EMERALD_CHESTPLATE); - entries.add(ModItems.EMERALD_LEGGINGS); - entries.add(ModItems.EMERALD_BOOTS); - entries.add(ModItems.TOPAZ_HELMET); - entries.add(ModItems.TOPAZ_CHESTPLATE); - entries.add(ModItems.TOPAZ_LEGGINGS); - entries.add(ModItems.TOPAZ_BOOTS); - entries.add(ModItems.TOURMALINE_HELMET); - entries.add(ModItems.TOURMALINE_CHESTPLATE); - entries.add(ModItems.TOURMALINE_LEGGINGS); - entries.add(ModItems.TOURMALINE_BOOTS); - entries.add(ModItems.RUBY_HELMET); - entries.add(ModItems.RUBY_CHESTPLATE); - entries.add(ModItems.RUBY_LEGGINGS); - entries.add(ModItems.RUBY_BOOTS); - entries.add(ModItems.SAPPHIRE_HELMET); - entries.add(ModItems.SAPPHIRE_CHESTPLATE); - entries.add(ModItems.SAPPHIRE_LEGGINGS); - entries.add(ModItems.SAPPHIRE_BOOTS); - entries.add(ModItems.TANZANITE_HELMET); - entries.add(ModItems.TANZANITE_CHESTPLATE); - entries.add(ModItems.TANZANITE_LEGGINGS); - entries.add(ModItems.TANZANITE_BOOTS); - entries.add(ModItems.MOISSANITE_HELMET); - entries.add(ModItems.MOISSANITE_CHESTPLATE); - entries.add(ModItems.MOISSANITE_LEGGINGS); - entries.add(ModItems.MOISSANITE_BOOTS); - entries.add(ModItems.TURQUOISE_HELMET); - entries.add(ModItems.TURQUOISE_CHESTPLATE); - entries.add(ModItems.TURQUOISE_LEGGINGS); - entries.add(ModItems.TURQUOISE_BOOTS); - entries.add(ModItems.OBSIDIAN_HELMET); - entries.add(ModItems.OBSIDIAN_CHESTPLATE); - entries.add(ModItems.OBSIDIAN_LEGGINGS); - entries.add(ModItems.OBSIDIAN_BOOTS); - entries.add(ModItems.ONYX_HELMET); - entries.add(ModItems.ONYX_CHESTPLATE); - entries.add(ModItems.ONYX_LEGGINGS); - entries.add(ModItems.ONYX_BOOTS); - entries.add(ModItems.GRAPHENE_HELMET); - entries.add(ModItems.GRAPHENE_CHESTPLATE); - entries.add(ModItems.GRAPHENE_LEGGINGS); - entries.add(ModItems.GRAPHENE_BOOTS); - }).build()); - -// public static final ItemGroup SHIELDS_GROUP = Registry.register(Registries.ITEM_GROUP, -// new Identifier(Mores.MOD_ID, "shields"), -// FabricItemGroup.builder().displayName(Text.translatable("creativemodetab.mores_shields")) -// .icon(() -> new ItemStack(ModItems.BRONZE_SHIELD)).entries((displayContext, entries) -> { -// entries.add(ModItems.TIN_SHIELD); -// entries.add(ModItems.COPPER_SHIELD); -// entries.add(ModItems.BRONZE_SHIELD); -// entries.add(ModItems.SILVER_SHIELD); -// entries.add(ModItems.COBALT_SHIELD); -// entries.add(ModItems.STERLING_SHIELD); -// entries.add(ModItems.STEEL_SHIELD); -// entries.add(ModItems.AMETHYST_SHIELD); -// entries.add(ModItems.EMERALD_SHIELD); -// entries.add(ModItems.TOPAZ_SHIELD); -// entries.add(ModItems.TOURMALINE_SHIELD); -// entries.add(ModItems.RUBY_SHIELD); -// entries.add(ModItems.SAPPHIRE_SHIELD); -// entries.add(ModItems.TANZANITE_SHIELD); -// entries.add(ModItems.MOISSANITE_SHIELD); -// entries.add(ModItems.TURQUOISE_SHIELD); -// entries.add(ModItems.OBSIDIAN_SHIELD); -// entries.add(ModItems.ONYX_SHIELD); -// entries.add(ModItems.GRAPHENE_SHIELD); +//package mod.leronus.mores.item; +// +//import mod.leronus.mores.Mores; +//import mod.leronus.mores.block.ModBlocks; +//import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; +//import net.minecraft.item.ItemGroup; +//import net.minecraft.item.ItemStack; +//import net.minecraft.registry.Registries; +//import net.minecraft.registry.Registry; +//import net.minecraft.text.Text; +//import net.minecraft.util.Identifier; +// +//public class ModItemGroups { +// public static final ItemGroup MATERIAL_GROUP = Registry.register(Registries.ITEM_GROUP, +// new Identifier(Mores.MOD_ID, "materials"), +// FabricItemGroup.builder().displayName(Text.translatable("creativemodetab.mores_materials")) +// .icon(() -> new ItemStack(ModItems.RUBY_GEM)).entries((displayContext, entries) -> { +// entries.add(ModItems.ANTHRACITE); +// entries.add(ModItems.RAW_TIN); +// entries.add(ModItems.RAW_SILVER); +// entries.add(ModItems.RAW_COBALT); +// entries.add(ModItems.TIN_NUGGET); +// +// entries.add(ModItems.BRONZE_NUGGET); +// entries.add(ModItems.SILVER_NUGGET); +// entries.add(ModItems.COBALT_NUGGET); +// entries.add(ModItems.STERLING_NUGGET); +// entries.add(ModItems.STEEL_NUGGET); +// entries.add(ModItems.TIN_INGOT); +// +// entries.add(ModItems.BRONZE_INGOT); +// entries.add(ModItems.SILVER_INGOT); +// entries.add(ModItems.COBALT_INGOT); +// entries.add(ModItems.STERLING_INGOT); +// +// entries.add(ModItems.STEEL_INGOT); +// entries.add(ModItems.OBSIDIAN_INGOT); +// entries.add(ModItems.TOPAZ_GEM); +// entries.add(ModItems.TOURMALINE_GEM); +// entries.add(ModItems.TANZANITE_GEM); +// +// entries.add(ModItems.RUBY_GEM); +// entries.add(ModItems.SAPPHIRE_GEM); +// entries.add(ModItems.MOISSANITE_GEM); +// +// entries.add(ModItems.TURQUOISE_GEM); +// entries.add(ModItems.ONYX_GEM); +// entries.add(ModItems.GRAPHENE_GEM); // }).build()); - - public static final ItemGroup HORSE_ARMOR_GROUP = Registry.register(Registries.ITEM_GROUP, - new Identifier(Mores.MOD_ID, "horse_armor"), - FabricItemGroup.builder().displayName(Text.translatable("creativemodetab.mores_horse_armor")) - .icon(() -> new ItemStack(ModItems.TOURMALINE_HORSE_ARMOR)).entries((displayContext, entries) -> { - entries.add(ModItems.TIN_HORSE_ARMOR); - entries.add(ModItems.COPPER_HORSE_ARMOR); - entries.add(ModItems.BRONZE_HORSE_ARMOR); - entries.add(ModItems.SILVER_HORSE_ARMOR); - entries.add(ModItems.COBALT_HORSE_ARMOR); - entries.add(ModItems.STERLING_HORSE_ARMOR); - entries.add(ModItems.STEEL_HORSE_ARMOR); - entries.add(ModItems.AMETHYST_HORSE_ARMOR); - entries.add(ModItems.EMERALD_HORSE_ARMOR); - entries.add(ModItems.TOPAZ_HORSE_ARMOR); - entries.add(ModItems.TOURMALINE_HORSE_ARMOR); - entries.add(ModItems.RUBY_HORSE_ARMOR); - entries.add(ModItems.SAPPHIRE_HORSE_ARMOR); - entries.add(ModItems.TANZANITE_HORSE_ARMOR); - entries.add(ModItems.MOISSANITE_HORSE_ARMOR); - entries.add(ModItems.TURQUOISE_HORSE_ARMOR); - entries.add(ModItems.OBSIDIAN_HORSE_ARMOR); - entries.add(ModItems.ONYX_HORSE_ARMOR); - entries.add(ModItems.GRAPHENE_HORSE_ARMOR); - entries.add(ModItems.NETHERITE_HORSE_ARMOR); - }).build()); - - public static final ItemGroup FOOD_GROUP = Registry.register(Registries.ITEM_GROUP, - new Identifier(Mores.MOD_ID, "food"), - FabricItemGroup.builder().displayName(Text.translatable("creativemodetab.mores_foods")) - .icon(() -> new ItemStack(ModItems.COBALT_APPLE)).entries((displayContext, entries) -> { - entries.add(ModItems.BRONZE_APPLE); - entries.add(ModItems.SILVER_APPLE); - entries.add(ModItems.COBALT_APPLE); - entries.add(ModItems.CHOCOLATE); - entries.add(ModItems.VELVET); - entries.add(ModItems.CARROT_PIE); -// entries.add(ModItems.DUCK); -// entries.add(ModItems.COOKED_DUCK); - }).build()); - -// public static final ItemGroup ENTITIES_GROUP = Registry.register(Registries.ITEM_GROUP, -// new Identifier(Mores.MOD_ID, "Entities"), -// FabricItemGroup.builder().displayName(Text.translatable("creativemodetab.mores_entities")) -// .icon(() -> new ItemStack(ModItems.DUCK_SPAWN_EGG)).entries((displayContext, entries) -> { -// entries.add(ModItems.DUCK_SPAWN_EGG); +// public static final ItemGroup BLOCK_GROUP = Registry.register(Registries.ITEM_GROUP, +// new Identifier(Mores.MOD_ID, "blocks"), +// FabricItemGroup.builder().displayName(Text.translatable("creativemodetab.mores_blocks")) +// .icon(() -> new ItemStack(ModBlocks.TURQUOISE_BLOCK)).entries((displayContext, entries) -> { +//// entries.add(ModBlocks.ALLOY_FURNACE); +// entries.add(ModBlocks.RAW_TIN_BLOCK); +// entries.add(ModBlocks.RAW_SILVER_BLOCK); +// entries.add(ModBlocks.RAW_COBALT_BLOCK); +// entries.add(ModBlocks.TIN_BLOCK); +// entries.add(ModBlocks.BRONZE_BLOCK); +// entries.add(ModBlocks.SILVER_BLOCK); +// entries.add(ModBlocks.COBALT_BLOCK); +// entries.add(ModBlocks.STERLING_BLOCK); +// entries.add(ModBlocks.STEEL_BLOCK); +// entries.add(ModBlocks.TOPAZ_BLOCK); +// entries.add(ModBlocks.TOURMALINE_BLOCK); +// entries.add(ModBlocks.TANZANITE_BLOCK); +// entries.add(ModBlocks.RUBY_BLOCK); +// entries.add(ModBlocks.SAPPHIRE_BLOCK); +// entries.add(ModBlocks.MOISSANITE_BLOCK); +// entries.add(ModBlocks.TURQUOISE_BLOCK); +// entries.add(ModBlocks.ONYX_BLOCK); +// entries.add(ModBlocks.GRAPHENE_BLOCK); // }).build()); - - public static void registerItemGroups() { - - } -} \ No newline at end of file +// +// public static final ItemGroup ORE_GROUP = Registry.register(Registries.ITEM_GROUP, +// new Identifier(Mores.MOD_ID, "ores"), +// FabricItemGroup.builder().displayName(Text.translatable("creativemodetab.mores_ores")) +// .icon(() -> new ItemStack(ModBlocks.DEEPSLATE_TURQUOISE_ORE)).entries((displayContext, entries) -> { +// entries.add(ModBlocks.ANTHRACITE_ORE); +// entries.add(ModBlocks.DEEPSLATE_ANTHRACITE_ORE); +// entries.add(ModBlocks.NETHER_ANTHRACITE_ORE); +// entries.add(ModBlocks.TIN_ORE); +// entries.add(ModBlocks.DEEPSLATE_TIN_ORE); +// entries.add(ModBlocks.SILVER_ORE); +// entries.add(ModBlocks.DEEPSLATE_SILVER_ORE); +// entries.add(ModBlocks.NETHER_SILVER_ORE); +// entries.add(ModBlocks.COBALT_ORE); +// entries.add(ModBlocks.DEEPSLATE_COBALT_ORE); +// entries.add(ModBlocks.TOPAZ_ORE); +// entries.add(ModBlocks.DEEPSLATE_TOPAZ_ORE); +// entries.add(ModBlocks.TOURMALINE_ORE); +// entries.add(ModBlocks.DEEPSLATE_TOURMALINE_ORE); +// entries.add(ModBlocks.NETHER_TANZANITE_ORE); +// entries.add(ModBlocks.RUBY_ORE); +// entries.add(ModBlocks.DEEPSLATE_RUBY_ORE); +// entries.add(ModBlocks.NETHER_RUBY_ORE); +// entries.add(ModBlocks.SAPPHIRE_ORE); +// entries.add(ModBlocks.DEEPSLATE_SAPPHIRE_ORE); +// entries.add(ModBlocks.NETHER_SAPPHIRE_ORE); +// entries.add(ModBlocks.MOISSANITE_ORE); +// entries.add(ModBlocks.DEEPSLATE_MOISSANITE_ORE); +// entries.add(ModBlocks.TURQUOISE_ORE); +// entries.add(ModBlocks.DEEPSLATE_TURQUOISE_ORE); +// entries.add(ModBlocks.ONYX_ORE); +// }).build()); +// +// public static final ItemGroup TOOLS_GROUP = Registry.register(Registries.ITEM_GROUP, +// new Identifier(Mores.MOD_ID, "tools"), +// FabricItemGroup.builder().displayName(Text.translatable("creativemodetab.mores_tools")) +// .icon(() -> new ItemStack(ModItems.COBALT_PICKAXE)).entries((displayContext, entries) -> { +// entries.add(ModItems.TIN_PICKAXE); +// entries.add(ModItems.TIN_AXE); +// entries.add(ModItems.TIN_SHOVEL); +// entries.add(ModItems.TIN_HOE); +// entries.add(ModItems.COPPER_PICKAXE); +// entries.add(ModItems.COPPER_AXE); +// entries.add(ModItems.COPPER_SHOVEL); +// entries.add(ModItems.COPPER_HOE); +// entries.add(ModItems.BRONZE_PICKAXE); +// entries.add(ModItems.BRONZE_AXE); +// entries.add(ModItems.BRONZE_SHOVEL); +// entries.add(ModItems.BRONZE_HOE); +// entries.add(ModItems.SILVER_PICKAXE); +// entries.add(ModItems.SILVER_AXE); +// entries.add(ModItems.SILVER_SHOVEL); +// entries.add(ModItems.SILVER_HOE); +// entries.add(ModItems.COBALT_PICKAXE); +// entries.add(ModItems.COBALT_AXE); +// entries.add(ModItems.COBALT_SHOVEL); +// entries.add(ModItems.COBALT_HOE); +// entries.add(ModItems.STERLING_PICKAXE); +// entries.add(ModItems.STERLING_AXE); +// entries.add(ModItems.STERLING_SHOVEL); +// entries.add(ModItems.STERLING_HOE); +// entries.add(ModItems.STEEL_PICKAXE); +// entries.add(ModItems.STEEL_AXE); +// entries.add(ModItems.STEEL_SHOVEL); +// entries.add(ModItems.STEEL_HOE); +// entries.add(ModItems.AMETHYST_PICKAXE); +// entries.add(ModItems.AMETHYST_AXE); +// entries.add(ModItems.AMETHYST_SHOVEL); +// entries.add(ModItems.AMETHYST_HOE); +// entries.add(ModItems.EMERALD_PICKAXE); +// entries.add(ModItems.EMERALD_AXE); +// entries.add(ModItems.EMERALD_SHOVEL); +// entries.add(ModItems.EMERALD_HOE); +// entries.add(ModItems.TOPAZ_PICKAXE); +// entries.add(ModItems.TOPAZ_AXE); +// entries.add(ModItems.TOPAZ_SHOVEL); +// entries.add(ModItems.TOPAZ_HOE); +// entries.add(ModItems.TOURMALINE_PICKAXE); +// entries.add(ModItems.TOURMALINE_AXE); +// entries.add(ModItems.TOURMALINE_SHOVEL); +// entries.add(ModItems.TOURMALINE_HOE); +// entries.add(ModItems.RUBY_PICKAXE); +// entries.add(ModItems.RUBY_AXE); +// entries.add(ModItems.RUBY_SHOVEL); +// entries.add(ModItems.RUBY_HOE); +// entries.add(ModItems.SAPPHIRE_PICKAXE); +// entries.add(ModItems.SAPPHIRE_AXE); +// entries.add(ModItems.SAPPHIRE_SHOVEL); +// entries.add(ModItems.SAPPHIRE_HOE); +// entries.add(ModItems.TANZANITE_PICKAXE); +// entries.add(ModItems.TANZANITE_AXE); +// entries.add(ModItems.TANZANITE_SHOVEL); +// entries.add(ModItems.TANZANITE_HOE); +// entries.add(ModItems.MOISSANITE_PICKAXE); +// entries.add(ModItems.MOISSANITE_AXE); +// entries.add(ModItems.MOISSANITE_SHOVEL); +// entries.add(ModItems.MOISSANITE_HOE); +// entries.add(ModItems.TURQUOISE_PICKAXE); +// entries.add(ModItems.TURQUOISE_AXE); +// entries.add(ModItems.TURQUOISE_SHOVEL); +// entries.add(ModItems.TURQUOISE_HOE); +// entries.add(ModItems.OBSIDIAN_PICKAXE); +// entries.add(ModItems.OBSIDIAN_AXE); +// entries.add(ModItems.OBSIDIAN_SHOVEL); +// entries.add(ModItems.OBSIDIAN_HOE); +// entries.add(ModItems.ONYX_PICKAXE); +// entries.add(ModItems.ONYX_AXE); +// entries.add(ModItems.ONYX_SHOVEL); +// entries.add(ModItems.ONYX_HOE); +// entries.add(ModItems.GRAPHENE_PICKAXE); +// entries.add(ModItems.GRAPHENE_AXE); +// entries.add(ModItems.GRAPHENE_SHOVEL); +// entries.add(ModItems.GRAPHENE_HOE); +// }).build()); +// +// public static final ItemGroup WEAPONS_GROUP = Registry.register(Registries.ITEM_GROUP, +// new Identifier(Mores.MOD_ID, "weapons"), +// FabricItemGroup.builder().displayName(Text.translatable("creativemodetab.mores_weapons")) +// .icon(() -> new ItemStack(ModItems.NETHERITE_BATTLEAXE)).entries((displayContext, entries) -> { +// entries.add(ModItems.WOOD_BATTLEAXE); +// entries.add(ModItems.WOOD_MACE); +// entries.add(ModItems.WOOD_DAGGER); +// entries.add(ModItems.STONE_BATTLEAXE); +// entries.add(ModItems.STONE_MACE); +// entries.add(ModItems.STONE_DAGGER); +// entries.add(ModItems.TIN_SWORD); +// entries.add(ModItems.TIN_BATTLEAXE); +// entries.add(ModItems.TIN_MACE); +// entries.add(ModItems.TIN_DAGGER); +// entries.add(ModItems.COPPER_SWORD); +// entries.add(ModItems.COPPER_BATTLEAXE); +// entries.add(ModItems.COPPER_MACE); +// entries.add(ModItems.COPPER_DAGGER); +// entries.add(ModItems.BRONZE_SWORD); +// entries.add(ModItems.BRONZE_BATTLEAXE); +// entries.add(ModItems.BRONZE_MACE); +// entries.add(ModItems.BRONZE_DAGGER); +// entries.add(ModItems.SILVER_SWORD); +// entries.add(ModItems.SILVER_BATTLEAXE); +// entries.add(ModItems.SILVER_MACE); +// entries.add(ModItems.SILVER_DAGGER); +// entries.add(ModItems.GOLD_BATTLEAXE); +// entries.add(ModItems.GOLD_MACE); +// entries.add(ModItems.GOLD_DAGGER); +// entries.add(ModItems.IRON_BATTLEAXE); +// entries.add(ModItems.IRON_MACE); +// entries.add(ModItems.IRON_DAGGER); +// entries.add(ModItems.COBALT_SWORD); +// entries.add(ModItems.COBALT_BATTLEAXE); +// entries.add(ModItems.COBALT_MACE); +// entries.add(ModItems.COBALT_DAGGER); +// entries.add(ModItems.STERLING_SWORD); +// entries.add(ModItems.STERLING_BATTLEAXE); +// entries.add(ModItems.STERLING_MACE); +// entries.add(ModItems.STERLING_DAGGER); +// entries.add(ModItems.STEEL_SWORD); +// entries.add(ModItems.STEEL_BATTLEAXE); +// entries.add(ModItems.STEEL_MACE); +// entries.add(ModItems.STEEL_DAGGER); +// entries.add(ModItems.AMETHYST_SWORD); +// entries.add(ModItems.AMETHYST_BATTLEAXE); +// entries.add(ModItems.AMETHYST_MACE); +// entries.add(ModItems.AMETHYST_DAGGER); +// entries.add(ModItems.EMERALD_SWORD); +// entries.add(ModItems.EMERALD_BATTLEAXE); +// entries.add(ModItems.EMERALD_MACE); +// entries.add(ModItems.EMERALD_DAGGER); +// entries.add(ModItems.TOPAZ_SWORD); +// entries.add(ModItems.TOPAZ_BATTLEAXE); +// entries.add(ModItems.TOPAZ_MACE); +// entries.add(ModItems.TOPAZ_DAGGER); +// entries.add(ModItems.TOURMALINE_SWORD); +// entries.add(ModItems.TOURMALINE_BATTLEAXE); +// entries.add(ModItems.TOURMALINE_MACE); +// entries.add(ModItems.TOURMALINE_DAGGER); +// entries.add(ModItems.DIAMOND_BATTLEAXE); +// entries.add(ModItems.DIAMOND_MACE); +// entries.add(ModItems.DIAMOND_DAGGER); +// entries.add(ModItems.RUBY_SWORD); +// entries.add(ModItems.RUBY_BATTLEAXE); +// entries.add(ModItems.RUBY_MACE); +// entries.add(ModItems.RUBY_DAGGER); +// entries.add(ModItems.SAPPHIRE_SWORD); +// entries.add(ModItems.SAPPHIRE_BATTLEAXE); +// entries.add(ModItems.SAPPHIRE_MACE); +// entries.add(ModItems.SAPPHIRE_DAGGER); +// entries.add(ModItems.TANZANITE_SWORD); +// entries.add(ModItems.TANZANITE_BATTLEAXE); +// entries.add(ModItems.TANZANITE_MACE); +// entries.add(ModItems.TANZANITE_DAGGER); +// entries.add(ModItems.MOISSANITE_SWORD); +// entries.add(ModItems.MOISSANITE_BATTLEAXE); +// entries.add(ModItems.MOISSANITE_MACE); +// entries.add(ModItems.MOISSANITE_DAGGER); +// entries.add(ModItems.TURQUOISE_SWORD); +// entries.add(ModItems.TURQUOISE_BATTLEAXE); +// entries.add(ModItems.TURQUOISE_MACE); +// entries.add(ModItems.TURQUOISE_DAGGER); +// entries.add(ModItems.OBSIDIAN_SWORD); +// entries.add(ModItems.OBSIDIAN_BATTLEAXE); +// entries.add(ModItems.OBSIDIAN_MACE); +// entries.add(ModItems.OBSIDIAN_DAGGER); +// entries.add(ModItems.NETHERITE_BATTLEAXE); +// entries.add(ModItems.NETHERITE_MACE); +// entries.add(ModItems.NETHERITE_DAGGER); +// entries.add(ModItems.ONYX_SWORD); +// entries.add(ModItems.ONYX_BATTLEAXE); +// entries.add(ModItems.ONYX_MACE); +// entries.add(ModItems.ONYX_DAGGER); +// entries.add(ModItems.GRAPHENE_SWORD); +// entries.add(ModItems.GRAPHENE_BATTLEAXE); +// entries.add(ModItems.GRAPHENE_MACE); +// entries.add(ModItems.GRAPHENE_DAGGER); +// }).build()); +// +// public static final ItemGroup ARMOR_GROUP = Registry.register(Registries.ITEM_GROUP, +// new Identifier(Mores.MOD_ID, "armor"), +// FabricItemGroup.builder().displayName(Text.translatable("creativemodetab.mores_armor")) +// .icon(() -> new ItemStack(ModItems.GRAPHENE_CHESTPLATE)).entries((displayContext, entries) -> { +// entries.add(ModItems.TIN_HELMET); +// entries.add(ModItems.TIN_CHESTPLATE); +// entries.add(ModItems.TIN_LEGGINGS); +// entries.add(ModItems.TIN_BOOTS); +// entries.add(ModItems.COPPER_HELMET); +// entries.add(ModItems.COPPER_CHESTPLATE); +// entries.add(ModItems.COPPER_LEGGINGS); +// entries.add(ModItems.COPPER_BOOTS); +// entries.add(ModItems.BRONZE_HELMET); +// entries.add(ModItems.BRONZE_CHESTPLATE); +// entries.add(ModItems.BRONZE_LEGGINGS); +// entries.add(ModItems.BRONZE_BOOTS); +// entries.add(ModItems.SILVER_HELMET); +// entries.add(ModItems.SILVER_CHESTPLATE); +// entries.add(ModItems.SILVER_LEGGINGS); +// entries.add(ModItems.SILVER_BOOTS); +// entries.add(ModItems.COBALT_HELMET); +// entries.add(ModItems.COBALT_CHESTPLATE); +// entries.add(ModItems.COBALT_LEGGINGS); +// entries.add(ModItems.COBALT_BOOTS); +// entries.add(ModItems.STERLING_HELMET); +// entries.add(ModItems.STERLING_CHESTPLATE); +// entries.add(ModItems.STERLING_LEGGINGS); +// entries.add(ModItems.STERLING_BOOTS); +// entries.add(ModItems.STEEL_HELMET); +// entries.add(ModItems.STEEL_CHESTPLATE); +// entries.add(ModItems.STEEL_LEGGINGS); +// entries.add(ModItems.STEEL_BOOTS); +// entries.add(ModItems.AMETHYST_HELMET); +// entries.add(ModItems.AMETHYST_CHESTPLATE); +// entries.add(ModItems.AMETHYST_LEGGINGS); +// entries.add(ModItems.AMETHYST_BOOTS); +// entries.add(ModItems.EMERALD_HELMET); +// entries.add(ModItems.EMERALD_CHESTPLATE); +// entries.add(ModItems.EMERALD_LEGGINGS); +// entries.add(ModItems.EMERALD_BOOTS); +// entries.add(ModItems.TOPAZ_HELMET); +// entries.add(ModItems.TOPAZ_CHESTPLATE); +// entries.add(ModItems.TOPAZ_LEGGINGS); +// entries.add(ModItems.TOPAZ_BOOTS); +// entries.add(ModItems.TOURMALINE_HELMET); +// entries.add(ModItems.TOURMALINE_CHESTPLATE); +// entries.add(ModItems.TOURMALINE_LEGGINGS); +// entries.add(ModItems.TOURMALINE_BOOTS); +// entries.add(ModItems.RUBY_HELMET); +// entries.add(ModItems.RUBY_CHESTPLATE); +// entries.add(ModItems.RUBY_LEGGINGS); +// entries.add(ModItems.RUBY_BOOTS); +// entries.add(ModItems.SAPPHIRE_HELMET); +// entries.add(ModItems.SAPPHIRE_CHESTPLATE); +// entries.add(ModItems.SAPPHIRE_LEGGINGS); +// entries.add(ModItems.SAPPHIRE_BOOTS); +// entries.add(ModItems.TANZANITE_HELMET); +// entries.add(ModItems.TANZANITE_CHESTPLATE); +// entries.add(ModItems.TANZANITE_LEGGINGS); +// entries.add(ModItems.TANZANITE_BOOTS); +// entries.add(ModItems.MOISSANITE_HELMET); +// entries.add(ModItems.MOISSANITE_CHESTPLATE); +// entries.add(ModItems.MOISSANITE_LEGGINGS); +// entries.add(ModItems.MOISSANITE_BOOTS); +// entries.add(ModItems.TURQUOISE_HELMET); +// entries.add(ModItems.TURQUOISE_CHESTPLATE); +// entries.add(ModItems.TURQUOISE_LEGGINGS); +// entries.add(ModItems.TURQUOISE_BOOTS); +// entries.add(ModItems.OBSIDIAN_HELMET); +// entries.add(ModItems.OBSIDIAN_CHESTPLATE); +// entries.add(ModItems.OBSIDIAN_LEGGINGS); +// entries.add(ModItems.OBSIDIAN_BOOTS); +// entries.add(ModItems.ONYX_HELMET); +// entries.add(ModItems.ONYX_CHESTPLATE); +// entries.add(ModItems.ONYX_LEGGINGS); +// entries.add(ModItems.ONYX_BOOTS); +// entries.add(ModItems.GRAPHENE_HELMET); +// entries.add(ModItems.GRAPHENE_CHESTPLATE); +// entries.add(ModItems.GRAPHENE_LEGGINGS); +// entries.add(ModItems.GRAPHENE_BOOTS); +// }).build()); +// +//// public static final ItemGroup SHIELDS_GROUP = Registry.register(Registries.ITEM_GROUP, +//// new Identifier(Mores.MOD_ID, "shields"), +//// FabricItemGroup.builder().displayName(Text.translatable("creativemodetab.mores_shields")) +//// .icon(() -> new ItemStack(ModItems.BRONZE_SHIELD)).entries((displayContext, entries) -> { +//// entries.add(ModItems.TIN_SHIELD); +//// entries.add(ModItems.COPPER_SHIELD); +//// entries.add(ModItems.BRONZE_SHIELD); +//// entries.add(ModItems.SILVER_SHIELD); +//// entries.add(ModItems.COBALT_SHIELD); +//// entries.add(ModItems.STERLING_SHIELD); +//// entries.add(ModItems.STEEL_SHIELD); +//// entries.add(ModItems.AMETHYST_SHIELD); +//// entries.add(ModItems.EMERALD_SHIELD); +//// entries.add(ModItems.TOPAZ_SHIELD); +//// entries.add(ModItems.TOURMALINE_SHIELD); +//// entries.add(ModItems.RUBY_SHIELD); +//// entries.add(ModItems.SAPPHIRE_SHIELD); +//// entries.add(ModItems.TANZANITE_SHIELD); +//// entries.add(ModItems.MOISSANITE_SHIELD); +//// entries.add(ModItems.TURQUOISE_SHIELD); +//// entries.add(ModItems.OBSIDIAN_SHIELD); +//// entries.add(ModItems.ONYX_SHIELD); +//// entries.add(ModItems.GRAPHENE_SHIELD); +//// }).build()); +// +// public static final ItemGroup HORSE_ARMOR_GROUP = Registry.register(Registries.ITEM_GROUP, +// new Identifier(Mores.MOD_ID, "horse_armor"), +// FabricItemGroup.builder().displayName(Text.translatable("creativemodetab.mores_horse_armor")) +// .icon(() -> new ItemStack(ModItems.TOURMALINE_HORSE_ARMOR)).entries((displayContext, entries) -> { +// entries.add(ModItems.TIN_HORSE_ARMOR); +// entries.add(ModItems.COPPER_HORSE_ARMOR); +// entries.add(ModItems.BRONZE_HORSE_ARMOR); +// entries.add(ModItems.SILVER_HORSE_ARMOR); +// entries.add(ModItems.COBALT_HORSE_ARMOR); +// entries.add(ModItems.STERLING_HORSE_ARMOR); +// entries.add(ModItems.STEEL_HORSE_ARMOR); +// entries.add(ModItems.AMETHYST_HORSE_ARMOR); +// entries.add(ModItems.EMERALD_HORSE_ARMOR); +// entries.add(ModItems.TOPAZ_HORSE_ARMOR); +// entries.add(ModItems.TOURMALINE_HORSE_ARMOR); +// entries.add(ModItems.RUBY_HORSE_ARMOR); +// entries.add(ModItems.SAPPHIRE_HORSE_ARMOR); +// entries.add(ModItems.TANZANITE_HORSE_ARMOR); +// entries.add(ModItems.MOISSANITE_HORSE_ARMOR); +// entries.add(ModItems.TURQUOISE_HORSE_ARMOR); +// entries.add(ModItems.OBSIDIAN_HORSE_ARMOR); +// entries.add(ModItems.ONYX_HORSE_ARMOR); +// entries.add(ModItems.GRAPHENE_HORSE_ARMOR); +// entries.add(ModItems.NETHERITE_HORSE_ARMOR); +// }).build()); +// +// public static final ItemGroup FOOD_GROUP = Registry.register(Registries.ITEM_GROUP, +// new Identifier(Mores.MOD_ID, "food"), +// FabricItemGroup.builder().displayName(Text.translatable("creativemodetab.mores_foods")) +// .icon(() -> new ItemStack(ModItems.COBALT_APPLE)).entries((displayContext, entries) -> { +// entries.add(ModItems.BRONZE_APPLE); +// entries.add(ModItems.SILVER_APPLE); +// entries.add(ModItems.COBALT_APPLE); +// entries.add(ModItems.CHOCOLATE); +// entries.add(ModItems.VELVET); +// entries.add(ModItems.CARROT_PIE); +//// entries.add(ModItems.DUCK); +//// entries.add(ModItems.COOKED_DUCK); +// }).build()); +// +//// public static final ItemGroup ENTITIES_GROUP = Registry.register(Registries.ITEM_GROUP, +//// new Identifier(Mores.MOD_ID, "Entities"), +//// FabricItemGroup.builder().displayName(Text.translatable("creativemodetab.mores_entities")) +//// .icon(() -> new ItemStack(ModItems.DUCK_SPAWN_EGG)).entries((displayContext, entries) -> { +//// entries.add(ModItems.DUCK_SPAWN_EGG); +//// }).build()); +// +// public static void registerItemGroups() { +// +// } +//} \ No newline at end of file diff --git a/src/main/java/mod/leronus/mores/item/ModItems.java b/src/main/java/mod/leronus/mores/item/ModItems.java index d81b440..003cc74 100644 --- a/src/main/java/mod/leronus/mores/item/ModItems.java +++ b/src/main/java/mod/leronus/mores/item/ModItems.java @@ -1,10 +1,8 @@ package mod.leronus.mores.item; -import com.github.crimsondawn45.fabricshieldlib.lib.object.FabricShieldItem; import mod.leronus.mores.Mores; import mod.leronus.mores.item.custom.*; import mod.leronus.mores.sound.ModSounds; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroupEntries; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.minecraft.item.*; @@ -20,59 +18,59 @@ public class ModItems { /** * Fills the registry with items */ - public static final Item SWEET_CAROLINE_MUSIC_DISC = registerItem("sweet_caroline_music_disc", new MusicDiscItem(4, ModSounds.SWEET_CAROLINE_BOOTLEG, new FabricItemSettings().rarity(Rarity.RARE), 4040)); - public static final Item CIPHER_DISC = registerItem("cipher_music_disc", new MusicDiscItem(5, ModSounds.CIPHER, new FabricItemSettings().rarity(Rarity.RARE), 3820)); - - public static final Item OBSIDIAN_UPGRADE_SMITHING_TEMPLATE = registerItem("obsidian_upgrade_smithing_template", (Item) ModSmithingTemplateItem.createObsidianUpgrade()); - public static final Item BRONZE_ALLOY_SMITHING_TEMPLATE = registerItem("bronze_alloy_smithing_template", (Item) ModSmithingTemplateItem.createBronzeAlloyTemplate()); - public static final Item STERLING_ALLOY_SMITHING_TEMPLATE = registerItem("sterling_alloy_smithing_template", (Item) ModSmithingTemplateItem.createSterlingAlloyTemplate()); - public static final Item STEEL_ALLOY_SMITHING_TEMPLATE = registerItem("steel_alloy_smithing_template", (Item) ModSmithingTemplateItem.createSteelAlloyTemplate()); - public static final Item GRAPHENE_ALLOY_SMITHING_TEMPLATE = registerItem("graphene_alloy_smithing_template", (Item) ModSmithingTemplateItem.createGrapheneAlloyTemplate()); - - public static final Item CHOCOLATE = registerItem("chocolate", new Item(new FabricItemSettings().food(ModFoodComponents.CHOCOLATE))); - public static final Item CARROT_PIE = registerItem("carrot_pie", new Item(new FabricItemSettings().food(ModFoodComponents.CARROT_PIE))); - public static final Item VELVET = registerItem("velvet", new Item(new FabricItemSettings().food(ModFoodComponents.VELVET))); - - public static final Item RAW_TIN = registerItem("raw_tin", new Item(new FabricItemSettings())); - public static final Item RAW_SILVER = registerItem("raw_silver", new Item(new FabricItemSettings())); - public static final Item RAW_COBALT = registerItem("raw_cobalt", new Item(new FabricItemSettings())); - - public static final Item TIN_INGOT = registerItem("tin_ingot", new Item(new FabricItemSettings())); - public static final Item SILVER_INGOT = registerItem("silver_ingot", new Item(new FabricItemSettings())); - public static final Item COBALT_INGOT = registerItem("cobalt_ingot", new Item(new FabricItemSettings())); - public static final Item BRONZE_INGOT = registerItem("bronze_ingot", new Item(new FabricItemSettings())); - public static final Item STEEL_INGOT = registerItem("steel_ingot", new Item(new FabricItemSettings())); - public static final Item STERLING_INGOT = registerItem("sterling_ingot", new Item(new FabricItemSettings())); - public static final Item OBSIDIAN_INGOT = registerItem("obsidian_ingot", new Item(new FabricItemSettings())); - - public static final Item TOPAZ_GEM = registerItem("topaz_gem", new Item(new FabricItemSettings())); - public static final Item TOURMALINE_GEM = registerItem("tourmaline_gem", new Item(new FabricItemSettings())); - public static final Item TANZANITE_GEM = registerItem("tanzanite_gem", new Item(new FabricItemSettings())); - public static final Item RUBY_GEM = registerItem("ruby_gem", new Item(new FabricItemSettings())); - public static final Item SAPPHIRE_GEM = registerItem("sapphire_gem", new Item(new FabricItemSettings())); - public static final Item TURQUOISE_GEM = registerItem("turquoise_gem", new Item(new FabricItemSettings())); - public static final Item MOISSANITE_GEM = registerItem("moissanite_gem", new Item(new FabricItemSettings())); - public static final Item ONYX_GEM = registerItem("onyx_gem", new Item(new FabricItemSettings())); - public static final Item GRAPHENE_GEM = registerItem("graphene_gem", new Item(new FabricItemSettings())); - - public static final Item CHAIN = registerItem("chain", new Item(new FabricItemSettings())); - - public static final Item TIN_NUGGET = registerItem("tin_nugget", new Item(new FabricItemSettings())); - public static final Item COPPER_NUGGET = registerItem("copper_nugget", new Item(new FabricItemSettings())); - public static final Item SILVER_NUGGET = registerItem("silver_nugget", new Item(new FabricItemSettings())); - public static final Item COBALT_NUGGET = registerItem("cobalt_nugget", new Item(new FabricItemSettings())); - public static final Item BRONZE_NUGGET = registerItem("bronze_nugget", new Item(new FabricItemSettings())); - public static final Item STEEL_NUGGET = registerItem("steel_nugget", new Item(new FabricItemSettings())); - public static final Item STERLING_NUGGET = registerItem("sterling_nugget", new Item(new FabricItemSettings())); - - public static final Item SILVER_APPLE = registerItem("silver_apple", new Item(new FabricItemSettings().food(ModFoodComponents.SILVER_APPLE))); - public static final Item BRONZE_APPLE = registerItem("bronze_apple", new Item(new FabricItemSettings().food(ModFoodComponents.BRONZE_APPLE))); - public static final Item COBALT_APPLE = registerItem("cobalt_apple", new Item(new FabricItemSettings().food(ModFoodComponents.COBALT_APPLE))); - -// public static final Item DUCK = registerItem("duck", new Item(new FabricItemSettings()).food(new FoodProperties.Builder().nutrition(2).saturationMod(0.3F).effect(new MobEffectInstance(MobEffects.HUNGER, 600, 0), 0.3F).meat().build()))); -// public static final Item COOKED_DUCK = registerItem("cooked_duck", new Item(new FabricItemSettings()).food(new FoodProperties.Builder().nutrition(6).saturationMod(0.6F).meat().build()))); + public static final Item SWEET_CAROLINE_MUSIC_DISC = registerItem("sweet_caroline_music_disc", new MusicDiscItem(4, ModSounds.SWEET_CAROLINE_BOOTLEG, new Item.Settings().rarity(Rarity.RARE), 4040)); + public static final Item CIPHER_DISC = registerItem("cipher_music_disc", new MusicDiscItem(5, ModSounds.CIPHER, new Item.Settings().rarity(Rarity.RARE), 3820)); + + public static final Item OBSIDIAN_UPGRADE_SMITHING_TEMPLATE = registerItem("obsidian_upgrade_smithing_template", ModSmithingTemplateItem.createObsidianUpgrade()); + public static final Item BRONZE_ALLOY_SMITHING_TEMPLATE = registerItem("bronze_alloy_smithing_template", ModSmithingTemplateItem.createBronzeAlloyTemplate()); + public static final Item STERLING_ALLOY_SMITHING_TEMPLATE = registerItem("sterling_alloy_smithing_template", ModSmithingTemplateItem.createSterlingAlloyTemplate()); + public static final Item STEEL_ALLOY_SMITHING_TEMPLATE = registerItem("steel_alloy_smithing_template", ModSmithingTemplateItem.createSteelAlloyTemplate()); + public static final Item GRAPHENE_ALLOY_SMITHING_TEMPLATE = registerItem("graphene_alloy_smithing_template", ModSmithingTemplateItem.createGrapheneAlloyTemplate()); + +// public static final Item CHOCOLATE = registerItem("chocolate", new Item(new Item.Settings().food(ModFoodComponents.CHOCOLATE))); +// public static final Item CARROT_PIE = registerItem("carrot_pie", new Item(new Item.Settings().food(ModFoodComponents.CARROT_PIE))); +// public static final Item VELVET = registerItem("velvet", new Item(new Item.Settings().food(ModFoodComponents.VELVET))); + + public static final Item RAW_TIN = registerItem("raw_tin", new Item(new Item.Settings())); + public static final Item RAW_SILVER = registerItem("raw_silver", new Item(new Item.Settings())); + public static final Item RAW_COBALT = registerItem("raw_cobalt", new Item(new Item.Settings())); + + public static final Item TIN_INGOT = registerItem("tin_ingot", new Item(new Item.Settings())); + public static final Item SILVER_INGOT = registerItem("silver_ingot", new Item(new Item.Settings())); + public static final Item COBALT_INGOT = registerItem("cobalt_ingot", new Item(new Item.Settings())); + public static final Item BRONZE_INGOT = registerItem("bronze_ingot", new Item(new Item.Settings())); + public static final Item STEEL_INGOT = registerItem("steel_ingot", new Item(new Item.Settings())); + public static final Item STERLING_INGOT = registerItem("sterling_ingot", new Item(new Item.Settings())); + public static final Item OBSIDIAN_INGOT = registerItem("obsidian_ingot", new Item(new Item.Settings())); + + public static final Item TOPAZ_GEM = registerItem("topaz_gem", new Item(new Item.Settings())); + public static final Item TOURMALINE_GEM = registerItem("tourmaline_gem", new Item(new Item.Settings())); + public static final Item TANZANITE_GEM = registerItem("tanzanite_gem", new Item(new Item.Settings())); + public static final Item RUBY_GEM = registerItem("ruby_gem", new Item(new Item.Settings())); + public static final Item SAPPHIRE_GEM = registerItem("sapphire_gem", new Item(new Item.Settings())); + public static final Item TURQUOISE_GEM = registerItem("turquoise_gem", new Item(new Item.Settings())); + public static final Item MOISSANITE_GEM = registerItem("moissanite_gem", new Item(new Item.Settings())); + public static final Item ONYX_GEM = registerItem("onyx_gem", new Item(new Item.Settings())); + public static final Item GRAPHENE_GEM = registerItem("graphene_gem", new Item(new Item.Settings())); + + public static final Item CHAIN = registerItem("chain", new Item(new Item.Settings())); + + public static final Item TIN_NUGGET = registerItem("tin_nugget", new Item(new Item.Settings())); + public static final Item COPPER_NUGGET = registerItem("copper_nugget", new Item(new Item.Settings())); + public static final Item SILVER_NUGGET = registerItem("silver_nugget", new Item(new Item.Settings())); + public static final Item COBALT_NUGGET = registerItem("cobalt_nugget", new Item(new Item.Settings())); + public static final Item BRONZE_NUGGET = registerItem("bronze_nugget", new Item(new Item.Settings())); + public static final Item STEEL_NUGGET = registerItem("steel_nugget", new Item(new Item.Settings())); + public static final Item STERLING_NUGGET = registerItem("sterling_nugget", new Item(new Item.Settings())); + +// public static final Item SILVER_APPLE = registerItem("silver_apple", new Item(new Item.Settings().food(ModFoodComponents.SILVER_APPLE))); +// public static final Item BRONZE_APPLE = registerItem("bronze_apple", new Item(new Item.Settings().food(ModFoodComponents.BRONZE_APPLE))); +// public static final Item COBALT_APPLE = registerItem("cobalt_apple", new Item(new Item.Settings().food(ModFoodComponents.COBALT_APPLE))); + +// public static final Item DUCK = registerItem("duck", new Item(new Item.Settings()).food(new FoodProperties.Builder().nutrition(2).saturationMod(0.3F).effect(new MobEffectInstance(MobEffects.HUNGER, 600, 0), 0.3F).meat().build()))); +// public static final Item COOKED_DUCK = registerItem("cooked_duck", new Item(new Item.Settings()).food(new FoodProperties.Builder().nutrition(6).saturationMod(0.6F).meat().build()))); // - public static final Item ANTHRACITE = registerItem("anthracite", new Item(new FabricItemSettings())); + public static final Item ANTHRACITE = registerItem("anthracite", new Item(new Item.Settings())); // public static final Item DUCK_SPAWN_EGG = registerItem("duck_spawn_egg", new ForgeSpawnEggItem(ModEntityTypes.DUCK, 0x006808, 0xFFD400, new FabricItemSettings)); // public static final Item DUCK_EGG = registerItem("duck_egg", new ModEggItem(new FabricItemSettings)); @@ -82,391 +80,392 @@ public class ModItems { //All horse armor - public static final Item COPPER_HORSE_ARMOR = registerItem("copper_horse_armor", new HorseArmorItem(3, "copper", (new FabricItemSettings()).maxCount(1))); - public static final Item TIN_HORSE_ARMOR = registerItem("tin_horse_armor", new HorseArmorItem(2, "tin", (new FabricItemSettings()).maxCount(1))); - public static final Item SILVER_HORSE_ARMOR = registerItem("silver_horse_armor", new HorseArmorItem(5, "silver", (new FabricItemSettings()).maxCount(1))); - public static final Item COBALT_HORSE_ARMOR = registerItem("cobalt_horse_armor", new HorseArmorItem(6, "cobalt", (new FabricItemSettings()).maxCount(1))); - public static final Item BRONZE_HORSE_ARMOR = registerItem("bronze_horse_armor", new HorseArmorItem(4, "bronze", (new FabricItemSettings()).maxCount(1))); - public static final Item STEEL_HORSE_ARMOR = registerItem("steel_horse_armor", new HorseArmorItem(8, "steel", (new FabricItemSettings()).maxCount(1))); - public static final Item STERLING_HORSE_ARMOR = registerItem("sterling_horse_armor", new HorseArmorItem(7, "sterling", (new FabricItemSettings()).maxCount(1))); - public static final Item AMETHYST_HORSE_ARMOR = registerItem("amethyst_horse_armor", new HorseArmorItem(7, "amethyst", (new FabricItemSettings()).maxCount(1))); - public static final Item OBSIDIAN_HORSE_ARMOR = registerItem("obsidian_horse_armor", new HorseArmorItem(9, "obsidian", (new FabricItemSettings()).maxCount(1))); - public static final Item EMERALD_HORSE_ARMOR = registerItem("emerald_horse_armor", new HorseArmorItem(8, "emerald", (new FabricItemSettings()).maxCount(1))); - public static final Item TOPAZ_HORSE_ARMOR = registerItem("topaz_horse_armor", new HorseArmorItem(9, "topaz", (new FabricItemSettings()).maxCount(1))); - public static final Item TOURMALINE_HORSE_ARMOR = registerItem("tourmaline_horse_armor", new HorseArmorItem(10, "tourmaline", (new FabricItemSettings()).maxCount(1))); - public static final Item TANZANITE_HORSE_ARMOR = registerItem("tanzanite_horse_armor", new HorseArmorItem(10, "tanzanite", (new FabricItemSettings()).maxCount(1))); - public static final Item RUBY_HORSE_ARMOR = registerItem("ruby_horse_armor", new HorseArmorItem(12, "ruby", (new FabricItemSettings()).maxCount(1))); - public static final Item SAPPHIRE_HORSE_ARMOR = registerItem("sapphire_horse_armor", new HorseArmorItem(11, "sapphire", (new FabricItemSettings()).maxCount(1))); - public static final Item TURQUOISE_HORSE_ARMOR = registerItem("turquoise_horse_armor", new HorseArmorItem(12, "turquoise", (new FabricItemSettings()).maxCount(1))); - public static final Item MOISSANITE_HORSE_ARMOR = registerItem("moissanite_horse_armor", new HorseArmorItem(13, "moissanite", (new FabricItemSettings()).maxCount(1))); - public static final Item ONYX_HORSE_ARMOR = registerItem("onyx_horse_armor", new HorseArmorItem(14, "onyx", (new FabricItemSettings()).maxCount(1))); - public static final Item GRAPHENE_HORSE_ARMOR = registerItem("graphene_horse_armor", new HorseArmorItem(16, "graphene", (new FabricItemSettings()).maxCount(1))); - public static final Item NETHERITE_HORSE_ARMOR = registerItem("netherite_horse_armor", new HorseArmorItem(15, "netherite", (new FabricItemSettings()).maxCount(1))); +// public static final Item COPPER_HORSE_ARMOR = registerItem("copper_horse_armor", new HorseArmorItem(3, "copper", (new Item.Settings()).maxCount(1))); +// public static final Item TIN_HORSE_ARMOR = registerItem("tin_horse_armor", new HorseArmorItem(2, "tin", (new Item.Settings()).maxCount(1))); +// public static final Item SILVER_HORSE_ARMOR = registerItem("silver_horse_armor", new HorseArmorItem(5, "silver", (new Item.Settings()).maxCount(1))); +// public static final Item COBALT_HORSE_ARMOR = registerItem("cobalt_horse_armor", new HorseArmorItem(6, "cobalt", (new Item.Settings()).maxCount(1))); +// public static final Item BRONZE_HORSE_ARMOR = registerItem("bronze_horse_armor", new HorseArmorItem(4, "bronze", (new Item.Settings()).maxCount(1))); +// public static final Item STEEL_HORSE_ARMOR = registerItem("steel_horse_armor", new HorseArmorItem(8, "steel", (new Item.Settings()).maxCount(1))); +// public static final Item STERLING_HORSE_ARMOR = registerItem("sterling_horse_armor", new HorseArmorItem(7, "sterling", (new Item.Settings()).maxCount(1))); +// public static final Item AMETHYST_HORSE_ARMOR = registerItem("amethyst_horse_armor", new HorseArmorItem(7, "amethyst", (new Item.Settings()).maxCount(1))); +// public static final Item OBSIDIAN_HORSE_ARMOR = registerItem("obsidian_horse_armor", new HorseArmorItem(9, "obsidian", (new Item.Settings()).maxCount(1))); +// public static final Item EMERALD_HORSE_ARMOR = registerItem("emerald_horse_armor", new HorseArmorItem(8, "emerald", (new Item.Settings()).maxCount(1))); +// public static final Item TOPAZ_HORSE_ARMOR = registerItem("topaz_horse_armor", new HorseArmorItem(9, "topaz", (new Item.Settings()).maxCount(1))); +// public static final Item TOURMALINE_HORSE_ARMOR = registerItem("tourmaline_horse_armor", new HorseArmorItem(10, "tourmaline", (new Item.Settings()).maxCount(1))); +// public static final Item TANZANITE_HORSE_ARMOR = registerItem("tanzanite_horse_armor", new HorseArmorItem(10, "tanzanite", (new Item.Settings()).maxCount(1))); +// public static final Item RUBY_HORSE_ARMOR = registerItem("ruby_horse_armor", new HorseArmorItem(12, "ruby", (new Item.Settings()).maxCount(1))); +// public static final Item SAPPHIRE_HORSE_ARMOR = registerItem("sapphire_horse_armor", new HorseArmorItem(11, "sapphire", (new Item.Settings()).maxCount(1))); +// public static final Item TURQUOISE_HORSE_ARMOR = registerItem("turquoise_horse_armor", new HorseArmorItem(12, "turquoise", (new Item.Settings()).maxCount(1))); +// public static final Item MOISSANITE_HORSE_ARMOR = registerItem("moissanite_horse_armor", new HorseArmorItem(13, "moissanite", (new Item.Settings()).maxCount(1))); +// public static final Item ONYX_HORSE_ARMOR = registerItem("onyx_horse_armor", new HorseArmorItem(14, "onyx", (new Item.Settings()).maxCount(1))); +// public static final Item GRAPHENE_HORSE_ARMOR = registerItem("graphene_horse_armor", new HorseArmorItem(16, "graphene", (new Item.Settings()).maxCount(1))); +// public static final Item NETHERITE_HORSE_ARMOR = registerItem("netherite_horse_armor", new HorseArmorItem(15, "netherite", (new Item.Settings()).maxCount(1))); //All armor - public static final Item TIN_HELMET = registerItem("tin_helmet", new ModArmorItem(ModArmorMaterials.TIN, ArmorItem.Type.HELMET, (new FabricItemSettings()))); - public static final Item TIN_CHESTPLATE = registerItem("tin_chestplate", new ModArmorItem(ModArmorMaterials.TIN, ArmorItem.Type.CHESTPLATE, (new FabricItemSettings()))); - public static final Item TIN_LEGGINGS = registerItem("tin_leggings", new ModArmorItem(ModArmorMaterials.TIN, ArmorItem.Type.LEGGINGS, (new FabricItemSettings()))); - public static final Item TIN_BOOTS = registerItem("tin_boots", new ModArmorItem(ModArmorMaterials.TIN, ArmorItem.Type.BOOTS, (new FabricItemSettings()))); - - public static final Item COPPER_HELMET = registerItem("copper_helmet", new ModArmorItem(ModArmorMaterials.COPPER, ArmorItem.Type.HELMET, (new FabricItemSettings()))); - public static final Item COPPER_CHESTPLATE = registerItem("copper_chestplate", new ModArmorItem(ModArmorMaterials.COPPER, ArmorItem.Type.CHESTPLATE, (new FabricItemSettings()))); - public static final Item COPPER_LEGGINGS = registerItem("copper_leggings", new ModArmorItem(ModArmorMaterials.COPPER, ArmorItem.Type.LEGGINGS, (new FabricItemSettings()))); - public static final Item COPPER_BOOTS = registerItem("copper_boots", new ModArmorItem(ModArmorMaterials.COPPER, ArmorItem.Type.BOOTS, (new FabricItemSettings()))); - - public static final Item SILVER_HELMET = registerItem("silver_helmet", new ModArmorItem(ModArmorMaterials.SILVER, ArmorItem.Type.HELMET, (new FabricItemSettings()))); - public static final Item SILVER_CHESTPLATE = registerItem("silver_chestplate", new ModArmorItem(ModArmorMaterials.SILVER, ArmorItem.Type.CHESTPLATE, (new FabricItemSettings()))); - public static final Item SILVER_LEGGINGS = registerItem("silver_leggings", new ModArmorItem(ModArmorMaterials.SILVER, ArmorItem.Type.LEGGINGS, (new FabricItemSettings()))); - public static final Item SILVER_BOOTS = registerItem("silver_boots", new ModArmorItem(ModArmorMaterials.SILVER, ArmorItem.Type.BOOTS, (new FabricItemSettings()))); - - public static final Item BRONZE_HELMET = registerItem("bronze_helmet", new ModArmorItem(ModArmorMaterials.BRONZE, ArmorItem.Type.HELMET, (new FabricItemSettings()))); - public static final Item BRONZE_CHESTPLATE = registerItem("bronze_chestplate", new ModArmorItem(ModArmorMaterials.BRONZE, ArmorItem.Type.CHESTPLATE, (new FabricItemSettings()))); - public static final Item BRONZE_LEGGINGS = registerItem("bronze_leggings", new ModArmorItem(ModArmorMaterials.BRONZE, ArmorItem.Type.LEGGINGS, (new FabricItemSettings()))); - public static final Item BRONZE_BOOTS = registerItem("bronze_boots", new ModArmorItem(ModArmorMaterials.BRONZE, ArmorItem.Type.BOOTS, (new FabricItemSettings()))); - - public static final Item STERLING_HELMET = registerItem("sterling_helmet", new ModArmorItem(ModArmorMaterials.STERLING, ArmorItem.Type.HELMET, (new FabricItemSettings()))); - public static final Item STERLING_CHESTPLATE = registerItem("sterling_chestplate", new ModArmorItem(ModArmorMaterials.STERLING, ArmorItem.Type.CHESTPLATE, (new FabricItemSettings()))); - public static final Item STERLING_LEGGINGS = registerItem("sterling_leggings", new ModArmorItem(ModArmorMaterials.STERLING, ArmorItem.Type.LEGGINGS, (new FabricItemSettings()))); - public static final Item STERLING_BOOTS = registerItem("sterling_boots", new ModArmorItem(ModArmorMaterials.STERLING, ArmorItem.Type.BOOTS, (new FabricItemSettings()))); - - public static final Item OBSIDIAN_HELMET = registerItem("obsidian_helmet", new ModArmorItem(ModArmorMaterials.OBSIDIAN, ArmorItem.Type.HELMET, (new FabricItemSettings()))); - public static final Item OBSIDIAN_CHESTPLATE = registerItem("obsidian_chestplate", new ModArmorItem(ModArmorMaterials.OBSIDIAN, ArmorItem.Type.CHESTPLATE, (new FabricItemSettings()))); - public static final Item OBSIDIAN_LEGGINGS = registerItem("obsidian_leggings", new ModArmorItem(ModArmorMaterials.OBSIDIAN, ArmorItem.Type.LEGGINGS, (new FabricItemSettings()))); - public static final Item OBSIDIAN_BOOTS = registerItem("obsidian_boots", new ModArmorItem(ModArmorMaterials.OBSIDIAN, ArmorItem.Type.BOOTS, (new FabricItemSettings()))); - - public static final Item COBALT_HELMET = registerItem("cobalt_helmet", new ModArmorItem(ModArmorMaterials.COBALT, ArmorItem.Type.HELMET, (new FabricItemSettings()))); - public static final Item COBALT_CHESTPLATE = registerItem("cobalt_chestplate", new ModArmorItem(ModArmorMaterials.COBALT, ArmorItem.Type.CHESTPLATE, (new FabricItemSettings()))); - public static final Item COBALT_LEGGINGS = registerItem("cobalt_leggings", new ModArmorItem(ModArmorMaterials.COBALT, ArmorItem.Type.LEGGINGS, (new FabricItemSettings()))); - public static final Item COBALT_BOOTS = registerItem("cobalt_boots", new ModArmorItem(ModArmorMaterials.COBALT, ArmorItem.Type.BOOTS, (new FabricItemSettings()))); - - public static final Item STEEL_HELMET = registerItem("steel_helmet", new ModArmorItem(ModArmorMaterials.STEEL, ArmorItem.Type.HELMET, (new FabricItemSettings()))); - public static final Item STEEL_CHESTPLATE = registerItem("steel_chestplate", new ModArmorItem(ModArmorMaterials.STEEL, ArmorItem.Type.CHESTPLATE, (new FabricItemSettings()))); - public static final Item STEEL_LEGGINGS = registerItem("steel_leggings", new ModArmorItem(ModArmorMaterials.STEEL, ArmorItem.Type.LEGGINGS, (new FabricItemSettings()))); - public static final Item STEEL_BOOTS = registerItem("steel_boots", new ModArmorItem(ModArmorMaterials.STEEL, ArmorItem.Type.BOOTS, (new FabricItemSettings()))); - - public static final Item AMETHYST_HELMET = registerItem("amethyst_helmet", new ModArmorItem(ModArmorMaterials.AMETHYST, ArmorItem.Type.HELMET, (new FabricItemSettings()))); - public static final Item AMETHYST_CHESTPLATE = registerItem("amethyst_chestplate", new ModArmorItem(ModArmorMaterials.AMETHYST, ArmorItem.Type.CHESTPLATE, (new FabricItemSettings()))); - public static final Item AMETHYST_LEGGINGS = registerItem("amethyst_leggings", new ModArmorItem(ModArmorMaterials.AMETHYST, ArmorItem.Type.LEGGINGS, (new FabricItemSettings()))); - public static final Item AMETHYST_BOOTS = registerItem("amethyst_boots", new ModArmorItem(ModArmorMaterials.AMETHYST, ArmorItem.Type.BOOTS, (new FabricItemSettings()))); - - public static final Item EMERALD_HELMET = registerItem("emerald_helmet", new ModArmorItem(ModArmorMaterials.EMERALD, ArmorItem.Type.HELMET, (new FabricItemSettings()))); - public static final Item EMERALD_CHESTPLATE = registerItem("emerald_chestplate", new ModArmorItem(ModArmorMaterials.EMERALD, ArmorItem.Type.CHESTPLATE, (new FabricItemSettings()))); - public static final Item EMERALD_LEGGINGS = registerItem("emerald_leggings", new ModArmorItem(ModArmorMaterials.EMERALD, ArmorItem.Type.LEGGINGS, (new FabricItemSettings()))); - public static final Item EMERALD_BOOTS = registerItem("emerald_boots", new ModArmorItem(ModArmorMaterials.EMERALD, ArmorItem.Type.BOOTS, (new FabricItemSettings()))); - - public static final Item TOPAZ_HELMET = registerItem("topaz_helmet", new ModArmorItem(ModArmorMaterials.TOPAZ, ArmorItem.Type.HELMET, (new FabricItemSettings()))); - public static final Item TOPAZ_CHESTPLATE = registerItem("topaz_chestplate", new ModArmorItem(ModArmorMaterials.TOPAZ, ArmorItem.Type.CHESTPLATE, (new FabricItemSettings()))); - public static final Item TOPAZ_LEGGINGS = registerItem("topaz_leggings", new ModArmorItem(ModArmorMaterials.TOPAZ, ArmorItem.Type.LEGGINGS, (new FabricItemSettings()))); - public static final Item TOPAZ_BOOTS = registerItem("topaz_boots", new ModArmorItem(ModArmorMaterials.TOPAZ, ArmorItem.Type.BOOTS, (new FabricItemSettings()))); - - public static final Item TOURMALINE_HELMET = registerItem("tourmaline_helmet", new ModArmorItem(ModArmorMaterials.TOURMALINE, ArmorItem.Type.HELMET, (new FabricItemSettings()))); - public static final Item TOURMALINE_CHESTPLATE = registerItem("tourmaline_chestplate", new ModArmorItem(ModArmorMaterials.TOURMALINE, ArmorItem.Type.CHESTPLATE, (new FabricItemSettings()))); - public static final Item TOURMALINE_LEGGINGS = registerItem("tourmaline_leggings", new ModArmorItem(ModArmorMaterials.TOURMALINE, ArmorItem.Type.LEGGINGS, (new FabricItemSettings()))); - public static final Item TOURMALINE_BOOTS = registerItem("tourmaline_boots", new ModArmorItem(ModArmorMaterials.TOURMALINE, ArmorItem.Type.BOOTS, (new FabricItemSettings()))); - - public static final Item TANZANITE_HELMET = registerItem("tanzanite_helmet", new ModArmorItem(ModArmorMaterials.TANZANITE, ArmorItem.Type.HELMET, (new FabricItemSettings()))); - public static final Item TANZANITE_CHESTPLATE = registerItem("tanzanite_chestplate", new ModArmorItem(ModArmorMaterials.TANZANITE, ArmorItem.Type.CHESTPLATE, (new FabricItemSettings()))); - public static final Item TANZANITE_LEGGINGS = registerItem("tanzanite_leggings", new ModArmorItem(ModArmorMaterials.TANZANITE, ArmorItem.Type.LEGGINGS, (new FabricItemSettings()))); - public static final Item TANZANITE_BOOTS = registerItem("tanzanite_boots", new ModArmorItem(ModArmorMaterials.TANZANITE, ArmorItem.Type.BOOTS, (new FabricItemSettings()))); - - public static final Item RUBY_HELMET = registerItem("ruby_helmet", new ModArmorItem(ModArmorMaterials.RUBY, ArmorItem.Type.HELMET, (new FabricItemSettings()))); - public static final Item RUBY_CHESTPLATE = registerItem("ruby_chestplate", new ModArmorItem(ModArmorMaterials.RUBY, ArmorItem.Type.CHESTPLATE, (new FabricItemSettings()))); - public static final Item RUBY_LEGGINGS = registerItem("ruby_leggings", new ModArmorItem(ModArmorMaterials.RUBY, ArmorItem.Type.LEGGINGS, (new FabricItemSettings()))); - public static final Item RUBY_BOOTS = registerItem("ruby_boots", new ModArmorItem(ModArmorMaterials.RUBY, ArmorItem.Type.BOOTS, (new FabricItemSettings()))); - - public static final Item SAPPHIRE_HELMET = registerItem("sapphire_helmet", new ModArmorItem(ModArmorMaterials.SAPPHIRE, ArmorItem.Type.HELMET, (new FabricItemSettings()))); - public static final Item SAPPHIRE_CHESTPLATE = registerItem("sapphire_chestplate", new ModArmorItem(ModArmorMaterials.SAPPHIRE, ArmorItem.Type.CHESTPLATE, (new FabricItemSettings()))); - public static final Item SAPPHIRE_LEGGINGS = registerItem("sapphire_leggings", new ModArmorItem(ModArmorMaterials.SAPPHIRE, ArmorItem.Type.LEGGINGS, (new FabricItemSettings()))); - public static final Item SAPPHIRE_BOOTS = registerItem("sapphire_boots", new ModArmorItem(ModArmorMaterials.SAPPHIRE, ArmorItem.Type.BOOTS, (new FabricItemSettings()))); - - public static final Item TURQUOISE_HELMET = registerItem("turquoise_helmet", new ModArmorItem(ModArmorMaterials.TURQUOISE, ArmorItem.Type.HELMET, (new FabricItemSettings()))); - public static final Item TURQUOISE_CHESTPLATE = registerItem("turquoise_chestplate", new ModArmorItem(ModArmorMaterials.TURQUOISE, ArmorItem.Type.CHESTPLATE, (new FabricItemSettings()))); - public static final Item TURQUOISE_LEGGINGS = registerItem("turquoise_leggings", new ModArmorItem(ModArmorMaterials.TURQUOISE, ArmorItem.Type.LEGGINGS, (new FabricItemSettings()))); - public static final Item TURQUOISE_BOOTS = registerItem("turquoise_boots", new ModArmorItem(ModArmorMaterials.TURQUOISE, ArmorItem.Type.BOOTS, (new FabricItemSettings()))); - - public static final Item MOISSANITE_HELMET = registerItem("moissanite_helmet", new ModArmorItem(ModArmorMaterials.MOISSANITE, ArmorItem.Type.HELMET, (new FabricItemSettings()))); - public static final Item MOISSANITE_CHESTPLATE = registerItem("moissanite_chestplate", new ModArmorItem(ModArmorMaterials.MOISSANITE, ArmorItem.Type.CHESTPLATE, (new FabricItemSettings()))); - public static final Item MOISSANITE_LEGGINGS = registerItem("moissanite_leggings", new ModArmorItem(ModArmorMaterials.MOISSANITE, ArmorItem.Type.LEGGINGS, (new FabricItemSettings()))); - public static final Item MOISSANITE_BOOTS = registerItem("moissanite_boots", new ModArmorItem(ModArmorMaterials.MOISSANITE, ArmorItem.Type.BOOTS, (new FabricItemSettings()))); - - public static final Item ONYX_HELMET = registerItem("onyx_helmet", new ModArmorItem(ModArmorMaterials.ONYX, ArmorItem.Type.HELMET, (new FabricItemSettings()))); - public static final Item ONYX_CHESTPLATE = registerItem("onyx_chestplate", new ModArmorItem(ModArmorMaterials.ONYX, ArmorItem.Type.CHESTPLATE, (new FabricItemSettings()))); - public static final Item ONYX_LEGGINGS = registerItem("onyx_leggings", new ModArmorItem(ModArmorMaterials.ONYX, ArmorItem.Type.LEGGINGS, (new FabricItemSettings()))); - public static final Item ONYX_BOOTS = registerItem("onyx_boots", new ModArmorItem(ModArmorMaterials.ONYX, ArmorItem.Type.BOOTS, (new FabricItemSettings()))); - - public static final Item GRAPHENE_HELMET = registerItem("graphene_helmet", new ModArmorItem(ModArmorMaterials.GRAPHENE, ArmorItem.Type.HELMET, (new FabricItemSettings()))); - public static final Item GRAPHENE_CHESTPLATE = registerItem("graphene_chestplate", new ModArmorItem(ModArmorMaterials.GRAPHENE, ArmorItem.Type.CHESTPLATE, (new FabricItemSettings()))); - public static final Item GRAPHENE_LEGGINGS = registerItem("graphene_leggings", new ModArmorItem(ModArmorMaterials.GRAPHENE, ArmorItem.Type.LEGGINGS, (new FabricItemSettings()))); - public static final Item GRAPHENE_BOOTS = registerItem("graphene_boots", new ModArmorItem(ModArmorMaterials.GRAPHENE, ArmorItem.Type.BOOTS, (new FabricItemSettings()))); + //TODO Set max damage + public static final Item TIN_HELMET = registerItem("tin_helmet", new ModArmorItem(ModArmorMaterials.TIN, ArmorItem.Type.HELMET, (new Item.Settings()).maxDamage(5))); + public static final Item TIN_CHESTPLATE = registerItem("tin_chestplate", new ModArmorItem(ModArmorMaterials.TIN, ArmorItem.Type.CHESTPLATE, (new Item.Settings()))); + public static final Item TIN_LEGGINGS = registerItem("tin_leggings", new ModArmorItem(ModArmorMaterials.TIN, ArmorItem.Type.LEGGINGS, (new Item.Settings()))); + public static final Item TIN_BOOTS = registerItem("tin_boots", new ModArmorItem(ModArmorMaterials.TIN, ArmorItem.Type.BOOTS, (new Item.Settings()))); + + public static final Item COPPER_HELMET = registerItem("copper_helmet", new ModArmorItem(ModArmorMaterials.COPPER, ArmorItem.Type.HELMET, (new Item.Settings()))); + public static final Item COPPER_CHESTPLATE = registerItem("copper_chestplate", new ModArmorItem(ModArmorMaterials.COPPER, ArmorItem.Type.CHESTPLATE, (new Item.Settings()))); + public static final Item COPPER_LEGGINGS = registerItem("copper_leggings", new ModArmorItem(ModArmorMaterials.COPPER, ArmorItem.Type.LEGGINGS, (new Item.Settings()))); + public static final Item COPPER_BOOTS = registerItem("copper_boots", new ModArmorItem(ModArmorMaterials.COPPER, ArmorItem.Type.BOOTS, (new Item.Settings()))); + + public static final Item SILVER_HELMET = registerItem("silver_helmet", new ModArmorItem(ModArmorMaterials.SILVER, ArmorItem.Type.HELMET, (new Item.Settings()))); + public static final Item SILVER_CHESTPLATE = registerItem("silver_chestplate", new ModArmorItem(ModArmorMaterials.SILVER, ArmorItem.Type.CHESTPLATE, (new Item.Settings()))); + public static final Item SILVER_LEGGINGS = registerItem("silver_leggings", new ModArmorItem(ModArmorMaterials.SILVER, ArmorItem.Type.LEGGINGS, (new Item.Settings()))); + public static final Item SILVER_BOOTS = registerItem("silver_boots", new ModArmorItem(ModArmorMaterials.SILVER, ArmorItem.Type.BOOTS, (new Item.Settings()))); + + public static final Item BRONZE_HELMET = registerItem("bronze_helmet", new ModArmorItem(ModArmorMaterials.BRONZE, ArmorItem.Type.HELMET, (new Item.Settings()))); + public static final Item BRONZE_CHESTPLATE = registerItem("bronze_chestplate", new ModArmorItem(ModArmorMaterials.BRONZE, ArmorItem.Type.CHESTPLATE, (new Item.Settings()))); + public static final Item BRONZE_LEGGINGS = registerItem("bronze_leggings", new ModArmorItem(ModArmorMaterials.BRONZE, ArmorItem.Type.LEGGINGS, (new Item.Settings()))); + public static final Item BRONZE_BOOTS = registerItem("bronze_boots", new ModArmorItem(ModArmorMaterials.BRONZE, ArmorItem.Type.BOOTS, (new Item.Settings()))); + + public static final Item STERLING_HELMET = registerItem("sterling_helmet", new ModArmorItem(ModArmorMaterials.STERLING, ArmorItem.Type.HELMET, (new Item.Settings()))); + public static final Item STERLING_CHESTPLATE = registerItem("sterling_chestplate", new ModArmorItem(ModArmorMaterials.STERLING, ArmorItem.Type.CHESTPLATE, (new Item.Settings()))); + public static final Item STERLING_LEGGINGS = registerItem("sterling_leggings", new ModArmorItem(ModArmorMaterials.STERLING, ArmorItem.Type.LEGGINGS, (new Item.Settings()))); + public static final Item STERLING_BOOTS = registerItem("sterling_boots", new ModArmorItem(ModArmorMaterials.STERLING, ArmorItem.Type.BOOTS, (new Item.Settings()))); + +// public static final Item OBSIDIAN_HELMET = registerItem("obsidian_helmet", new ModArmorItem(ModArmorMaterials.OBSIDIAN, ArmorItem.Type.HELMET, (new Item.Settings()))); +// public static final Item OBSIDIAN_CHESTPLATE = registerItem("obsidian_chestplate", new ModArmorItem(ModArmorMaterials.OBSIDIAN, ArmorItem.Type.CHESTPLATE, (new Item.Settings()))); +// public static final Item OBSIDIAN_LEGGINGS = registerItem("obsidian_leggings", new ModArmorItem(ModArmorMaterials.OBSIDIAN, ArmorItem.Type.LEGGINGS, (new Item.Settings()))); +// public static final Item OBSIDIAN_BOOTS = registerItem("obsidian_boots", new ModArmorItem(ModArmorMaterials.OBSIDIAN, ArmorItem.Type.BOOTS, (new Item.Settings()))); + + public static final Item COBALT_HELMET = registerItem("cobalt_helmet", new ModArmorItem(ModArmorMaterials.COBALT, ArmorItem.Type.HELMET, (new Item.Settings()))); + public static final Item COBALT_CHESTPLATE = registerItem("cobalt_chestplate", new ModArmorItem(ModArmorMaterials.COBALT, ArmorItem.Type.CHESTPLATE, (new Item.Settings()))); + public static final Item COBALT_LEGGINGS = registerItem("cobalt_leggings", new ModArmorItem(ModArmorMaterials.COBALT, ArmorItem.Type.LEGGINGS, (new Item.Settings()))); + public static final Item COBALT_BOOTS = registerItem("cobalt_boots", new ModArmorItem(ModArmorMaterials.COBALT, ArmorItem.Type.BOOTS, (new Item.Settings()))); + + public static final Item STEEL_HELMET = registerItem("steel_helmet", new ModArmorItem(ModArmorMaterials.STEEL, ArmorItem.Type.HELMET, (new Item.Settings()))); + public static final Item STEEL_CHESTPLATE = registerItem("steel_chestplate", new ModArmorItem(ModArmorMaterials.STEEL, ArmorItem.Type.CHESTPLATE, (new Item.Settings()))); + public static final Item STEEL_LEGGINGS = registerItem("steel_leggings", new ModArmorItem(ModArmorMaterials.STEEL, ArmorItem.Type.LEGGINGS, (new Item.Settings()))); + public static final Item STEEL_BOOTS = registerItem("steel_boots", new ModArmorItem(ModArmorMaterials.STEEL, ArmorItem.Type.BOOTS, (new Item.Settings()))); + +// public static final Item AMETHYST_HELMET = registerItem("amethyst_helmet", new ModArmorItem(ModArmorMaterials.AMETHYST, ArmorItem.Type.HELMET, (new Item.Settings()))); +// public static final Item AMETHYST_CHESTPLATE = registerItem("amethyst_chestplate", new ModArmorItem(ModArmorMaterials.AMETHYST, ArmorItem.Type.CHESTPLATE, (new Item.Settings()))); +// public static final Item AMETHYST_LEGGINGS = registerItem("amethyst_leggings", new ModArmorItem(ModArmorMaterials.AMETHYST, ArmorItem.Type.LEGGINGS, (new Item.Settings()))); +// public static final Item AMETHYST_BOOTS = registerItem("amethyst_boots", new ModArmorItem(ModArmorMaterials.AMETHYST, ArmorItem.Type.BOOTS, (new Item.Settings()))); +// +// public static final Item EMERALD_HELMET = registerItem("emerald_helmet", new ModArmorItem(ModArmorMaterials.EMERALD, ArmorItem.Type.HELMET, (new Item.Settings()))); +// public static final Item EMERALD_CHESTPLATE = registerItem("emerald_chestplate", new ModArmorItem(ModArmorMaterials.EMERALD, ArmorItem.Type.CHESTPLATE, (new Item.Settings()))); +// public static final Item EMERALD_LEGGINGS = registerItem("emerald_leggings", new ModArmorItem(ModArmorMaterials.EMERALD, ArmorItem.Type.LEGGINGS, (new Item.Settings()))); +// public static final Item EMERALD_BOOTS = registerItem("emerald_boots", new ModArmorItem(ModArmorMaterials.EMERALD, ArmorItem.Type.BOOTS, (new Item.Settings()))); +// +// public static final Item TOPAZ_HELMET = registerItem("topaz_helmet", new ModArmorItem(ModArmorMaterials.TOPAZ, ArmorItem.Type.HELMET, (new Item.Settings()))); +// public static final Item TOPAZ_CHESTPLATE = registerItem("topaz_chestplate", new ModArmorItem(ModArmorMaterials.TOPAZ, ArmorItem.Type.CHESTPLATE, (new Item.Settings()))); +// public static final Item TOPAZ_LEGGINGS = registerItem("topaz_leggings", new ModArmorItem(ModArmorMaterials.TOPAZ, ArmorItem.Type.LEGGINGS, (new Item.Settings()))); +// public static final Item TOPAZ_BOOTS = registerItem("topaz_boots", new ModArmorItem(ModArmorMaterials.TOPAZ, ArmorItem.Type.BOOTS, (new Item.Settings()))); +// +// public static final Item TOURMALINE_HELMET = registerItem("tourmaline_helmet", new ModArmorItem(ModArmorMaterials.TOURMALINE, ArmorItem.Type.HELMET, (new Item.Settings()))); +// public static final Item TOURMALINE_CHESTPLATE = registerItem("tourmaline_chestplate", new ModArmorItem(ModArmorMaterials.TOURMALINE, ArmorItem.Type.CHESTPLATE, (new Item.Settings()))); +// public static final Item TOURMALINE_LEGGINGS = registerItem("tourmaline_leggings", new ModArmorItem(ModArmorMaterials.TOURMALINE, ArmorItem.Type.LEGGINGS, (new Item.Settings()))); +// public static final Item TOURMALINE_BOOTS = registerItem("tourmaline_boots", new ModArmorItem(ModArmorMaterials.TOURMALINE, ArmorItem.Type.BOOTS, (new Item.Settings()))); +// +// public static final Item TANZANITE_HELMET = registerItem("tanzanite_helmet", new ModArmorItem(ModArmorMaterials.TANZANITE, ArmorItem.Type.HELMET, (new Item.Settings()))); +// public static final Item TANZANITE_CHESTPLATE = registerItem("tanzanite_chestplate", new ModArmorItem(ModArmorMaterials.TANZANITE, ArmorItem.Type.CHESTPLATE, (new Item.Settings()))); +// public static final Item TANZANITE_LEGGINGS = registerItem("tanzanite_leggings", new ModArmorItem(ModArmorMaterials.TANZANITE, ArmorItem.Type.LEGGINGS, (new Item.Settings()))); +// public static final Item TANZANITE_BOOTS = registerItem("tanzanite_boots", new ModArmorItem(ModArmorMaterials.TANZANITE, ArmorItem.Type.BOOTS, (new Item.Settings()))); +// +// public static final Item RUBY_HELMET = registerItem("ruby_helmet", new ModArmorItem(ModArmorMaterials.RUBY, ArmorItem.Type.HELMET, (new Item.Settings()))); +// public static final Item RUBY_CHESTPLATE = registerItem("ruby_chestplate", new ModArmorItem(ModArmorMaterials.RUBY, ArmorItem.Type.CHESTPLATE, (new Item.Settings()))); +// public static final Item RUBY_LEGGINGS = registerItem("ruby_leggings", new ModArmorItem(ModArmorMaterials.RUBY, ArmorItem.Type.LEGGINGS, (new Item.Settings()))); +// public static final Item RUBY_BOOTS = registerItem("ruby_boots", new ModArmorItem(ModArmorMaterials.RUBY, ArmorItem.Type.BOOTS, (new Item.Settings()))); +// +// public static final Item SAPPHIRE_HELMET = registerItem("sapphire_helmet", new ModArmorItem(ModArmorMaterials.SAPPHIRE, ArmorItem.Type.HELMET, (new Item.Settings()))); +// public static final Item SAPPHIRE_CHESTPLATE = registerItem("sapphire_chestplate", new ModArmorItem(ModArmorMaterials.SAPPHIRE, ArmorItem.Type.CHESTPLATE, (new Item.Settings()))); +// public static final Item SAPPHIRE_LEGGINGS = registerItem("sapphire_leggings", new ModArmorItem(ModArmorMaterials.SAPPHIRE, ArmorItem.Type.LEGGINGS, (new Item.Settings()))); +// public static final Item SAPPHIRE_BOOTS = registerItem("sapphire_boots", new ModArmorItem(ModArmorMaterials.SAPPHIRE, ArmorItem.Type.BOOTS, (new Item.Settings()))); +// +// public static final Item TURQUOISE_HELMET = registerItem("turquoise_helmet", new ModArmorItem(ModArmorMaterials.TURQUOISE, ArmorItem.Type.HELMET, (new Item.Settings()))); +// public static final Item TURQUOISE_CHESTPLATE = registerItem("turquoise_chestplate", new ModArmorItem(ModArmorMaterials.TURQUOISE, ArmorItem.Type.CHESTPLATE, (new Item.Settings()))); +// public static final Item TURQUOISE_LEGGINGS = registerItem("turquoise_leggings", new ModArmorItem(ModArmorMaterials.TURQUOISE, ArmorItem.Type.LEGGINGS, (new Item.Settings()))); +// public static final Item TURQUOISE_BOOTS = registerItem("turquoise_boots", new ModArmorItem(ModArmorMaterials.TURQUOISE, ArmorItem.Type.BOOTS, (new Item.Settings()))); +// +// public static final Item MOISSANITE_HELMET = registerItem("moissanite_helmet", new ModArmorItem(ModArmorMaterials.MOISSANITE, ArmorItem.Type.HELMET, (new Item.Settings()))); +// public static final Item MOISSANITE_CHESTPLATE = registerItem("moissanite_chestplate", new ModArmorItem(ModArmorMaterials.MOISSANITE, ArmorItem.Type.CHESTPLATE, (new Item.Settings()))); +// public static final Item MOISSANITE_LEGGINGS = registerItem("moissanite_leggings", new ModArmorItem(ModArmorMaterials.MOISSANITE, ArmorItem.Type.LEGGINGS, (new Item.Settings()))); +// public static final Item MOISSANITE_BOOTS = registerItem("moissanite_boots", new ModArmorItem(ModArmorMaterials.MOISSANITE, ArmorItem.Type.BOOTS, (new Item.Settings()))); +// +// public static final Item ONYX_HELMET = registerItem("onyx_helmet", new ModArmorItem(ModArmorMaterials.ONYX, ArmorItem.Type.HELMET, (new Item.Settings()))); +// public static final Item ONYX_CHESTPLATE = registerItem("onyx_chestplate", new ModArmorItem(ModArmorMaterials.ONYX, ArmorItem.Type.CHESTPLATE, (new Item.Settings()))); +// public static final Item ONYX_LEGGINGS = registerItem("onyx_leggings", new ModArmorItem(ModArmorMaterials.ONYX, ArmorItem.Type.LEGGINGS, (new Item.Settings()))); +// public static final Item ONYX_BOOTS = registerItem("onyx_boots", new ModArmorItem(ModArmorMaterials.ONYX, ArmorItem.Type.BOOTS, (new Item.Settings()))); +// +// public static final Item GRAPHENE_HELMET = registerItem("graphene_helmet", new ModArmorItem(ModArmorMaterials.GRAPHENE, ArmorItem.Type.HELMET, (new Item.Settings()))); +// public static final Item GRAPHENE_CHESTPLATE = registerItem("graphene_chestplate", new ModArmorItem(ModArmorMaterials.GRAPHENE, ArmorItem.Type.CHESTPLATE, (new Item.Settings()))); +// public static final Item GRAPHENE_LEGGINGS = registerItem("graphene_leggings", new ModArmorItem(ModArmorMaterials.GRAPHENE, ArmorItem.Type.LEGGINGS, (new Item.Settings()))); +// public static final Item GRAPHENE_BOOTS = registerItem("graphene_boots", new ModArmorItem(ModArmorMaterials.GRAPHENE, ArmorItem.Type.BOOTS, (new Item.Settings()))); //All swords //p_i48460_2_: Attack Damage (1 = 1 Attack Point) //p_i48460_3_: Attack Speed (1.0F = ... Attack Speed) - public static final Item TIN_SWORD = registerItem("tin_sword", new ModSwordItem(ModToolMaterials.TIN, 3, -2.4F, new FabricItemSettings())); - public static final Item COPPER_SWORD = registerItem("copper_sword", new ModSwordItem(ModToolMaterials.COPPER, 3, -2.4F, new FabricItemSettings())); + public static final Item TIN_SWORD = registerItem("tin_sword", new ModSwordItem(ModToolMaterials.TIN, 3, -2.4F, new Item.Settings())); + public static final Item COPPER_SWORD = registerItem("copper_sword", new ModSwordItem(ModToolMaterials.COPPER, 3, -2.4F, new Item.Settings())); - public static final Item SILVER_SWORD = registerItem("silver_sword", new ModSwordItem(ModToolMaterials.SILVER, 3, -2.4F, new FabricItemSettings())); + public static final Item SILVER_SWORD = registerItem("silver_sword", new ModSwordItem(ModToolMaterials.SILVER, 3, -2.4F, new Item.Settings())); - public static final Item BRONZE_SWORD = registerItem("bronze_sword", new ModSwordItem(ModToolMaterials.BRONZE, 3, -2.4F, new FabricItemSettings())); + public static final Item BRONZE_SWORD = registerItem("bronze_sword", new ModSwordItem(ModToolMaterials.BRONZE, 3, -2.4F, new Item.Settings())); - public static final Item OBSIDIAN_SWORD = registerItem("obsidian_sword", new ModSwordItem(ModToolMaterials.OBSIDIAN, 3, -2.4F, new FabricItemSettings())); - public static final Item COBALT_SWORD = registerItem("cobalt_sword", new ModSwordItem(ModToolMaterials.COBALT, 3, -2.4F, new FabricItemSettings())); - public static final Item STEEL_SWORD = registerItem("steel_sword", new ModSwordItem(ModToolMaterials.STEEL, 3, -2.4F, new FabricItemSettings())); - public static final Item STERLING_SWORD = registerItem("sterling_sword", new ModSwordItem(ModToolMaterials.STERLING, 3, -2.4F, new FabricItemSettings())); + public static final Item OBSIDIAN_SWORD = registerItem("obsidian_sword", new ModSwordItem(ModToolMaterials.OBSIDIAN, 3, -2.4F, new Item.Settings())); + public static final Item COBALT_SWORD = registerItem("cobalt_sword", new ModSwordItem(ModToolMaterials.COBALT, 3, -2.4F, new Item.Settings())); + public static final Item STEEL_SWORD = registerItem("steel_sword", new ModSwordItem(ModToolMaterials.STEEL, 3, -2.4F, new Item.Settings())); + public static final Item STERLING_SWORD = registerItem("sterling_sword", new ModSwordItem(ModToolMaterials.STERLING, 3, -2.4F, new Item.Settings())); - public static final Item AMETHYST_SWORD = registerItem("amethyst_sword", new ModSwordItem(ModToolMaterials.AMETHYST, 3, -2.4F, new FabricItemSettings())); - public static final Item EMERALD_SWORD = registerItem("emerald_sword", new ModSwordItem(ModToolMaterials.EMERALD, 3, -2.4F, new FabricItemSettings())); + public static final Item AMETHYST_SWORD = registerItem("amethyst_sword", new ModSwordItem(ModToolMaterials.AMETHYST, 3, -2.4F, new Item.Settings())); + public static final Item EMERALD_SWORD = registerItem("emerald_sword", new ModSwordItem(ModToolMaterials.EMERALD, 3, -2.4F, new Item.Settings())); - public static final Item TOPAZ_SWORD = registerItem("topaz_sword", new ModSwordItem(ModToolMaterials.TOPAZ, 3, -2.4F, new FabricItemSettings())); - public static final Item TOURMALINE_SWORD = registerItem("tourmaline_sword", new ModSwordItem(ModToolMaterials.TOURMALINE, 3, -2.4F, new FabricItemSettings())); - public static final Item TANZANITE_SWORD = registerItem("tanzanite_sword", new ModSwordItem(ModToolMaterials.TANZANITE, 3, -2.4F, new FabricItemSettings())); + public static final Item TOPAZ_SWORD = registerItem("topaz_sword", new ModSwordItem(ModToolMaterials.TOPAZ, 3, -2.4F, new Item.Settings())); + public static final Item TOURMALINE_SWORD = registerItem("tourmaline_sword", new ModSwordItem(ModToolMaterials.TOURMALINE, 3, -2.4F, new Item.Settings())); + public static final Item TANZANITE_SWORD = registerItem("tanzanite_sword", new ModSwordItem(ModToolMaterials.TANZANITE, 3, -2.4F, new Item.Settings())); - public static final Item RUBY_SWORD = registerItem("ruby_sword", new ModSwordItem(ModToolMaterials.RUBY, 3, -2.4F, new FabricItemSettings())); - public static final Item SAPPHIRE_SWORD = registerItem("sapphire_sword", new ModSwordItem(ModToolMaterials.SAPPHIRE, 3, -2.4F, new FabricItemSettings())); - public static final Item TURQUOISE_SWORD = registerItem("turquoise_sword", new ModSwordItem(ModToolMaterials.TURQUOISE, 3, -2.4F, new FabricItemSettings())); + public static final Item RUBY_SWORD = registerItem("ruby_sword", new ModSwordItem(ModToolMaterials.RUBY, 3, -2.4F, new Item.Settings())); + public static final Item SAPPHIRE_SWORD = registerItem("sapphire_sword", new ModSwordItem(ModToolMaterials.SAPPHIRE, 3, -2.4F, new Item.Settings())); + public static final Item TURQUOISE_SWORD = registerItem("turquoise_sword", new ModSwordItem(ModToolMaterials.TURQUOISE, 3, -2.4F, new Item.Settings())); - public static final Item MOISSANITE_SWORD = registerItem("moissanite_sword", new ModSwordItem(ModToolMaterials.MOISSANITE, 3, -2.4F, new FabricItemSettings())); - public static final Item ONYX_SWORD = registerItem("onyx_sword", new ModSwordItem(ModToolMaterials.ONYX, 3, -2.4F, new FabricItemSettings())); + public static final Item MOISSANITE_SWORD = registerItem("moissanite_sword", new ModSwordItem(ModToolMaterials.MOISSANITE, 3, -2.4F, new Item.Settings())); + public static final Item ONYX_SWORD = registerItem("onyx_sword", new ModSwordItem(ModToolMaterials.ONYX, 3, -2.4F, new Item.Settings())); - public static final Item GRAPHENE_SWORD = registerItem("graphene_sword", new ModSwordItem(ModToolMaterials.GRAPHENE, 3, -2.4F, new FabricItemSettings())); + public static final Item GRAPHENE_SWORD = registerItem("graphene_sword", new ModSwordItem(ModToolMaterials.GRAPHENE, 3, -2.4F, new Item.Settings())); //All battleaxes //p_i48460_2_: Attack Damage (1 = 1 Attack Point) //p_i48460_3_: Attack Speed (1.0F = ... Attack Speed) - public static final Item WOOD_BATTLEAXE = registerItem("wood_battleaxe", new ModBattleAxeItem(ToolMaterials.WOOD, 5, -2.8F, new FabricItemSettings())); - public static final Item STONE_BATTLEAXE = registerItem("stone_battleaxe", new ModBattleAxeItem(ToolMaterials.STONE, 5, -2.8F, new FabricItemSettings())); - public static final Item IRON_BATTLEAXE = registerItem("iron_battleaxe", new ModBattleAxeItem(ToolMaterials.IRON, 5, -2.8F, new FabricItemSettings())); - public static final Item GOLD_BATTLEAXE = registerItem("gold_battleaxe", new ModBattleAxeItem(ToolMaterials.GOLD, 5, -2.8F, new FabricItemSettings())); - public static final Item DIAMOND_BATTLEAXE = registerItem("diamond_battleaxe", new ModBattleAxeItem(ToolMaterials.DIAMOND, 5, -2.8F, new FabricItemSettings())); - public static final Item NETHERITE_BATTLEAXE = registerItem("netherite_battleaxe", new ModBattleAxeItem(ToolMaterials.NETHERITE, 5, -2.8F, new FabricItemSettings())); + public static final Item WOOD_BATTLEAXE = registerItem("wood_battleaxe", new ModBattleAxeItem(ToolMaterials.WOOD, 5, -2.8F, new Item.Settings())); + public static final Item STONE_BATTLEAXE = registerItem("stone_battleaxe", new ModBattleAxeItem(ToolMaterials.STONE, 5, -2.8F, new Item.Settings())); + public static final Item IRON_BATTLEAXE = registerItem("iron_battleaxe", new ModBattleAxeItem(ToolMaterials.IRON, 5, -2.8F, new Item.Settings())); + public static final Item GOLD_BATTLEAXE = registerItem("gold_battleaxe", new ModBattleAxeItem(ToolMaterials.GOLD, 5, -2.8F, new Item.Settings())); + public static final Item DIAMOND_BATTLEAXE = registerItem("diamond_battleaxe", new ModBattleAxeItem(ToolMaterials.DIAMOND, 5, -2.8F, new Item.Settings())); + public static final Item NETHERITE_BATTLEAXE = registerItem("netherite_battleaxe", new ModBattleAxeItem(ToolMaterials.NETHERITE, 5, -2.8F, new Item.Settings())); - public static final Item TIN_BATTLEAXE = registerItem("tin_battleaxe", new ModBattleAxeItem(ModToolMaterials.TIN, 5, -2.8F, new FabricItemSettings())); - public static final Item COPPER_BATTLEAXE = registerItem("copper_battleaxe", new ModBattleAxeItem(ModToolMaterials.COPPER, 5, -2.8F, new FabricItemSettings())); + public static final Item TIN_BATTLEAXE = registerItem("tin_battleaxe", new ModBattleAxeItem(ModToolMaterials.TIN, 5, -2.8F, new Item.Settings())); + public static final Item COPPER_BATTLEAXE = registerItem("copper_battleaxe", new ModBattleAxeItem(ModToolMaterials.COPPER, 5, -2.8F, new Item.Settings())); - public static final Item SILVER_BATTLEAXE = registerItem("silver_battleaxe", new ModBattleAxeItem(ModToolMaterials.SILVER, 5, -2.8F, new FabricItemSettings())); + public static final Item SILVER_BATTLEAXE = registerItem("silver_battleaxe", new ModBattleAxeItem(ModToolMaterials.SILVER, 5, -2.8F, new Item.Settings())); - public static final Item BRONZE_BATTLEAXE = registerItem("bronze_battleaxe", new ModBattleAxeItem(ModToolMaterials.BRONZE, 5, -2.8F, new FabricItemSettings())); + public static final Item BRONZE_BATTLEAXE = registerItem("bronze_battleaxe", new ModBattleAxeItem(ModToolMaterials.BRONZE, 5, -2.8F, new Item.Settings())); - public static final Item OBSIDIAN_BATTLEAXE = registerItem("obsidian_battleaxe", new ModBattleAxeItem(ModToolMaterials.OBSIDIAN, 5, -2.7F, new FabricItemSettings())); - public static final Item COBALT_BATTLEAXE = registerItem("cobalt_battleaxe", new ModBattleAxeItem(ModToolMaterials.COBALT, 5, -2.7F, new FabricItemSettings())); - public static final Item STEEL_BATTLEAXE = registerItem("steel_battleaxe", new ModBattleAxeItem(ModToolMaterials.STEEL, 5, -2.7F, new FabricItemSettings())); - public static final Item STERLING_BATTLEAXE = registerItem("sterling_battleaxe", new ModBattleAxeItem(ModToolMaterials.STERLING, 5, -2.7F, new FabricItemSettings())); + public static final Item OBSIDIAN_BATTLEAXE = registerItem("obsidian_battleaxe", new ModBattleAxeItem(ModToolMaterials.OBSIDIAN, 5, -2.7F, new Item.Settings())); + public static final Item COBALT_BATTLEAXE = registerItem("cobalt_battleaxe", new ModBattleAxeItem(ModToolMaterials.COBALT, 5, -2.7F, new Item.Settings())); + public static final Item STEEL_BATTLEAXE = registerItem("steel_battleaxe", new ModBattleAxeItem(ModToolMaterials.STEEL, 5, -2.7F, new Item.Settings())); + public static final Item STERLING_BATTLEAXE = registerItem("sterling_battleaxe", new ModBattleAxeItem(ModToolMaterials.STERLING, 5, -2.7F, new Item.Settings())); - public static final Item AMETHYST_BATTLEAXE = registerItem("amethyst_battleaxe", new ModBattleAxeItem(ModToolMaterials.AMETHYST, 5, -2.7F, new FabricItemSettings())); - public static final Item EMERALD_BATTLEAXE = registerItem("emerald_battleaxe", new ModBattleAxeItem(ModToolMaterials.EMERALD, 5, -2.7F, new FabricItemSettings())); + public static final Item AMETHYST_BATTLEAXE = registerItem("amethyst_battleaxe", new ModBattleAxeItem(ModToolMaterials.AMETHYST, 5, -2.7F, new Item.Settings())); + public static final Item EMERALD_BATTLEAXE = registerItem("emerald_battleaxe", new ModBattleAxeItem(ModToolMaterials.EMERALD, 5, -2.7F, new Item.Settings())); - public static final Item TOPAZ_BATTLEAXE = registerItem("topaz_battleaxe", new ModBattleAxeItem(ModToolMaterials.TOPAZ, 5, -2.6F, new FabricItemSettings())); - public static final Item TOURMALINE_BATTLEAXE = registerItem("tourmaline_battleaxe", new ModBattleAxeItem(ModToolMaterials.TOURMALINE, 5, -2.6F, new FabricItemSettings())); - public static final Item TANZANITE_BATTLEAXE = registerItem("tanzanite_battleaxe", new ModBattleAxeItem(ModToolMaterials.TANZANITE, 5, -2.6F, new FabricItemSettings())); + public static final Item TOPAZ_BATTLEAXE = registerItem("topaz_battleaxe", new ModBattleAxeItem(ModToolMaterials.TOPAZ, 5, -2.6F, new Item.Settings())); + public static final Item TOURMALINE_BATTLEAXE = registerItem("tourmaline_battleaxe", new ModBattleAxeItem(ModToolMaterials.TOURMALINE, 5, -2.6F, new Item.Settings())); + public static final Item TANZANITE_BATTLEAXE = registerItem("tanzanite_battleaxe", new ModBattleAxeItem(ModToolMaterials.TANZANITE, 5, -2.6F, new Item.Settings())); - public static final Item RUBY_BATTLEAXE = registerItem("ruby_battleaxe", new ModBattleAxeItem(ModToolMaterials.RUBY, 5, -2.6F, new FabricItemSettings())); - public static final Item SAPPHIRE_BATTLEAXE = registerItem("sapphire_battleaxe", new ModBattleAxeItem(ModToolMaterials.SAPPHIRE, 5, -2.6F, new FabricItemSettings())); - public static final Item TURQUOISE_BATTLEAXE = registerItem("turquoise_battleaxe", new ModBattleAxeItem(ModToolMaterials.TURQUOISE, 5, -2.6F, new FabricItemSettings())); + public static final Item RUBY_BATTLEAXE = registerItem("ruby_battleaxe", new ModBattleAxeItem(ModToolMaterials.RUBY, 5, -2.6F, new Item.Settings())); + public static final Item SAPPHIRE_BATTLEAXE = registerItem("sapphire_battleaxe", new ModBattleAxeItem(ModToolMaterials.SAPPHIRE, 5, -2.6F, new Item.Settings())); + public static final Item TURQUOISE_BATTLEAXE = registerItem("turquoise_battleaxe", new ModBattleAxeItem(ModToolMaterials.TURQUOISE, 5, -2.6F, new Item.Settings())); - public static final Item MOISSANITE_BATTLEAXE = registerItem("moissanite_battleaxe", new ModBattleAxeItem(ModToolMaterials.MOISSANITE, 5, -2.6F, new FabricItemSettings())); - public static final Item ONYX_BATTLEAXE = registerItem("onyx_battleaxe", new ModBattleAxeItem(ModToolMaterials.ONYX, 5, -2.6F, new FabricItemSettings())); + public static final Item MOISSANITE_BATTLEAXE = registerItem("moissanite_battleaxe", new ModBattleAxeItem(ModToolMaterials.MOISSANITE, 5, -2.6F, new Item.Settings())); + public static final Item ONYX_BATTLEAXE = registerItem("onyx_battleaxe", new ModBattleAxeItem(ModToolMaterials.ONYX, 5, -2.6F, new Item.Settings())); - public static final Item GRAPHENE_BATTLEAXE = registerItem("graphene_battleaxe", new ModBattleAxeItem(ModToolMaterials.GRAPHENE, 5, -2.6F, new FabricItemSettings())); + public static final Item GRAPHENE_BATTLEAXE = registerItem("graphene_battleaxe", new ModBattleAxeItem(ModToolMaterials.GRAPHENE, 5, -2.6F, new Item.Settings())); //All maces //p_i48460_2_: Attack Damage (1 = 1 Attack Point) //p_i48460_3_: Attack Speed (1.0F = ... Attack Speed) //TODO Check attack values - public static final Item WOOD_MACE = registerItem("wood_mace", new ModSwordItem(ToolMaterials.WOOD, 3, -2.2F, new FabricItemSettings())); - public static final Item STONE_MACE = registerItem("stone_mace", new ModSwordItem(ToolMaterials.STONE, 3, -2.2F, new FabricItemSettings())); - public static final Item IRON_MACE = registerItem("iron_mace", new ModSwordItem(ToolMaterials.IRON, 3, -2.2F, new FabricItemSettings())); - public static final Item GOLD_MACE = registerItem("gold_mace", new ModSwordItem(ToolMaterials.GOLD, 3, -2.2F, new FabricItemSettings())); - public static final Item DIAMOND_MACE = registerItem("diamond_mace", new ModSwordItem(ToolMaterials.DIAMOND, 3, -2.1F, new FabricItemSettings())); - public static final Item NETHERITE_MACE = registerItem("netherite_mace", new ModSwordItem(ToolMaterials.NETHERITE, 3, -2.0F, new FabricItemSettings())); + public static final Item WOOD_MACE = registerItem("wood_mace", new ModSwordItem(ToolMaterials.WOOD, 3, -2.2F, new Item.Settings())); + public static final Item STONE_MACE = registerItem("stone_mace", new ModSwordItem(ToolMaterials.STONE, 3, -2.2F, new Item.Settings())); + public static final Item IRON_MACE = registerItem("iron_mace", new ModSwordItem(ToolMaterials.IRON, 3, -2.2F, new Item.Settings())); + public static final Item GOLD_MACE = registerItem("gold_mace", new ModSwordItem(ToolMaterials.GOLD, 3, -2.2F, new Item.Settings())); + public static final Item DIAMOND_MACE = registerItem("diamond_mace", new ModSwordItem(ToolMaterials.DIAMOND, 3, -2.1F, new Item.Settings())); + public static final Item NETHERITE_MACE = registerItem("netherite_mace", new ModSwordItem(ToolMaterials.NETHERITE, 3, -2.0F, new Item.Settings())); - public static final Item TIN_MACE = registerItem("tin_mace", new ModSwordItem(ModToolMaterials.TIN, 3, -2.2F, new FabricItemSettings())); - public static final Item COPPER_MACE = registerItem("copper_mace", new ModSwordItem(ModToolMaterials.COPPER, 3, -2.2F, new FabricItemSettings())); + public static final Item TIN_MACE = registerItem("tin_mace", new ModSwordItem(ModToolMaterials.TIN, 3, -2.2F, new Item.Settings())); + public static final Item COPPER_MACE = registerItem("copper_mace", new ModSwordItem(ModToolMaterials.COPPER, 3, -2.2F, new Item.Settings())); - public static final Item SILVER_MACE = registerItem("silver_mace", new ModSwordItem(ModToolMaterials.SILVER, 3, -2.2F, new FabricItemSettings())); + public static final Item SILVER_MACE = registerItem("silver_mace", new ModSwordItem(ModToolMaterials.SILVER, 3, -2.2F, new Item.Settings())); - public static final Item BRONZE_MACE = registerItem("bronze_mace", new ModSwordItem(ModToolMaterials.BRONZE, 3, -2.2F, new FabricItemSettings())); + public static final Item BRONZE_MACE = registerItem("bronze_mace", new ModSwordItem(ModToolMaterials.BRONZE, 3, -2.2F, new Item.Settings())); - public static final Item OBSIDIAN_MACE = registerItem("obsidian_mace", new ModSwordItem(ModToolMaterials.OBSIDIAN, 3, -2.1F, new FabricItemSettings())); - public static final Item COBALT_MACE = registerItem("cobalt_mace", new ModSwordItem(ModToolMaterials.COBALT, 3, -2.1F, new FabricItemSettings())); - public static final Item STEEL_MACE = registerItem("steel_mace", new ModSwordItem(ModToolMaterials.STEEL, 3, -2.1F, new FabricItemSettings())); - public static final Item STERLING_MACE = registerItem("sterling_mace", new ModSwordItem(ModToolMaterials.STERLING, 3, -2.1F, new FabricItemSettings())); + public static final Item OBSIDIAN_MACE = registerItem("obsidian_mace", new ModSwordItem(ModToolMaterials.OBSIDIAN, 3, -2.1F, new Item.Settings())); + public static final Item COBALT_MACE = registerItem("cobalt_mace", new ModSwordItem(ModToolMaterials.COBALT, 3, -2.1F, new Item.Settings())); + public static final Item STEEL_MACE = registerItem("steel_mace", new ModSwordItem(ModToolMaterials.STEEL, 3, -2.1F, new Item.Settings())); + public static final Item STERLING_MACE = registerItem("sterling_mace", new ModSwordItem(ModToolMaterials.STERLING, 3, -2.1F, new Item.Settings())); - public static final Item AMETHYST_MACE = registerItem("amethyst_mace", new ModSwordItem(ModToolMaterials.AMETHYST, 3, -2.1F, new FabricItemSettings())); - public static final Item EMERALD_MACE = registerItem("emerald_mace", new ModSwordItem(ModToolMaterials.EMERALD, 3, -2.1F, new FabricItemSettings())); + public static final Item AMETHYST_MACE = registerItem("amethyst_mace", new ModSwordItem(ModToolMaterials.AMETHYST, 3, -2.1F, new Item.Settings())); + public static final Item EMERALD_MACE = registerItem("emerald_mace", new ModSwordItem(ModToolMaterials.EMERALD, 3, -2.1F, new Item.Settings())); - public static final Item TOPAZ_MACE = registerItem("topaz_mace", new ModSwordItem(ModToolMaterials.TOPAZ, 3, -2.0F, new FabricItemSettings())); - public static final Item TOURMALINE_MACE = registerItem("tourmaline_mace", new ModSwordItem(ModToolMaterials.TOURMALINE, 3, -2.0F, new FabricItemSettings())); - public static final Item TANZANITE_MACE = registerItem("tanzanite_mace", new ModSwordItem(ModToolMaterials.TANZANITE, 3, -2.0F, new FabricItemSettings())); + public static final Item TOPAZ_MACE = registerItem("topaz_mace", new ModSwordItem(ModToolMaterials.TOPAZ, 3, -2.0F, new Item.Settings())); + public static final Item TOURMALINE_MACE = registerItem("tourmaline_mace", new ModSwordItem(ModToolMaterials.TOURMALINE, 3, -2.0F, new Item.Settings())); + public static final Item TANZANITE_MACE = registerItem("tanzanite_mace", new ModSwordItem(ModToolMaterials.TANZANITE, 3, -2.0F, new Item.Settings())); - public static final Item RUBY_MACE = registerItem("ruby_mace", new ModSwordItem(ModToolMaterials.RUBY, 3, -2.0F, new FabricItemSettings())); - public static final Item SAPPHIRE_MACE = registerItem("sapphire_mace", new ModSwordItem(ModToolMaterials.SAPPHIRE, 3, -2.0F, new FabricItemSettings())); - public static final Item TURQUOISE_MACE = registerItem("turquoise_mace", new ModSwordItem(ModToolMaterials.TURQUOISE, 3, -2.0F, new FabricItemSettings())); + public static final Item RUBY_MACE = registerItem("ruby_mace", new ModSwordItem(ModToolMaterials.RUBY, 3, -2.0F, new Item.Settings())); + public static final Item SAPPHIRE_MACE = registerItem("sapphire_mace", new ModSwordItem(ModToolMaterials.SAPPHIRE, 3, -2.0F, new Item.Settings())); + public static final Item TURQUOISE_MACE = registerItem("turquoise_mace", new ModSwordItem(ModToolMaterials.TURQUOISE, 3, -2.0F, new Item.Settings())); - public static final Item MOISSANITE_MACE = registerItem("moissanite_mace", new ModSwordItem(ModToolMaterials.MOISSANITE, 3, -2.0F, new FabricItemSettings())); - public static final Item ONYX_MACE = registerItem("onyx_mace", new ModSwordItem(ModToolMaterials.ONYX, 3, -2.0F, new FabricItemSettings())); + public static final Item MOISSANITE_MACE = registerItem("moissanite_mace", new ModSwordItem(ModToolMaterials.MOISSANITE, 3, -2.0F, new Item.Settings())); + public static final Item ONYX_MACE = registerItem("onyx_mace", new ModSwordItem(ModToolMaterials.ONYX, 3, -2.0F, new Item.Settings())); - public static final Item GRAPHENE_MACE = registerItem("graphene_mace", new ModSwordItem(ModToolMaterials.GRAPHENE, 3, -1.8F, new FabricItemSettings())); + public static final Item GRAPHENE_MACE = registerItem("graphene_mace", new ModSwordItem(ModToolMaterials.GRAPHENE, 3, -1.8F, new Item.Settings())); //All daggers //p_i48460_2_: Attack Damage (1 = 1 Attack Point) //p_i48460_3_: Attack Speed (1.0F = ... Attack Speed) - public static final Item WOOD_DAGGER = registerItem("wood_dagger", new ModSwordItem(ToolMaterials.WOOD, 1, -1.8F, new FabricItemSettings())); - public static final Item STONE_DAGGER = registerItem("stone_dagger", new ModSwordItem(ToolMaterials.STONE, 1, -1.8F, new FabricItemSettings())); - public static final Item IRON_DAGGER = registerItem("iron_dagger", new ModSwordItem(ToolMaterials.IRON, 1, -1.8F, new FabricItemSettings())); - public static final Item GOLD_DAGGER = registerItem("gold_dagger", new ModSwordItem(ToolMaterials.GOLD, 1, -1.8F, new FabricItemSettings())); - public static final Item DIAMOND_DAGGER = registerItem("diamond_dagger", new ModSwordItem(ToolMaterials.DIAMOND, 1, -1.7F, new FabricItemSettings())); - public static final Item NETHERITE_DAGGER = registerItem("netherite_dagger", new ModSwordItem(ToolMaterials.NETHERITE, 1, -1.5F, new FabricItemSettings())); + public static final Item WOOD_DAGGER = registerItem("wood_dagger", new ModSwordItem(ToolMaterials.WOOD, 1, -1.8F, new Item.Settings())); + public static final Item STONE_DAGGER = registerItem("stone_dagger", new ModSwordItem(ToolMaterials.STONE, 1, -1.8F, new Item.Settings())); + public static final Item IRON_DAGGER = registerItem("iron_dagger", new ModSwordItem(ToolMaterials.IRON, 1, -1.8F, new Item.Settings())); + public static final Item GOLD_DAGGER = registerItem("gold_dagger", new ModSwordItem(ToolMaterials.GOLD, 1, -1.8F, new Item.Settings())); + public static final Item DIAMOND_DAGGER = registerItem("diamond_dagger", new ModSwordItem(ToolMaterials.DIAMOND, 1, -1.7F, new Item.Settings())); + public static final Item NETHERITE_DAGGER = registerItem("netherite_dagger", new ModSwordItem(ToolMaterials.NETHERITE, 1, -1.5F, new Item.Settings())); - public static final Item TIN_DAGGER = registerItem("tin_dagger", new ModSwordItem(ModToolMaterials.TIN, 1, -1.8F, new FabricItemSettings())); - public static final Item COPPER_DAGGER = registerItem("copper_dagger", new ModSwordItem(ModToolMaterials.COPPER, 1, -1.8F, new FabricItemSettings())); + public static final Item TIN_DAGGER = registerItem("tin_dagger", new ModSwordItem(ModToolMaterials.TIN, 1, -1.8F, new Item.Settings())); + public static final Item COPPER_DAGGER = registerItem("copper_dagger", new ModSwordItem(ModToolMaterials.COPPER, 1, -1.8F, new Item.Settings())); - public static final Item SILVER_DAGGER = registerItem("silver_dagger", new ModSwordItem(ModToolMaterials.SILVER, 1, -1.8F, new FabricItemSettings())); + public static final Item SILVER_DAGGER = registerItem("silver_dagger", new ModSwordItem(ModToolMaterials.SILVER, 1, -1.8F, new Item.Settings())); - public static final Item BRONZE_DAGGER = registerItem("bronze_dagger", new ModSwordItem(ModToolMaterials.BRONZE, 1, -1.8F, new FabricItemSettings())); + public static final Item BRONZE_DAGGER = registerItem("bronze_dagger", new ModSwordItem(ModToolMaterials.BRONZE, 1, -1.8F, new Item.Settings())); - public static final Item OBSIDIAN_DAGGER = registerItem("obsidian_dagger", new ModSwordItem(ModToolMaterials.OBSIDIAN, 1, -1.8F, new FabricItemSettings())); - public static final Item COBALT_DAGGER = registerItem("cobalt_dagger", new ModSwordItem(ModToolMaterials.COBALT, 1, -1.8F, new FabricItemSettings())); - public static final Item STEEL_DAGGER = registerItem("steel_dagger", new ModSwordItem(ModToolMaterials.STEEL, 1, -1.8F, new FabricItemSettings())); - public static final Item STERLING_DAGGER = registerItem("sterling_dagger", new ModSwordItem(ModToolMaterials.STERLING, 1, -1.8F, new FabricItemSettings())); + public static final Item OBSIDIAN_DAGGER = registerItem("obsidian_dagger", new ModSwordItem(ModToolMaterials.OBSIDIAN, 1, -1.8F, new Item.Settings())); + public static final Item COBALT_DAGGER = registerItem("cobalt_dagger", new ModSwordItem(ModToolMaterials.COBALT, 1, -1.8F, new Item.Settings())); + public static final Item STEEL_DAGGER = registerItem("steel_dagger", new ModSwordItem(ModToolMaterials.STEEL, 1, -1.8F, new Item.Settings())); + public static final Item STERLING_DAGGER = registerItem("sterling_dagger", new ModSwordItem(ModToolMaterials.STERLING, 1, -1.8F, new Item.Settings())); - public static final Item AMETHYST_DAGGER = registerItem("amethyst_dagger", new ModSwordItem(ModToolMaterials.AMETHYST, 1, -1.8F, new FabricItemSettings())); - public static final Item EMERALD_DAGGER = registerItem("emerald_dagger", new ModSwordItem(ModToolMaterials.EMERALD, 1, -1.8F, new FabricItemSettings())); + public static final Item AMETHYST_DAGGER = registerItem("amethyst_dagger", new ModSwordItem(ModToolMaterials.AMETHYST, 1, -1.8F, new Item.Settings())); + public static final Item EMERALD_DAGGER = registerItem("emerald_dagger", new ModSwordItem(ModToolMaterials.EMERALD, 1, -1.8F, new Item.Settings())); - public static final Item TOPAZ_DAGGER = registerItem("topaz_dagger", new ModSwordItem(ModToolMaterials.TOPAZ, 1, -1.7F, new FabricItemSettings())); - public static final Item TOURMALINE_DAGGER = registerItem("tourmaline_dagger", new ModSwordItem(ModToolMaterials.TOURMALINE, 1, -1.7F, new FabricItemSettings())); - public static final Item TANZANITE_DAGGER = registerItem("tanzanite_dagger", new ModSwordItem(ModToolMaterials.TANZANITE, 1, -1.7F, new FabricItemSettings())); + public static final Item TOPAZ_DAGGER = registerItem("topaz_dagger", new ModSwordItem(ModToolMaterials.TOPAZ, 1, -1.7F, new Item.Settings())); + public static final Item TOURMALINE_DAGGER = registerItem("tourmaline_dagger", new ModSwordItem(ModToolMaterials.TOURMALINE, 1, -1.7F, new Item.Settings())); + public static final Item TANZANITE_DAGGER = registerItem("tanzanite_dagger", new ModSwordItem(ModToolMaterials.TANZANITE, 1, -1.7F, new Item.Settings())); - public static final Item RUBY_DAGGER = registerItem("ruby_dagger", new ModSwordItem(ModToolMaterials.RUBY, 1, -1.7F, new FabricItemSettings())); - public static final Item SAPPHIRE_DAGGER = registerItem("sapphire_dagger", new ModSwordItem(ModToolMaterials.SAPPHIRE, 1, -1.7F, new FabricItemSettings())); - public static final Item TURQUOISE_DAGGER = registerItem("turquoise_dagger", new ModSwordItem(ModToolMaterials.TURQUOISE, 1, -1.7F, new FabricItemSettings())); + public static final Item RUBY_DAGGER = registerItem("ruby_dagger", new ModSwordItem(ModToolMaterials.RUBY, 1, -1.7F, new Item.Settings())); + public static final Item SAPPHIRE_DAGGER = registerItem("sapphire_dagger", new ModSwordItem(ModToolMaterials.SAPPHIRE, 1, -1.7F, new Item.Settings())); + public static final Item TURQUOISE_DAGGER = registerItem("turquoise_dagger", new ModSwordItem(ModToolMaterials.TURQUOISE, 1, -1.7F, new Item.Settings())); - public static final Item MOISSANITE_DAGGER = registerItem("moissanite_dagger", new ModSwordItem(ModToolMaterials.MOISSANITE, 1, -1.7F, new FabricItemSettings())); - public static final Item ONYX_DAGGER = registerItem("onyx_dagger", new ModSwordItem(ModToolMaterials.ONYX, 1, -1.6F, new FabricItemSettings())); + public static final Item MOISSANITE_DAGGER = registerItem("moissanite_dagger", new ModSwordItem(ModToolMaterials.MOISSANITE, 1, -1.7F, new Item.Settings())); + public static final Item ONYX_DAGGER = registerItem("onyx_dagger", new ModSwordItem(ModToolMaterials.ONYX, 1, -1.6F, new Item.Settings())); - public static final Item GRAPHENE_DAGGER = registerItem("graphene_dagger", new ModSwordItem(ModToolMaterials.GRAPHENE, 1, -1.5F, new FabricItemSettings())); + public static final Item GRAPHENE_DAGGER = registerItem("graphene_dagger", new ModSwordItem(ModToolMaterials.GRAPHENE, 1, -1.5F, new Item.Settings())); // All pickaxes - public static final Item TIN_PICKAXE = registerItem("tin_pickaxe", new ModPickaxeItem(ModToolMaterials.TIN, 1, -2.8F, new FabricItemSettings())); - public static final Item COPPER_PICKAXE = registerItem("copper_pickaxe", new ModPickaxeItem(ModToolMaterials.COPPER, 1, -2.8F, new FabricItemSettings())); + public static final Item TIN_PICKAXE = registerItem("tin_pickaxe", new ModPickaxeItem(ModToolMaterials.TIN, 1, -2.8F, new Item.Settings())); + public static final Item COPPER_PICKAXE = registerItem("copper_pickaxe", new ModPickaxeItem(ModToolMaterials.COPPER, 1, -2.8F, new Item.Settings())); - public static final Item SILVER_PICKAXE = registerItem("silver_pickaxe", new ModPickaxeItem(ModToolMaterials.SILVER, 1, -2.8F, new FabricItemSettings())); + public static final Item SILVER_PICKAXE = registerItem("silver_pickaxe", new ModPickaxeItem(ModToolMaterials.SILVER, 1, -2.8F, new Item.Settings())); - public static final Item BRONZE_PICKAXE = registerItem("bronze_pickaxe", new ModPickaxeItem(ModToolMaterials.BRONZE, 1, -2.8F, new FabricItemSettings())); + public static final Item BRONZE_PICKAXE = registerItem("bronze_pickaxe", new ModPickaxeItem(ModToolMaterials.BRONZE, 1, -2.8F, new Item.Settings())); - public static final Item OBSIDIAN_PICKAXE = registerItem("obsidian_pickaxe", new ModPickaxeItem(ModToolMaterials.OBSIDIAN, 1, -2.8F, new FabricItemSettings())); - public static final Item COBALT_PICKAXE = registerItem("cobalt_pickaxe", new ModPickaxeItem(ModToolMaterials.COBALT, 1, -2.8F, new FabricItemSettings())); - public static final Item STEEL_PICKAXE = registerItem("steel_pickaxe", new ModPickaxeItem(ModToolMaterials.STEEL, 1, -2.8F, new FabricItemSettings())); - public static final Item STERLING_PICKAXE = registerItem("sterling_pickaxe", new ModPickaxeItem(ModToolMaterials.STERLING, 1, -2.8F, new FabricItemSettings())); + public static final Item OBSIDIAN_PICKAXE = registerItem("obsidian_pickaxe", new ModPickaxeItem(ModToolMaterials.OBSIDIAN, 1, -2.8F, new Item.Settings())); + public static final Item COBALT_PICKAXE = registerItem("cobalt_pickaxe", new ModPickaxeItem(ModToolMaterials.COBALT, 1, -2.8F, new Item.Settings())); + public static final Item STEEL_PICKAXE = registerItem("steel_pickaxe", new ModPickaxeItem(ModToolMaterials.STEEL, 1, -2.8F, new Item.Settings())); + public static final Item STERLING_PICKAXE = registerItem("sterling_pickaxe", new ModPickaxeItem(ModToolMaterials.STERLING, 1, -2.8F, new Item.Settings())); - public static final Item AMETHYST_PICKAXE = registerItem("amethyst_pickaxe", new ModPickaxeItem(ModToolMaterials.AMETHYST, 1, -2.8F, new FabricItemSettings())); - public static final Item EMERALD_PICKAXE = registerItem("emerald_pickaxe", new ModPickaxeItem(ModToolMaterials.EMERALD, 1, -2.8F, new FabricItemSettings())); + public static final Item AMETHYST_PICKAXE = registerItem("amethyst_pickaxe", new ModPickaxeItem(ModToolMaterials.AMETHYST, 1, -2.8F, new Item.Settings())); + public static final Item EMERALD_PICKAXE = registerItem("emerald_pickaxe", new ModPickaxeItem(ModToolMaterials.EMERALD, 1, -2.8F, new Item.Settings())); - public static final Item TOPAZ_PICKAXE = registerItem("topaz_pickaxe", new ModPickaxeItem(ModToolMaterials.TOPAZ, 1, -2.8F, new FabricItemSettings())); - public static final Item TOURMALINE_PICKAXE = registerItem("tourmaline_pickaxe", new ModPickaxeItem(ModToolMaterials.TOURMALINE, 1, -2.8F, new FabricItemSettings())); - public static final Item TANZANITE_PICKAXE = registerItem("tanzanite_pickaxe", new ModPickaxeItem(ModToolMaterials.TANZANITE, 1, -2.8F, new FabricItemSettings())); + public static final Item TOPAZ_PICKAXE = registerItem("topaz_pickaxe", new ModPickaxeItem(ModToolMaterials.TOPAZ, 1, -2.8F, new Item.Settings())); + public static final Item TOURMALINE_PICKAXE = registerItem("tourmaline_pickaxe", new ModPickaxeItem(ModToolMaterials.TOURMALINE, 1, -2.8F, new Item.Settings())); + public static final Item TANZANITE_PICKAXE = registerItem("tanzanite_pickaxe", new ModPickaxeItem(ModToolMaterials.TANZANITE, 1, -2.8F, new Item.Settings())); - public static final Item RUBY_PICKAXE = registerItem("ruby_pickaxe", new ModPickaxeItem(ModToolMaterials.RUBY, 1, -2.8F, new FabricItemSettings())); - public static final Item SAPPHIRE_PICKAXE = registerItem("sapphire_pickaxe", new ModPickaxeItem(ModToolMaterials.SAPPHIRE, 1, -2.8F, new FabricItemSettings())); - public static final Item TURQUOISE_PICKAXE = registerItem("turquoise_pickaxe", new ModPickaxeItem(ModToolMaterials.TURQUOISE, 1, -2.8F, new FabricItemSettings())); + public static final Item RUBY_PICKAXE = registerItem("ruby_pickaxe", new ModPickaxeItem(ModToolMaterials.RUBY, 1, -2.8F, new Item.Settings())); + public static final Item SAPPHIRE_PICKAXE = registerItem("sapphire_pickaxe", new ModPickaxeItem(ModToolMaterials.SAPPHIRE, 1, -2.8F, new Item.Settings())); + public static final Item TURQUOISE_PICKAXE = registerItem("turquoise_pickaxe", new ModPickaxeItem(ModToolMaterials.TURQUOISE, 1, -2.8F, new Item.Settings())); - public static final Item MOISSANITE_PICKAXE = registerItem("moissanite_pickaxe", new ModPickaxeItem(ModToolMaterials.MOISSANITE, 3, -2.8F, new FabricItemSettings())); - public static final Item ONYX_PICKAXE = registerItem("onyx_pickaxe", new ModPickaxeItem(ModToolMaterials.ONYX, 1, -2.8F, new FabricItemSettings())); + public static final Item MOISSANITE_PICKAXE = registerItem("moissanite_pickaxe", new ModPickaxeItem(ModToolMaterials.MOISSANITE, 3, -2.8F, new Item.Settings())); + public static final Item ONYX_PICKAXE = registerItem("onyx_pickaxe", new ModPickaxeItem(ModToolMaterials.ONYX, 1, -2.8F, new Item.Settings())); - public static final Item GRAPHENE_PICKAXE = registerItem("graphene_pickaxe", new ModPickaxeItem(ModToolMaterials.GRAPHENE, 1, -2.8F, new FabricItemSettings())); + public static final Item GRAPHENE_PICKAXE = registerItem("graphene_pickaxe", new ModPickaxeItem(ModToolMaterials.GRAPHENE, 1, -2.8F, new Item.Settings())); //All axes //TODO Checkout items for proper atk dmg and speed values - public static final Item TIN_AXE = registerItem("tin_axe", new ModAxeItem(ModToolMaterials.TIN, 6.0F, -3.2F, new FabricItemSettings())); - public static final Item COPPER_AXE = registerItem("copper_axe", new ModAxeItem(ModToolMaterials.COPPER, 6.0F, -3.2F, new FabricItemSettings())); + public static final Item TIN_AXE = registerItem("tin_axe", new ModAxeItem(ModToolMaterials.TIN, 6.0F, -3.2F, new Item.Settings())); + public static final Item COPPER_AXE = registerItem("copper_axe", new ModAxeItem(ModToolMaterials.COPPER, 6.0F, -3.2F, new Item.Settings())); - public static final Item SILVER_AXE = registerItem("silver_axe", new ModAxeItem(ModToolMaterials.SILVER, 6.0F, -3.2F, new FabricItemSettings())); + public static final Item SILVER_AXE = registerItem("silver_axe", new ModAxeItem(ModToolMaterials.SILVER, 6.0F, -3.2F, new Item.Settings())); - public static final Item BRONZE_AXE = registerItem("bronze_axe", new ModAxeItem(ModToolMaterials.BRONZE, 6.0F, -3.2F, new FabricItemSettings())); + public static final Item BRONZE_AXE = registerItem("bronze_axe", new ModAxeItem(ModToolMaterials.BRONZE, 6.0F, -3.2F, new Item.Settings())); - public static final Item OBSIDIAN_AXE = registerItem("obsidian_axe", new ModAxeItem(ModToolMaterials.OBSIDIAN, 6.0F, -3.2F, new FabricItemSettings())); - public static final Item COBALT_AXE = registerItem("cobalt_axe", new ModAxeItem(ModToolMaterials.COBALT, 6.0F, -3.2F, new FabricItemSettings())); - public static final Item STEEL_AXE = registerItem("steel_axe", new ModAxeItem(ModToolMaterials.STEEL, 6.0F, -3.2F, new FabricItemSettings())); - public static final Item STERLING_AXE = registerItem("sterling_axe", new ModAxeItem(ModToolMaterials.STERLING, 6.0F, -3.2F, new FabricItemSettings())); + public static final Item OBSIDIAN_AXE = registerItem("obsidian_axe", new ModAxeItem(ModToolMaterials.OBSIDIAN, 6.0F, -3.2F, new Item.Settings())); + public static final Item COBALT_AXE = registerItem("cobalt_axe", new ModAxeItem(ModToolMaterials.COBALT, 6.0F, -3.2F, new Item.Settings())); + public static final Item STEEL_AXE = registerItem("steel_axe", new ModAxeItem(ModToolMaterials.STEEL, 6.0F, -3.2F, new Item.Settings())); + public static final Item STERLING_AXE = registerItem("sterling_axe", new ModAxeItem(ModToolMaterials.STERLING, 6.0F, -3.2F, new Item.Settings())); - public static final Item AMETHYST_AXE = registerItem("amethyst_axe", new ModAxeItem(ModToolMaterials.AMETHYST, 6.0F, -3.2F, new FabricItemSettings())); - public static final Item EMERALD_AXE = registerItem("emerald_axe", new ModAxeItem(ModToolMaterials.EMERALD, 6.0F, -3.2F, new FabricItemSettings())); + public static final Item AMETHYST_AXE = registerItem("amethyst_axe", new ModAxeItem(ModToolMaterials.AMETHYST, 6.0F, -3.2F, new Item.Settings())); + public static final Item EMERALD_AXE = registerItem("emerald_axe", new ModAxeItem(ModToolMaterials.EMERALD, 6.0F, -3.2F, new Item.Settings())); - public static final Item TOPAZ_AXE = registerItem("topaz_axe", new ModAxeItem(ModToolMaterials.TOPAZ, 6.0F, -3.2F, new FabricItemSettings())); - public static final Item TOURMALINE_AXE = registerItem("tourmaline_axe", new ModAxeItem(ModToolMaterials.TOURMALINE, 6.0F, -3.2F, new FabricItemSettings())); - public static final Item TANZANITE_AXE = registerItem("tanzanite_axe", new ModAxeItem(ModToolMaterials.TANZANITE, 6.0F, -3.2F, new FabricItemSettings())); + public static final Item TOPAZ_AXE = registerItem("topaz_axe", new ModAxeItem(ModToolMaterials.TOPAZ, 6.0F, -3.2F, new Item.Settings())); + public static final Item TOURMALINE_AXE = registerItem("tourmaline_axe", new ModAxeItem(ModToolMaterials.TOURMALINE, 6.0F, -3.2F, new Item.Settings())); + public static final Item TANZANITE_AXE = registerItem("tanzanite_axe", new ModAxeItem(ModToolMaterials.TANZANITE, 6.0F, -3.2F, new Item.Settings())); - public static final Item RUBY_AXE = registerItem("ruby_axe", new ModAxeItem(ModToolMaterials.RUBY, 6.0F, -3.2F, new FabricItemSettings())); - public static final Item SAPPHIRE_AXE = registerItem("sapphire_axe", new ModAxeItem(ModToolMaterials.SAPPHIRE, 6.0F, -3.2F, new FabricItemSettings())); - public static final Item TURQUOISE_AXE = registerItem("turquoise_axe", new ModAxeItem(ModToolMaterials.TURQUOISE, 6.0F, -3.2F, new FabricItemSettings())); + public static final Item RUBY_AXE = registerItem("ruby_axe", new ModAxeItem(ModToolMaterials.RUBY, 6.0F, -3.2F, new Item.Settings())); + public static final Item SAPPHIRE_AXE = registerItem("sapphire_axe", new ModAxeItem(ModToolMaterials.SAPPHIRE, 6.0F, -3.2F, new Item.Settings())); + public static final Item TURQUOISE_AXE = registerItem("turquoise_axe", new ModAxeItem(ModToolMaterials.TURQUOISE, 6.0F, -3.2F, new Item.Settings())); - public static final Item MOISSANITE_AXE = registerItem("moissanite_axe", new ModAxeItem(ModToolMaterials.MOISSANITE, 6.0F, -3.2F, new FabricItemSettings())); - public static final Item ONYX_AXE = registerItem("onyx_axe", new ModAxeItem(ModToolMaterials.ONYX, 6.0F, -3.2F, new FabricItemSettings())); + public static final Item MOISSANITE_AXE = registerItem("moissanite_axe", new ModAxeItem(ModToolMaterials.MOISSANITE, 6.0F, -3.2F, new Item.Settings())); + public static final Item ONYX_AXE = registerItem("onyx_axe", new ModAxeItem(ModToolMaterials.ONYX, 6.0F, -3.2F, new Item.Settings())); - public static final Item GRAPHENE_AXE = registerItem("graphene_axe", new ModAxeItem(ModToolMaterials.GRAPHENE, 6.0F, -3.2F, new FabricItemSettings())); + public static final Item GRAPHENE_AXE = registerItem("graphene_axe", new ModAxeItem(ModToolMaterials.GRAPHENE, 6.0F, -3.2F, new Item.Settings())); //All shovels - public static final Item TIN_SHOVEL = registerItem("tin_shovel", new ModShovelItem(ModToolMaterials.TIN, 1.5F, -3.0F, new FabricItemSettings())); - public static final Item COPPER_SHOVEL = registerItem("copper_shovel", new ModShovelItem(ModToolMaterials.TIN, 1.5F, -3.0F, new FabricItemSettings())); + public static final Item TIN_SHOVEL = registerItem("tin_shovel", new ModShovelItem(ModToolMaterials.TIN, 1.5F, -3.0F, new Item.Settings())); + public static final Item COPPER_SHOVEL = registerItem("copper_shovel", new ModShovelItem(ModToolMaterials.TIN, 1.5F, -3.0F, new Item.Settings())); - public static final Item SILVER_SHOVEL = registerItem("silver_shovel", new ModShovelItem(ModToolMaterials.SILVER, 1.5F, -3.0F, new FabricItemSettings())); - public static final Item BRONZE_SHOVEL = registerItem("bronze_shovel", new ModShovelItem(ModToolMaterials.BRONZE, 1.5F, -3.0F, new FabricItemSettings())); + public static final Item SILVER_SHOVEL = registerItem("silver_shovel", new ModShovelItem(ModToolMaterials.SILVER, 1.5F, -3.0F, new Item.Settings())); + public static final Item BRONZE_SHOVEL = registerItem("bronze_shovel", new ModShovelItem(ModToolMaterials.BRONZE, 1.5F, -3.0F, new Item.Settings())); - public static final Item OBSIDIAN_SHOVEL = registerItem("obsidian_shovel", new ModShovelItem(ModToolMaterials.OBSIDIAN, 1.5F, -3.0F, new FabricItemSettings())); - public static final Item COBALT_SHOVEL = registerItem("cobalt_shovel", new ModShovelItem(ModToolMaterials.COBALT, 1.5F, -3.0F, new FabricItemSettings())); - public static final Item STEEL_SHOVEL = registerItem("steel_shovel", new ModShovelItem(ModToolMaterials.STEEL, 1.5F, -3.0F, new FabricItemSettings())); - public static final Item STERLING_SHOVEL = registerItem("sterling_shovel", new ModShovelItem(ModToolMaterials.STERLING, 1.5F, -3.0F, new FabricItemSettings())); + public static final Item OBSIDIAN_SHOVEL = registerItem("obsidian_shovel", new ModShovelItem(ModToolMaterials.OBSIDIAN, 1.5F, -3.0F, new Item.Settings())); + public static final Item COBALT_SHOVEL = registerItem("cobalt_shovel", new ModShovelItem(ModToolMaterials.COBALT, 1.5F, -3.0F, new Item.Settings())); + public static final Item STEEL_SHOVEL = registerItem("steel_shovel", new ModShovelItem(ModToolMaterials.STEEL, 1.5F, -3.0F, new Item.Settings())); + public static final Item STERLING_SHOVEL = registerItem("sterling_shovel", new ModShovelItem(ModToolMaterials.STERLING, 1.5F, -3.0F, new Item.Settings())); - public static final Item AMETHYST_SHOVEL = registerItem("amethyst_shovel", new ModShovelItem(ModToolMaterials.AMETHYST, 1.5F, -3.0F, new FabricItemSettings())); - public static final Item EMERALD_SHOVEL = registerItem("emerald_shovel", new ModShovelItem(ModToolMaterials.EMERALD, 1.5F, -3.0F, new FabricItemSettings())); + public static final Item AMETHYST_SHOVEL = registerItem("amethyst_shovel", new ModShovelItem(ModToolMaterials.AMETHYST, 1.5F, -3.0F, new Item.Settings())); + public static final Item EMERALD_SHOVEL = registerItem("emerald_shovel", new ModShovelItem(ModToolMaterials.EMERALD, 1.5F, -3.0F, new Item.Settings())); - public static final Item TOPAZ_SHOVEL = registerItem("topaz_shovel", new ModShovelItem(ModToolMaterials.TOPAZ, 1.5F, -3.0F, new FabricItemSettings())); - public static final Item TOURMALINE_SHOVEL = registerItem("tourmaline_shovel", new ModShovelItem(ModToolMaterials.TOURMALINE, 1.5F, -3.0F, new FabricItemSettings())); - public static final Item TANZANITE_SHOVEL = registerItem("tanzanite_shovel", new ModShovelItem(ModToolMaterials.TANZANITE, 1.5F, -3.0F, new FabricItemSettings())); + public static final Item TOPAZ_SHOVEL = registerItem("topaz_shovel", new ModShovelItem(ModToolMaterials.TOPAZ, 1.5F, -3.0F, new Item.Settings())); + public static final Item TOURMALINE_SHOVEL = registerItem("tourmaline_shovel", new ModShovelItem(ModToolMaterials.TOURMALINE, 1.5F, -3.0F, new Item.Settings())); + public static final Item TANZANITE_SHOVEL = registerItem("tanzanite_shovel", new ModShovelItem(ModToolMaterials.TANZANITE, 1.5F, -3.0F, new Item.Settings())); - public static final Item RUBY_SHOVEL = registerItem("ruby_shovel", new ModShovelItem(ModToolMaterials.RUBY, 1.5F, -3.0F, new FabricItemSettings())); - public static final Item SAPPHIRE_SHOVEL = registerItem("sapphire_shovel", new ModShovelItem(ModToolMaterials.SAPPHIRE, 1.5F, -3.0F, new FabricItemSettings())); - public static final Item TURQUOISE_SHOVEL = registerItem("turquoise_shovel", new ModShovelItem(ModToolMaterials.TURQUOISE, 1.5F, -3.0F, new FabricItemSettings())); + public static final Item RUBY_SHOVEL = registerItem("ruby_shovel", new ModShovelItem(ModToolMaterials.RUBY, 1.5F, -3.0F, new Item.Settings())); + public static final Item SAPPHIRE_SHOVEL = registerItem("sapphire_shovel", new ModShovelItem(ModToolMaterials.SAPPHIRE, 1.5F, -3.0F, new Item.Settings())); + public static final Item TURQUOISE_SHOVEL = registerItem("turquoise_shovel", new ModShovelItem(ModToolMaterials.TURQUOISE, 1.5F, -3.0F, new Item.Settings())); - public static final Item MOISSANITE_SHOVEL = registerItem("moissanite_shovel", new ModShovelItem(ModToolMaterials.MOISSANITE, 1.5F, -3.0F, new FabricItemSettings())); - public static final Item ONYX_SHOVEL = registerItem("onyx_shovel", new ModShovelItem(ModToolMaterials.ONYX, 1.5F, -3.0F, new FabricItemSettings())); + public static final Item MOISSANITE_SHOVEL = registerItem("moissanite_shovel", new ModShovelItem(ModToolMaterials.MOISSANITE, 1.5F, -3.0F, new Item.Settings())); + public static final Item ONYX_SHOVEL = registerItem("onyx_shovel", new ModShovelItem(ModToolMaterials.ONYX, 1.5F, -3.0F, new Item.Settings())); - public static final Item GRAPHENE_SHOVEL = registerItem("graphene_shovel", new ModShovelItem(ModToolMaterials.GRAPHENE, 1.5F, -3.0F, new FabricItemSettings())); + public static final Item GRAPHENE_SHOVEL = registerItem("graphene_shovel", new ModShovelItem(ModToolMaterials.GRAPHENE, 1.5F, -3.0F, new Item.Settings())); //All hoes - public static final Item TIN_HOE = registerItem("tin_hoe", new ModHoeItem(ModToolMaterials.TIN, 0, -3.0F, new FabricItemSettings())); - public static final Item COPPER_HOE = registerItem("copper_hoe", new ModHoeItem(ModToolMaterials.COPPER, 0, -3.0F, new FabricItemSettings())); + public static final Item TIN_HOE = registerItem("tin_hoe", new ModHoeItem(ModToolMaterials.TIN, 0, -3.0F, new Item.Settings())); + public static final Item COPPER_HOE = registerItem("copper_hoe", new ModHoeItem(ModToolMaterials.COPPER, 0, -3.0F, new Item.Settings())); - public static final Item SILVER_HOE = registerItem("silver_hoe", new ModHoeItem(ModToolMaterials.SILVER, 0, -3.0F, new FabricItemSettings())); - public static final Item BRONZE_HOE = registerItem("bronze_hoe", new ModHoeItem(ModToolMaterials.BRONZE, 0, -3.0F, new FabricItemSettings())); + public static final Item SILVER_HOE = registerItem("silver_hoe", new ModHoeItem(ModToolMaterials.SILVER, 0, -3.0F, new Item.Settings())); + public static final Item BRONZE_HOE = registerItem("bronze_hoe", new ModHoeItem(ModToolMaterials.BRONZE, 0, -3.0F, new Item.Settings())); - public static final Item OBSIDIAN_HOE = registerItem("obsidian_hoe", new ModHoeItem(ModToolMaterials.OBSIDIAN, 0, -3.0F, new FabricItemSettings())); - public static final Item COBALT_HOE = registerItem("cobalt_hoe", new ModHoeItem(ModToolMaterials.COBALT, 0, -3.0F, new FabricItemSettings())); - public static final Item STEEL_HOE = registerItem("steel_hoe", new ModHoeItem(ModToolMaterials.STEEL, 0, -3.0F, new FabricItemSettings())); - public static final Item STERLING_HOE = registerItem("sterling_hoe", new ModHoeItem(ModToolMaterials.STERLING, 0, -3.0F, new FabricItemSettings())); + public static final Item OBSIDIAN_HOE = registerItem("obsidian_hoe", new ModHoeItem(ModToolMaterials.OBSIDIAN, 0, -3.0F, new Item.Settings())); + public static final Item COBALT_HOE = registerItem("cobalt_hoe", new ModHoeItem(ModToolMaterials.COBALT, 0, -3.0F, new Item.Settings())); + public static final Item STEEL_HOE = registerItem("steel_hoe", new ModHoeItem(ModToolMaterials.STEEL, 0, -3.0F, new Item.Settings())); + public static final Item STERLING_HOE = registerItem("sterling_hoe", new ModHoeItem(ModToolMaterials.STERLING, 0, -3.0F, new Item.Settings())); - public static final Item AMETHYST_HOE = registerItem("amethyst_hoe", new ModHoeItem(ModToolMaterials.AMETHYST, 0, -3.0F, new FabricItemSettings())); - public static final Item EMERALD_HOE = registerItem("emerald_hoe", new ModHoeItem(ModToolMaterials.EMERALD, 0, -3.0F, new FabricItemSettings())); + public static final Item AMETHYST_HOE = registerItem("amethyst_hoe", new ModHoeItem(ModToolMaterials.AMETHYST, 0, -3.0F, new Item.Settings())); + public static final Item EMERALD_HOE = registerItem("emerald_hoe", new ModHoeItem(ModToolMaterials.EMERALD, 0, -3.0F, new Item.Settings())); - public static final Item TOPAZ_HOE = registerItem("topaz_hoe", new ModHoeItem(ModToolMaterials.TOPAZ, 0, -3.0F, new FabricItemSettings())); - public static final Item TOURMALINE_HOE = registerItem("tourmaline_hoe", new ModHoeItem(ModToolMaterials.TOURMALINE, 0, -3.0F, new FabricItemSettings())); - public static final Item TANZANITE_HOE = registerItem("tanzanite_hoe", new ModHoeItem(ModToolMaterials.TANZANITE, 0, -3.0F, new FabricItemSettings())); + public static final Item TOPAZ_HOE = registerItem("topaz_hoe", new ModHoeItem(ModToolMaterials.TOPAZ, 0, -3.0F, new Item.Settings())); + public static final Item TOURMALINE_HOE = registerItem("tourmaline_hoe", new ModHoeItem(ModToolMaterials.TOURMALINE, 0, -3.0F, new Item.Settings())); + public static final Item TANZANITE_HOE = registerItem("tanzanite_hoe", new ModHoeItem(ModToolMaterials.TANZANITE, 0, -3.0F, new Item.Settings())); - public static final Item RUBY_HOE = registerItem("ruby_hoe", new ModHoeItem(ModToolMaterials.RUBY, 0, -3.0F, new FabricItemSettings())); - public static final Item SAPPHIRE_HOE = registerItem("sapphire_hoe", new ModHoeItem(ModToolMaterials.SAPPHIRE, 0, -3.0F, new FabricItemSettings())); - public static final Item TURQUOISE_HOE = registerItem("turquoise_hoe", new ModHoeItem(ModToolMaterials.TURQUOISE, 0, -3.0F, new FabricItemSettings())); + public static final Item RUBY_HOE = registerItem("ruby_hoe", new ModHoeItem(ModToolMaterials.RUBY, 0, -3.0F, new Item.Settings())); + public static final Item SAPPHIRE_HOE = registerItem("sapphire_hoe", new ModHoeItem(ModToolMaterials.SAPPHIRE, 0, -3.0F, new Item.Settings())); + public static final Item TURQUOISE_HOE = registerItem("turquoise_hoe", new ModHoeItem(ModToolMaterials.TURQUOISE, 0, -3.0F, new Item.Settings())); - public static final Item MOISSANITE_HOE = registerItem("moissanite_hoe", new ModHoeItem(ModToolMaterials.MOISSANITE, 0, -3.0F, new FabricItemSettings())); - public static final Item ONYX_HOE = registerItem("onyx_hoe", new ModHoeItem(ModToolMaterials.ONYX, 0, -3.0F, new FabricItemSettings())); + public static final Item MOISSANITE_HOE = registerItem("moissanite_hoe", new ModHoeItem(ModToolMaterials.MOISSANITE, 0, -3.0F, new Item.Settings())); + public static final Item ONYX_HOE = registerItem("onyx_hoe", new ModHoeItem(ModToolMaterials.ONYX, 0, -3.0F, new Item.Settings())); - public static final Item GRAPHENE_HOE = registerItem("graphene_hoe", new ModHoeItem(ModToolMaterials.GRAPHENE, 0, -3.0F, new FabricItemSettings())); + public static final Item GRAPHENE_HOE = registerItem("graphene_hoe", new ModHoeItem(ModToolMaterials.GRAPHENE, 0, -3.0F, new Item.Settings())); //Vanilla tools @@ -474,25 +473,25 @@ public class ModItems { //Shields -// public static final Item TIN_SHIELD = registerItem("tin_shield", new FabricShieldItem(new FabricItemSettings().maxDamage(84), 10, 5, ModItems.TIN_INGOT)); // FabricShieldItem(maxDamage(durability), cooldownTicks, enchantability, repairItems) -// public static final Item COPPER_SHIELD = registerItem("copper_shield", new FabricShieldItem(new FabricItemSettings().maxDamage(112), 10, 10, Items.COPPER_INGOT)); -// public static final Item SILVER_SHIELD = registerItem("silver_shield", new FabricShieldItem(new FabricItemSettings().maxDamage(134), 10, 15, ModItems.SILVER_INGOT)); -// public static final Item BRONZE_SHIELD = registerItem("bronze_shield", new FabricShieldItem(new FabricItemSettings().maxDamage(299), 10, 13, ModItems.BRONZE_INGOT)); -// public static final Item COBALT_SHIELD = registerItem("cobalt_shield", new FabricShieldItem(new FabricItemSettings().maxDamage(388), 10, 22, ModItems.COBALT_INGOT)); -// public static final Item STERLING_SHIELD = registerItem("sterling_shield", new FabricShieldItem(new FabricItemSettings().maxDamage(333), 10, 17, ModItems.STERLING_INGOT)); -// public static final Item AMETHYST_SHIELD = registerItem("amethyst_shield", new FabricShieldItem(new FabricItemSettings().maxDamage(420), 10, 15, Items.AMETHYST_SHARD)); -// public static final Item STEEL_SHIELD = registerItem("steel_shield", new FabricShieldItem(new FabricItemSettings().maxDamage(555), 10, 14, ModItems.STEEL_INGOT)); -// public static final Item EMERALD_SHIELD = registerItem("emerald_shield", new FabricShieldItem(new FabricItemSettings().maxDamage(500), 10, 18, Items.EMERALD)); -// public static final Item TOPAZ_SHIELD = registerItem("topaz_shield", new FabricShieldItem(new FabricItemSettings().maxDamage(632), 10, 14, ModItems.TOPAZ_GEM)); -// public static final Item TOURMALINE_SHIELD = registerItem("tourmaline_shield", new FabricShieldItem(new FabricItemSettings().maxDamage(621), 10, 16, ModItems.TOURMALINE_GEM)); -// public static final Item TANZANITE_SHIELD = registerItem("tanzanite_shield", new FabricShieldItem(new FabricItemSettings().maxDamage(784), 10, 11, ModItems.TANZANITE_GEM)); -// public static final Item RUBY_SHIELD = registerItem("ruby_shield", new FabricShieldItem(new FabricItemSettings().maxDamage(809), 10, 15, ModItems.RUBY_GEM)); -// public static final Item SAPPHIRE_SHIELD = registerItem("sapphire_shield", new FabricShieldItem(new FabricItemSettings().maxDamage(711), 10, 18, ModItems.SAPPHIRE_GEM)); -// public static final Item OBSIDIAN_SHIELD = registerItem("obsidian_shield", new FabricShieldItem(new FabricItemSettings().maxDamage(821), 10, 21, ModItems.OBSIDIAN_INGOT)); -// public static final Item TURQUOISE_SHIELD = registerItem("turquoise_shield", new FabricShieldItem(new FabricItemSettings().maxDamage(999), 10, 25, ModItems.TURQUOISE_GEM)); -// public static final Item MOISSANITE_SHIELD = registerItem("moissanite_shield", new FabricShieldItem(new FabricItemSettings().maxDamage(913), 10, 10, ModItems.MOISSANITE_GEM)); -// public static final Item ONYX_SHIELD = registerItem("onyx_shield", new FabricShieldItem(new FabricItemSettings().maxDamage(1111), 10, 13, ModItems.ONYX_GEM)); -// public static final Item GRAPHENE_SHIELD = registerItem("graphene_shield", new FabricShieldItem(new FabricItemSettings().maxDamage(1333), 10, 19, ModItems.GRAPHENE_GEM)); +// public static final Item TIN_SHIELD = registerItem("tin_shield", new FabricShieldItem(new Item.Settings().maxDamage(84), 10, 5, ModItems.TIN_INGOT)); // FabricShieldItem(maxDamage(durability), cooldownTicks, enchantability, repairItems) +// public static final Item COPPER_SHIELD = registerItem("copper_shield", new FabricShieldItem(new Item.Settings().maxDamage(112), 10, 10, Items.COPPER_INGOT)); +// public static final Item SILVER_SHIELD = registerItem("silver_shield", new FabricShieldItem(new Item.Settings().maxDamage(134), 10, 15, ModItems.SILVER_INGOT)); +// public static final Item BRONZE_SHIELD = registerItem("bronze_shield", new FabricShieldItem(new Item.Settings().maxDamage(299), 10, 13, ModItems.BRONZE_INGOT)); +// public static final Item COBALT_SHIELD = registerItem("cobalt_shield", new FabricShieldItem(new Item.Settings().maxDamage(388), 10, 22, ModItems.COBALT_INGOT)); +// public static final Item STERLING_SHIELD = registerItem("sterling_shield", new FabricShieldItem(new Item.Settings().maxDamage(333), 10, 17, ModItems.STERLING_INGOT)); +// public static final Item AMETHYST_SHIELD = registerItem("amethyst_shield", new FabricShieldItem(new Item.Settings().maxDamage(420), 10, 15, Items.AMETHYST_SHARD)); +// public static final Item STEEL_SHIELD = registerItem("steel_shield", new FabricShieldItem(new Item.Settings().maxDamage(555), 10, 14, ModItems.STEEL_INGOT)); +// public static final Item EMERALD_SHIELD = registerItem("emerald_shield", new FabricShieldItem(new Item.Settings().maxDamage(500), 10, 18, Items.EMERALD)); +// public static final Item TOPAZ_SHIELD = registerItem("topaz_shield", new FabricShieldItem(new Item.Settings().maxDamage(632), 10, 14, ModItems.TOPAZ_GEM)); +// public static final Item TOURMALINE_SHIELD = registerItem("tourmaline_shield", new FabricShieldItem(new Item.Settings().maxDamage(621), 10, 16, ModItems.TOURMALINE_GEM)); +// public static final Item TANZANITE_SHIELD = registerItem("tanzanite_shield", new FabricShieldItem(new Item.Settings().maxDamage(784), 10, 11, ModItems.TANZANITE_GEM)); +// public static final Item RUBY_SHIELD = registerItem("ruby_shield", new FabricShieldItem(new Item.Settings().maxDamage(809), 10, 15, ModItems.RUBY_GEM)); +// public static final Item SAPPHIRE_SHIELD = registerItem("sapphire_shield", new FabricShieldItem(new Item.Settings().maxDamage(711), 10, 18, ModItems.SAPPHIRE_GEM)); +// public static final Item OBSIDIAN_SHIELD = registerItem("obsidian_shield", new FabricShieldItem(new Item.Settings().maxDamage(821), 10, 21, ModItems.OBSIDIAN_INGOT)); +// public static final Item TURQUOISE_SHIELD = registerItem("turquoise_shield", new FabricShieldItem(new Item.Settings().maxDamage(999), 10, 25, ModItems.TURQUOISE_GEM)); +// public static final Item MOISSANITE_SHIELD = registerItem("moissanite_shield", new FabricShieldItem(new Item.Settings().maxDamage(913), 10, 10, ModItems.MOISSANITE_GEM)); +// public static final Item ONYX_SHIELD = registerItem("onyx_shield", new FabricShieldItem(new Item.Settings().maxDamage(1111), 10, 13, ModItems.ONYX_GEM)); +// public static final Item GRAPHENE_SHIELD = registerItem("graphene_shield", new FabricShieldItem(new Item.Settings().maxDamage(1333), 10, 19, ModItems.GRAPHENE_GEM)); private static void addItemsToIngredientItemGroup(FabricItemGroupEntries entries) { entries.add(ANTHRACITE); @@ -667,9 +666,9 @@ private static void addItemsToCombatItemGroup(FabricItemGroupEntries entries) { // entries.add(GRAPHENE_SHIELD); } private static void addItemsToFoodItemGroup(FabricItemGroupEntries entries) { - entries.add(CHOCOLATE); - entries.add(CARROT_PIE); - entries.add(VELVET); +// entries.add(CHOCOLATE); +// entries.add(CARROT_PIE); +// entries.add(VELVET); } private static void addItemsToToolsItemGroup(FabricItemGroupEntries entries) { entries.add(TIN_PICKAXE); diff --git a/src/main/java/mod/leronus/mores/item/ModToolMaterials.java b/src/main/java/mod/leronus/mores/item/ModToolMaterials.java index 5e53ff1..1ed449b 100644 --- a/src/main/java/mod/leronus/mores/item/ModToolMaterials.java +++ b/src/main/java/mod/leronus/mores/item/ModToolMaterials.java @@ -1,9 +1,13 @@ package mod.leronus.mores.item; +import com.google.common.base.Suppliers; +import net.minecraft.block.Block; import net.minecraft.item.Items; import net.minecraft.item.ToolMaterial; import net.minecraft.recipe.Ingredient; +import net.minecraft.registry.tag.BlockTags; +import net.minecraft.registry.tag.TagKey; import java.util.function.Supplier; @@ -12,72 +16,79 @@ * @author Leronus */ public enum ModToolMaterials implements ToolMaterial { - TIN(0, 100, 4.8F, 1.5F, 6, () -> Ingredient.ofItems(ModItems.TIN_INGOT)), - COPPER(1, 90, 5.0F, 1.5F, 4, () -> Ingredient.ofItems(Items.COPPER_INGOT)), - SILVER(2, 230, 5.5F, 2.0F, 16, () -> Ingredient.ofItems(ModItems.SILVER_INGOT)), - BRONZE(2, 270, 6.0F, 2.0F, 7, () -> Ingredient.ofItems(ModItems.BRONZE_INGOT)), - IRON(2, 250, 6.0F, 2.0F, 14, () -> Ingredient.ofItems(Items.DIAMOND)), - STERLING(2, 320, 6.0F, 2.2F, 14, () -> Ingredient.ofItems(ModItems.STERLING_INGOT)), - COBALT(2, 350, 6.5F, 2.2F, 12, () -> Ingredient.ofItems(ModItems.COBALT_INGOT)), - STEEL(3, 600, 6.5F, 2.5F, 18, () -> Ingredient.ofItems(ModItems.STEEL_INGOT)), - AMETHYST(2, 700, 6.5F, 2.7F, 8, () -> Ingredient.ofItems(Items.AMETHYST_SHARD)), - EMERALD(2, 900, 7.5F, 2.7F, 17, () -> Ingredient.ofItems(Items.EMERALD)), - TOPAZ(2, 1300, 7.0F, 2.7F, 14, () -> Ingredient.ofItems(ModItems.TOPAZ_GEM)), - TOURMALINE(2, 1500, 7.0F, 2.7F, 13, () -> Ingredient.ofItems(ModItems.TOURMALINE_GEM)), - DIAMOND(3, 1561, 8.0F, 3.0F, 10, () -> Ingredient.ofItems(Items.DIAMOND)), - SAPPHIRE(3, 1782, 8.0F, 3.5F, 15, () -> Ingredient.ofItems(ModItems.SAPPHIRE_GEM)), - TANZANITE(3, 1957, 8.0F, 3.5F, 17, () -> Ingredient.ofItems(ModItems.TANZANITE_GEM)), - OBSIDIAN(3, 2169, 8.5F, 3.5F, 13, () -> Ingredient.ofItems(Items.OBSIDIAN)), - RUBY(3, 1601, 8.0F, 3.5F, 11, () -> Ingredient.ofItems(ModItems.RUBY_GEM)), - MOISSANITE(3, 1723, 8.0F, 3.5F, 23, () -> Ingredient.ofItems(ModItems.MOISSANITE_GEM)), - NETHERITE(4, 2031, 9.0F, 4.0F, 15, () -> Ingredient.ofItems(Items.NETHERITE_INGOT)), - ONYX(4, 2700, 9.5F, 4.0F, 14, () -> Ingredient.ofItems(ModItems.ONYX_GEM)), - TURQUOISE(4, 2400, 9.0F, 4.0F, 14, () -> Ingredient.ofItems(ModItems.TURQUOISE_GEM)), - GRAPHENE(5, 3569, 11.0F, 6.0F, 18, () -> Ingredient.ofItems(ModItems.GRAPHENE_GEM)); + TIN(BlockTags.INCORRECT_FOR_STONE_TOOL, 100, 4.8F, 1.5F, 6, () -> Ingredient.ofItems(ModItems.TIN_INGOT)), + COPPER(BlockTags.INCORRECT_FOR_IRON_TOOL, 90, 5.0F, 1.5F, 4, () -> Ingredient.ofItems(Items.COPPER_INGOT)), + SILVER(BlockTags.INCORRECT_FOR_IRON_TOOL, 230, 5.5F, 2.0F, 16, () -> Ingredient.ofItems(ModItems.SILVER_INGOT)), + BRONZE(BlockTags.INCORRECT_FOR_IRON_TOOL, 270, 6.0F, 2.0F, 7, () -> Ingredient.ofItems(ModItems.BRONZE_INGOT)), + IRON(BlockTags.INCORRECT_FOR_IRON_TOOL, 250, 6.0F, 2.0F, 14, () -> Ingredient.ofItems(Items.DIAMOND)), + STERLING(BlockTags.INCORRECT_FOR_IRON_TOOL, 320, 6.0F, 2.2F, 14, () -> Ingredient.ofItems(ModItems.STERLING_INGOT)), + COBALT(BlockTags.INCORRECT_FOR_IRON_TOOL, 350, 6.5F, 2.2F, 12, () -> Ingredient.ofItems(ModItems.COBALT_INGOT)), + STEEL(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, 600, 6.5F, 2.5F, 18, () -> Ingredient.ofItems(ModItems.STEEL_INGOT)), + AMETHYST(BlockTags.INCORRECT_FOR_IRON_TOOL, 700, 6.5F, 2.7F, 8, () -> Ingredient.ofItems(Items.AMETHYST_SHARD)), + EMERALD(BlockTags.INCORRECT_FOR_IRON_TOOL, 900, 7.5F, 2.7F, 17, () -> Ingredient.ofItems(Items.EMERALD)), + TOPAZ(BlockTags.INCORRECT_FOR_IRON_TOOL, 1300, 7.0F, 2.7F, 14, () -> Ingredient.ofItems(ModItems.TOPAZ_GEM)), + TOURMALINE(BlockTags.INCORRECT_FOR_IRON_TOOL, 1500, 7.0F, 2.7F, 13, () -> Ingredient.ofItems(ModItems.TOURMALINE_GEM)), + DIAMOND(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, 1561, 8.0F, 3.0F, 10, () -> Ingredient.ofItems(Items.DIAMOND)), + SAPPHIRE(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, 1782, 8.0F, 3.5F, 15, () -> Ingredient.ofItems(ModItems.SAPPHIRE_GEM)), + TANZANITE(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, 1957, 8.0F, 3.5F, 17, () -> Ingredient.ofItems(ModItems.TANZANITE_GEM)), + OBSIDIAN(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, 2169, 8.5F, 3.5F, 13, () -> Ingredient.ofItems(Items.OBSIDIAN)), + RUBY(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, 1601, 8.0F, 3.5F, 11, () -> Ingredient.ofItems(ModItems.RUBY_GEM)), + MOISSANITE(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, 1723, 8.0F, 3.5F, 23, () -> Ingredient.ofItems(ModItems.MOISSANITE_GEM)), + NETHERITE(BlockTags.INCORRECT_FOR_NETHERITE_TOOL, 2031, 9.0F, 4.0F, 15, () -> Ingredient.ofItems(Items.NETHERITE_INGOT)), + ONYX(BlockTags.INCORRECT_FOR_NETHERITE_TOOL, 2700, 9.5F, 4.0F, 14, () -> Ingredient.ofItems(ModItems.ONYX_GEM)), + TURQUOISE(BlockTags.INCORRECT_FOR_NETHERITE_TOOL, 2400, 9.0F, 4.0F, 14, () -> Ingredient.ofItems(ModItems.TURQUOISE_GEM)), + GRAPHENE(BlockTags.INCORRECT_FOR_NETHERITE_TOOL, 3569, 11.0F, 6.0F, 18, () -> Ingredient.ofItems(ModItems.GRAPHENE_GEM)); - private final int miningLevel; + private final TagKey inverseTag; private final int itemDurability; private final float miningSpeed; private final float attackDamage; private final int enchantability; private final Supplier repairIngredient; - ModToolMaterials(int miningLevel, int itemDurability, float miningSpeed, float attckDamage, int enchantability, Supplier repairIngredient) { - this.miningLevel = miningLevel; + ModToolMaterials(TagKey inverseTag, int itemDurability, float miningSpeed, float attackDamage, int enchantability, Supplier repairIngredient) + { + this.inverseTag = inverseTag; this.itemDurability = itemDurability; this.miningSpeed = miningSpeed; - this.attackDamage = attckDamage; + this.attackDamage = attackDamage; this.enchantability = enchantability; - this.repairIngredient = repairIngredient; + this.repairIngredient = Suppliers.memoize(repairIngredient::get); } @Override - public int getDurability() { - return this.itemDurability; + public int getDurability() + { + return itemDurability; } @Override - public float getMiningSpeedMultiplier() { - return this.miningSpeed; + public float getMiningSpeedMultiplier() + { + return miningSpeed; } @Override - public float getAttackDamage() { - return this.attackDamage; + public float getAttackDamage() + { + return attackDamage; } @Override - public int getMiningLevel() { - return this.miningLevel; + public TagKey getInverseTag() + { + return inverseTag; } @Override - public int getEnchantability() { - return this.enchantability; + public int getEnchantability() + { + return enchantability; } @Override - public Ingredient getRepairIngredient() { - return this.repairIngredient.get(); + public Ingredient getRepairIngredient() + { + return repairIngredient.get(); } -} +} \ No newline at end of file diff --git a/src/main/java/mod/leronus/mores/item/custom/ModArmorItem.java b/src/main/java/mod/leronus/mores/item/custom/ModArmorItem.java index 8e5c7bb..93a3ae6 100644 --- a/src/main/java/mod/leronus/mores/item/custom/ModArmorItem.java +++ b/src/main/java/mod/leronus/mores/item/custom/ModArmorItem.java @@ -1,8 +1,6 @@ package mod.leronus.mores.item.custom; -import com.google.common.collect.ImmutableMap; import mod.leronus.mores.item.ModArmorMaterials; -import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.Entity; import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.effect.StatusEffectInstance; @@ -11,201 +9,134 @@ import net.minecraft.item.ArmorItem; import net.minecraft.item.ArmorMaterial; import net.minecraft.item.ItemStack; -import net.minecraft.text.Text; -import net.minecraft.util.Formatting; +import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.world.World; -import org.jetbrains.annotations.Nullable; -import java.util.List; +import java.util.ArrayList; +import java.util.HashMap; import java.util.Map; -public class ModArmorItem extends ArmorItem { - private static final Map MATERIAL_TO_EFFECT_MAP = - (new ImmutableMap.Builder()) - .put(ModArmorMaterials.TIN, new StatusEffectInstance(StatusEffects.JUMP_BOOST, 10, 1, - false, true, false)) - .put(ModArmorMaterials.COBALT, new StatusEffectInstance(StatusEffects.HASTE, 10, 0, - false, true, false)) - .put(ModArmorMaterials.STEEL, new StatusEffectInstance(StatusEffects.STRENGTH, 10, 0, - false, true, false)) - .put(ModArmorMaterials.AMETHYST, new StatusEffectInstance(StatusEffects.SLOW_FALLING, 10, 0, - false, true, false)) - .put(ModArmorMaterials.EMERALD, new StatusEffectInstance(StatusEffects.LUCK, 10, 0, - false, true, false)) - .put(ModArmorMaterials.TOPAZ, new StatusEffectInstance(StatusEffects.HASTE, 10, 1, - false, true, false)) - .put(ModArmorMaterials.TOURMALINE, new StatusEffectInstance(StatusEffects.REGENERATION, 10, 0, - false, true, false)) - .put(ModArmorMaterials.TANZANITE, new StatusEffectInstance(StatusEffects.SPEED, 10, 0, - false, true, false)) - .put(ModArmorMaterials.RUBY, new StatusEffectInstance(StatusEffects.FIRE_RESISTANCE, 10, 0, - false, true, false)) - .put(ModArmorMaterials.SAPPHIRE, new StatusEffectInstance(StatusEffects.NIGHT_VISION, 250, 0, - false, true, false)) - .put(ModArmorMaterials.MOISSANITE, new StatusEffectInstance(StatusEffects.CONDUIT_POWER, 10, 0, - false, true, false)) - .put(ModArmorMaterials.TURQUOISE, new StatusEffectInstance(StatusEffects.DOLPHINS_GRACE, 10, 0, - false, true, false)) - .build(); - - public ModArmorItem(ArmorMaterial material, Type type, Settings settings) { - super(material, type, settings); +public class ModArmorItem extends ArmorItem +{ + private static final Map, ArrayList> MATERIAL_TO_EFFECT; + + static + { + MATERIAL_TO_EFFECT = new HashMap<>(); + addValue(ModArmorMaterials.TIN, StatusEffects.JUMP_BOOST); + addValue(ModArmorMaterials.COBALT, StatusEffects.HASTE); + addValue(ModArmorMaterials.STEEL, StatusEffects.STRENGTH); + +// addValue(ModArmorMaterials.AMETHYST, StatusEffects.SLOW_FALLING); +// addValue(ModArmorMaterials.EMERALD, StatusEffects.LUCK); +// +// addValue(ModArmorMaterials.TOPAZ, StatusEffects.HASTE, 10, 1); +// addValue(ModArmorMaterials.TOURMALINE, StatusEffects.REGENERATION); +// +// addValue(ModArmorMaterials.TANZANITE, StatusEffects.SPEED); +// addValue(ModArmorMaterials.RUBY, StatusEffects.FIRE_RESISTANCE); +// +// addValue(ModArmorMaterials.SAPPHIRE, StatusEffects.NIGHT_VISION); +// addValue(ModArmorMaterials.MOISSANITE, StatusEffects.CONDUIT_POWER); +// +// addValue(ModArmorMaterials.TURQUOISE, StatusEffects.WATER_BREATHING); +// addValue(ModArmorMaterials.TURQUOISE, StatusEffects.DOLPHINS_GRACE); } - @Override - public void inventoryTick(ItemStack stack, World world, Entity entity, int slot, boolean selected) { - if(!world.isClient()) { - if(entity instanceof PlayerEntity player && hasFullSuitOfArmorOn(player)) { - evaluateArmorEffects(player); - } - } - - super.inventoryTick(stack, world, entity, slot, selected); + public ModArmorItem(RegistryEntry material, Type type, Settings settings) + { + super(material, type, settings); } - private void evaluateArmorEffects(PlayerEntity player) { - for (Map.Entry entry : MATERIAL_TO_EFFECT_MAP.entrySet()) { - ArmorMaterial mapArmorMaterial = entry.getKey(); - StatusEffectInstance mapStatusEffect = entry.getValue(); + private static void addValue(RegistryEntry key, RegistryEntry effect) + { + ArrayList tempList; - if(hasCorrectArmorOn(mapArmorMaterial, player)) { - addStatusEffectForMaterial(player, mapArmorMaterial, mapStatusEffect); - } - } - } + StatusEffectInstance newEffect = new StatusEffectInstance(effect, 1200, 3, false, false, true); - private void addStatusEffectForMaterial(PlayerEntity player, ArmorMaterial mapArmorMaterial, StatusEffectInstance mapStatusEffect) { - boolean hasPlayerEffect = player.hasStatusEffect(mapStatusEffect.getEffectType()); - StatusEffect playerEffect = mapStatusEffect.getEffectType(); - if(hasCorrectArmorOn(mapArmorMaterial, player) && !hasPlayerEffect) { - player.addStatusEffect(new StatusEffectInstance(mapStatusEffect)); + if (MATERIAL_TO_EFFECT.containsKey(key)) + { + tempList = MATERIAL_TO_EFFECT.get(key); + if (tempList == null) + tempList = new ArrayList<>(); + tempList.add(newEffect); } - if (hasCorrectArmorOn(mapArmorMaterial, player) && playerEffect == StatusEffects.NIGHT_VISION){ - player.setStatusEffect(new StatusEffectInstance(StatusEffects.NIGHT_VISION, 250, 0, - false, true, false), null); + else + { + tempList = new ArrayList<>(); + tempList.add(newEffect); } + + MATERIAL_TO_EFFECT.put(key, tempList); + } + + @Override + public void inventoryTick(ItemStack stack, World world, Entity entity, int slot, boolean selected) + { + if (!world.isClient()) + if (entity instanceof PlayerEntity player && hasFullArmorSet(player)) + evaluateArmorEffect(player); + super.inventoryTick(stack, world, entity, slot, selected); } - private boolean hasFullSuitOfArmorOn(PlayerEntity player) { + private boolean hasFullArmorSet(PlayerEntity player) + { ItemStack boots = player.getInventory().getArmorStack(0); ItemStack leggings = player.getInventory().getArmorStack(1); - ItemStack breastplate = player.getInventory().getArmorStack(2); + ItemStack chestplate = player.getInventory().getArmorStack(2); ItemStack helmet = player.getInventory().getArmorStack(3); - return !helmet.isEmpty() && !breastplate.isEmpty() - && !leggings.isEmpty() && !boots.isEmpty(); + return !helmet.isEmpty() && !chestplate.isEmpty() && !leggings.isEmpty() && !boots.isEmpty(); } - private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) { - for (ItemStack armorStack: player.getInventory().armor) { - if(!(armorStack.getItem() instanceof ArmorItem)) { - return false; - } + private void evaluateArmorEffect(PlayerEntity player) + { + for (Map.Entry, ArrayList> entry : MATERIAL_TO_EFFECT.entrySet()) + { + ArmorMaterial material = entry.getKey().value(); + + entry.getValue().forEach((effect) -> + { + if (hasCorrectArmor(material, player) && isStatusFading(player, effect)) + addStatus(player, effect); + }); } + } + + private boolean hasCorrectArmor(ArmorMaterial material, PlayerEntity player) + { + // Preventing Elytra from Crashing the Game (Elytra is not ArmorItem) + for (ItemStack armor : player.getInventory().armor) + if (!(armor.getItem() instanceof ArmorItem)) + return false; - ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem()); - ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem()); - ArmorItem breastplate = ((ArmorItem)player.getInventory().getArmorStack(2).getItem()); - ArmorItem helmet = ((ArmorItem)player.getInventory().getArmorStack(3).getItem()); + ArmorItem boots = ((ArmorItem) player.getInventory().getArmorStack(0).getItem()); + ArmorItem leggings = ((ArmorItem) player.getInventory().getArmorStack(1).getItem()); + ArmorItem chestplate = ((ArmorItem) player.getInventory().getArmorStack(2).getItem()); + ArmorItem helmet = ((ArmorItem) player.getInventory().getArmorStack(3).getItem()); - return helmet.getMaterial() == material && breastplate.getMaterial() == material && - leggings.getMaterial() == material && boots.getMaterial() == material; + return helmet.getMaterial().value() == material && + chestplate.getMaterial().value() == material && + leggings.getMaterial().value() == material && + boots.getMaterial().value() == material; } - @Override - public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { - if (stack.getItem() instanceof ModArmorItem){ - ModArmorItem item = (ModArmorItem) stack.getItem(); - - if (item.getMaterial() == ModArmorMaterials.TIN) { - //Making the tooltips - tooltip.add(Text.translatable("")); - tooltip.add(Text.translatable("mores.full_set_bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.jump_boost").formatted(Formatting.YELLOW))); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(ModArmorMaterials.TIN.getDurability(item.getType()))).formatted(Formatting.LIGHT_PURPLE))); - } else if (item.getMaterial() == ModArmorMaterials.COBALT) { - //Making the tooltips - tooltip.add(Text.translatable("")); - tooltip.add(Text.translatable("mores.full_set_bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.haste").formatted(Formatting.GOLD))); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(ModArmorMaterials.COBALT.getDurability(item.getType()))).formatted(Formatting.LIGHT_PURPLE))); - } else if (item.getMaterial() == ModArmorMaterials.AMETHYST) { - //Making the tooltips - tooltip.add(Text.translatable("")); - tooltip.add(Text.translatable("mores.full_set_bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.slow_falling").formatted(Formatting.YELLOW))); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(ModArmorMaterials.AMETHYST.getDurability(item.getType()))).formatted(Formatting.LIGHT_PURPLE))); - } else if (item.getMaterial() == ModArmorMaterials.OBSIDIAN) { - //Making the tooltips - tooltip.add(Text.translatable("")); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(ModArmorMaterials.OBSIDIAN.getDurability(item.getType()))).formatted(Formatting.LIGHT_PURPLE))); - } else if (item.getMaterial() == ModArmorMaterials.EMERALD) { - //Making the tooltips - tooltip.add(Text.translatable("")); - tooltip.add(Text.translatable("mores.full_set_bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.luck").formatted(Formatting.GREEN))); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(ModArmorMaterials.EMERALD.getDurability(item.getType()))).formatted(Formatting.LIGHT_PURPLE))); - } else if (item.getMaterial() == ModArmorMaterials.TOURMALINE) { - //Making the tooltips - tooltip.add(Text.translatable("")); - tooltip.add(Text.translatable("mores.full_set_bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.regeneration").formatted(Formatting.RED))); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(ModArmorMaterials.TOURMALINE.getDurability(item.getType()))).formatted(Formatting.LIGHT_PURPLE))); - } else if (item.getMaterial() == ModArmorMaterials.TANZANITE) { - //Making the tooltips - tooltip.add(Text.translatable("")); - tooltip.add(Text.translatable("mores.full_set_bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.speed").formatted(Formatting.YELLOW))); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(ModArmorMaterials.TANZANITE.getDurability(item.getType()))).formatted(Formatting.LIGHT_PURPLE))); - } else if (item.getMaterial() == ModArmorMaterials.RUBY) { - //Making the tooltips - tooltip.add(Text.translatable("")); - tooltip.add(Text.translatable("mores.full_set_bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.fire_resistance").formatted(Formatting.DARK_RED))); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(ModArmorMaterials.RUBY.getDurability(item.getType()))).formatted(Formatting.LIGHT_PURPLE))); - } else if (item.getMaterial() == ModArmorMaterials.SAPPHIRE) { - //Making the tooltips - tooltip.add(Text.translatable("")); - tooltip.add(Text.translatable("mores.full_set_bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.night_vision").formatted(Formatting.BLUE))); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(ModArmorMaterials.SAPPHIRE.getDurability(item.getType()))).formatted(Formatting.LIGHT_PURPLE))); - } else if (item.getMaterial() == ModArmorMaterials.TURQUOISE) { - //Making the tooltips - tooltip.add(Text.translatable("")); - tooltip.add(Text.translatable("mores.full_set_bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.water_effects").formatted(Formatting.AQUA))); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(ModArmorMaterials.TURQUOISE.getDurability(item.getType()))).formatted(Formatting.LIGHT_PURPLE))); - } else if (item.getMaterial() == ModArmorMaterials.COPPER) { - //Making the tooltips - tooltip.add(Text.translatable("")); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(ModArmorMaterials.COPPER.getDurability(item.getType()))).formatted(Formatting.LIGHT_PURPLE))); - } else if (item.getMaterial() == ModArmorMaterials.BRONZE) { - //Making the tooltips - tooltip.add(Text.translatable("")); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(ModArmorMaterials.BRONZE.getDurability(item.getType()))).formatted(Formatting.LIGHT_PURPLE))); - } else if (item.getMaterial() == ModArmorMaterials.SILVER) { - //Making the tooltips - tooltip.add(Text.translatable("")); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(ModArmorMaterials.SILVER.getDurability(item.getType()))).formatted(Formatting.LIGHT_PURPLE))); - } else if (item.getMaterial() == ModArmorMaterials.STERLING) { - //Making the tooltips - tooltip.add(Text.translatable("")); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(ModArmorMaterials.STERLING.getDurability(item.getType()))).formatted(Formatting.LIGHT_PURPLE))); - } else if (item.getMaterial() == ModArmorMaterials.STEEL) { - //Making the tooltips - tooltip.add(Text.translatable("")); - tooltip.add(Text.translatable("mores.full_set_bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.strength").formatted(Formatting.DARK_PURPLE))); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(ModArmorMaterials.STEEL.getDurability(item.getType()))).formatted(Formatting.LIGHT_PURPLE))); - } else if (item.getMaterial() == ModArmorMaterials.TOPAZ) { - //Making the tooltips - tooltip.add(Text.translatable("")); - tooltip.add(Text.translatable("mores.full_set_bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.haste").formatted(Formatting.GOLD))); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(ModArmorMaterials.TOPAZ.getDurability(item.getType()))).formatted(Formatting.LIGHT_PURPLE))); - } else if (item.getMaterial() == ModArmorMaterials.MOISSANITE) { - //Making the tooltips - tooltip.add(Text.translatable("")); - tooltip.add(Text.translatable("mores.full_set_bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.conduit").formatted(Formatting.AQUA))); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(ModArmorMaterials.MOISSANITE.getDurability(item.getType()))).formatted(Formatting.LIGHT_PURPLE))); - } else if (item.getMaterial() == ModArmorMaterials.ONYX) { - //Making the tooltips - tooltip.add(Text.translatable("")); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(ModArmorMaterials.ONYX.getDurability(item.getType()))).formatted(Formatting.LIGHT_PURPLE))); - } else if (item.getMaterial() == ModArmorMaterials.GRAPHENE) { - //Making the tooltips - tooltip.add(Text.translatable("")); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(ModArmorMaterials.GRAPHENE.getDurability(item.getType()))).formatted(Formatting.LIGHT_PURPLE))); - } - } + private boolean isStatusFading(PlayerEntity player, StatusEffectInstance effect) + { + StatusEffectInstance playerEffect = player.getStatusEffect(effect.getEffectType()); + + return playerEffect == null || + !player.hasStatusEffect(effect.getEffectType()) || + playerEffect.isDurationBelow(220); + } + + private void addStatus(PlayerEntity player, StatusEffectInstance effect) + { + player.addStatusEffect(new StatusEffectInstance(effect.getEffectType(), + effect.getDuration(), + effect.getAmplifier(), + effect.isAmbient(), + effect.shouldShowParticles(), + effect.shouldShowIcon())); } } \ No newline at end of file diff --git a/src/main/java/mod/leronus/mores/item/custom/ModAxeItem.java b/src/main/java/mod/leronus/mores/item/custom/ModAxeItem.java index 8d262a3..a6bcf93 100644 --- a/src/main/java/mod/leronus/mores/item/custom/ModAxeItem.java +++ b/src/main/java/mod/leronus/mores/item/custom/ModAxeItem.java @@ -1,35 +1,24 @@ package mod.leronus.mores.item.custom; -import mod.leronus.mores.item.ModArmorMaterials; -import mod.leronus.mores.item.ModToolMaterials; -import net.minecraft.client.item.TooltipContext; import net.minecraft.item.AxeItem; -import net.minecraft.item.ItemStack; -import net.minecraft.item.MiningToolItem; import net.minecraft.item.ToolMaterial; -import net.minecraft.text.Text; -import net.minecraft.util.Formatting; -import net.minecraft.world.World; -import org.jetbrains.annotations.Nullable; - -import java.util.List; public class ModAxeItem extends AxeItem { public ModAxeItem(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) { - super(material, attackDamage, attackSpeed, settings); + super(material, settings); } - @Override - public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { - if (stack.getItem() instanceof MiningToolItem item) { - if (item.getMaterial() == ModToolMaterials.RUBY){ - tooltip.add(Text.literal("")); - tooltip.add(Text.translatable("mores.bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.auto_smelt").formatted(Formatting.DARK_RED))); - } - tooltip.add(Text.literal("")); - tooltip.add(Text.translatable("mores.harvest_level").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaterial().getMiningLevel())).formatted(Formatting.GOLD))); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaxDamage())).formatted(Formatting.LIGHT_PURPLE))); - tooltip.add(Text.translatable("mores.efficiency").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaterial().getMiningSpeedMultiplier())).formatted(Formatting.RED))); - } - } +// @Override +// public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { +// if (stack.getItem() instanceof MiningToolItem item) { +// if (item.getMaterial() == ModToolMaterials.RUBY){ +// tooltip.add(Text.literal("")); +// tooltip.add(Text.translatable("mores.bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.auto_smelt").formatted(Formatting.DARK_RED))); +// } +// tooltip.add(Text.literal("")); +// tooltip.add(Text.translatable("mores.harvest_level").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaterial().getMiningLevel())).formatted(Formatting.GOLD))); +// tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaxDamage())).formatted(Formatting.LIGHT_PURPLE))); +// tooltip.add(Text.translatable("mores.efficiency").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaterial().getMiningSpeedMultiplier())).formatted(Formatting.RED))); +// } +// } } diff --git a/src/main/java/mod/leronus/mores/item/custom/ModBattleAxeItem.java b/src/main/java/mod/leronus/mores/item/custom/ModBattleAxeItem.java index 1516f09..c6bfd7f 100644 --- a/src/main/java/mod/leronus/mores/item/custom/ModBattleAxeItem.java +++ b/src/main/java/mod/leronus/mores/item/custom/ModBattleAxeItem.java @@ -1,36 +1,26 @@ package mod.leronus.mores.item.custom; -import mod.leronus.mores.item.ModItems; -import net.minecraft.client.item.TooltipContext; -import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; import net.minecraft.item.ToolMaterial; -import net.minecraft.text.Text; -import net.minecraft.util.Formatting; -import net.minecraft.world.World; -import org.jetbrains.annotations.Nullable; - -import java.util.List; public class ModBattleAxeItem extends SwordItem { public ModBattleAxeItem(ToolMaterial toolMaterial, int attackDamageModifier, float attackSpeedModifier, Item.Settings settings) { - super(toolMaterial, attackDamageModifier, attackSpeedModifier, settings); + super(toolMaterial, settings); } - @Override - public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { - if (stack.getItem() instanceof ModBattleAxeItem){ +// @Override +// public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { +// if (stack.getItem() instanceof ModBattleAxeItem){ +//// tooltip.add(Text.literal("")); +//// if (stack.getItem() == ModItems.ONYX_BATTLEAXE) { +//// tooltip.add(Text.translatable("mores.bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.wither_effect").formatted(Formatting.DARK_GRAY))); +//// } // tooltip.add(Text.literal("")); -// if (stack.getItem() == ModItems.ONYX_BATTLEAXE) { -// tooltip.add(Text.translatable("mores.bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.wither_effect").formatted(Formatting.DARK_GRAY))); -// } - tooltip.add(Text.literal("")); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(stack.getItem().getMaxDamage())).formatted(Formatting.LIGHT_PURPLE))); -// if (stack.getItem() == ModItems.RUBY_SWORD || stack.getItem() == ModItems.RUBY_MACE || stack.getItem() == ModItems.RUBY_BATTLEAXE || stack.getItem() == ModItems.RUBY_DAGGER) { -// tooltip.add(Text.translatable(Formatting.GRAY + "mores.bonus" + Formatting.RED + "Burn Effect")); -// } - } - } +// tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(stack.getItem().getMaxDamage())).formatted(Formatting.LIGHT_PURPLE))); +//// if (stack.getItem() == ModItems.RUBY_SWORD || stack.getItem() == ModItems.RUBY_MACE || stack.getItem() == ModItems.RUBY_BATTLEAXE || stack.getItem() == ModItems.RUBY_DAGGER) { +//// tooltip.add(Text.translatable(Formatting.GRAY + "mores.bonus" + Formatting.RED + "Burn Effect")); +//// } +// } +// } } diff --git a/src/main/java/mod/leronus/mores/item/custom/ModHoeItem.java b/src/main/java/mod/leronus/mores/item/custom/ModHoeItem.java index 533d777..830fa06 100644 --- a/src/main/java/mod/leronus/mores/item/custom/ModHoeItem.java +++ b/src/main/java/mod/leronus/mores/item/custom/ModHoeItem.java @@ -1,34 +1,24 @@ package mod.leronus.mores.item.custom; -import mod.leronus.mores.item.ModToolMaterials; -import net.minecraft.client.item.TooltipContext; import net.minecraft.item.HoeItem; -import net.minecraft.item.ItemStack; -import net.minecraft.item.MiningToolItem; import net.minecraft.item.ToolMaterial; -import net.minecraft.text.Text; -import net.minecraft.util.Formatting; -import net.minecraft.world.World; -import org.jetbrains.annotations.Nullable; - -import java.util.List; public class ModHoeItem extends HoeItem { public ModHoeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) { - super(material, attackDamage, attackSpeed, settings); + super(material, settings); } - @Override - public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { - if (stack.getItem() instanceof MiningToolItem item) { - if (item.getMaterial() == ModToolMaterials.RUBY){ - tooltip.add(Text.literal("")); - tooltip.add(Text.translatable("mores.bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.auto_smelt").formatted(Formatting.DARK_RED))); - } - tooltip.add(Text.literal("")); - tooltip.add(Text.translatable("mores.harvest_level").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaterial().getMiningLevel())).formatted(Formatting.GOLD))); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaxDamage())).formatted(Formatting.LIGHT_PURPLE))); - tooltip.add(Text.translatable("mores.efficiency").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaterial().getMiningSpeedMultiplier())).formatted(Formatting.RED))); - } - } +// @Override +// public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { +// if (stack.getItem() instanceof MiningToolItem item) { +// if (item.getMaterial() == ModToolMaterials.RUBY){ +// tooltip.add(Text.literal("")); +// tooltip.add(Text.translatable("mores.bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.auto_smelt").formatted(Formatting.DARK_RED))); +// } +// tooltip.add(Text.literal("")); +// tooltip.add(Text.translatable("mores.harvest_level").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaterial().getMiningLevel())).formatted(Formatting.GOLD))); +// tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaxDamage())).formatted(Formatting.LIGHT_PURPLE))); +// tooltip.add(Text.translatable("mores.efficiency").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaterial().getMiningSpeedMultiplier())).formatted(Formatting.RED))); +// } +// } } diff --git a/src/main/java/mod/leronus/mores/item/custom/ModPickaxeItem.java b/src/main/java/mod/leronus/mores/item/custom/ModPickaxeItem.java index 9329d0f..e88b5a2 100644 --- a/src/main/java/mod/leronus/mores/item/custom/ModPickaxeItem.java +++ b/src/main/java/mod/leronus/mores/item/custom/ModPickaxeItem.java @@ -1,7 +1,6 @@ package mod.leronus.mores.item.custom; import mod.leronus.mores.item.ModToolMaterials; -import net.minecraft.client.item.TooltipContext; import net.minecraft.item.ItemStack; import net.minecraft.item.MiningToolItem; import net.minecraft.item.PickaxeItem; @@ -15,20 +14,20 @@ public class ModPickaxeItem extends PickaxeItem { public ModPickaxeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) { - super(material, attackDamage, attackSpeed, settings); + super(material, settings); } - @Override - public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { - if (stack.getItem() instanceof MiningToolItem item) { - if (item.getMaterial() == ModToolMaterials.RUBY){ - tooltip.add(Text.literal("")); - tooltip.add(Text.translatable("mores.bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.auto_smelt").formatted(Formatting.DARK_RED))); - } - tooltip.add(Text.literal("")); - tooltip.add(Text.translatable("mores.harvest_level").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaterial().getMiningLevel())).formatted(Formatting.GOLD))); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaxDamage())).formatted(Formatting.LIGHT_PURPLE))); - tooltip.add(Text.translatable("mores.efficiency").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaterial().getMiningSpeedMultiplier())).formatted(Formatting.RED))); - } - } +// @Override +// public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { +// if (stack.getItem() instanceof MiningToolItem item) { +// if (item.getMaterial() == ModToolMaterials.RUBY){ +// tooltip.add(Text.literal("")); +// tooltip.add(Text.translatable("mores.bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.auto_smelt").formatted(Formatting.DARK_RED))); +// } +// tooltip.add(Text.literal("")); +// tooltip.add(Text.translatable("mores.harvest_level").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaterial().getMiningLevel())).formatted(Formatting.GOLD))); +// tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaxDamage())).formatted(Formatting.LIGHT_PURPLE))); +// tooltip.add(Text.translatable("mores.efficiency").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaterial().getMiningSpeedMultiplier())).formatted(Formatting.RED))); +// } +// } } diff --git a/src/main/java/mod/leronus/mores/item/custom/ModShovelItem.java b/src/main/java/mod/leronus/mores/item/custom/ModShovelItem.java index 0f21290..5845603 100644 --- a/src/main/java/mod/leronus/mores/item/custom/ModShovelItem.java +++ b/src/main/java/mod/leronus/mores/item/custom/ModShovelItem.java @@ -1,34 +1,24 @@ package mod.leronus.mores.item.custom; -import mod.leronus.mores.item.ModToolMaterials; -import net.minecraft.client.item.TooltipContext; -import net.minecraft.item.ItemStack; -import net.minecraft.item.MiningToolItem; import net.minecraft.item.ShovelItem; import net.minecraft.item.ToolMaterial; -import net.minecraft.text.Text; -import net.minecraft.util.Formatting; -import net.minecraft.world.World; -import org.jetbrains.annotations.Nullable; - -import java.util.List; public class ModShovelItem extends ShovelItem { public ModShovelItem(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) { - super(material, attackDamage, attackSpeed, settings); + super(material,settings); } - @Override - public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { - if (stack.getItem() instanceof MiningToolItem item) { - if (item.getMaterial() == ModToolMaterials.RUBY){ - tooltip.add(Text.literal("")); - tooltip.add(Text.translatable("mores.bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.auto_smelt").formatted(Formatting.DARK_RED))); - } - tooltip.add(Text.literal("")); - tooltip.add(Text.translatable("mores.harvest_level").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaterial().getMiningLevel())).formatted(Formatting.GOLD))); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaxDamage())).formatted(Formatting.LIGHT_PURPLE))); - tooltip.add(Text.translatable("mores.efficiency").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaterial().getMiningSpeedMultiplier())).formatted(Formatting.RED))); - } - } +// @Override +// public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { +// if (stack.getItem() instanceof MiningToolItem item) { +// if (item.getMaterial() == ModToolMaterials.RUBY){ +// tooltip.add(Text.literal("")); +// tooltip.add(Text.translatable("mores.bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.auto_smelt").formatted(Formatting.DARK_RED))); +// } +// tooltip.add(Text.literal("")); +// tooltip.add(Text.translatable("mores.harvest_level").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaterial().getMiningLevel())).formatted(Formatting.GOLD))); +// tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaxDamage())).formatted(Formatting.LIGHT_PURPLE))); +// tooltip.add(Text.translatable("mores.efficiency").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(item.getMaterial().getMiningSpeedMultiplier())).formatted(Formatting.RED))); +// } +// } } diff --git a/src/main/java/mod/leronus/mores/item/custom/ModSwordItem.java b/src/main/java/mod/leronus/mores/item/custom/ModSwordItem.java index 23a4612..a2e4345 100644 --- a/src/main/java/mod/leronus/mores/item/custom/ModSwordItem.java +++ b/src/main/java/mod/leronus/mores/item/custom/ModSwordItem.java @@ -5,7 +5,6 @@ import mod.leronus.mores.item.ModItems; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; -import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.attribute.EntityAttribute; @@ -18,23 +17,17 @@ import net.minecraft.item.SwordItem; import net.minecraft.item.ToolMaterial; import net.minecraft.registry.tag.BlockTags; -import net.minecraft.text.Text; -import net.minecraft.util.Formatting; -import net.minecraft.world.World; -import org.jetbrains.annotations.Nullable; - -import java.util.List; public class ModSwordItem extends SwordItem { private final float attackDamage; private final Multimap attributeModifiers; public ModSwordItem(ToolMaterial toolMaterial, int attackDamage, float attackSpeed, Item.Settings settings) { - super(toolMaterial, attackDamage, attackSpeed, settings); + super(toolMaterial, settings); this.attackDamage = (float)attackDamage + toolMaterial.getAttackDamage(); ImmutableMultimap.Builder builder = ImmutableMultimap.builder(); - builder.put(EntityAttributes.GENERIC_ATTACK_DAMAGE, new EntityAttributeModifier(ATTACK_DAMAGE_MODIFIER_ID, "Weapon modifier", (double)this.attackDamage, EntityAttributeModifier.Operation.ADDITION)); - builder.put(EntityAttributes.GENERIC_ATTACK_SPEED, new EntityAttributeModifier(ATTACK_SPEED_MODIFIER_ID, "Weapon modifier", (double)attackSpeed, EntityAttributeModifier.Operation.ADDITION)); +// builder.put(EntityAttributes.GENERIC_ATTACK_DAMAGE, new EntityAttributeModifier(ATTACK_DAMAGE_MODIFIER_ID, "Weapon modifier", (double)this.attackDamage, EntityAttributeModifier.Operation.ADDITION)); +// builder.put(EntityAttributes.GENERIC_ATTACK_SPEED, new EntityAttributeModifier(ATTACK_SPEED_MODIFIER_ID, "Weapon modifier", (double)attackSpeed, EntityAttributeModifier.Operation.ADDITION)); this.attributeModifiers = builder.build(); } @@ -50,24 +43,24 @@ public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { } } - public Multimap getAttributeModifiers(EquipmentSlot slot) { - return slot == EquipmentSlot.MAINHAND ? this.attributeModifiers : super.getAttributeModifiers(slot); - } +// public Multimap getAttributeModifiers(EquipmentSlot slot) { +// return slot == EquipmentSlot.MAINHAND ? this.attributeModifiers : super.getAttributeModifiers(slot); +// } - @Override - public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { - if (stack.getItem() instanceof ModSwordItem){ - tooltip.add(Text.literal("")); - if (stack.getItem() == ModItems.ONYX_SWORD || stack.getItem() == ModItems.ONYX_MACE || stack.getItem() == ModItems.ONYX_DAGGER) { - tooltip.add(Text.translatable("mores.bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.wither_effect").formatted(Formatting.DARK_GRAY))); - } - tooltip.add(Text.literal("")); - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(stack.getItem().getMaxDamage())).formatted(Formatting.LIGHT_PURPLE))); - if (stack.getItem() == ModItems.RUBY_SWORD || stack.getItem() == ModItems.RUBY_MACE || stack.getItem() == ModItems.RUBY_BATTLEAXE || stack.getItem() == ModItems.RUBY_DAGGER) { - tooltip.add(Text.translatable(Formatting.GRAY + "mores.bonus" + Formatting.RED + "Burn Effect")); - } - } - } +// @Override +// public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { +// if (stack.getItem() instanceof ModSwordItem){ +// tooltip.add(Text.literal("")); +// if (stack.getItem() == ModItems.ONYX_SWORD || stack.getItem() == ModItems.ONYX_MACE || stack.getItem() == ModItems.ONYX_DAGGER) { +// tooltip.add(Text.translatable("mores.bonus").formatted(Formatting.GRAY).append(Text.translatable("mores.wither_effect").formatted(Formatting.DARK_GRAY))); +// } +// tooltip.add(Text.literal("")); +// tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(stack.getItem().getMaxDamage())).formatted(Formatting.LIGHT_PURPLE))); +// if (stack.getItem() == ModItems.RUBY_SWORD || stack.getItem() == ModItems.RUBY_MACE || stack.getItem() == ModItems.RUBY_BATTLEAXE || stack.getItem() == ModItems.RUBY_DAGGER) { +// tooltip.add(Text.translatable(Formatting.GRAY + "mores.bonus" + Formatting.RED + "Burn Effect")); +// } +// } +// } /** * Called when an enemy is attacked using the sword diff --git a/src/main/java/mod/leronus/mores/mixin/SwordItemMixin.java b/src/main/java/mod/leronus/mores/mixin/SwordItemMixin.java index bea31ee..00cf780 100644 --- a/src/main/java/mod/leronus/mores/mixin/SwordItemMixin.java +++ b/src/main/java/mod/leronus/mores/mixin/SwordItemMixin.java @@ -1,23 +1,15 @@ package mod.leronus.mores.mixin; -import net.minecraft.client.item.TooltipContext; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.text.Text; -import net.minecraft.util.Formatting; -import net.minecraft.world.World; -import org.jetbrains.annotations.Nullable; -import org.spongepowered.asm.mixin.Mixin; - -import java.util.List; - -@Mixin(net.minecraft.item.SwordItem.class) -public class SwordItemMixin extends Item { - public SwordItemMixin(Settings settings) { - super(settings); - } - @Override - public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { - tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(stack.getItem().getMaxDamage())).formatted(Formatting.LIGHT_PURPLE))); - } -} \ No newline at end of file +//import net.minecraft.item.Item; +//import org.spongepowered.asm.mixin.Mixin; +// +//@Mixin(net.minecraft.item.SwordItem.class) +//public class SwordItemMixin extends Item { +// public SwordItemMixin(Settings settings) { +// super(settings); +// } +// @Override +// public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { +// tooltip.add(Text.translatable("mores.durability").formatted(Formatting.GRAY).append(Text.translatable(String.valueOf(stack.getItem().getMaxDamage())).formatted(Formatting.LIGHT_PURPLE))); +// } +//} \ No newline at end of file diff --git a/src/main/resources/mores.mixins.json b/src/main/resources/mores.mixins.json index 8df17e5..d3916f0 100644 --- a/src/main/resources/mores.mixins.json +++ b/src/main/resources/mores.mixins.json @@ -4,7 +4,6 @@ "compatibilityLevel": "JAVA_17", "mixins": [ "MoresMixin", - "SwordItemMixin", "BlockMixin" ], "injectors": {