Enhance AdvancedItemSettings#hasBrokenState

MModding · Oct 15, 2024 · 10222bb · 10222bb
1 parent 1aa30ba
commit 10222bb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/src/main/java/com/mmodding/mmodding_lib/library/items/settings/AdvancedItemSettings.java b/src/main/java/com/mmodding/mmodding_lib/library/items/settings/AdvancedItemSettings.java
@@ -14,16 +14,17 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 public class AdvancedItemSettings extends QuiltItemSettings {
 
 	public static final CustomItemSetting<List<Formatting>> NAME_FORMATTINGS = CustomItemSetting.create(Collections::emptyList);
 	public static final CustomItemSetting<Text[]> DESCRIPTION_LINES = CustomItemSetting.create(() -> null);
-	public static final CustomItemSetting<Function<ItemStack, Boolean>> GLINT = CustomItemSetting.create((stack) -> false);
+	public static final CustomItemSetting<Function<ItemStack, Boolean>> GLINT = CustomItemSetting.create(stack -> false);
 	public static final CustomItemSetting<GlintPackView> GLINT_PACK = CustomItemSetting.create(() -> null);
 	public static final CustomItemSetting<Boolean> EATABLE = CustomItemSetting.create(Boolean.FALSE);
 	public static final CustomItemSetting<Boolean> DRINKABLE = CustomItemSetting.create(Boolean.FALSE);
-	public static final CustomItemSetting<Boolean> HAS_BROKEN_STATE = CustomItemSetting.create(Boolean.FALSE);
+	public static final CustomItemSetting<Predicate<ItemStack>> HAS_BROKEN_STATE = CustomItemSetting.create(stack -> false);
 	public static final CustomItemSetting<ItemUse> ITEM_USE = CustomItemSetting.create(() -> null);
 	public static final CustomItemSetting<ItemFinishUsing> ITEM_FINISH_USING = CustomItemSetting.create(() -> null);
 	public static final CustomItemSetting<ItemUseOnBlock> ITEM_USE_ON_BLOCK = CustomItemSetting.create(() -> null);
@@ -65,7 +66,11 @@ public AdvancedItemSettings drinkable() {
 	}
 
 	public AdvancedItemSettings hasBrokenState() {
-		return this.customSetting(HAS_BROKEN_STATE, true);
+		return this.hasBrokenState(stack -> true);
+	}
+
+	public AdvancedItemSettings hasBrokenState(Predicate<ItemStack> hasBrokenState) {
+		return this.customSetting(HAS_BROKEN_STATE, hasBrokenState);
 	}
 
 	public AdvancedItemSettings itemUse(ItemUse itemUseSetting) {

diff --git a/src/main/java/com/mmodding/mmodding_lib/mixin/injectors/ItemMixin.java b/src/main/java/com/mmodding/mmodding_lib/mixin/injectors/ItemMixin.java
@@ -122,7 +122,7 @@ private void getUseAction(ItemStack stack, CallbackInfoReturnable<UseAction> cir
 
 	@Unique
 	protected boolean isBroken(ItemStack stack) {
-		if (AdvancedItemSettings.HAS_BROKEN_STATE.get(this.getObject())) {
+		if (AdvancedItemSettings.HAS_BROKEN_STATE.get(this.getObject()).test(stack)) {
 			return stack.getDamage() >= stack.getMaxDamage();
 		}
 		else {

diff --git a/src/main/java/com/mmodding/mmodding_lib/mixin/injectors/MiningToolItemMixin.java b/src/main/java/com/mmodding/mmodding_lib/mixin/injectors/MiningToolItemMixin.java
@@ -30,7 +30,7 @@ private void cancelIfBroken(ItemStack stack, BlockState state, CallbackInfoRetur
 
 	@WrapOperation(method = "postHit", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;damage(ILnet/minecraft/entity/LivingEntity;Ljava/util/function/Consumer;)V"))
 	private void cancelHitStackDamageIfBroken(ItemStack instance, int amount, LivingEntity entity, Consumer<LivingEntity> breakCallback, Operation<Void> original) {
-		if (AdvancedItemSettings.HAS_BROKEN_STATE.get(this.getObject())) {
+		if (AdvancedItemSettings.HAS_BROKEN_STATE.get(this.getObject()).test(instance)) {
 			instance.setDamage(Math.min(instance.getDamage() + amount, instance.getMaxDamage()));
 		}
 		else {
@@ -46,7 +46,7 @@ private void postHit(ItemStack stack, LivingEntity target, LivingEntity attacker
 
 	@WrapOperation(method = "postMine", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;damage(ILnet/minecraft/entity/LivingEntity;Ljava/util/function/Consumer;)V"))
 	private void cancelMineStackDamageIfBroken(ItemStack instance, int amount, LivingEntity entity, Consumer<LivingEntity> breakCallback, Operation<Void> original) {
-		if (AdvancedItemSettings.HAS_BROKEN_STATE.get(this.getObject())) {
+		if (AdvancedItemSettings.HAS_BROKEN_STATE.get(this.getObject()).test(instance)) {
 			instance.setDamage(Math.min(instance.getDamage() + amount, instance.getMaxDamage()));
 		}
 		else {

diff --git a/src/main/java/com/mmodding/mmodding_lib/mixin/injectors/SwordItemMixin.java b/src/main/java/com/mmodding/mmodding_lib/mixin/injectors/SwordItemMixin.java
@@ -35,7 +35,7 @@ private void cancelIfBroken(ItemStack stack, BlockState state, CallbackInfoRetur
 
 	@WrapOperation(method = "postHit", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;damage(ILnet/minecraft/entity/LivingEntity;Ljava/util/function/Consumer;)V"))
 	private void cancelHitStackDamageIfBroken(ItemStack instance, int amount, LivingEntity entity, Consumer<LivingEntity> breakCallback, Operation<Void> original) {
-		if (AdvancedItemSettings.HAS_BROKEN_STATE.get(this.getObject())) {
+		if (AdvancedItemSettings.HAS_BROKEN_STATE.get(this.getObject()).test(instance)) {
 			instance.setDamage(Math.min(instance.getDamage() + amount, instance.getMaxDamage()));
 		}
 		else {
@@ -51,7 +51,7 @@ private void postHit(ItemStack stack, LivingEntity target, LivingEntity attacker
 
 	@WrapOperation(method = "postMine", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;damage(ILnet/minecraft/entity/LivingEntity;Ljava/util/function/Consumer;)V"))
 	private void cancelMineStackDamageIfBroken(ItemStack instance, int amount, LivingEntity entity, Consumer<LivingEntity> breakCallback, Operation<Void> original) {
-		if (AdvancedItemSettings.HAS_BROKEN_STATE.get(this.getObject())) {
+		if (AdvancedItemSettings.HAS_BROKEN_STATE.get(this.getObject()).test(instance)) {
 			instance.setDamage(Math.min(instance.getDamage() + amount, instance.getMaxDamage()));
 		}
 		else {