Updated armor effects to show infinite and be removed upon removing f…

…ull armor

Updated swords attack dmg and speed to 1.20.6
Temporarily disabled vanilla mOres weapons
Fixed food items

MORES-CHANGELOG.txt

@@ -1,5 +1,10 @@
 v1.6.0
 Updated to Minecraft 1.20.6
-- Updated item groups to match vanilla
-- Harvest level (temporarily?) removed from tooltips
--
+- Updated full armor effects to show infinite instead of a countdown timer that keeps refreshing
+- Updated item groups to match vanilla Minecraft item groups
+- All armor trims are working correctly (bronze was missing before)
+- All food items working (velvet, chocolate, carrot pie & 3 metal apples)
+- Ruby tools autosmelter working
+- Swords working (speeds / dmg still need testing)
+- Harvest level (temporarily?) removed from tooltips on tools
+- Horse armor and shields currently not present in 1.20 versions

MORES-TODO.txt

@@ -1,3 +1,4 @@
 check block xp values
 fix horse armor
-fix foods
+bronze armor trim?
+add vanilla mOres weapons

src/main/java/mod/leronus/mores/datagen/ModItemTagProvider.java

@@ -1,5 +1,6 @@
 package mod.leronus.mores.datagen;
 
+import mod.leronus.mores.block.ModBlocks;
 import mod.leronus.mores.item.ModItems;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
@@ -15,35 +16,35 @@ public ModItemTagProvider(FabricDataOutput output, CompletableFuture<RegistryWra
 
     @Override
     protected void configure(RegistryWrapper.WrapperLookup arg) {
-//        getOrCreateTagBuilder(ItemTags.TRIMMABLE_ARMOR)
-//                .add(
-//                        ModItems.SILVER_HELMET, ModItems.SILVER_CHESTPLATE, ModItems.SILVER_LEGGINGS, ModItems.SILVER_BOOTS,
-//                        ModItems.COPPER_HELMET, ModItems.COPPER_CHESTPLATE, ModItems.COPPER_LEGGINGS, ModItems.COPPER_BOOTS,
-//                        ModItems.BRONZE_HELMET, ModItems.BRONZE_CHESTPLATE, ModItems.BRONZE_LEGGINGS, ModItems.BRONZE_BOOTS,
-//                        ModItems.TIN_HELMET, ModItems.TIN_CHESTPLATE, ModItems.TIN_LEGGINGS, ModItems.TIN_BOOTS,
-//                        ModItems.STERLING_HELMET, ModItems.STERLING_CHESTPLATE, ModItems.STERLING_LEGGINGS, ModItems.STERLING_BOOTS,
-//                        ModItems.STEEL_HELMET, ModItems.STEEL_CHESTPLATE, ModItems.STEEL_LEGGINGS, ModItems.STEEL_BOOTS,
-//                        ModItems.AMETHYST_HELMET, ModItems.AMETHYST_CHESTPLATE, ModItems.AMETHYST_LEGGINGS, ModItems.AMETHYST_BOOTS,
-//                        ModItems.EMERALD_HELMET, ModItems.EMERALD_CHESTPLATE, ModItems.EMERALD_LEGGINGS, ModItems.EMERALD_BOOTS,
-//                        ModItems.TOURMALINE_HELMET, ModItems.TOURMALINE_CHESTPLATE, ModItems.TOURMALINE_LEGGINGS, ModItems.TOURMALINE_BOOTS,
-//                        ModItems.TOPAZ_HELMET, ModItems.TOPAZ_CHESTPLATE, ModItems.TOPAZ_LEGGINGS, ModItems.TOPAZ_BOOTS,
-//                        ModItems.RUBY_HELMET, ModItems.RUBY_CHESTPLATE, ModItems.RUBY_LEGGINGS, ModItems.RUBY_BOOTS,
-//                        ModItems.SAPPHIRE_HELMET, ModItems.SAPPHIRE_CHESTPLATE, ModItems.SAPPHIRE_LEGGINGS, ModItems.SAPPHIRE_BOOTS,
-//                        ModItems.TANZANITE_HELMET, ModItems.TANZANITE_CHESTPLATE, ModItems.TANZANITE_LEGGINGS, ModItems.TANZANITE_BOOTS,
-//                        ModItems.TURQUOISE_HELMET, ModItems.TURQUOISE_CHESTPLATE, ModItems.TURQUOISE_LEGGINGS, ModItems.TURQUOISE_BOOTS,
-//                        ModItems.MOISSANITE_HELMET, ModItems.MOISSANITE_CHESTPLATE, ModItems.MOISSANITE_LEGGINGS, ModItems.MOISSANITE_BOOTS,
-//                        ModItems.ONYX_HELMET, ModItems.ONYX_CHESTPLATE, ModItems.ONYX_LEGGINGS, ModItems.ONYX_BOOTS,
-//                        ModItems.GRAPHENE_HELMET, ModItems.GRAPHENE_CHESTPLATE, ModItems.GRAPHENE_LEGGINGS, ModItems.GRAPHENE_BOOTS
-//                     );
-
-//        getOrCreateTagBuilder(ItemTags.MUSIC_DISCS)
-//                .add(ModItems.SWEET_CAROLINE_MUSIC_DISC);
-
-//        getOrCreateTagBuilder(ItemTags.IRON_ORES)
-//                .add(ModBlocks.SILVER_ORE.asItem());
-//
-//        getOrCreateTagBuilder(ItemTags.DIAMOND_ORES)
-//                .add(ModBlocks.TURQUOISE_ORE.asItem());
-//
+        getOrCreateTagBuilder(ItemTags.TRIMMABLE_ARMOR)
+                .add(
+                        ModItems.SILVER_HELMET, ModItems.SILVER_CHESTPLATE, ModItems.SILVER_LEGGINGS, ModItems.SILVER_BOOTS,
+                        ModItems.COPPER_HELMET, ModItems.COPPER_CHESTPLATE, ModItems.COPPER_LEGGINGS, ModItems.COPPER_BOOTS,
+                        ModItems.BRONZE_HELMET, ModItems.BRONZE_CHESTPLATE, ModItems.BRONZE_LEGGINGS, ModItems.BRONZE_BOOTS,
+                        ModItems.TIN_HELMET, ModItems.TIN_CHESTPLATE, ModItems.TIN_LEGGINGS, ModItems.TIN_BOOTS,
+                        ModItems.STERLING_HELMET, ModItems.STERLING_CHESTPLATE, ModItems.STERLING_LEGGINGS, ModItems.STERLING_BOOTS,
+                        ModItems.STEEL_HELMET, ModItems.STEEL_CHESTPLATE, ModItems.STEEL_LEGGINGS, ModItems.STEEL_BOOTS,
+                        ModItems.AMETHYST_HELMET, ModItems.AMETHYST_CHESTPLATE, ModItems.AMETHYST_LEGGINGS, ModItems.AMETHYST_BOOTS,
+                        ModItems.EMERALD_HELMET, ModItems.EMERALD_CHESTPLATE, ModItems.EMERALD_LEGGINGS, ModItems.EMERALD_BOOTS,
+                        ModItems.TOURMALINE_HELMET, ModItems.TOURMALINE_CHESTPLATE, ModItems.TOURMALINE_LEGGINGS, ModItems.TOURMALINE_BOOTS,
+                        ModItems.TOPAZ_HELMET, ModItems.TOPAZ_CHESTPLATE, ModItems.TOPAZ_LEGGINGS, ModItems.TOPAZ_BOOTS,
+                        ModItems.RUBY_HELMET, ModItems.RUBY_CHESTPLATE, ModItems.RUBY_LEGGINGS, ModItems.RUBY_BOOTS,
+                        ModItems.SAPPHIRE_HELMET, ModItems.SAPPHIRE_CHESTPLATE, ModItems.SAPPHIRE_LEGGINGS, ModItems.SAPPHIRE_BOOTS,
+                        ModItems.TANZANITE_HELMET, ModItems.TANZANITE_CHESTPLATE, ModItems.TANZANITE_LEGGINGS, ModItems.TANZANITE_BOOTS,
+                        ModItems.TURQUOISE_HELMET, ModItems.TURQUOISE_CHESTPLATE, ModItems.TURQUOISE_LEGGINGS, ModItems.TURQUOISE_BOOTS,
+                        ModItems.MOISSANITE_HELMET, ModItems.MOISSANITE_CHESTPLATE, ModItems.MOISSANITE_LEGGINGS, ModItems.MOISSANITE_BOOTS,
+                        ModItems.ONYX_HELMET, ModItems.ONYX_CHESTPLATE, ModItems.ONYX_LEGGINGS, ModItems.ONYX_BOOTS,
+                        ModItems.GRAPHENE_HELMET, ModItems.GRAPHENE_CHESTPLATE, ModItems.GRAPHENE_LEGGINGS, ModItems.GRAPHENE_BOOTS
+                     );
+
+        getOrCreateTagBuilder(ItemTags.MUSIC_DISCS)
+                .add(ModItems.SWEET_CAROLINE_MUSIC_DISC, ModItems.CIPHER_DISC);
+
+        getOrCreateTagBuilder(ItemTags.IRON_ORES)
+                .add(ModBlocks.SILVER_ORE.asItem());
+
+        getOrCreateTagBuilder(ItemTags.DIAMOND_ORES)
+                .add(ModBlocks.TURQUOISE_ORE.asItem());
+
     }
 }

src/main/java/mod/leronus/mores/datagen/ModModelProvider.java

@@ -435,18 +435,19 @@ public void generateItemModels(ItemModelGenerator itemModelGenerator) {
 
         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);
 //        itemModelGenerator.register(ModItems.DUCK_EGG, Models.GENERATED);
-//        itemModelGenerator.register(ModItems.SWEET_CAROLINE_MUSIC_DISC, Models.GENERATED);
+        itemModelGenerator.register(ModItems.SWEET_CAROLINE_MUSIC_DISC, Models.GENERATED);
+        itemModelGenerator.register(ModItems.CIPHER_DISC, Models.GENERATED);
 
 //        itemModelGenerator.register(ModItems.DUCK_SPAWN_EGG,
 //                new Model(Optional.of(new Identifier("item/template_spawn_egg")), Optional.empty()));

src/main/java/mod/leronus/mores/item/ModFoodComponents.java

@@ -1,18 +1,18 @@
 package mod.leronus.mores.item;
 
+import net.minecraft.component.type.FoodComponent;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.effect.StatusEffects;
-//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().nutrition(4).saturationModifier(0.8f).build();
+    public static final FoodComponent CARROT_PIE = new FoodComponent.Builder().nutrition(5).saturationModifier(0.4f).build();
+    public static final FoodComponent VELVET = new FoodComponent.Builder().nutrition(5).saturationModifier(0.4f).build();
+
+    public static final FoodComponent SILVER_APPLE = new FoodComponent.Builder().nutrition(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().nutrition(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().nutrition(5).saturationModifier(0.4f)
+            .statusEffect(new StatusEffectInstance(StatusEffects.HASTE, 400), 0.25f).statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 200), 0.25f).build();
 }

src/main/java/mod/leronus/mores/item/ModItemGroups.java

@@ -421,19 +421,19 @@ public class ModItemGroups {
 //                        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 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"),