Account for the various enchantment based changes

pupnewfster · pupnewfster · commit 8f603db01f2a · 2024-06-13T09:12:10.000-05:00
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ minecraft_version=1.21
 previous_minecraft_version=1.20.4
 previous_minor_minecraft_version=1.20.6
 loader_version_range=[4,)
-forge_version=21.0.0-alpha.1.21-rc1.20240612.183440
+forge_version=21.0.0-alpha.1.21-rc1.20240613.054156
 mod_version=10.5.20
 #This determines the minimum version of forge required to use Mekanism
 # Only bump it whenever we need access to a feature in forge that is not available in earlier versions
diff --git a/src/main/java/mekanism/common/item/gear/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/gear/ItemAtomicDisassembler.java
@@ -45,6 +45,7 @@
 import mekanism.common.util.MekanismUtils;
 import mekanism.common.util.StorageUtils;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.Holder;
 import net.minecraft.core.component.DataComponentType;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -292,7 +293,7 @@ public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
     }
 
     @Override
-    public boolean canApplyAtEnchantingTable(ItemStack stack, Enchantment enchantment) {
+    public boolean isPrimaryItemFor(ItemStack stack, Holder<Enchantment> enchantment) {
         return false;
     }
 
diff --git a/src/main/java/mekanism/common/item/gear/ItemElectricBow.java b/src/main/java/mekanism/common/item/gear/ItemElectricBow.java
@@ -1,6 +1,7 @@
 package mekanism.common.item.gear;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Consumer;
 import javax.annotation.Nullable;
 import mekanism.api.Action;
@@ -17,6 +18,8 @@
 import mekanism.common.util.StorageUtils;
 import mekanism.common.util.text.BooleanStateDisplay.OnOff;
 import net.minecraft.core.Holder;
+import net.minecraft.core.Holder.Reference;
+import net.minecraft.core.HolderLookup.RegistryLookup;
 import net.minecraft.core.component.DataComponentType;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerLevel;
@@ -74,11 +77,10 @@ protected void shoot(@NotNull ServerLevel world, @NotNull LivingEntity entity, @
     }
 
     @Override
-    public boolean canApplyAtEnchantingTable(@NotNull ItemStack stack, @NotNull Enchantment enchantment) {
+    public boolean isPrimaryItemFor(@NotNull ItemStack stack, @NotNull Holder<Enchantment> enchantment) {
         //Note: This stops application of it via enchanted books while in survival. We don't override isBookEnchantable as we don't care
         // if someone enchants it in creative and would rather not stop players from enchanting with books that have flame and power on them
-        //TODO - 1.21: Re-enable after https://github.com/neoforged/NeoForge/pull/1089
-        return /*enchantment != Enchantments.FLAME &&*/ super.canApplyAtEnchantingTable(stack, enchantment);
+        return !enchantment.is(Enchantments.FLAME) && super.isPrimaryItemFor(stack, enchantment);
     }
 
     @Override
@@ -93,14 +95,19 @@ public int getEnchantmentLevel(@NotNull ItemStack stack, @NotNull Holder<Enchant
 
     @NotNull
     @Override
-    public ItemEnchantments getAllEnchantments(@NotNull ItemStack stack) {
-        ItemEnchantments enchantments = super.getAllEnchantments(stack);
-        //TODO - 1.21: Re-enable after https://github.com/neoforged/NeoForge/pull/1089
-        /*if (getMode(stack) && enchantments.getLevel(Enchantments.FLAME) == 0) {
-            ItemEnchantments.Mutable mutable = new ItemEnchantments.Mutable(enchantments);
-            mutable.set(Enchantments.FLAME, 1);
-            return mutable.toImmutable();
-        }*/
+    public ItemEnchantments getAllEnchantments(@NotNull ItemStack stack, @NotNull RegistryLookup<Enchantment> lookup) {
+        ItemEnchantments enchantments = super.getAllEnchantments(stack, lookup);
+        if (getMode(stack)) {
+            Optional<Reference<Enchantment>> enchantment = lookup.get(Enchantments.FLAME);
+            if (enchantment.isPresent()) {
+                Holder<Enchantment> flame = enchantment.get();
+                if (enchantments.getLevel(flame) == 0){
+                    ItemEnchantments.Mutable mutable = new ItemEnchantments.Mutable(enchantments);
+                    mutable.set(flame, 1);
+                    return mutable.toImmutable();
+                }
+            }
+        }
         return enchantments;
     }
 
diff --git a/src/main/java/mekanism/common/item/gear/ItemFlamethrower.java b/src/main/java/mekanism/common/item/gear/ItemFlamethrower.java
@@ -27,6 +27,7 @@
 import mekanism.common.util.ChemicalUtil;
 import mekanism.common.util.MekanismUtils;
 import mekanism.common.util.StorageUtils;
+import net.minecraft.core.Holder;
 import net.minecraft.core.component.DataComponentType;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.codec.ByteBufCodecs;
@@ -209,7 +210,7 @@ public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
     }
 
     @Override
-    public boolean canApplyAtEnchantingTable(ItemStack stack, Enchantment enchantment) {
+    public boolean isPrimaryItemFor(ItemStack stack, Holder<Enchantment> enchantment) {
         return false;
     }
 
diff --git a/src/main/java/mekanism/common/item/gear/ItemFreeRunners.java b/src/main/java/mekanism/common/item/gear/ItemFreeRunners.java
@@ -4,6 +4,7 @@
 import io.netty.buffer.ByteBuf;
 import java.util.List;
 import java.util.Locale;
+import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.IntFunction;
 import mekanism.api.IIncrementalEnum;
@@ -22,6 +23,8 @@
 import mekanism.common.registries.MekanismDataComponents;
 import mekanism.common.util.StorageUtils;
 import net.minecraft.core.Holder;
+import net.minecraft.core.Holder.Reference;
+import net.minecraft.core.HolderLookup.RegistryLookup;
 import net.minecraft.core.component.DataComponentType;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.codec.ByteBufCodecs;
@@ -103,15 +106,18 @@ public int getEnchantmentLevel(@NotNull ItemStack stack, @NotNull Holder<Enchant
 
     @NotNull
     @Override
-    public ItemEnchantments getAllEnchantments(@NotNull ItemStack stack) {
-        ItemEnchantments enchantments = super.getAllEnchantments(stack);
-        //TODO - 1.21: Re-enable after https://github.com/neoforged/NeoForge/pull/1089
-        /*int fakeLevel = getFakeEnchantmentLevel(stack, Enchantments.SOUL_SPEED);
-        if (enchantments.getLevel(Enchantments.SOUL_SPEED) < fakeLevel) {
-            ItemEnchantments.Mutable mutable = new ItemEnchantments.Mutable(enchantments);
-            mutable.set(Enchantments.SOUL_SPEED, fakeLevel);
-            return mutable.toImmutable();
-        }*/
+    public ItemEnchantments getAllEnchantments(@NotNull ItemStack stack, @NotNull RegistryLookup<Enchantment> lookup) {
+        ItemEnchantments enchantments = super.getAllEnchantments(stack, lookup);
+        Optional<Reference<Enchantment>> enchantment = lookup.get(Enchantments.SOUL_SPEED);
+        if (enchantment.isPresent()) {
+            Holder<Enchantment> soulSpeed = enchantment.get();
+            int fakeLevel = getFakeEnchantmentLevel(stack, soulSpeed);
+            if (enchantments.getLevel(soulSpeed) < fakeLevel) {
+                ItemEnchantments.Mutable mutable = new ItemEnchantments.Mutable(enchantments);
+                mutable.set(soulSpeed, fakeLevel);
+                return mutable.toImmutable();
+            }
+        }
         return enchantments;
     }
 
diff --git a/src/main/java/mekanism/common/item/gear/ItemHazmatSuitArmor.java b/src/main/java/mekanism/common/item/gear/ItemHazmatSuitArmor.java
@@ -5,6 +5,7 @@
 import mekanism.common.capabilities.radiation.item.RadiationShieldingHandler;
 import mekanism.common.integration.gender.GenderCapabilityHelper;
 import mekanism.common.registries.MekanismArmorMaterials;
+import net.minecraft.core.Holder;
 import net.minecraft.world.item.ArmorItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Rarity;
@@ -45,7 +46,7 @@ public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
     }
 
     @Override
-    public boolean canApplyAtEnchantingTable(ItemStack stack, Enchantment enchantment) {
-        return isEnchantable(stack) && super.canApplyAtEnchantingTable(stack, enchantment);
+    public boolean isPrimaryItemFor(ItemStack stack, Holder<Enchantment> enchantment) {
+        return isEnchantable(stack) && super.isPrimaryItemFor(stack, enchantment);
     }
 }
diff --git a/src/main/java/mekanism/common/item/gear/ItemMekaSuitArmor.java b/src/main/java/mekanism/common/item/gear/ItemMekaSuitArmor.java
@@ -61,6 +61,7 @@
 import mekanism.common.util.StorageUtils;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.Holder;
+import net.minecraft.core.HolderLookup.RegistryLookup;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
@@ -233,8 +234,8 @@ public int getEnchantmentLevel(ItemStack stack, Holder<Enchantment> enchantment)
 
     @NotNull
     @Override
-    public ItemEnchantments getAllEnchantments(@NotNull ItemStack stack) {
-        ItemEnchantments enchantments = super.getAllEnchantments(stack);
+    public ItemEnchantments getAllEnchantments(@NotNull ItemStack stack, RegistryLookup<Enchantment> lookup) {
+        ItemEnchantments enchantments = super.getAllEnchantments(stack, lookup);
         IModuleContainer container = IModuleHelper.INSTANCE.getModuleContainer(stack);
         if (container != null) {
             ItemEnchantments moduleEnchantments = container.moduleBasedEnchantments();
diff --git a/src/main/java/mekanism/common/item/gear/ItemMekaTool.java b/src/main/java/mekanism/common/item/gear/ItemMekaTool.java
@@ -46,6 +46,7 @@
 import mekanism.common.util.StorageUtils;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
+import net.minecraft.core.HolderLookup.RegistryLookup;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;
@@ -175,8 +176,8 @@ public int getEnchantmentLevel(ItemStack stack, Holder<Enchantment> enchantment)
 
     @NotNull
     @Override
-    public ItemEnchantments getAllEnchantments(@NotNull ItemStack stack) {
-        ItemEnchantments enchantments = super.getAllEnchantments(stack);
+    public ItemEnchantments getAllEnchantments(@NotNull ItemStack stack, RegistryLookup<Enchantment> lookup) {
+        ItemEnchantments enchantments = super.getAllEnchantments(stack, lookup);
         IModuleContainer container = IModuleHelper.INSTANCE.getModuleContainer(stack);
         if (container != null) {
             ItemEnchantments moduleEnchantments = container.moduleBasedEnchantments();
@@ -456,7 +457,7 @@ public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
     }
 
     @Override
-    public boolean canApplyAtEnchantingTable(ItemStack stack, Enchantment enchantment) {
+    public boolean isPrimaryItemFor(ItemStack stack, Holder<Enchantment> enchantment) {
         return false;
     }
 
diff --git a/src/main/java/mekanism/common/item/gear/ItemSpecialArmor.java b/src/main/java/mekanism/common/item/gear/ItemSpecialArmor.java
@@ -28,8 +28,8 @@ public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
     }
 
     @Override
-    public boolean canApplyAtEnchantingTable(ItemStack stack, Enchantment enchantment) {
-        return isEnchantable(stack) && super.canApplyAtEnchantingTable(stack, enchantment);
+    public boolean isPrimaryItemFor(ItemStack stack, Holder<Enchantment> enchantment) {
+        return isEnchantable(stack) && super.isPrimaryItemFor(stack, enchantment);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@`
`45`	`45`	`import mekanism.common.util.MekanismUtils;`
`46`	`46`	`import mekanism.common.util.StorageUtils;`
`47`	`47`	`import net.minecraft.core.BlockPos;`
	`48`	`+import net.minecraft.core.Holder;`
`48`	`49`	`import net.minecraft.core.component.DataComponentType;`
`49`	`50`	`import net.minecraft.core.component.DataComponents;`
`50`	`51`	`import net.minecraft.core.registries.BuiltInRegistries;`
`@@ -292,7 +293,7 @@ public boolean isBookEnchantable(ItemStack stack, ItemStack book) {`
`292`	`293`	`}`
`293`	`294`
`294`	`295`	`@Override`
`295`		`- public boolean canApplyAtEnchantingTable(ItemStack stack, Enchantment enchantment) {`
	`296`	`+ public boolean isPrimaryItemFor(ItemStack stack, Holder<Enchantment> enchantment) {`
`296`	`297`	`return false;`
`297`	`298`	`}`
`298`	`299`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`import mekanism.common.util.ChemicalUtil;`
`28`	`28`	`import mekanism.common.util.MekanismUtils;`
`29`	`29`	`import mekanism.common.util.StorageUtils;`
	`30`	`+import net.minecraft.core.Holder;`
`30`	`31`	`import net.minecraft.core.component.DataComponentType;`
`31`	`32`	`import net.minecraft.network.chat.Component;`
`32`	`33`	`import net.minecraft.network.codec.ByteBufCodecs;`
`@@ -209,7 +210,7 @@ public boolean isBookEnchantable(ItemStack stack, ItemStack book) {`
`209`	`210`	`}`
`210`	`211`
`211`	`212`	`@Override`
`212`		`- public boolean canApplyAtEnchantingTable(ItemStack stack, Enchantment enchantment) {`
	`213`	`+ public boolean isPrimaryItemFor(ItemStack stack, Holder<Enchantment> enchantment) {`
`213`	`214`	`return false;`
`214`	`215`	`}`
`215`	`216`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`import mekanism.common.capabilities.radiation.item.RadiationShieldingHandler;`
`6`	`6`	`import mekanism.common.integration.gender.GenderCapabilityHelper;`
`7`	`7`	`import mekanism.common.registries.MekanismArmorMaterials;`
	`8`	`+import net.minecraft.core.Holder;`
`8`	`9`	`import net.minecraft.world.item.ArmorItem;`
`9`	`10`	`import net.minecraft.world.item.ItemStack;`
`10`	`11`	`import net.minecraft.world.item.Rarity;`
`@@ -45,7 +46,7 @@ public boolean isBookEnchantable(ItemStack stack, ItemStack book) {`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`@Override`
`48`		`- public boolean canApplyAtEnchantingTable(ItemStack stack, Enchantment enchantment) {`
`49`		`- return isEnchantable(stack) && super.canApplyAtEnchantingTable(stack, enchantment);`
	`49`	`+ public boolean isPrimaryItemFor(ItemStack stack, Holder<Enchantment> enchantment) {`
	`50`	`+ return isEnchantable(stack) && super.isPrimaryItemFor(stack, enchantment);`
`50`	`51`	`}`
`51`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ public boolean isBookEnchantable(ItemStack stack, ItemStack book) {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@Override`
`31`		`- public boolean canApplyAtEnchantingTable(ItemStack stack, Enchantment enchantment) {`
`32`		`- return isEnchantable(stack) && super.canApplyAtEnchantingTable(stack, enchantment);`
	`31`	`+ public boolean isPrimaryItemFor(ItemStack stack, Holder<Enchantment> enchantment) {`
	`32`	`+ return isEnchantable(stack) && super.isPrimaryItemFor(stack, enchantment);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Override`