1.21 Update I

 - Updated to 1.21
 - Continued Enchantment Rework

build.gradle

@@ -59,7 +59,7 @@ dependencies {
 
     // Clumps
     //modImplementation "com.blamejared.clumps:Clumps-fabric-${project.minecraft_version}:${project.clumps_version}"
-    modImplementation "com.blamejared.clumps:Clumps-fabric-1.20.6:${project.clumps_version}"
+    modImplementation "com.blamejared.clumps:Clumps-fabric-1.21:${project.clumps_version}"
 
     // Ranged Weapon API
     //modImplementation "maven.modrinth:ranged-weapon-api:${project.ranged_weapon_api_version}"

gradle.properties

@@ -1,11 +1,11 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
-org.gradle.parallel=true
+    org.gradle.jvmargs=-Xmx1G
+    org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
-    minecraft_version=24w21b
-    yarn_mappings=24w21b+build.5
+    minecraft_version=1.21
+    yarn_mappings=1.21+build.7
     fabric_loader_version=0.15.11
 
 # Mod Properties
@@ -16,9 +16,9 @@ org.gradle.parallel=true
 # Dependencies
 # check this on https://fabricmc.net/develop/
     #fabricKotlinVersion = 1.10.18+kotlin.1.9.22
-    fabric_version=0.99.1+1.21
-    fzzy_config=0.3.3+24w21b
+    fabric_version=0.100.4+1.21
+    fzzy_config=0.3.5+1.21
 
 # Compatibility
-    clumps_version=17.0.0.1
+    clumps_version=18.0.0.1
     #ranged_weapon_api_version=1.1.1+1.20.1

src/main/java/dev/timefall/mcdw/Mcdw.java

@@ -9,7 +9,7 @@
 import dev.timefall.mcdw.configs.CompatibilityFlags;
 import dev.timefall.mcdw.data.ConfigEnchantmentEnabledCondition;
 import dev.timefall.mcdw.data.ConfigItemEnabledCondition;
-import dev.timefall.mcdw.enchants.EnchantmentIds;
+import dev.timefall.mcdw.enchantment.EnchantmentIds;
 import dev.timefall.mcdw.registries.*;
 import dev.timefall.mcdw.registries.items.*;
 import net.fabricmc.api.ModInitializer;

src/main/java/dev/timefall/mcdw/api/interfaces/IMcdwDrawSpeed.java

@@ -0,0 +1,12 @@
+/*
+ * Timefall Development License 1.2
+ * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved.
+ *
+ * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt
+ */
+
+package dev.timefall.mcdw.api.interfaces;
+
+public interface IMcdwDrawSpeed {
+    float getDrawSpeed();
+}

src/main/java/dev/timefall/mcdw/bases/McdwAxeItem.java

@@ -11,12 +11,12 @@
 import dev.timefall.mcdw.registries.ItemGroupRegistry;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.minecraft.block.BlockState;
-import net.minecraft.client.item.TooltipType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.AxeItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ToolMaterial;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;

src/main/java/dev/timefall/mcdw/bases/McdwBowItem.java

@@ -7,12 +7,13 @@
  */
 package dev.timefall.mcdw.bases;
 
+import dev.timefall.mcdw.api.interfaces.IMcdwDrawSpeed;
 import dev.timefall.mcdw.api.util.CleanlinessHelper;
 import dev.timefall.mcdw.configs.stats.IMcdwWeaponStats;
 import dev.timefall.mcdw.registries.ItemGroupRegistry;
 import dev.timefall.mcdw.registries.items.McdwBowItemRegistry;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
-import net.minecraft.client.item.TooltipType;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.item.BowItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -26,7 +27,7 @@
 import static dev.timefall.mcdw.api.util.RangedAttackHelper.getVanillaBowChargeTime;
 
 @SuppressWarnings("UnusedAssignment")
-public class McdwBowItem extends BowItem {
+public class McdwBowItem extends BowItem implements IMcdwDrawSpeed {
 
     private final ToolMaterial material;
     IMcdwWeaponStats.RangedStats itemStats;
@@ -46,6 +47,7 @@ public McdwBowItem(IMcdwWeaponStats.RangedStats itemStats, ToolMaterial material
         ItemGroupEvents.modifyEntriesEvent(ItemGroupRegistry.RANGED).register(entries -> entries.add(this.getDefaultStack()));
     }
 
+    @Override
     public float getDrawSpeed() {
         return Math.max(0, drawSpeed);
     }

src/main/java/dev/timefall/mcdw/bases/McdwCrossbowItem.java

@@ -6,18 +6,19 @@
  */
 package dev.timefall.mcdw.bases;
 
+import dev.timefall.mcdw.api.interfaces.IMcdwDrawSpeed;
 import dev.timefall.mcdw.api.util.CleanlinessHelper;
 import dev.timefall.mcdw.configs.stats.IMcdwWeaponStats;
 import dev.timefall.mcdw.registries.ItemGroupRegistry;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
-import net.minecraft.client.item.TooltipType;
 import net.minecraft.component.type.ChargedProjectilesComponent;
 import net.minecraft.item.*;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.text.Text;
 
 import java.util.List;
 
-public class McdwCrossbowItem extends CrossbowItem {
+public class McdwCrossbowItem extends CrossbowItem implements IMcdwDrawSpeed {
 
     private final ToolMaterial material;
     IMcdwWeaponStats.RangedStats itemStats;
@@ -53,7 +54,8 @@ public boolean canRepair(ItemStack stack, ItemStack ingredient) {
         return itemStats.repairIngredient.toIngredient().test(ingredient);
     }
 
-    public int getDrawSpeed() {
+    @Override
+    public float getDrawSpeed() {
         return this.drawSpeed;
     }
 

src/main/java/dev/timefall/mcdw/bases/McdwDaggerItem.java

@@ -11,7 +11,7 @@
 import dev.timefall.mcdw.configs.stats.IMcdwWeaponStats;
 import dev.timefall.mcdw.registries.ItemGroupRegistry;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
-import net.minecraft.client.item.TooltipType;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

src/main/java/dev/timefall/mcdw/bases/McdwDoubleAxeItem.java

@@ -11,7 +11,7 @@
 import dev.timefall.mcdw.registries.ItemGroupRegistry;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.minecraft.block.BlockState;
-import net.minecraft.client.item.TooltipType;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.AxeItem;
 import net.minecraft.item.Item;

src/main/java/dev/timefall/mcdw/bases/McdwGauntletItem.java

@@ -11,7 +11,7 @@
 import dev.timefall.mcdw.configs.stats.IMcdwWeaponStats;
 import dev.timefall.mcdw.registries.ItemGroupRegistry;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
-import net.minecraft.client.item.TooltipType;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

src/main/java/dev/timefall/mcdw/bases/McdwGlaiveItem.java

@@ -10,7 +10,7 @@
 import dev.timefall.mcdw.configs.stats.IMcdwWeaponStats;
 import dev.timefall.mcdw.registries.ItemGroupRegistry;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
-import net.minecraft.client.item.TooltipType;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.SwordItem;

src/main/java/dev/timefall/mcdw/bases/McdwHammerItem.java

@@ -10,7 +10,7 @@
 import dev.timefall.mcdw.configs.stats.IMcdwWeaponStats;
 import dev.timefall.mcdw.registries.ItemGroupRegistry;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
-import net.minecraft.client.item.TooltipType;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.MaceItem;

src/main/java/dev/timefall/mcdw/bases/McdwLongbowItem.java

@@ -7,11 +7,12 @@
  */
 package dev.timefall.mcdw.bases;
 
+import dev.timefall.mcdw.api.interfaces.IMcdwDrawSpeed;
 import dev.timefall.mcdw.api.util.CleanlinessHelper;
 import dev.timefall.mcdw.configs.stats.IMcdwWeaponStats;
 import dev.timefall.mcdw.registries.ItemGroupRegistry;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
-import net.minecraft.client.item.TooltipType;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.item.BowItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -22,7 +23,7 @@
 import java.util.List;
 
 // TODO Question: Should this extend BowItem or McdwBowItem?
-public class McdwLongbowItem extends BowItem {
+public class McdwLongbowItem extends BowItem implements IMcdwDrawSpeed {
 
     private final ToolMaterial material;
     IMcdwWeaponStats.RangedStats itemStats;
@@ -42,12 +43,11 @@ public McdwLongbowItem(IMcdwWeaponStats.RangedStats itemStats, ToolMaterial mate
         ItemGroupEvents.modifyEntriesEvent(ItemGroupRegistry.RANGED).register(entries -> entries.add(this.getDefaultStack()));
     }
 
+    @Override
     public float getDrawSpeed() {
         return Math.max(0, drawSpeed);
     }
 
-
-
     @Override
     public int getRange() {
         return this.maxBowRange;

src/main/java/dev/timefall/mcdw/bases/McdwPickaxeItem.java

@@ -10,7 +10,7 @@
 import dev.timefall.mcdw.configs.stats.IMcdwWeaponStats;
 import dev.timefall.mcdw.registries.ItemGroupRegistry;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
-import net.minecraft.client.item.TooltipType;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.PickaxeItem;

src/main/java/dev/timefall/mcdw/bases/McdwScytheItem.java

@@ -10,7 +10,7 @@
 import dev.timefall.mcdw.configs.stats.IMcdwWeaponStats;
 import dev.timefall.mcdw.registries.ItemGroupRegistry;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
-import net.minecraft.client.item.TooltipType;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.SwordItem;

src/main/java/dev/timefall/mcdw/bases/McdwShortbowItem.java

@@ -7,11 +7,12 @@
  */
 package dev.timefall.mcdw.bases;
 
+import dev.timefall.mcdw.api.interfaces.IMcdwDrawSpeed;
 import dev.timefall.mcdw.api.util.CleanlinessHelper;
 import dev.timefall.mcdw.configs.stats.IMcdwWeaponStats;
 import dev.timefall.mcdw.registries.ItemGroupRegistry;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
-import net.minecraft.client.item.TooltipType;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.item.BowItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -22,7 +23,7 @@
 import java.util.List;
 
 // TODO Question: Should this extend BowItem or McdwBowItem?
-public class McdwShortbowItem extends BowItem {
+public class McdwShortbowItem extends BowItem implements IMcdwDrawSpeed {
 
     private final ToolMaterial material;
     IMcdwWeaponStats.RangedStats itemStats;
@@ -42,6 +43,7 @@ public McdwShortbowItem(IMcdwWeaponStats.RangedStats itemStats, ToolMaterial mat
         ItemGroupEvents.modifyEntriesEvent(ItemGroupRegistry.RANGED).register(entries -> entries.add(this.getDefaultStack()));
     }
 
+    @Override
     public float getDrawSpeed() {
         return Math.max(0, drawSpeed);
     }

src/main/java/dev/timefall/mcdw/bases/McdwSickleItem.java

@@ -11,7 +11,7 @@
 import dev.timefall.mcdw.configs.stats.IMcdwWeaponStats;
 import dev.timefall.mcdw.registries.ItemGroupRegistry;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
-import net.minecraft.client.item.TooltipType;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

src/main/java/dev/timefall/mcdw/bases/McdwSoulDaggerItem.java

@@ -10,7 +10,7 @@
 import dev.timefall.mcdw.configs.stats.IMcdwWeaponStats;
 import dev.timefall.mcdw.registries.ItemGroupRegistry;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
-import net.minecraft.client.item.TooltipType;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.SwordItem;

src/main/java/dev/timefall/mcdw/bases/McdwSpearItem.java

@@ -11,7 +11,7 @@
 import dev.timefall.mcdw.registries.ItemGroupRegistry;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.minecraft.block.BlockState;
-import net.minecraft.client.item.TooltipType;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

src/main/java/dev/timefall/mcdw/bases/McdwStaffItem.java

@@ -11,7 +11,7 @@
 import dev.timefall.mcdw.registries.ItemGroupRegistry;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.minecraft.block.BlockState;
-import net.minecraft.client.item.TooltipType;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;

src/main/java/dev/timefall/mcdw/bases/McdwSwordItem.java

@@ -18,7 +18,7 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Oxidizable;
 import net.minecraft.block.PillarBlock;
-import net.minecraft.client.item.TooltipType;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.*;

src/main/java/dev/timefall/mcdw/bases/McdwWhipItem.java

@@ -11,7 +11,7 @@
 import dev.timefall.mcdw.registries.ItemGroupRegistry;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.minecraft.block.BlockState;
-import net.minecraft.client.item.TooltipType;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ToolMaterial;

src/main/java/dev/timefall/mcdw/component/McdwEffectComponentTypes.java

@@ -8,12 +8,12 @@
 package dev.timefall.mcdw.component;
 
 import dev.timefall.mcdw.Mcdw;
-import dev.timefall.mcdw.enchants.effect.EntityAwareValueEffectType;
+import dev.timefall.mcdw.enchantment.effect.EntityAwareValueEffect;
 import net.minecraft.component.ComponentType;
 import net.minecraft.enchantment.effect.EnchantmentEffectEntry;
-import net.minecraft.enchantment.effect.EnchantmentEntityEffectType;
-import net.minecraft.enchantment.effect.EnchantmentValueEffectType;
-import net.minecraft.enchantment.effect.TargetedEnchantmentEffectType;
+import net.minecraft.enchantment.effect.EnchantmentEntityEffect;
+import net.minecraft.enchantment.effect.EnchantmentValueEffect;
+import net.minecraft.enchantment.effect.TargetedEnchantmentEffect;
 import net.minecraft.loot.context.LootContextTypes;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
@@ -23,12 +23,12 @@
 
 public class McdwEffectComponentTypes {
 
-    public static final ComponentType<EntityAwareValueEffectType> ACCELERATE_CHARGE_TIME = register("accelerate_charge_time", builder -> builder.codec(EntityAwareValueEffectType.CODEC));
-    public static final ComponentType<List<EnchantmentEffectEntry<EntityAwareValueEffectType>>> ENTITY_AWARE_DAMAGE = register("entity_aware_damage", builder -> builder.codec(EnchantmentEffectEntry.createCodec(EntityAwareValueEffectType.CODEC, LootContextTypes.ENCHANTED_DAMAGE).listOf()));
-    public static final ComponentType<List<EnchantmentEffectEntry<EnchantmentEntityEffectType>>> ON_JUMP = register("on_jump", builder -> builder.codec(EnchantmentEffectEntry.createCodec(EnchantmentEntityEffectType.CODEC, LootContextTypes.ENCHANTED_ENTITY).listOf()));
-    public static final ComponentType<List<TargetedEnchantmentEffectType<EnchantmentEntityEffectType>>> POST_DEATH = register("post_death", builder -> builder.codec(TargetedEnchantmentEffectType.createPostAttackCodec(EnchantmentEntityEffectType.CODEC, LootContextTypes.ENCHANTED_DAMAGE).listOf()));
-    public static final ComponentType<List<EnchantmentEffectEntry<EnchantmentValueEffectType>>> XP_REPAIR_PLAYER = register("xp_repair_player", builder -> builder.codec(EnchantmentEffectEntry.createCodec(EnchantmentValueEffectType.CODEC, LootContextTypes.ENCHANTED_ENTITY).listOf()));
-
+    public static final ComponentType<EntityAwareValueEffect> ACCELERATE_CHARGE_TIME = register("accelerate_charge_time", builder -> builder.codec(EntityAwareValueEffect.CODEC));
+    public static final ComponentType<EnchantmentEntityEffect> ACCELERATE_BOW_CHARGED = register("accelerate_bow_charged", builder -> builder.codec(EnchantmentEntityEffect.CODEC));
+    public static final ComponentType<List<EnchantmentEffectEntry<EntityAwareValueEffect>>> ENTITY_AWARE_DAMAGE = register("entity_aware_damage", builder -> builder.codec(EnchantmentEffectEntry.createCodec(EntityAwareValueEffect.CODEC, LootContextTypes.ENCHANTED_DAMAGE).listOf()));
+    public static final ComponentType<List<EnchantmentEffectEntry<EnchantmentEntityEffect>>> ON_JUMP = register("on_jump", builder -> builder.codec(EnchantmentEffectEntry.createCodec(EnchantmentEntityEffect.CODEC, LootContextTypes.ENCHANTED_ENTITY).listOf()));
+    public static final ComponentType<List<TargetedEnchantmentEffect<EnchantmentEntityEffect>>> POST_DEATH = register("post_death", builder -> builder.codec(TargetedEnchantmentEffect.createPostAttackCodec(EnchantmentEntityEffect.CODEC, LootContextTypes.ENCHANTED_DAMAGE).listOf()));
+    public static final ComponentType<List<EnchantmentEffectEntry<EnchantmentValueEffect>>> XP_REPAIR_PLAYER = register("xp_repair_player", builder -> builder.codec(EnchantmentEffectEntry.createCodec(EnchantmentValueEffect.CODEC, LootContextTypes.ENCHANTED_ENTITY).listOf()));
 
     private static <T> ComponentType<T> register(String id, UnaryOperator<ComponentType.Builder<T>> builderOperator) {
         return Registry.register(Registries.ENCHANTMENT_EFFECT_COMPONENT_TYPE, Mcdw.ID(id), (builderOperator.apply(ComponentType.builder())).build());

src/main/java/dev/timefall/mcdw/configs/McdwEnchantmentSettingsConfig.java

@@ -8,7 +8,7 @@
 package dev.timefall.mcdw.configs;
 
 import dev.timefall.mcdw.Mcdw;
-import dev.timefall.mcdw.enchants.EnchantmentIds;
+import dev.timefall.mcdw.enchantment.EnchantmentIds;
 import me.fzzyhmstrs.fzzy_config.annotations.IgnoreVisibility;
 import me.fzzyhmstrs.fzzy_config.api.ConfigApi;
 import me.fzzyhmstrs.fzzy_config.config.Config;

src/main/java/dev/timefall/mcdw/configs/stats/McdwWeaponStatsConfig.java

@@ -16,8 +16,6 @@
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.ApiStatus;
 
-import java.beans.Transient;
-import java.util.IdentityHashMap;
 import java.util.LinkedHashMap;
 import java.util.function.Supplier;
 

src/main/java/dev/timefall/mcdw/data/ConfigItemEnabledCondition.java

@@ -10,7 +10,6 @@
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import dev.timefall.mcdw.Mcdw;
-import dev.timefall.mcdw.configs.McdwEnchantmentSettingsConfig;
 import dev.timefall.mcdw.configs.stats.McdwWeaponStatsConfig;
 import net.fabricmc.fabric.api.resource.conditions.v1.ResourceCondition;
 import net.fabricmc.fabric.api.resource.conditions.v1.ResourceConditionType;