Update to 1.21

MOJANG DELETED THE ENCHANTMENT CLASS! This update completely rebuilds the entire Combat+ enchantment infrastructure from the ground up.

All enchantment types from Combat+ have been removed, their tags are still there and should be used instead. Exclusive-set tags have also been added.

Combat+ enchantment hooks have been remade as components that act the same way. Combat+ components take two entities and are heavily inspired by Apoli's bientity actions. Combat+ now also implements double entity conditions (also inspired by Apoli) and a small collection of single/double enchantment conditions to aid modders (and datapack makers now, I guess) in creating unique enchantments.

Combat+ now also implements a data generator for enchantments and several registries (including one that allows enchantment to perform code execution).

Author: Provismet

gradle.properties

@@ -4,16 +4,16 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.6
-yarn_mappings=1.20.6+build.1
+minecraft_version=1.21
+yarn_mappings=1.21+build.2
 loader_version=0.15.11
 
 # Mod Properties
-mod_version=2.0.1
+mod_version=3.0.0
 maven_group=com.provismet
 archives_base_name=combatplus-core
 modid=combat-plus-core
 
 # Dependencies
-fabric_version=0.98.0+1.20.6
-lilylib_version=1.1.3-mc1.20.6
+fabric_version=0.100.1+1.21
+lilylib_version=1.1.3-mc1.21

src/main/generated/data/c/tags/items/enchantables.json src/main/generated/data/c/tags/item/enchantables.json

@@ -0,0 +1,51 @@
+{
+  "fabric:load_conditions": [
+    {
+      "condition": "combat-plus:developer_mode"
+    }
+  ],
+  "anvil_cost": 1,
+  "description": {
+    "translate": "enchantment.combat-plus.logger"
+  },
+  "effects": {
+    "combat-plus:post_charged_attack": [
+      {
+        "effect": {
+          "type": "combat-plus:code_execution_double_entity",
+          "function": "combat-plus:log-charged"
+        }
+      }
+    ],
+    "combat-plus:post_critical_attack": [
+      {
+        "effect": {
+          "type": "combat-plus:code_execution_double_entity",
+          "function": "combat-plus:log-critical"
+        }
+      }
+    ],
+    "combat-plus:post_kill": [
+      {
+        "effect": {
+          "type": "combat-plus:code_execution_double_entity",
+          "function": "combat-plus:log-kill"
+        }
+      }
+    ]
+  },
+  "max_cost": {
+    "base": 1,
+    "per_level_above_first": 0
+  },
+  "max_level": 1,
+  "min_cost": {
+    "base": 1,
+    "per_level_above_first": 0
+  },
+  "slots": [
+    "mainhand"
+  ],
+  "supported_items": "#combat-plus:enchantable/damage",
+  "weight": 1
+}

src/main/generated/data/c/tags/items/tools/melee_weapons.json src/main/generated/data/c/tags/item/tools/melee_weapon.json

@@ -0,0 +1,12 @@
+{
+  "values": [
+    {
+      "id": "#combat-plus:additional_damage",
+      "required": false
+    },
+    {
+      "id": "#combat-plus:offhand",
+      "required": false
+    }
+  ]
+}

src/main/generated/data/combat-plus/enchantment/logger.json

@@ -0,0 +1,12 @@
+{
+  "values": [
+    {
+      "id": "#combat-plus:exclusive_set/aspect_offhand",
+      "required": false
+    },
+    {
+      "id": "#combat-plus:offhand",
+      "required": false
+    }
+  ]
+}

src/main/generated/data/combat-plus/tags/enchantment/exclusive_set/additional_damage.json

@@ -1,7 +1,7 @@
 {
   "values": [
     {
-      "id": "#minecraft:axes",
+      "id": "#combat-plus:aspect",
       "required": false
     }
   ]

src/main/generated/data/combat-plus/tags/enchantment/exclusive_set/aspect.json

@@ -0,0 +1,12 @@
+{
+  "values": [
+    {
+      "id": "#combat-plus:additional_damage",
+      "required": false
+    },
+    {
+      "id": "#c:weapon_damage_enhancements",
+      "required": false
+    }
+  ]
+}

src/main/generated/data/combat-plus/tags/items/breaks_shields.json src/main/generated/data/combat-plus/tags/enchantment/exclusive_set/aspect_offhand.json

@@ -0,0 +1,12 @@
+{
+  "values": [
+    {
+      "id": "#combat-plus:offhand",
+      "required": false
+    },
+    {
+      "id": "#combat-plus:exclusive_set/weapon_utility_offhand",
+      "required": false
+    }
+  ]
+}

src/main/generated/data/combat-plus/tags/enchantment/exclusive_set/offhand.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "#combat-plus:weapon_utility",
+      "required": false
+    }
+  ]
+}

src/main/generated/data/combat-plus/tags/enchantment/exclusive_set/weapon_utility.json

@@ -1,5 +1,6 @@
 {
   "values": [
-    "minecraft:sweeping_edge"
+    "minecraft:sweeping_edge",
+    "minecraft:wind_burst"
   ]
 }

src/main/generated/data/combat-plus/tags/enchantment/exclusive_set/weapon_utility_offhand.json

@@ -0,0 +1,12 @@
+{
+  "values": [
+    {
+      "id": "#minecraft:axes",
+      "required": false
+    },
+    {
+      "id": "combat-plus:debugger",
+      "required": false
+    }
+  ]
+}

src/main/generated/data/combat-plus/tags/enchantment/weapon_utility.json

@@ -7,6 +7,7 @@
     {
       "id": "#minecraft:axes",
       "required": false
-    }
+    },
+    "minecraft:mace"
   ]
 }

src/main/generated/data/combat-plus/tags/item/breaks_shields.json

@@ -0,0 +1,12 @@
+{
+  "values": [
+    {
+      "id": "#combat-plus:additional_damage",
+      "required": false
+    },
+    {
+      "id": "#combat-plus:offhand",
+      "required": false
+    }
+  ]
+}

src/main/generated/data/combat-plus/tags/items/dual_weapon.json src/main/generated/data/combat-plus/tags/item/dual_weapon.json

@@ -1,15 +1,22 @@
 package com.provismet.CombatPlusCore;
 
-import com.provismet.CombatPlusCore.debug.registries.CPCDebugEnchantments;
 import com.provismet.CombatPlusCore.debug.registries.CPCDebugItems;
-import com.provismet.CombatPlusCore.utility.CPCItemGroups;
+import com.provismet.CombatPlusCore.enchantment.component.CPCEnchantmentComponents;
+import com.provismet.CombatPlusCore.registries.CPCDoubleEntityLootConditionTypes;
+import com.provismet.CombatPlusCore.registries.CPCEnchantmentDoubleEntityEffects;
+import com.provismet.CombatPlusCore.registries.CPCEnchantmentSingleEntityEffects;
+import com.provismet.CombatPlusCore.registries.CPCSingleEntityLootConditionTypes;
+import com.provismet.CombatPlusCore.registries.LambdaRegistry;
+import com.provismet.CombatPlusCore.utility.item.CPCItemGroups;
+import com.provismet.CombatPlusCore.utility.CPCRegistries;
+import com.provismet.CombatPlusCore.utility.resource.CPCResourceConditions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.provismet.CombatPlusCore.api.CombatPlusEntrypoint;
 import com.provismet.CombatPlusCore.interfaces.mixin.IMixinItemStack;
 import com.provismet.CombatPlusCore.utility.CPCEnchantmentHelper;
-import com.provismet.CombatPlusCore.utility.CombatGameRules;
+import com.provismet.CombatPlusCore.utility.CPCGameRules;
 
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.entity.event.v1.ServerEntityCombatEvents;
@@ -28,19 +35,26 @@ public static Identifier identifier (String path) {
 
     @Override
     public void onInitialize () {
-        CombatGameRules.register();
+        CPCRegistries.init();
+        CPCEnchantmentComponents.init();
+        CPCSingleEntityLootConditionTypes.init();
+        CPCDoubleEntityLootConditionTypes.init();
+        CPCResourceConditions.register();
+        CPCEnchantmentDoubleEntityEffects.register();
+        LambdaRegistry.register();
+        CPCGameRules.register();
         CPCItemGroups.register();
+        CPCEnchantmentSingleEntityEffects.register();
 
         if (FabricLoader.getInstance().isDevelopmentEnvironment()) {
             LOGGER.warn("Combat+ Core development code is running. If you see this, you should be in a development environment.");
             CPCDebugItems.register();
-            CPCDebugEnchantments.register();
         }
 
         ServerEntityCombatEvents.AFTER_KILLED_OTHER_ENTITY.register((world, entity, target) -> {
             if (entity instanceof LivingEntity user) {
                 ((IMixinItemStack)(Object)user.getMainHandStack()).CPC_postKill(user, target);
-                CPCEnchantmentHelper.postKill(user, target, EquipmentSlot.MAINHAND);
+                CPCEnchantmentHelper.postKill(world, user, target, EquipmentSlot.MAINHAND);
             }
         });
 

src/main/generated/data/combat-plus/tags/items/enchantable/aspect.json src/main/generated/data/combat-plus/tags/item/enchantable/aspect.json

@@ -21,8 +21,8 @@ public DebuggerItem(Settings settings) {
 
     public static AttributeModifiersComponent createSimpleAttributes () {
         return AttributeModifiersComponent.builder()
-            .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, new EntityAttributeModifier(ATTACK_DAMAGE_MODIFIER_ID, "Weapon modifier", 3f, EntityAttributeModifier.Operation.ADD_VALUE), AttributeModifierSlot.MAINHAND)
-            .add(EntityAttributes.GENERIC_ATTACK_SPEED, new EntityAttributeModifier(ATTACK_SPEED_MODIFIER_ID, "Weapon modifier", -2.4f, EntityAttributeModifier.Operation.ADD_VALUE), AttributeModifierSlot.MAINHAND)
+            .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, new EntityAttributeModifier(BASE_ATTACK_DAMAGE_MODIFIER_ID, 3f, EntityAttributeModifier.Operation.ADD_VALUE), AttributeModifierSlot.MAINHAND)
+            .add(EntityAttributes.GENERIC_ATTACK_SPEED, new EntityAttributeModifier(BASE_ATTACK_SPEED_MODIFIER_ID, -2.4f, EntityAttributeModifier.Operation.ADD_VALUE), AttributeModifierSlot.MAINHAND)
             .build();
     }
 

src/main/generated/data/combat-plus/tags/items/enchantable/aspect_primary.json src/main/generated/data/combat-plus/tags/item/enchantable/aspect_primary.json

@@ -0,0 +1,24 @@
+package com.provismet.CombatPlusCore.enchantment.component;
+
+import com.provismet.CombatPlusCore.CPCMain;
+import com.provismet.CombatPlusCore.enchantment.effect.CPCEnchantmentEntityEffect;
+import com.provismet.CombatPlusCore.enchantment.loot.context.CPCLootContextTypes;
+import net.minecraft.component.ComponentType;
+import net.minecraft.enchantment.effect.EnchantmentEffectEntry;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
+
+import java.util.List;
+import java.util.function.UnaryOperator;
+
+public class CPCEnchantmentComponents {
+    public static final ComponentType<List<EnchantmentEffectEntry<CPCEnchantmentEntityEffect>>> POST_CHARGED_ATTACK = register("post_charged_attack", builder -> builder.codec(EnchantmentEffectEntry.createCodec(CPCEnchantmentEntityEffect.CODEC, CPCLootContextTypes.DOUBLE_ENTITY).listOf()));
+    public static final ComponentType<List<EnchantmentEffectEntry<CPCEnchantmentEntityEffect>>> POST_CRITICAL_ATTACK = register("post_critical_attack", builder -> builder.codec(EnchantmentEffectEntry.createCodec(CPCEnchantmentEntityEffect.CODEC, CPCLootContextTypes.DOUBLE_ENTITY).listOf()));
+    public static final ComponentType<List<EnchantmentEffectEntry<CPCEnchantmentEntityEffect>>> POST_KILL = register("post_kill", builder -> builder.codec(EnchantmentEffectEntry.createCodec(CPCEnchantmentEntityEffect.CODEC, CPCLootContextTypes.DOUBLE_ENTITY).listOf()));
+
+    public static void init () {}
+
+    private static <T> ComponentType<T> register (String name, UnaryOperator<ComponentType.Builder<T>> builderOperator) {
+        return Registry.register(Registries.ENCHANTMENT_EFFECT_COMPONENT_TYPE, CPCMain.identifier(name), (builderOperator.apply(ComponentType.builder())).build());
+    }
+}

src/main/generated/data/combat-plus/tags/items/enchantable/damage.json src/main/generated/data/combat-plus/tags/item/enchantable/damage.json

@@ -0,0 +1,24 @@
+package com.provismet.CombatPlusCore.enchantment.effect;
+
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
+import com.provismet.CombatPlusCore.registries.CPCEnchantmentDoubleEntityEffects;
+import com.provismet.CombatPlusCore.utility.CPCRegistries;
+import net.minecraft.enchantment.EnchantmentEffectContext;
+import net.minecraft.entity.Entity;
+import net.minecraft.server.world.ServerWorld;
+
+import java.util.function.Function;
+
+/**
+ * Combat+ Enchantment Effect for effects that can look at both the attacker and the target simultaneously.
+ *
+ * @see CPCEnchantmentDoubleEntityEffects
+ */
+public interface CPCEnchantmentEntityEffect {
+    public static final Codec<CPCEnchantmentEntityEffect> CODEC = CPCRegistries.ENCHANTMENT_DUAL_ENTITY_EFFECT_TYPE.getCodec().dispatch(CPCEnchantmentEntityEffect::getCodec, Function.identity());
+
+    public void apply (ServerWorld world, int level, EnchantmentEffectContext context, Entity attacker, Entity target);
+
+    public MapCodec<? extends CPCEnchantmentEntityEffect> getCodec();
+}