- Fix crashes...

- Fix MultiLineLabel align offset.
- When the controller is stopped by redstone control, a structure check is performed immediately upon recovery.

Author: KasumiNova

src/main/java/github/kasuminova/mmce/client/gui/widget/MultiLineLabel.java

@@ -75,18 +75,19 @@ public void render(final WidgetGui gui, final RenderSize renderSize, final Rende
     // Utils
 
     protected float getLineRenderOffset(final String s, final FontRenderer fr) {
+        if (leftAligned && !rightAligned) {
+            return 0;
+        }
+
         int width = getWidth();
+        float stringWidth = fr.getStringWidth(s) * scale;
 
         if (leftAligned && rightAligned) {
-            int stringWidth = fr.getStringWidth(s);
-            return (float) (width - stringWidth) / 2 / scale;
-        } else if (leftAligned) {
-            return 0;
+            return (width - (stringWidth)) / 2F;
         } else if (rightAligned) {
-            return width - fr.getStringWidth(s) / scale;
+            return (width - (stringWidth));
         } else {
-            int stringWidth = fr.getStringWidth(s);
-            return (float) (width - stringWidth) / 2 / scale;
+            return (width - (stringWidth)) / 2F;
         }
     }
 

src/main/java/github/kasuminova/mmce/client/gui/widget/container/Column.java

@@ -257,7 +257,7 @@ public RenderPos getWidgetRenderOffset(DynamicWidget widget, int width, int y) {
             xOffset = widget.getMarginLeft();
             yOffset = y + widget.getMarginUp();
         } else if (rightAligned) {
-            xOffset = width - widget.getWidth() - widget.getMarginRight();
+            xOffset = width - (widget.getWidth() + widget.getMarginRight());
             yOffset = y + widget.getMarginUp();
         } else {
             // Where does it align?

src/main/java/github/kasuminova/mmce/common/world/MMWorldEventListener.java

@@ -1,6 +1,8 @@
 package github.kasuminova.mmce.common.world;
 
 import github.kasuminova.mmce.client.world.BlockModelHider;
+import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
+import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -21,14 +23,12 @@
 import javax.annotation.Nullable;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class MMWorldEventListener implements IWorldEventListener {
 
     public static final MMWorldEventListener INSTANCE = new MMWorldEventListener();
 
-    private final Map<World, Map<ChunkPos, StructureBoundingBox>> worldChangedChunksLastTick = new ConcurrentHashMap<>();
-    private final Map<World, Map<ChunkPos, StructureBoundingBox>> worldChangedChunks = new ConcurrentHashMap<>();
+    private final Map<World, Long2ObjectMap<StructureBoundingBox>> worldChangedChunks = new HashMap<>();
 
     private MMWorldEventListener() {
     }
@@ -51,19 +51,16 @@ public void onWorldUnloaded(WorldEvent.Unload event) {
             return;
         }
         worldChangedChunks.remove(world);
-        worldChangedChunksLastTick.remove(world);
         MachineComponentManager.INSTANCE.removeWorld(world);
     }
 
     @SubscribeEvent
-    public void onServerTickStart(TickEvent.ServerTickEvent event) {
+    public void onWorldTickStart(TickEvent.WorldTickEvent event) {
         if (event.side != Side.SERVER || event.phase != TickEvent.Phase.START) {
             return;
         }
 
-        worldChangedChunksLastTick.clear();
-        worldChangedChunksLastTick.putAll(worldChangedChunks);
-        worldChangedChunks.clear();
+        worldChangedChunks.put(event.world, new Long2ObjectOpenHashMap<>());
     }
 
     @SubscribeEvent
@@ -79,7 +76,7 @@ public void onChunkUnload(final ChunkEvent.Unload event) {
         int zEnd = pos.getZEnd();
 
         StructureBoundingBox structureArea = new StructureBoundingBox(xStart, zStart, xEnd, zEnd);
-        worldChangedChunks.get(world).put(pos, structureArea);
+        worldChangedChunks.get(world).put(ChunkPos.asLong(pos.x, pos.z), structureArea);
     }
 
     public boolean isAreaChanged(@Nonnull final World worldIn,
@@ -94,9 +91,9 @@ public boolean isAreaChanged(@Nonnull final World worldIn,
 
         for (int chunkX = minChunkX; chunkX <= maxChunkX; chunkX++) {
             for (int chunkZ = minChunkZ; chunkZ <= maxChunkZ; chunkZ++) {
-                Map<ChunkPos, StructureBoundingBox> chunkPosBoundingBoxMap = worldChangedChunksLastTick.get(worldIn);
-                if (chunkPosBoundingBoxMap != null) {
-                    StructureBoundingBox changedArea = chunkPosBoundingBoxMap.get(new ChunkPos(chunkX, chunkZ));
+                Long2ObjectMap<StructureBoundingBox> changedChunks = worldChangedChunks.get(worldIn);
+                if (changedChunks != null) {
+                    StructureBoundingBox changedArea = changedChunks.get(ChunkPos.asLong(chunkX, chunkZ));
                     if (changedArea != null && changedArea.intersectsWith(structureArea)) {
                         return true;
                     }
@@ -111,16 +108,17 @@ public void notifyBlockUpdate(@Nonnull final World worldIn,
                                   @Nonnull final BlockPos pos,
                                   @Nonnull final IBlockState oldState,
                                   @Nonnull final IBlockState newState, final int flags) {
-        if ((flags != 1 && flags != 3) || oldState == newState) {
+        if ((flags & 1) == 0 || oldState == newState) {
             return;
         }
 
-        Map<ChunkPos, StructureBoundingBox> chunkPosHeightSetMap = worldChangedChunks.computeIfAbsent(worldIn, v -> new HashMap<>());
+        Long2ObjectMap<StructureBoundingBox> changedChunks = worldChangedChunks.computeIfAbsent(worldIn, v -> new Long2ObjectOpenHashMap<>());
         ChunkPos chunkPos = new ChunkPos(pos.getX() >> 4, pos.getZ() >> 4);
-        StructureBoundingBox changedArea = chunkPosHeightSetMap.get(chunkPos);
+        long longChunkPos = ChunkPos.asLong(chunkPos.x, chunkPos.z);
+        StructureBoundingBox changedArea = changedChunks.get(longChunkPos);
 
         if (changedArea == null) {
-            chunkPosHeightSetMap.put(chunkPos, new StructureBoundingBox(pos, pos));
+            changedChunks.put(longChunkPos, new StructureBoundingBox(pos, pos));
         } else {
             changedArea.expandTo(new StructureBoundingBox(pos, pos));
         }

src/main/java/hellfirepvp/modularmachinery/common/tiles/TileFactoryController.java

@@ -48,6 +48,8 @@ public class TileFactoryController extends TileMultiblockMachineController {
     private FactoryRecipeSearchTask searchTask = null;
     private SequentialTaskExecutor threadTask = null;
 
+    private boolean redstoneEffected = false;
+
     public TileFactoryController() {
 
     }
@@ -67,6 +69,7 @@ public TileFactoryController(IBlockState state) {
     @Override
     public void doControllerTick() {
         if (getStrongPower() > 0) {
+            redstoneEffected = true;
             return;
         }
 
@@ -539,6 +542,15 @@ protected void updateComponents() {
         }
     }
 
+    @Override
+    protected boolean canCheckStructure() {
+        if (redstoneEffected) {
+            redstoneEffected = false;
+            return true;
+        }
+        return super.canCheckStructure();
+    }
+
     @Override
     protected void checkRotation() {
         IBlockState state = getWorld().getBlockState(getPos());

src/main/java/hellfirepvp/modularmachinery/common/tiles/TileMachineController.java

@@ -40,6 +40,8 @@ public class TileMachineController extends TileMultiblockMachineController {
     private MachineRecipeThread recipeThread = new MachineRecipeThread(this);
     private BlockController parentController = null;
 
+    private boolean redstoneEffected = false;
+
     public TileMachineController() {
     }
 
@@ -59,6 +61,7 @@ public TileMachineController(IBlockState state) {
     @Override
     public void doControllerTick() {
         if (getStrongPower() > 0) {
+            redstoneEffected = true;
             return;
         }
 
@@ -222,6 +225,15 @@ protected void updateComponents() {
         ctx.updateComponents(foundComponents.values());
     }
 
+    @Override
+    protected boolean canCheckStructure() {
+        if (redstoneEffected) {
+            redstoneEffected = false;
+            return true;
+        }
+        return super.canCheckStructure();
+    }
+
     @Override
     protected void checkRotation() {
         IBlockState state = getWorld().getBlockState(getPos());