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 { } else {
inventory.getStack(slotID).increment(extractedStack.getCount()); inventory.getStack(slotID).increment(extractedStack.getCount());
} }
inventory.setChanged(); inventory.setHashChanged();
break; break;
} }
} }

View file

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

View file

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

View file

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

View file

@ -186,7 +186,7 @@ public abstract class AbstractIronMachineBlockEntity extends MachineBaseBlockEnt
} }
if (isBurning != isBurning()) { if (isBurning != isBurning()) {
inventory.setChanged(); inventory.setHashChanged();
updateState(); updateState();
} }
if (inventory.hasChanged()) { if (inventory.hasChanged()) {

View file

@ -276,7 +276,7 @@ public class FusionControlComputerBlockEntity extends GenericMachineBlockEntity
// Force check every second // Force check every second
if (world.getTime() % 20 == 0) { if (world.getTime() % 20 == 0) {
inventory.setChanged(); inventory.setHashChanged();
} }
if (!isMultiblockValid()) { if (!isMultiblockValid()) {
@ -291,7 +291,7 @@ public class FusionControlComputerBlockEntity extends GenericMachineBlockEntity
if (currentRecipe != null) { if (currentRecipe != null) {
if (!hasStartedCrafting && !validateRecipe(currentRecipe)) { if (!hasStartedCrafting && !validateRecipe(currentRecipe)) {
resetCrafter(); resetCrafter();
inventory.resetChanged(); inventory.resetHasChanged();
return; return;
} }
@ -338,7 +338,7 @@ public class FusionControlComputerBlockEntity extends GenericMachineBlockEntity
markDirty(); markDirty();
} }
inventory.resetChanged(); inventory.resetHasChanged();
} }
@Override @Override

View file

@ -345,7 +345,7 @@ public class AutoCraftingTableBlockEntity extends PowerAcceptorBlockEntity
} }
sourceStack.decrement(1); sourceStack.decrement(1);
inventory.getStack(bestSlot.getLeft()).increment(1); inventory.getStack(bestSlot.getLeft()).increment(1);
inventory.setChanged(); inventory.setHashChanged();
return Optional.of(getCraftingInventory()); return Optional.of(getCraftingInventory());
} }

View file

@ -68,7 +68,7 @@ public class ElectricFurnaceBlockEntity extends PowerAcceptorBlockEntity
} }
private void setInvDirty(boolean isDirty) { private void setInvDirty(boolean isDirty) {
inventory.setChanged(isDirty); inventory.setHashChanged(isDirty);
} }
private boolean isInvDirty() { private boolean isInvDirty() {

View file

@ -279,7 +279,7 @@ public class RollingMachineBlockEntity extends PowerAcceptorBlockEntity
} }
sourceStack.decrement(1); sourceStack.decrement(1);
inventory.getStack(bestSlot.getLeft()).increment(1); inventory.getStack(bestSlot.getLeft()).increment(1);
inventory.setChanged(); inventory.setHashChanged();
return Optional.of(getCraftingMatrix()); return Optional.of(getCraftingMatrix());
} }
@ -292,7 +292,7 @@ public class RollingMachineBlockEntity extends PowerAcceptorBlockEntity
for (int i = 0; i < 9; i++) { for (int i = 0; i < 9; i++) {
craftCache.setStack(i, inventory.getStack(i).copy()); craftCache.setStack(i, inventory.getStack(i).copy());
} }
inventory.resetChanged(); inventory.resetHasChanged();
} }
return craftCache; return craftCache;
} }

View file

@ -211,7 +211,7 @@ public class StorageUnitBaseBlockEntity extends MachineBaseBlockEntity implement
} }
} }
inventory.setChanged(); inventory.setHashChanged();
return inputStack; return inputStack;
} }
@ -270,7 +270,7 @@ public class StorageUnitBaseBlockEntity extends MachineBaseBlockEntity implement
if (inventory.hasChanged()) { if (inventory.hasChanged()) {
syncWithAll(); syncWithAll();
inventory.resetChanged(); inventory.resetHasChanged();
} }
} }

View file

@ -107,7 +107,7 @@ public class StorageUnitBlock extends BlockMachineBase {
out.setCount(0); out.setCount(0);
} }
inventory.setChanged(); inventory.setHashChanged();
} }
} }

View file

@ -80,6 +80,6 @@ public class EntityNukePrimed extends TntEntity {
} }
RebornExplosion nukeExplosion = new RebornExplosion(getBlockPos(), world, TechRebornConfig.nukeRadius); RebornExplosion nukeExplosion = new RebornExplosion(getBlockPos(), world, TechRebornConfig.nukeRadius);
nukeExplosion.setLivingBase(getCausingEntity()); nukeExplosion.setLivingBase(getCausingEntity());
nukeExplosion.explode(); nukeExplosion.applyExplosion();
} }
} }