Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java

@@ -1094,7 +1094,7 @@ public abstract class Contraption {
 
 		GridAlignedBB betterBounds = GridAlignedBB.ofRadius(radius);
 
-		GridAlignedBB contraptionBounds = GridAlignedBB.fromAABB(bounds);
+		GridAlignedBB contraptionBounds = GridAlignedBB.from(bounds);
 		if (axis == Direction.Axis.X) {
 			betterBounds.maxX = contraptionBounds.maxX;
 			betterBounds.minX = contraptionBounds.minX;

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionLighter.java

@@ -40,13 +40,15 @@ public abstract class ContraptionLighter<C extends Contraption> implements Light
     public abstract GridAlignedBB getContraptionBounds();
 
     @Override
-    public void onLightUpdate(ILightReader world, LightType type, GridAlignedBB changed) {
+    public boolean onLightUpdate(ILightReader world, LightType type, GridAlignedBB changed) {
         lightVolume.notifyLightUpdate(world, type, changed);
+        return false;
     }
 
     @Override
-    public void onLightPacket(ILightReader world, int chunkX, int chunkZ) {
+    public boolean onLightPacket(ILightReader world, int chunkX, int chunkZ) {
         lightVolume.notifyLightPacket(world, chunkX, chunkZ);
+        return false;
     }
 
     protected void startListening() {

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/NonStationaryLighter.java

@@ -32,7 +32,7 @@ public class NonStationaryLighter<C extends Contraption> extends ContraptionLigh
 
     @Override
     public GridAlignedBB getContraptionBounds() {
-        GridAlignedBB bb = GridAlignedBB.fromAABB(contraption.bounds);
+        GridAlignedBB bb = GridAlignedBB.from(contraption.bounds);
 
         bb.translate(contraption.entity.getPosition());
 

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/AnchoredLighter.java

@@ -12,7 +12,7 @@ public class AnchoredLighter extends ContraptionLighter<Contraption> {
 
     @Override
     public GridAlignedBB getContraptionBounds() {
-        GridAlignedBB bb = GridAlignedBB.fromAABB(contraption.bounds);
+        GridAlignedBB bb = GridAlignedBB.from(contraption.bounds);
         bb.translate(contraption.anchor);
         return bb;
     }

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonLighter.java

@@ -12,7 +12,7 @@ public class PistonLighter extends ContraptionLighter<PistonContraption> {
 
     @Override
     public GridAlignedBB getContraptionBounds() {
-        GridAlignedBB bounds = GridAlignedBB.fromAABB(contraption.bounds);
+        GridAlignedBB bounds = GridAlignedBB.from(contraption.bounds);
         bounds.translate(contraption.anchor);
 
         int length = contraption.extensionLength;

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyLighter.java

@@ -15,7 +15,7 @@ public class PulleyLighter extends ContraptionLighter<PulleyContraption> {
     @Override
     public GridAlignedBB getContraptionBounds() {
 
-        GridAlignedBB bounds = GridAlignedBB.fromAABB(contraption.bounds);
+        GridAlignedBB bounds = GridAlignedBB.from(contraption.bounds);
 
         World world = contraption.entity.world;
 

src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java

@@ -294,10 +294,10 @@ public class BeltRenderer extends SafeTileEntityRenderer<BeltTileEntity> {
 	}
 
 	protected int getPackedLight(BeltTileEntity controller, float beltPos) {
-		BeltTileEntity belt = BeltHelper.getBeltForOffset(controller, beltPos);
+		int segment = (int) Math.floor(beltPos) * 2;
 
-		if (belt == null) return 0;
+		if (controller.light == null || segment >= controller.light.length) return 0;
 
-		return (belt.skyLight << 20) | (belt.blockLight << 4);
+		return (controller.light[segment + 1] << 20) | (controller.light[segment] << 4);
 	}
 }

src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java

@@ -23,7 +23,9 @@ import com.simibubi.create.content.contraptions.relays.belt.transport.ItemHandle
 import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
 import com.simibubi.create.content.logistics.block.belts.tunnel.BrassTunnelTileEntity;
 import com.simibubi.create.foundation.render.backend.FastRenderDispatcher;
-import com.simibubi.create.foundation.render.backend.light.ILightListener;
+import com.simibubi.create.foundation.render.backend.light.GridAlignedBB;
+import com.simibubi.create.foundation.render.backend.light.LightUpdateListener;
+import com.simibubi.create.foundation.render.backend.light.LightUpdater;
 import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour;
 import com.simibubi.create.foundation.tileEntity.behaviour.belt.DirectBeltInputBehaviour;
 import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
@@ -42,10 +44,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.Direction;
 import net.minecraft.util.Direction.Axis;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.*;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.ILightReader;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.math.Vec3i;
 import net.minecraft.world.LightType;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.model.data.IModelData;
@@ -57,7 +57,7 @@ import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 
-public class BeltTileEntity extends KineticTileEntity implements ILightListener {
+public class BeltTileEntity extends KineticTileEntity implements LightUpdateListener {
 
 	public Map<Entity, TransportedEntityInfo> passengers;
 	public Optional<DyeColor> color;
@@ -73,8 +73,7 @@ public class BeltTileEntity extends KineticTileEntity implements ILightListener
 	public CompoundNBT trackerUpdateTag;
 
 	// client
-	public byte blockLight = -1;
+	public byte[] light;
-	public byte skyLight = -1;
 
 	public static enum CasingType {
 		NONE, ANDESITE, BRASS;
@@ -109,12 +108,15 @@ public class BeltTileEntity extends KineticTileEntity implements ILightListener
 
 		initializeItemHandler();
 
-		if (blockLight == -1)
-			updateLight();
-
 		// Move Items
 		if (!isController())
 			return;
+
+		if (light == null && world.isRemote) {
+			initializeLight();
+			LightUpdater.getInstance().startListening(getBeltVolume(), this);
+		}
+
 		getInventory().tick();
 
 		if (getSpeed() == 0)
@@ -513,23 +515,77 @@ public class BeltTileEntity extends KineticTileEntity implements ILightListener
 		return 0;
 	}
 
-	@Override
-	public void onChunkLightUpdate() {
-		updateLight();
-	}
-
 	@Override
 	public boolean shouldRenderAsTE() {
 		return isController();
 	}
 
-	private void updateLight() {
+	@Override
-		if (world != null) {
+	public boolean onLightUpdate(ILightReader world, LightType type, GridAlignedBB changed) {
-			skyLight = (byte) world.getLightLevel(LightType.SKY, pos);
+		if (this.removed) {
-			blockLight = (byte) world.getLightLevel(LightType.BLOCK, pos);
+			return true;
-		} else {
+		}
-			skyLight = -1;
+
-			blockLight = -1;
+		GridAlignedBB beltVolume = getBeltVolume();
+
+		if (beltVolume.intersects(changed)) {
+			if (type == LightType.BLOCK)
+				updateBlockLight();
+
+			if (type == LightType.SKY)
+				updateSkyLight();
+		}
+
+		return false;
+	}
+
+	private GridAlignedBB getBeltVolume() {
+		BlockPos endPos = BeltHelper.getPositionForOffset(this, beltLength - 1);
+
+		GridAlignedBB bb = GridAlignedBB.from(pos, endPos);
+		bb.fixMinMax();
+		return bb;
+	}
+
+	private void initializeLight() {
+		light = new byte[beltLength * 2];
+
+		Vec3i vec = getBeltFacing().getDirectionVec();
+		BeltSlope slope = getBlockState().get(BeltBlock.SLOPE);
+		int verticality = slope == BeltSlope.DOWNWARD ? -1 : slope == BeltSlope.UPWARD ? 1 : 0;
+
+		BlockPos.Mutable pos = new BlockPos.Mutable(controller);
+		for (int i = 0; i < beltLength * 2; i += 2) {
+			light[i] = (byte) world.getLightLevel(LightType.BLOCK, pos);
+			light[i + 1] = (byte) world.getLightLevel(LightType.SKY, pos);
+
+			pos.move(vec.getX(), verticality, vec.getZ());
+		}
+	}
+
+	private void updateBlockLight() {
+		Vec3i vec = getBeltFacing().getDirectionVec();
+		BeltSlope slope = getBlockState().get(BeltBlock.SLOPE);
+		int verticality = slope == BeltSlope.DOWNWARD ? -1 : slope == BeltSlope.UPWARD ? 1 : 0;
+
+		BlockPos.Mutable pos = new BlockPos.Mutable(controller);
+		for (int i = 0; i < beltLength * 2; i += 2) {
+			light[i] = (byte) world.getLightLevel(LightType.BLOCK, pos);
+
+			pos.move(vec.getX(), verticality, vec.getZ());
+		}
+	}
+
+	private void updateSkyLight() {
+		Vec3i vec = getBeltFacing().getDirectionVec();
+		BeltSlope slope = getBlockState().get(BeltBlock.SLOPE);
+		int verticality = slope == BeltSlope.DOWNWARD ? -1 : slope == BeltSlope.UPWARD ? 1 : 0;
+
+		BlockPos.Mutable pos = new BlockPos.Mutable(controller);
+		for (int i = 1; i < beltLength * 2; i += 2) {
+			light[i] = (byte) world.getLightLevel(LightType.SKY, pos);
+
+			pos.move(vec.getX(), verticality, vec.getZ());
 		}
 	}
 }

src/main/java/com/simibubi/create/foundation/mixin/LightUpdateMixin.java

@@ -10,7 +10,6 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
-import com.simibubi.create.foundation.render.backend.light.ILightListener;
 import com.simibubi.create.foundation.render.backend.light.LightUpdater;
 
 import net.minecraft.client.multiplayer.ClientChunkProvider;
@@ -49,9 +48,6 @@ public abstract class LightUpdateMixin extends AbstractChunkProvider {
                  .map(Map.Entry::getValue)
                  .forEach(tile -> {
                 CreateClient.kineticRenderer.get(world).onLightUpdate(tile);
-
-                if (tile instanceof ILightListener)
-                    ((ILightListener) tile).onChunkLightUpdate();
             });
         }
 

src/main/java/com/simibubi/create/foundation/mixin/NetworkLightUpdateMixin.java

@@ -3,7 +3,6 @@ package com.simibubi.create.foundation.mixin;
 import com.simibubi.create.CreateClient;
 import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
 import com.simibubi.create.foundation.render.backend.RenderWork;
-import com.simibubi.create.foundation.render.backend.light.ILightListener;
 import com.simibubi.create.foundation.render.backend.light.LightUpdater;
 
 import net.minecraft.client.Minecraft;
@@ -39,9 +38,6 @@ public class NetworkLightUpdateMixin {
                         .values()
                         .forEach(tile -> {
                             CreateClient.kineticRenderer.get(world).onLightUpdate(tile);
-
-                            if (tile instanceof ILightListener)
-                                ((ILightListener) tile).onChunkLightUpdate();
                         });
             }
 

src/main/java/com/simibubi/create/foundation/render/backend/light/GridAlignedBB.java

@@ -6,6 +6,7 @@ import com.simibubi.create.foundation.render.backend.RenderUtil;
 
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.SectionPos;
 import net.minecraft.util.math.Vec3i;
 
@@ -34,7 +35,7 @@ public class GridAlignedBB {
         return new GridAlignedBB(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ);
     }
 
-    public static GridAlignedBB fromAABB(AxisAlignedBB aabb) {
+    public static GridAlignedBB from(AxisAlignedBB aabb) {
         int minX = (int) Math.floor(aabb.minX);
         int minY = (int) Math.floor(aabb.minY);
         int minZ = (int) Math.floor(aabb.minZ);
@@ -44,7 +45,7 @@ public class GridAlignedBB {
         return new GridAlignedBB(minX, minY, minZ, maxX, maxY, maxZ);
     }
 
-    public static GridAlignedBB fromSection(SectionPos pos) {
+    public static GridAlignedBB from(SectionPos pos) {
         return new GridAlignedBB(pos.getWorldStartX(),
                                  pos.getWorldStartY(),
                                  pos.getWorldStartZ(),
@@ -53,7 +54,16 @@ public class GridAlignedBB {
                                  pos.getWorldEndZ() + 1);
     }
 
-    public static GridAlignedBB fromChunk(int sectionX, int sectionZ) {
+    public static GridAlignedBB from(BlockPos start, BlockPos end) {
+        return new GridAlignedBB(start.getX(),
+                                 start.getY(),
+                                 start.getZ(),
+                                 end.getX() + 1,
+                                 end.getY() + 1,
+                                 end.getZ() + 1);
+    }
+
+    public static GridAlignedBB from(int sectionX, int sectionZ) {
         int startX = sectionX << 4;
         int startZ = sectionZ << 4;
         return new GridAlignedBB(startX,
@@ -81,6 +91,22 @@ public class GridAlignedBB {
                 maxZ == other.maxZ;
     }
 
+    public void fixMinMax() {
+        int minX = Math.min(this.minX, this.maxX);
+        int minY = Math.min(this.minY, this.maxY);
+        int minZ = Math.min(this.minZ, this.maxZ);
+        int maxX = Math.max(this.minX, this.maxX);
+        int maxY = Math.max(this.minY, this.maxY);
+        int maxZ = Math.max(this.minZ, this.maxZ);
+
+        this.minX = minX;
+        this.minY = minY;
+        this.minZ = minZ;
+        this.maxX = maxX;
+        this.maxY = maxY;
+        this.maxZ = maxZ;
+    }
+
     public int sizeX() {
         return maxX - minX;
     }

src/main/java/com/simibubi/create/foundation/render/backend/light/ILightListener.java

@@ -1,5 +0,0 @@
-package com.simibubi.create.foundation.render.backend.light;
-
-public interface ILightListener {
-    void onChunkLightUpdate();
-}

src/main/java/com/simibubi/create/foundation/render/backend/light/LightUpdateListener.java

@@ -11,16 +11,22 @@ public interface LightUpdateListener {
 
 	/**
 	 * Called when a light updates in a chunk the implementor cares about.
+	 *
+	 * @return true if this object is no longer valid and should not receive any more updates.
 	 */
-	void onLightUpdate(ILightReader world, LightType type, GridAlignedBB changed);
+	boolean onLightUpdate(ILightReader world, LightType type, GridAlignedBB changed);
 
 	/**
 	 * Called when the server sends light data to the client.
+	 *
+	 * @return true if this object is no longer valid and should not receive any more updates.
 	 */
-	default void onLightPacket(ILightReader world, int chunkX, int chunkZ) {
+	default boolean onLightPacket(ILightReader world, int chunkX, int chunkZ) {
-		GridAlignedBB changedVolume = GridAlignedBB.fromChunk(chunkX, chunkZ);
+		GridAlignedBB changedVolume = GridAlignedBB.from(chunkX, chunkZ);
 
-		onLightUpdate(world, LightType.BLOCK, changedVolume);
+		if (onLightUpdate(world, LightType.BLOCK, changedVolume))
-		onLightUpdate(world, LightType.SKY, changedVolume);
+			return true;
+
+		return onLightUpdate(world, LightType.SKY, changedVolume);
 	}
 }

src/main/java/com/simibubi/create/foundation/render/backend/light/LightUpdater.java

@@ -114,12 +114,9 @@ public class LightUpdater {
 
 		if (set == null || set.isEmpty()) return;
 
-		GridAlignedBB chunkBox = GridAlignedBB.fromSection(SectionPos.from(sectionPos));
+		GridAlignedBB chunkBox = GridAlignedBB.from(SectionPos.from(sectionPos));
-
-		for (LightUpdateListener listener : set) {
-			listener.onLightUpdate(world, type, chunkBox.copy());
-		}
 
+		set.removeIf(listener -> listener.onLightUpdate(world, type, chunkBox.copy()));
 	}
 
 	/**
@@ -136,10 +133,7 @@ public class LightUpdater {
 
 		if (set == null || set.isEmpty()) return;
 
-		for (LightUpdateListener listener : set) {
+		set.removeIf(listener -> listener.onLightPacket(world, chunkX, chunkZ));
-			listener.onLightPacket(world, chunkX, chunkZ);
-		}
-
 	}
 
 	private LongRBTreeSet clearChunks(LightUpdateListener listener) {

src/main/java/com/simibubi/create/foundation/render/backend/light/LightVolume.java

@@ -14,7 +14,6 @@ import com.simibubi.create.foundation.render.backend.RenderWork;
 import com.simibubi.create.foundation.render.backend.gl.GlTexture;
 
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.SectionPos;
 import net.minecraft.world.ILightReader;
 import net.minecraft.world.LightType;
 
@@ -138,7 +137,7 @@ public class LightVolume {
     public void notifyLightPacket(ILightReader world, int chunkX, int chunkZ) {
         if (removed) return;
 
-        GridAlignedBB changedVolume = GridAlignedBB.fromChunk(chunkX, chunkZ);
+        GridAlignedBB changedVolume = GridAlignedBB.from(chunkX, chunkZ);
         if (!changedVolume.intersects(sampleVolume))
             return;
         changedVolume.intersectAssign(sampleVolume); // compute the region contained by us that has dirty lighting data.