Fix water mill short circuit

Author: SakiiCode

src/main/java/ml/sakii/factoryisland/Game.java

@@ -50,7 +50,6 @@
 import ml.sakii.factoryisland.blocks.components.PowerPropagatorComponent;
 import ml.sakii.factoryisland.blocks.components.SignalConsumerComponent;
 import ml.sakii.factoryisland.blocks.components.SignalPropagatorComponent;
-import ml.sakii.factoryisland.blocks.components.TickUpdateComponent;
 import ml.sakii.factoryisland.blocks.components.WorldLoadComponent;
 import ml.sakii.factoryisland.entities.Entity;
 import ml.sakii.factoryisland.entities.PlayerMP;
@@ -595,7 +594,7 @@ public void run() {
 					float timePercent = (realTime*1f/Globals.TICKS_PER_DAY);
 					double light = Math.sin(2*Math.PI*timePercent);
 					debugInfo.add("Tick: " + Engine.Tick + "(" + Engine.TickableBlocks.size() + "), day:"+Engine.isDay((int)PE.ViewFrom.z)+",light:"+light);
-					debugInfo.add("needUpdate:" + !SelectedBlock.getComponents(TickUpdateComponent.class).isEmpty() +", blockLightPass:"+Engine.world.lightCalcRuns);
+					debugInfo.add("needUpdate:" + Engine.TickableBlocks.contains(SelectedBlock.pos) +", blockLightPass:"+Engine.world.lightCalcRuns);
 					debugInfo.add("Blocks: " + Engine.world.getSize() + ", hotbarIndex:"+PE.inventory.getHotbarIndex()+", selected:"+((PE.inventory.getHotbarIndex()>-1 ) ? PE.inventory.getSelectedKind() : ""));
 					if (Engine.client != null)
 					{

src/main/java/ml/sakii/factoryisland/GameEngine.java

@@ -33,7 +33,7 @@ public class GameEngine{
 
 
 	public World world;
-	public final HashSet<TickUpdateComponent> TickableBlocks = new HashSet<>();
+	public final ArrayList<Point3D> TickableBlocks = new ArrayList<>();
 	final ArrayList<DayNightComponent> DayNightBlocks = new ArrayList<>();
 	public long Tick=0;
 
@@ -96,11 +96,33 @@ public void performTick() {
     	if(server != null || client==null) {
 
 
-    		for(TickUpdateComponent tuc : new ArrayList<>(TickableBlocks)) {
+    		ArrayList<Point3D> current = new ArrayList<>(TickableBlocks);
+			TickableBlocks.clear();
+			for(Point3D p : current) {
+				
+				Block bl = world.getBlockAtP(p);
+				if(bl != Block.NOTHING) {
+						boolean keep=false;
+						for(TickUpdateComponent tuc : bl.getComponents(TickUpdateComponent.class)) {
+			    			if(Tick % tuc.refreshRate != 0 || tuc.onTick(Tick)) {
+			    				keep=true;
+			    			}
+						}
+						if(keep) {
+							TickableBlocks.add(p);
+						}
+				}else if(Main.verbose){
+					// Air block ticked
+					Main.err("Attempted to tick air block:"+p);
+				}
+				
+			}
+    		
+    		/*for(TickUpdateComponent tuc : new ArrayList<>(TickableBlocks)) {
     			if(Tick % tuc.refreshRate == 0 && !tuc.onTick(Tick)) {
     				TickableBlocks.remove(tuc);
     			}
-    		}
+    		}*/
 
 
 

src/main/java/ml/sakii/factoryisland/World.java

@@ -445,13 +445,13 @@ private void ReplaceBlock(Block b) {
 
 		for (Entry<BlockFace, Block> entry : get6Blocks(b, false).entrySet()) {
 			Block block = entry.getValue();
-			for(TickUpdateComponent tuc : block.getComponents(TickUpdateComponent.class)) {
-				Engine.TickableBlocks.add(tuc);
+			if(block.getComponents(TickUpdateComponent.class).size() > 0) {
+				Engine.TickableBlocks.add(block.pos);
 			}
 		}
 
-		for(TickUpdateComponent tuc : b.getComponents(TickUpdateComponent.class)) {
-			Engine.TickableBlocks.add(tuc);
+		if(b.getComponents(TickUpdateComponent.class).size() > 0) {
+			Engine.TickableBlocks.add(b.pos);
 		}
 
 		for(DayNightComponent dnc : b.getComponents(DayNightComponent.class)) {
@@ -504,7 +504,8 @@ public void destroyBlock(Block b, boolean resend) {
 		}else {
 
 			if (getBlockAtP(b.pos) == Block.NOTHING) {
-				Main.err("Attempted to destroy air block: "+b.pos);
+				Thread.dumpStack();
+				//Main.err("Attempted to destroy air block: "+b.pos);
 				return;
 			}
 
@@ -520,13 +521,16 @@ public void destroyBlock(Block b, boolean resend) {
 
 			for (Entry<BlockFace, Block> entry : get6Blocks(b, false).entrySet()) {
 				Block bu = entry.getValue();
-				for(TickUpdateComponent tuc : bu.getComponents(TickUpdateComponent.class)) {
-					Engine.TickableBlocks.add(tuc);
+				if (bu.getComponents(TickUpdateComponent.class).size() > 0) {
+					Engine.TickableBlocks.add(bu.pos);
 				}
+				
 			}
 
-			for(TickUpdateComponent tuc : b.getComponents(TickUpdateComponent.class)) {
-				Engine.TickableBlocks.remove(tuc);
+			
+
+			if (b.getComponents(TickUpdateComponent.class).size() > 0) {
+				Engine.TickableBlocks.remove(b.pos);
 			}
 
 			for(DayNightComponent dnc : b.getComponents(DayNightComponent.class)) {

src/main/java/ml/sakii/factoryisland/api/Block.java

@@ -1,9 +1,6 @@
 package ml.sakii.factoryisland.api;
 
-import java.util.List;
-
 import ml.sakii.factoryisland.GameEngine;
-import ml.sakii.factoryisland.blocks.components.TickUpdateComponent;
 
 public class Block{
 
@@ -46,8 +43,7 @@ public void setMetadata(String key, String value) {
 	}
 
 	public void update() {
-		List<TickUpdateComponent> tuc = b.getComponents(TickUpdateComponent.class);
-		Engine.TickableBlocks.addAll(tuc);
+		Engine.TickableBlocks.add(b.pos);
 	}
 
 

src/main/java/ml/sakii/factoryisland/blocks/Block.java

@@ -197,14 +197,16 @@ public final void setMetadata(String key, String value, boolean resend)
 			if(!alreadyput) {
 				BlockMeta.put(key, value);
 			}
-			for(TickUpdateComponent tuc : this.getComponents(TickUpdateComponent.class)) {
-				Engine.TickableBlocks.add(tuc);
+			
+			if(this.getComponents(TickUpdateComponent.class).size() > 0) {
+				Engine.TickableBlocks.add(pos);
 			}
+			
 			for (Block b2 : Engine.world.get6Blocks(this, false).values())
 			{
 				if(Engine.client == null || (Engine.client != null && Engine.client != null)) {
-					for(TickUpdateComponent tuc2 : b2.getComponents(TickUpdateComponent.class)) {
-						Engine.TickableBlocks.add(tuc2);
+					if(b2.getComponents(TickUpdateComponent.class).size() > 0) {
+						Engine.TickableBlocks.add(b2.pos);
 					}
 				}
 			}