Merge pull request #1977 from VT-14/Update-Curios-Implementation

Update Curios Implementation (1.20 API)

Author: WayofTime

gradle.properties

@@ -30,5 +30,5 @@ mod_description=Example mod description.\nNewline characters can be used and wil
 
 #Mod dependencies
 jei_version=15.2.0.23
-curios_version=5.2.0-beta.3+1.20.1
+curios_version=5.3.4+1.20.1
 patchouli_version=1.20.1-80-FORGE

src/main/java/wayoftime/bloodmagic/BloodMagic.java

@@ -116,7 +116,7 @@ public BloodMagic() {
         // Register the setup method for modloading
         modBus.addListener(this::setup);
         // Register the enqueueIMC method for modloading
-        modBus.addListener(this::enqueueIMC);
+        // modBus.addListener(this::enqueueIMC);
         // Register the processIMC method for modloading
         modBus.addListener(this::processIMC);
         // Register the doClientStuff method for modloading
@@ -242,11 +242,11 @@ private void registerColors(final RegisterColorHandlersEvent event) {
             ClientEvents.colorHandlerEvent((RegisterColorHandlersEvent.Item) event);
     }
 
-    private void enqueueIMC(final InterModEnqueueEvent event) {
-        if (curiosLoaded) {
-            curiosCompat.setupSlots(event);
-        }
-    }
+//    private void enqueueIMC(final InterModEnqueueEvent event) {
+//        if (curiosLoaded) {
+//            curiosCompat.setupSlots(event);
+//        }
+//    }
 
     private void processIMC(final InterModProcessEvent event) {
     }

src/main/java/wayoftime/bloodmagic/compat/CuriosCompat.java

@@ -1,30 +1,20 @@
 package wayoftime.bloodmagic.compat;
 
 import net.minecraft.core.NonNullList;
+import net.minecraft.world.entity.ai.attributes.AttributeModifier;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.fml.InterModComms;
-import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
-import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.IItemHandlerModifiable;
 import top.theillusivec4.curios.api.CuriosApi;
-import top.theillusivec4.curios.api.SlotTypeMessage;
-import top.theillusivec4.curios.api.SlotTypePreset;
-import top.theillusivec4.curios.api.type.util.ISlotHelper;
-import wayoftime.bloodmagic.BloodMagic;
+import top.theillusivec4.curios.api.type.inventory.ICurioStacksHandler;
 import wayoftime.bloodmagic.core.LivingArmorRegistrar;
 import wayoftime.bloodmagic.core.living.LivingStats;
 import wayoftime.bloodmagic.core.living.LivingUtil;
 import wayoftime.bloodmagic.impl.BloodMagicAPI;
+import java.util.Map;
 
 public class CuriosCompat
 {
-	public void setupSlots(InterModEnqueueEvent evt)
-	{
-		InterModComms.sendTo("curios", SlotTypeMessage.REGISTER_TYPE, () -> SlotTypePreset.NECKLACE.getMessageBuilder().build());
-		InterModComms.sendTo("curios", SlotTypeMessage.REGISTER_TYPE, () -> SlotTypePreset.CHARM.getMessageBuilder().build());
-		InterModComms.sendTo("curios", SlotTypeMessage.REGISTER_TYPE, () -> new SlotTypeMessage.Builder("living_armour_socket").size(0).icon(BloodMagic.rl("item/curios_empty_living_armour_socket")).build());
-	}
-
 	public void registerInventory()
 	{
 		BloodMagicAPI.INSTANCE.registerInventoryProvider("curiosInventory", player -> getCuriosInventory(player));
@@ -33,8 +23,7 @@ public void registerInventory()
 
 	public NonNullList<ItemStack> getCuriosInventory(Player player)
 	{
-		IItemHandler itemHandler = CuriosApi.getCuriosHelper().getEquippedCurios(player).resolve().get();
-
+		IItemHandlerModifiable itemHandler = CuriosApi.getCuriosInventory(player).resolve().get().getEquippedCurios();
 		NonNullList<ItemStack> inventory = NonNullList.create();
 		for (int i = 0; i < itemHandler.getSlots(); i++)
 		{
@@ -45,26 +34,20 @@ public NonNullList<ItemStack> getCuriosInventory(Player player)
 
 	public int recalculateCuriosSlots(Player player)
 	{
-		ISlotHelper slotHelper = CuriosApi.getSlotHelper();
+		ICurioStacksHandler livingArmourSockets = CuriosApi.getCuriosInventory(player).resolve().get().getCurios().get("living_armour_socket");
 		if (LivingUtil.hasFullSet(player))
 		{
 			LivingStats stats = LivingStats.fromPlayer(player);
-
-			int curiosLevel = stats != null ? stats.getLevel(LivingArmorRegistrar.UPGRADE_CURIOS_SOCKET.get().getKey())
-					: 0;
-
-			if (curiosLevel == 0)
-			{
-				slotHelper.setSlotsForType("living_armour_socket", player, 0);
-			} else
+			int curiosLevel = (stats != null) ? stats.getLevel(LivingArmorRegistrar.UPGRADE_CURIOS_SOCKET.get().getKey()) : 0;
+			livingArmourSockets.removeModifier(player.getUUID());
+			if (curiosLevel != 0)
 			{
-				int slotCount = LivingArmorRegistrar.UPGRADE_CURIOS_SOCKET.get().getBonusValue("slots", curiosLevel).intValue();
-				slotHelper.setSlotsForType("living_armour_socket", player, slotCount);
+				livingArmourSockets.addTransientModifier(new AttributeModifier(player.getUUID(), "legacy", Double.valueOf(LivingArmorRegistrar.UPGRADE_CURIOS_SOCKET.get().getBonusValue("slots", curiosLevel).intValue()), AttributeModifier.Operation.ADDITION));
 			}
 			return curiosLevel;
 		} else
 		{
-			slotHelper.setSlotsForType("living_armour_socket", player, 0);
+			livingArmourSockets.removeModifier(player.getUUID());
 			return 0;
 		}
 	}

src/main/resources/assets/bloodmagic/textures/item/curios_empty_living_armour_socket.png

@@ -0,0 +1,8 @@
+{
+  "entities": ["player"],
+  "slots": [
+    "charm",
+    "necklace",
+    "living_armour_socket"
+  ]
+}

src/main/resources/data/bloodmagic/curios/entities/bmplayerslots.json

@@ -0,0 +1,4 @@
+{
+  "size": 0,
+  "icon": "bloodmagic:item/curios_empty_living_armour_socket"
+}