Fixed FallingColors#541, allow MediaHolderItems to specify their cons…

…umptionPriority.
Master-Bw3 · Aug 29, 2024 · fa21dc8 · fa21dc8
1 parent b140b10
commit fa21dc8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Common/src/main/java/at/petrak/hexcasting/api/item/MediaHolderItem.java b/Common/src/main/java/at/petrak/hexcasting/api/item/MediaHolderItem.java
@@ -1,5 +1,6 @@
 package at.petrak.hexcasting.api.item;
 
+import at.petrak.hexcasting.api.addldata.ADMediaHolder;
 import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.ApiStatus;
 
@@ -59,4 +60,8 @@ default long insertMedia(ItemStack stack, long amount, boolean simulate) {
         }
         return inserting;
     }
+
+    default int getConsumptionPriority(ItemStack stack) {
+        return ADMediaHolder.BATTERY_PRIORITY;
+    }
 }
diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/adimpl/CCMediaHolder.java b/Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/adimpl/CCMediaHolder.java
@@ -51,7 +51,7 @@ public boolean canProvide() {
 
         @Override
         public int getConsumptionPriority() {
-            return ADMediaHolder.BATTERY_PRIORITY;
+            return this.mediaHolder.getConsumptionPriority(this.stack);
         }
 
         @Override

diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/cap/adimpl/CapItemMediaHolder.java b/Forge/src/main/java/at/petrak/hexcasting/forge/cap/adimpl/CapItemMediaHolder.java
@@ -37,7 +37,7 @@ public boolean canProvide() {
 
     @Override
     public int getConsumptionPriority() {
-        return ADMediaHolder.BATTERY_PRIORITY;
+        return holder.getConsumptionPriority(stack);
     }
 
     @Override