Fix conflicts with mojang's mappings

This commit is contained in:
modmuss50 2021-07-20 19:03:30 +01:00
parent 2ae5e8ff5b
commit 66c70e7e96
12 changed files with 23 additions and 23 deletions

View file

@ -335,7 +335,7 @@ public class SlotConfiguration implements NBTSerializable {
} else {
inventory.getStack(slotID).increment(extractedStack.getCount());
}
inventory.setChanged();
inventory.setHashChanged();
break;
}
}

View file

@ -81,7 +81,7 @@ public class RebornExplosion extends Explosion {
return livingBase;
}
public void explode() {
public void applyExplosion() {
StopWatch watch = new StopWatch();
watch.start();
for (int tx = -radius; tx < radius + 1; tx++) {
@ -104,12 +104,12 @@ public class RebornExplosion extends Explosion {
@Override
public void collectBlocksAndDamageEntities() {
explode();
applyExplosion();
}
@Override
public void affectWorld(boolean spawnParticles) {
explode();
applyExplosion();
}
@Override

View file

@ -357,7 +357,7 @@ public class RecipeCrafter implements IUpgradeHandler {
}
public void setInvDirty(boolean isDiry) {
inventory.setChanged(isDiry);
inventory.setHashChanged(isDiry);
}
public boolean isStackValidInput(ItemStack stack) {

View file

@ -69,7 +69,7 @@ public class RebornInventory<T extends MachineBaseBlockEntity> extends Inventory
@Override
public void setStack(int slot, @NotNull ItemStack stack) {
super.setStack(slot, stack);
setChanged();
setHashChanged();
}
@Override
@ -77,7 +77,7 @@ public class RebornInventory<T extends MachineBaseBlockEntity> extends Inventory
ItemStack stack = super.removeStack(i, i1);
if (!stack.isEmpty()) {
setChanged();
setHashChanged();
}
return stack;
@ -91,7 +91,7 @@ public class RebornInventory<T extends MachineBaseBlockEntity> extends Inventory
public ItemStack shrinkSlot(int slot, int count) {
ItemStack stack = getStack(slot);
stack.decrement(count);
setChanged();
setHashChanged();
return stack;
}
@ -139,15 +139,15 @@ public class RebornInventory<T extends MachineBaseBlockEntity> extends Inventory
return hasChanged;
}
public void setChanged() {
public void setHashChanged() {
this.hasChanged = true;
}
public void setChanged(boolean changed) {
public void setHashChanged(boolean changed) {
this.hasChanged = changed;
}
public void resetChanged() {
public void resetHasChanged() {
this.hasChanged = false;
}