Fixed world loading issues

Author: SakiiCode

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

@@ -573,6 +573,9 @@ public void run() {
 					for(PowerPropagatorComponent ppc : SelectedBlock.getComponents(PowerPropagatorComponent.class)) {
 						debugInfo.add("Generators: "+ppc.generators.toString());
 					}
+					for(PowerConsumerComponent pcc : SelectedBlock.getComponents(PowerConsumerComponent.class)) {
+						debugInfo.add("Generators: "+pcc.generators.toString());
+					}
 					if(SelectedPolygon != null) {
 						debugInfo.add("SelPoly: "+SelectedPolygon);
 					}else {

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

@@ -42,6 +42,7 @@
 import ml.sakii.factoryisland.blocks.Block;
 import ml.sakii.factoryisland.blocks.BlockFace;
 import ml.sakii.factoryisland.blocks.BlockInventoryInterface;
+import ml.sakii.factoryisland.blocks.MetadataListener;
 import ml.sakii.factoryisland.blocks.WaterBlock;
 import ml.sakii.factoryisland.blocks.components.DayNightComponent;
 import ml.sakii.factoryisland.blocks.components.DynamicTextureComponent;
@@ -217,6 +218,9 @@ private String loadWorld(GameEngine engine, Consumer<String> update) {
 	            	   if(bMetadata) {
 	            		   if(curBlock!=null && curMeta != null) {
 	            			   curBlock.storeMetadata(curMeta,data);
+	            			   if(curBlock instanceof MetadataListener ml) {
+	            				   ml.onMetadataUpdate(curMeta, data);
+	            			   }
 	            		   }else {
 	            			   return "No current block/metadata tag while parsing metadata";
 	            		   }
@@ -261,7 +265,7 @@ private String loadWorld(GameEngine engine, Consumer<String> update) {
 	                	curMeta=null;
 	                	bMetadata=false;
 	                }
-	                else if(endElement.getName().getLocalPart().equalsIgnoreCase("power")) {
+	                else if(endElement.getName().getLocalPart().equalsIgnoreCase("signals")) {
 	                	curSignals=null;
 	                	bSignals=false;
 	                }

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

@@ -226,10 +226,6 @@ public String toString()
 
 
 
-	BlockFace getTarget()
-	{
-		return BlockFace.values[java.lang.Integer.parseInt(this.BlockMeta.get("target"))];
-	}
 
 	long getTick()
 	{

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

@@ -5,7 +5,6 @@
 import java.util.List;
 import java.util.Map.Entry;
 
-import ml.sakii.factoryisland.Game;
 import ml.sakii.factoryisland.GameEngine;
 import ml.sakii.factoryisland.Main;
 import ml.sakii.factoryisland.Object3D;
@@ -140,16 +139,6 @@ public List<ItemStack> onBreak() {
 		};
 
 		addComponent(bc);
-		
-		wlc = new WorldLoadComponent(this) {
-			
-			@Override
-			public void onLoad(Game game) {
-				heightMap();
-			}
-		};
-		
-		addComponent(wlc);
 
 	}
 
@@ -176,12 +165,13 @@ private void heightMap() {
 	@Override
 	public boolean onMetadataUpdate(String key, String value)
 	{
-		storeMetadata(key, value);
 		if(key.equals("height")){
+			storeMetadata(key, value);
 			heightMap();
+			return true;
 		}
 
-		return true;
+		return false;
 	}
 
 

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

@@ -53,6 +53,8 @@ public SimpleMachine(String name, int x, int y, int z, Surface side, Surface fro
 			updateTargetColors(BlockFace.EAST,BlockFace.TOP);
 		}
 
+		// this is needed because if "active" comes before "target",
+		// the textures will be incorrect after world load
 		wlc = new WorldLoadComponent(this) {
 
 			@Override
@@ -240,7 +242,7 @@ public boolean onMetadataUpdate(String key, String value){
 			updateTargetColors(getTarget(),BlockFace.values[Integer.parseInt(value)]);
 			storeMetadata(key, value);
 
-			if(Engine.game != null) {
+			if(Engine.game != null && Engine.game.PE != null) {
 				dtc.updateTexture(new Vector(), Engine.game);
 			}
 			return true;
@@ -254,6 +256,11 @@ public boolean onMetadataUpdate(String key, String value){
 
 	}
 
+	protected BlockFace getTarget()
+	{
+		return BlockFace.values[java.lang.Integer.parseInt(getMetadata("target"))];
+	}
+	
 
 
 }

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

@@ -3,7 +3,6 @@
 import java.awt.Color;
 import ml.sakii.factoryisland.AssetLibrary;
 import ml.sakii.factoryisland.Color4;
-import ml.sakii.factoryisland.Game;
 import ml.sakii.factoryisland.GameEngine;
 import ml.sakii.factoryisland.Object3D;
 import ml.sakii.factoryisland.Polygon3D;
@@ -21,15 +20,6 @@ public WoodBlock(int x, int y, int z, GameEngine engine) {
 
 		spc = new SignalPropagatorComponent(this);
 		addComponent(spc);
-		
-		wlc = new WorldLoadComponent(this) {
-			@Override
-			public void onLoad(Game game) {
-				recalcPaints();
-			}
-		};
-		
-		addComponent(wlc);
 	}
 
 
@@ -38,9 +28,7 @@ public Surface[] getSurfaces() {
 		return Block.generateSurfacesCopy(new Surface(AssetLibrary.wood.Texture,Color4.TRANSPARENT));
 	}
 
-	private void recalcPaints() {
-		int charge = spc.getCharge();
-
+	private void recalcPaints(int charge) {
 		for(Object3D obj : Objects){
 			if(obj instanceof Polygon3D p) {
 				if(charge == 0){
@@ -60,7 +48,7 @@ private void recalcPaints() {
 	public boolean onMetadataUpdate(String key, String value) {
 		if(key.equals("signalLevel")) {
 			storeMetadata(key, value);
-			recalcPaints();
+			recalcPaints(Integer.parseInt(value));
 			return true;
 		}
 		return false;

src/main/java/ml/sakii/factoryisland/blocks/components/PowerConsumerComponent.java

@@ -12,7 +12,7 @@
 
 public class PowerConsumerComponent extends PowerComponent {
 
-	HashMap<PowerGeneratorComponent, Float> generators = new HashMap<>();
+	public HashMap<PowerGeneratorComponent, Float> generators = new HashMap<>();
 	BreakComponent bc;
 	PlaceComponent pc;
 

src/main/java/ml/sakii/factoryisland/blocks/components/PowerGeneratorComponent.java

@@ -5,6 +5,7 @@
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+
 import ml.sakii.factoryisland.Main;
 import ml.sakii.factoryisland.blocks.Block;
 import ml.sakii.factoryisland.blocks.BlockFace;
@@ -30,7 +31,7 @@ public List<ItemStack> onBreak() {
 		SubComponents.add(bc);
 
 		tuc = new TickUpdateComponent(block) {
-			
+			// automatically runs on world load
 			@Override
 			public boolean onTick(long tick) {
 				Main.log("Setting power to "+getDesiredPower());

src/main/java/ml/sakii/factoryisland/blocks/components/PowerPropagatorComponent.java

@@ -21,6 +21,9 @@ public PowerPropagatorComponent(Block block) {
 
 			@Override
 			public List<ItemStack> onBreak() {
+				for(PowerGeneratorComponent pgc : generators) {
+					propagate(0,pgc,new LinkedList<>(), new HashSet<>());
+				}
 				refreshGenerators(new LinkedList<>());
 				return null;
 			}