Tianpao/Arclight
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ModifyConstant being ineffective to AnvilMenu#createResult (#670)

Browse Source
This commit is contained in:
Yanang Pearce 2022-07-31 05:33:27 -05:00 committed by IzzelAliz
parent bfd9c1c380
commit 876cf34761
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/RepairContainerMixin.java
View File

@ -34,7 +34,11 @@ public abstract class RepairContainerMixin extends ItemCombinerMixin {
@Shadow public static int calculateIncreasedRepairCost(int oldRepairCost) { return 0; } @Shadow public static int calculateIncreasedRepairCost(int oldRepairCost) { return 0; }
// @formatter:on // @formatter:on
public int cancelThisBySettingCostToMaximum = 40;
public int maximumRenameCostThreshold = 40;
public int maximumAllowedRenameCost = 39;
public int maximumRepairCost = 40; public int maximumRepairCost = 40;
private CraftInventoryView bukkitEntity; private CraftInventoryView bukkitEntity;
/** /**
@ -43,6 +47,12 @@ public abstract class RepairContainerMixin extends ItemCombinerMixin {
*/ */
@Overwrite @Overwrite
public void createResult() { public void createResult() {
// define constants for ModifyConstant mixins to work
cancelThisBySettingCostToMaximum = 40;
maximumRenameCostThreshold = 40;
maximumAllowedRenameCost = 39;
maximumRepairCost = 40;
ItemStack itemstack = this.inputSlots.getItem(0); ItemStack itemstack = this.inputSlots.getItem(0);
this.cost.set(1); this.cost.set(1);
int i = 0; int i = 0;
@ -157,7 +167,7 @@ public abstract class RepairContainerMixin extends ItemCombinerMixin {
i += k3 * j2; i += k3 * j2;
if (itemstack.getCount() > 1) { if (itemstack.getCount() > 1) {
i = 40; i = cancelThisBySettingCostToMaximum;
} }
} }
} }
@ -190,8 +200,8 @@ public abstract class RepairContainerMixin extends ItemCombinerMixin {
itemstack1 = ItemStack.EMPTY; itemstack1 = ItemStack.EMPTY;
} }
if (k == i && k > 0 && this.cost.get() >= maximumRepairCost) { if (k == i && k > 0 && this.cost.get() >= maximumRenameCostThreshold) {
this.cost.set(maximumRepairCost - 1); this.cost.set(maximumAllowedRenameCost);
} }
if (this.cost.get() >= maximumRepairCost && !this.player.getAbilities().instabuild) { if (this.cost.get() >= maximumRepairCost && !this.player.getAbilities().instabuild) {