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

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -107,7 +107,7 @@ public class StorageUnitBlock extends BlockMachineBase {
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);
nukeExplosion.setLivingBase(getCausingEntity());
nukeExplosion.explode();
nukeExplosion.applyExplosion();
}
}