Faster markDirty implementation for saving (GregTechCEu#2016)

Author: serenibyss

src/main/java/gregtech/api/block/machines/BlockMachine.java

@@ -367,12 +367,6 @@ public void neighborChanged(@Nonnull IBlockState state, @Nonnull World worldIn,
         }
     }
 
-    @Override
-    public int getComparatorInputOverride(@Nonnull IBlockState blockState, @Nonnull World worldIn, @Nonnull BlockPos pos) {
-        MetaTileEntity metaTileEntity = getMetaTileEntity(worldIn, pos);
-        return metaTileEntity == null ? 0 : metaTileEntity.getComparatorValue();
-    }
-
     protected final ThreadLocal<MetaTileEntity> tileEntities = new ThreadLocal<>();
 
     @Override
@@ -382,11 +376,6 @@ public void harvestBlock(@Nonnull World worldIn, @Nonnull EntityPlayer player, @
         tileEntities.set(null);
     }
 
-    @Override
-    public boolean hasComparatorInputOverride(@Nonnull IBlockState state) {
-        return true;
-    }
-
     @Nullable
     @Override
     public TileEntity createNewTileEntity(@Nullable World worldIn, int meta) {

src/main/java/gregtech/api/metatileentity/MetaTileEntity.java

@@ -74,6 +74,7 @@
 import net.minecraftforge.items.ItemStackHandler;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.tuple.Pair;
+import org.jetbrains.annotations.ApiStatus;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -114,7 +115,6 @@ public abstract class MetaTileEntity implements ICoverable, IVoidable {
 
     private final int[] sidedRedstoneOutput = new int[6];
     private final int[] sidedRedstoneInput = new int[6];
-    private int cachedComparatorValue;
     private int cachedLightValue;
     protected boolean isFragile = false;
 
@@ -159,6 +159,7 @@ public BlockPos getPos() {
         return holder == null ? null : holder.pos();
     }
 
+    @Override
     public void markDirty() {
         if (holder != null) {
             holder.markAsDirty();
@@ -668,7 +669,6 @@ public boolean shouldRenderBackSide() {
     }
 
     public void onLoad() {
-        this.cachedComparatorValue = getActualComparatorValue();
         for (EnumFacing side : EnumFacing.VALUES) {
             this.sidedRedstoneInput[side.getIndex()] = GTUtility.getRedstonePower(getWorld(), getPos(), side);
         }
@@ -729,6 +729,11 @@ public void updateInputRedstoneSignals() {
         }
     }
 
+    /**
+     * @deprecated Will be removed in 2.9. Comparators no longer supported for MetaTileEntities, as cover are interactions favored.
+     */
+    @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
+    @Deprecated
     public int getActualComparatorValue() {
         return 0;
     }
@@ -737,24 +742,19 @@ public int getActualLightValue() {
         return 0;
     }
 
+    /**
+     * @deprecated Will be removed in 2.9.
+     */
+    @ApiStatus.ScheduledForRemoval(inVersion = "2.9")
+    @Deprecated
     public final int getComparatorValue() {
-        return cachedComparatorValue;
+        return 0;
     }
 
     public final int getLightValue() {
         return cachedLightValue;
     }
 
-    private void updateComparatorValue() {
-        int newComparatorValue = getActualComparatorValue();
-        if (cachedComparatorValue != newComparatorValue) {
-            this.cachedComparatorValue = newComparatorValue;
-            if (getWorld() != null && !getWorld().isRemote) {
-                notifyBlockUpdate();
-            }
-        }
-    }
-
     private void updateLightValue() {
         int newLightValue = getActualLightValue();
         if (cachedLightValue != newLightValue) {
@@ -777,9 +777,6 @@ public void update() {
                     ((ITickable) coverBehavior).update();
                 }
             }
-            if (getOffsetTimer() % 5 == 0L) {
-                updateComparatorValue();
-            }
         } else {
             updateSound();
         }
@@ -1130,7 +1127,6 @@ public final void setOutputRedstoneSignal(EnumFacing side, int strength) {
         this.sidedRedstoneOutput[side.getIndex()] = strength;
         if (getWorld() != null && !getWorld().isRemote && getCoverAtSide(side) == null) {
             notifyBlockUpdate();
-            markDirty();
         }
     }
 

src/main/java/gregtech/api/metatileentity/MetaTileEntityHolder.java

@@ -335,9 +335,12 @@ public BlockPos pos() {
         return getPos();
     }
 
+    @SuppressWarnings("ConstantConditions") // yes this CAN actually be null
     @Override
     public void markAsDirty() {
-        markDirty();
+        if (getWorld() != null && getPos() != null) {
+            getWorld().markChunkDirty(getPos(), this);
+        }
     }
 
     @Override

src/main/java/gregtech/api/metatileentity/TieredMetaTileEntity.java

@@ -16,7 +16,6 @@
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -47,14 +46,6 @@ protected void reinitializeEnergyContainer() {
                 tierVoltage * 64L, tierVoltage, getMaxInputOutputAmperage());
     }
 
-    @Override
-    public int getActualComparatorValue() {
-        long energyStored = energyContainer.getEnergyStored();
-        long energyCapacity = energyContainer.getEnergyCapacity();
-        float f = energyCapacity == 0L ? 0.0f : energyStored / (energyCapacity * 1.0f);
-        return MathHelper.floor(f * 14.0f) + (energyStored > 0 ? 1 : 0);
-    }
-
     @Override
     public void onEnergyChanged(IEnergyContainer container, boolean isInitialChange) {
     }

src/main/java/gregtech/api/pipenet/tile/TileEntityPipeBase.java

@@ -98,6 +98,14 @@ public BlockPos getPipePos() {
         return getPos();
     }
 
+    @SuppressWarnings("ConstantConditions") // yes this CAN actually be null
+    @Override
+    public void markDirty() {
+        if (getWorld() != null && getPos() != null) {
+            getWorld().markChunkDirty(getPos(), this);
+        }
+    }
+
     @Override
     public PipeCoverableImplementation getCoverableImplementation() {
         return coverableImplementation;

src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java

@@ -24,7 +24,6 @@
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.world.World;
 
@@ -53,14 +52,6 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) {
         return new MetaTileEntityDiode(metaTileEntityId, getTier());
     }
 
-    @Override
-    public int getActualComparatorValue() {
-        long energyStored = energyContainer.getEnergyStored();
-        long energyCapacity = energyContainer.getEnergyCapacity();
-        float f = energyCapacity == 0L ? 0.0f : energyStored / (energyCapacity * 1.0f);
-        return MathHelper.floor(f * 14.0f) + (energyStored > 0 ? 1 : 0);
-    }
-
     @Override
     public NBTTagCompound writeToNBT(NBTTagCompound data) {
         super.writeToNBT(data);

src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityHull.java

@@ -3,7 +3,6 @@
 import appeng.api.util.AECableType;
 import appeng.api.util.AEPartLocation;
 import appeng.me.helpers.AENetworkProxy;
-import codechicken.lib.raytracer.CuboidRayTraceResult;
 import codechicken.lib.render.CCRenderState;
 import codechicken.lib.render.pipeline.IVertexOperation;
 import codechicken.lib.vec.Matrix4;
@@ -23,9 +22,7 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Optional;
@@ -55,14 +52,6 @@ protected void reinitializeEnergyContainer() {
         ((EnergyContainerHandler) this.energyContainer).setSideOutputCondition(s -> s == getFrontFacing());
     }
 
-    @Override
-    public int getActualComparatorValue() {
-        long energyStored = energyContainer.getEnergyStored();
-        long energyCapacity = energyContainer.getEnergyCapacity();
-        float f = energyCapacity == 0L ? 0.0f : energyStored / (energyCapacity * 1.0f);
-        return MathHelper.floor(f * 14.0f) + (energyStored > 0 ? 1 : 0);
-    }
-
     @Override
     public void renderMetaTileEntity(CCRenderState renderState, Matrix4 translation, IVertexOperation[] pipeline) {
         super.renderMetaTileEntity(renderState, translation, pipeline);

src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCrate.java

@@ -24,7 +24,6 @@
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import net.minecraftforge.items.ItemHandlerHelper;
 import net.minecraftforge.items.ItemStackHandler;
 import org.apache.commons.lang3.tuple.Pair;
 
@@ -71,11 +70,6 @@ protected void initializeInventory() {
         this.itemInventory = inventory;
     }
 
-    @Override
-    public int getActualComparatorValue() {
-        return ItemHandlerHelper.calcRedstoneFromInventory(inventory);
-    }
-
     @Override
     public void clearMachineInventory(NonNullList<ItemStack> itemBuffer) {
         clearInventory(itemBuffer, inventory);

src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityDrum.java

@@ -29,7 +29,6 @@
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
@@ -74,15 +73,6 @@ public int getLightOpacity() {
         return 1;
     }
 
-    @Override
-    public int getActualComparatorValue() {
-        FluidTank fluidTank = this.fluidTank;
-        int fluidAmount = fluidTank.getFluidAmount();
-        int maxCapacity = fluidTank.getCapacity();
-        float f = fluidAmount / (maxCapacity * 1.0f);
-        return MathHelper.floor(f * 14.0f) + (fluidAmount > 0 ? 1 : 0);
-    }
-
     @Override
     public boolean isOpaqueCube() {
         return false;

src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumChest.java

@@ -35,7 +35,6 @@
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.AxisAlignedBB;
-import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextComponentTranslation;
@@ -116,12 +115,6 @@ public Pair<TextureAtlasSprite, Integer> getParticleTexture() {
         return Pair.of(Textures.VOLTAGE_CASINGS[tier].getParticleSprite(), getPaintingColorForRendering());
     }
 
-    @Override
-    public int getActualComparatorValue() {
-        float f = itemsStoredInside / (maxStoredItems * 1.0f);
-        return MathHelper.floor(f * 14.0f) + (itemsStoredInside > 0 ? 1 : 0);
-    }
-
     @Override
     public void update() {
         super.update();