Remove All Deprecated code from Curios

Leclowndu93150 · Jun 18, 2024 · de34d7f · de34d7f
1 parent 2df219a
commit de34d7f
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -80,7 +80,7 @@ configurations {
 
 dependencies {
     implementation "net.neoforged:neoforge:${neo_version}"
-    implementation "curse.maven:curios-1037991:5434184"
+    implementation "curse.maven:curios-1037991:5441959"
 }
 
 

diff --git a/src/main/java/com/leclowndu93150/modular_angelring/common/AngelRingItem.java b/src/main/java/com/leclowndu93150/modular_angelring/common/AngelRingItem.java
@@ -53,7 +53,7 @@ public static void tickRing(ItemStack stack, Player player) {
     }
 
     public static void tickPlayer(Player player) {
-        Optional<SlotResult> slotResult = CuriosApi.getCuriosHelper().getCuriosHandler(player).flatMap(curiosHandler -> curiosHandler.findFirstCurio(ItemRegistry.ANGEL_RING.get()));
+        Optional<SlotResult> slotResult = CuriosApi.getCuriosInventory(player).flatMap(handler -> handler.findFirstCurio(ItemRegistry.ANGEL_RING.get()));
         if (slotResult.isPresent()) {
             ItemStack angelRingStack = slotResult.get().stack();
                 tickRing(angelRingStack, player);

diff --git a/src/main/java/com/leclowndu93150/modular_angelring/common/AngelRingModules.java b/src/main/java/com/leclowndu93150/modular_angelring/common/AngelRingModules.java
@@ -23,11 +23,11 @@ public static Boolean getInertiaModifier(ItemStack stack) {
     }
 
     public static void setSpeedModifier(ItemStack stack) {
-        stack.set(DataComponentRegistry.SPEED_MODIFIER, true);
+        stack.set(DataComponentRegistry.SPEED_MODIFIER, null);
     }
 
-    public static Boolean getSpeedModifier(ItemStack stack) {
-        return stack.getOrDefault(DataComponentRegistry.SPEED_MODIFIER, false);
+    public static Float getSpeedModifier(ItemStack stack) {
+        return stack.getOrDefault(DataComponentRegistry.SPEED_MODIFIER,  0.02F );
     }
 
 }
diff --git a/src/main/java/com/leclowndu93150/modular_angelring/events/AngelRingEvents.java b/src/main/java/com/leclowndu93150/modular_angelring/events/AngelRingEvents.java
@@ -29,7 +29,7 @@ public class AngelRingEvents {
     @SubscribeEvent(priority = EventPriority.LOW)
     public static void setRingBreakSpeed(PlayerEvent.BreakSpeed event) {
         Player player = event.getEntity();
-        Optional<SlotResult> slotResult = CuriosApi.getCuriosHelper().getCuriosHandler(player).flatMap(curiosHandler -> curiosHandler.findFirstCurio(ItemRegistry.ANGEL_RING.get()));
+        Optional<SlotResult> slotResult = CuriosApi.getCuriosInventory(player).flatMap(handler -> handler.findFirstCurio(ItemRegistry.ANGEL_RING.get()));
             if (slotResult.isPresent()) {
                 ItemStack angelRingStack = slotResult.get().stack();
                 float newDigSpeed = event.getOriginalSpeed();
@@ -45,7 +45,7 @@ public static void setRingBreakSpeed(PlayerEvent.BreakSpeed event) {
     @SubscribeEvent(priority = EventPriority.LOW)
     public static void stopDrift(PlayerTickEvent.Pre event) {
         Player player = event.getEntity();
-        Optional<SlotResult> slotResult = CuriosApi.getCuriosHelper().getCuriosHandler(player).flatMap(curiosHandler -> curiosHandler.findFirstCurio(ItemRegistry.ANGEL_RING.get()));
+        Optional<SlotResult> slotResult = CuriosApi.getCuriosInventory(player).flatMap(handler -> handler.findFirstCurio(ItemRegistry.ANGEL_RING.get()));
         if (slotResult.isPresent()) {
             ItemStack angelRingStack = slotResult.get().stack();
                 Vec3 motion = player.getDeltaMovement();

diff --git a/src/main/java/com/leclowndu93150/modular_angelring/registry/KeyBindRegistry.java b/src/main/java/com/leclowndu93150/modular_angelring/registry/KeyBindRegistry.java
@@ -44,7 +44,7 @@ public static void registerBindings(RegisterKeyMappingsEvent event) {
     public static void onKey(InputEvent.Key event) {
         Player player = Minecraft.getInstance().player;
         if (player == null) return;
-        Optional<SlotResult> slotResult = CuriosApi.getCuriosHelper().getCuriosHandler(player).flatMap(curiosHandler -> curiosHandler.findFirstCurio(ItemRegistry.ANGEL_RING.get()));
+        Optional<SlotResult> slotResult = CuriosApi.getCuriosInventory(player).flatMap(handler -> handler.findFirstCurio(ItemRegistry.ANGEL_RING.get()));
             if (slotResult.isPresent()) {
                 ItemStack angelRingStack = slotResult.get().stack();
                 if (INERTIA_MODULE.get().consumeClick() && AngelRingModules.getInertiaModifier(angelRingStack)) {

diff --git a/src/main/java/com/leclowndu93150/modular_angelring/render/AbstractAngelRingRenderer.java b/src/main/java/com/leclowndu93150/modular_angelring/render/AbstractAngelRingRenderer.java
@@ -8,12 +8,8 @@
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.entity.RenderLayerParent;
-import net.minecraft.client.renderer.entity.layers.CapeLayer;
-import net.minecraft.client.renderer.entity.layers.ElytraLayer;
 import net.minecraft.client.renderer.entity.layers.RenderLayer;
 import net.minecraft.client.renderer.texture.OverlayTexture;
-import net.minecraft.world.entity.player.PlayerModelPart;
-import net.minecraft.world.item.ElytraItem;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.NotNull;

diff --git a/src/main/java/com/leclowndu93150/modular_angelring/render/AngelRingCheck.java b/src/main/java/com/leclowndu93150/modular_angelring/render/AngelRingCheck.java
@@ -6,7 +6,7 @@
 
 public class AngelRingCheck {
     public static boolean isBaseEquipped(AbstractClientPlayer playerEntity) {
-        return CuriosApi.getCuriosHelper().findEquippedCurio(ItemRegistry.ANGEL_RING.get(), playerEntity).isPresent();
+        return CuriosApi.getCuriosInventory(playerEntity).flatMap(handler -> handler.findFirstCurio(ItemRegistry.ANGEL_RING.get())).isPresent();
     }
 
     public static boolean isEquipped(AbstractClientPlayer playerEntity) {

diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml
@@ -99,7 +99,7 @@ description='''${mod_description}'''
 modId="curios"
 type="required"
 # This version range declares a minimum of the current minecraft version up to but not including the next major version
-versionRange="[9.0.0,]"
+versionRange="[9.0.2,]"
 ordering="NONE"
 side="BOTH"