From 3e84e72fd038d74e5fc96abe74d536864489723e Mon Sep 17 00:00:00 2001 From: Talia-12 Date: Tue, 6 Feb 2024 16:23:26 +1000 Subject: [PATCH] Fixed #541, allow MediaHolderItems to specify their consumptionPriority. --- .../java/at/petrak/hexcasting/api/item/MediaHolderItem.java | 5 +++++ .../at/petrak/hexcasting/fabric/cc/adimpl/CCMediaHolder.java | 2 +- .../hexcasting/forge/cap/adimpl/CapItemMediaHolder.java | 2 +- 3 files changed, 7 insertions(+), 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 index 51dad5b8f..a4aa3cfc0 100644 --- 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 index 539c5e5ed..b4ff6ed09 100644 --- 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 index b59589111..7f84f1d15 100644 --- 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