Multiblock and Cargo cars support

src/main/java/cam72cam/immersiverailroading/IRItems.java

@@ -11,6 +11,7 @@ public class IRItems {
 	public static ItemRailAugment ITEM_AUGMENT = new ItemRailAugment();
 	public static ItemTrackBlueprint ITEM_TRACK_BLUEPRINT = new ItemTrackBlueprint();
 	public static ItemManual ITEM_MANUAL = new ItemManual();
+	public static ItemMultiblockBlueprint ITEM_MULTIBLOCK_BLUEPRINT = new ItemMultiblockBlueprint();
 	public static ItemRail ITEM_RAIL = new ItemRail();
 	public static ItemPlate ITEM_PLATE = new ItemPlate();
 	public static ItemCastRail ITEM_CAST_RAIL = new ItemCastRail();

src/main/java/cam72cam/immersiverailroading/ImmersiveRailroading.java

@@ -76,8 +76,11 @@ public void commonEvent(ModEvent event) {
 
 				Packet.register(BuildableStockSyncPacket::new, PacketDirection.ServerToClient);
 				Packet.register(ItemRailUpdatePacket::new, PacketDirection.ClientToServer);
+				Packet.register(ItemMultiblockUpdatePacket::new, PacketDirection.ClientToServer);
 				Packet.register(MRSSyncPacket::new, PacketDirection.ServerToClient);
 				Packet.register(MultiblockSelectCraftPacket::new, PacketDirection.ClientToServer);
+                Packet.register(MultiblockSetStockPacket::new, PacketDirection.ClientToServer);
+                Packet.register(MultiblockControlChangePacket::new, PacketDirection.ClientToServer);
 				Packet.register(PreviewRenderPacket::new, PacketDirection.ServerToClient);
 				Packet.register(SoundPacket::new, PacketDirection.ServerToClient);
 				Packet.register(KeyPressPacket::new, PacketDirection.ClientToServer);
@@ -113,6 +116,11 @@ public void commonEvent(ModEvent event) {
 				MultiblockRegistry.register(RailRollerMultiblock.NAME, new RailRollerMultiblock());
 				MultiblockRegistry.register(BoilerRollerMultiblock.NAME, new BoilerRollerMultiblock());
 				MultiblockRegistry.register(CastingMultiblock.NAME, new CastingMultiblock());
+                for (String s : DefinitionManager.multiblocks.keySet()) {
+                    MultiblockRegistry.register(DefinitionManager.multiblocks.get(s).name,
+                            new CustomTransporterMultiblock(DefinitionManager.multiblocks.get(s)));
+                }
+                TileMultiblockRender.registerOthers();
 				IRFuzzy.applyFallbacks();
 				break;
 		}
@@ -143,6 +151,7 @@ public void clientEvent(ModEvent event) {
 				ItemRender.register(IRItems.ITEM_PAINT_BRUSH, ObjItemRender.getModelFor(new Identifier(MODID, "models/item/paint_brush.obj"), new Vec3d(0.5, 0.25, 0.5), 3));
 				ItemRender.register(IRItems.ITEM_RADIO_CONTROL_CARD, new Identifier(MODID, "items/radio_card"));
 				ItemRender.register(IRItems.ITEM_MANUAL, new Identifier(MODID, "items/engineerslexicon"));
+				ItemRender.register(IRItems.ITEM_MULTIBLOCK_BLUEPRINT, new Identifier(MODID, "items/engineerslexicon"));
 				ItemRender.register(IRItems.ITEM_TRACK_EXCHANGER, new TrackExchangerModel());
 
 				IEntityRender<EntityMoveableRollingStock> stockRender = new IEntityRender<EntityMoveableRollingStock>() {
@@ -194,7 +203,7 @@ public void postRender(EntityMoveableRollingStock entity, RenderState state, flo
 				break;
 			case SETUP:
 				GlobalRender.registerItemMouseover(IRItems.ITEM_TRACK_BLUEPRINT, TrackBlueprintItemModel::renderMouseover);
-				GlobalRender.registerItemMouseover(IRItems.ITEM_MANUAL, MBBlueprintRender::renderMouseover);
+				GlobalRender.registerItemMouseover(IRItems.ITEM_MULTIBLOCK_BLUEPRINT, MBBlueprintRender::renderMouseover);
 
 				GlobalRender.registerOverlay((state, pt) -> {
 					Entity riding = MinecraftClient.getPlayer().getRiding();

src/main/java/cam72cam/immersiverailroading/entity/EntityMoveableRollingStock.java

@@ -212,7 +212,7 @@ public void onDragRelease(Control<?> control) {
     }
 
     @Override
-    protected float defaultControlPosition(Control<?> control) {
+    public float defaultControlPosition(Control<?> control) {
         switch (control.part.type) {
             case INDEPENDENT_BRAKE_X:
                 return getDefinition().isLinearBrakeControl() ? 0 : 0.5f;

src/main/java/cam72cam/immersiverailroading/entity/EntityRollingStock.java

@@ -6,6 +6,8 @@
 import cam72cam.immersiverailroading.ImmersiveRailroading;
 import cam72cam.immersiverailroading.items.ItemPaintBrush;
 import cam72cam.immersiverailroading.library.*;
+import cam72cam.immersiverailroading.model.animation.ControlPositionMapper;
+import cam72cam.immersiverailroading.model.animation.IAnimatable;
 import cam72cam.immersiverailroading.model.part.Control;
 import cam72cam.immersiverailroading.registry.DefinitionManager;
 import cam72cam.immersiverailroading.registry.EntityRollingStockDefinition;
@@ -27,10 +29,9 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
-public class EntityRollingStock extends CustomEntity implements ITickable, IClickable, IKillable {
+public class EntityRollingStock extends CustomEntity implements ITickable, IClickable, IKillable, IAnimatable {
 	@TagField("defID")
     protected String defID;
 	@TagField("gauge")
@@ -265,6 +266,7 @@ public String getTexture() {
 		return texture;
 	}
 
+    @Override
 	public Matrix4 getModelMatrix() {
 		return this.modelMatrix.get(getPosition()).copy();
 	}
@@ -277,83 +279,77 @@ public boolean hasElectricalPower() {
 	@TagField(value="controlPositions", mapper = ControlPositionMapper.class)
 	protected Map<String, Pair<Boolean, Float>> controlPositions = new HashMap<>();
 
-	public void onDragStart(Control<?> control) {
-		setControlPressed(control, true);
-	}
-
-	public void onDrag(Control<?> control, double newValue) {
-		setControlPressed(control, true);
-		setControlPosition(control, (float)newValue);
-	}
+    @Override
+    public float defaultControlPosition(Control<?> control) {
+        return 0;
+    }
 
-	public void onDragRelease(Control<?> control) {
-		setControlPressed(control, false);
+    @Override
+    public Pair<Boolean, Float> getControlData(String control) {
+        return controlPositions.getOrDefault(control, Pair.of(false, 0f));
+    }
 
-		if (control.toggle) {
-			setControlPosition(control, Math.abs(getControlPosition(control) - 1));
-		}
-		if (control.press) {
-			setControlPosition(control, 0);
-		}
-	}
+    @Override
+    public Pair<Boolean, Float> getControlData(Control<?> control) {
+        return controlPositions.getOrDefault(control.controlGroup, Pair.of(false, defaultControlPosition(control)));
+    }
 
-	protected float defaultControlPosition(Control<?> control) {
-		return 0;
-	}
+    @Override
+    public float getControlPosition(Control<?> control) {
+        return getControlData(control).getRight();
+    }
 
-	public Pair<Boolean, Float> getControlData(String control) {
-		return controlPositions.getOrDefault(control, Pair.of(false, 0f));
-	}
+    @Override
+    public float getControlPosition(String control) {
+        return getControlData(control).getRight();
+    }
 
-	public Pair<Boolean, Float> getControlData(Control<?> control) {
-		return controlPositions.getOrDefault(control.controlGroup, Pair.of(false, defaultControlPosition(control)));
-	}
+    @Override
+    public void setControlPosition(Control<?> control, float val) {
+        val = Math.min(1, Math.max(0, val));
+        controlPositions.put(control.controlGroup, Pair.of(getControlPressed(control), val));
+    }
 
-	public boolean getControlPressed(Control<?> control) {
-		return getControlData(control).getLeft();
-	}
+    @Override
+    public void setControlPosition(String control, float val) {
+        val = Math.min(1, Math.max(0, val));
+        controlPositions.put(control, Pair.of(false, val));
+    }
 
-	public void setControlPressed(Control<?> control, boolean pressed) {
-		controlPositions.put(control.controlGroup, Pair.of(pressed, getControlPosition(control)));
-	}
+    @Override
+    public void setControlPositions(ModelComponentType type, float val) {
+        getDefinition().getModel().getControls().stream().filter(x -> x.part.type == type).forEach(c -> setControlPosition(c, val));
+    }
 
-	public float getControlPosition(Control<?> control) {
-		return getControlData(control).getRight();
+	public void onDragStart(Control<?> control) {
+		setControlPressed(control, true);
 	}
 
-	public float getControlPosition(String control) {
-		return getControlData(control).getRight();
+	public void onDrag(Control<?> control, double newValue) {
+		setControlPressed(control, true);
+		setControlPosition(control, (float)newValue);
 	}
 
-	public void setControlPosition(Control<?> control, float val) {
-		val = Math.min(1, Math.max(0, val));
-		controlPositions.put(control.controlGroup, Pair.of(getControlPressed(control), val));
-	}
+	public void onDragRelease(Control<?> control) {
+        setControlPressed(control, false);
+
+        if (control.toggle) {
+            setControlPosition(control, Math.abs(getControlPosition(control) - 1));
+        }
+        if (control.press) {
+            setControlPosition(control, 0);
+        }
+    }
 
-	public void setControlPosition(String control, float val) {
-		val = Math.min(1, Math.max(0, val));
-		controlPositions.put(control, Pair.of(false, val));
-	}
+    public boolean getControlPressed(Control<?> control) {
+        return getControlData(control).getLeft();
+    }
 
-	public void setControlPositions(ModelComponentType type, float val) {
-		getDefinition().getModel().getControls().stream().filter(x -> x.part.type == type).forEach(c -> setControlPosition(c, val));
-	}
+    public void setControlPressed(Control<?> control, boolean pressed) {
+        controlPositions.put(control.controlGroup, Pair.of(pressed, getControlPosition(control)));
+    }
 
 	public boolean playerCanDrag(Player player, Control<?> control) {
 		return control.part.type != ModelComponentType.INDEPENDENT_BRAKE_X || player.hasPermission(Permissions.BRAKE_CONTROL);
 	}
-
-
-	private static class ControlPositionMapper implements TagMapper<Map<String, Pair<Boolean, Float>>> {
-		@Override
-		public TagAccessor<Map<String, Pair<Boolean, Float>>> apply(
-				Class<Map<String, Pair<Boolean, Float>>> type,
-				String fieldName,
-				TagField tag) throws SerializationException {
-			return new TagAccessor<>(
-					(d, o) -> d.setMap(fieldName, o, Function.identity(), x -> new TagCompound().setBoolean("pressed", x.getLeft()).setFloat("pos", x.getRight())),
-					d -> d.getMap(fieldName, Function.identity(), x -> Pair.of(x.hasKey("pressed") && x.getBoolean("pressed"), x.getFloat("pos")))
-			);
-		}
-	}
 }

src/main/java/cam72cam/immersiverailroading/entity/Freight.java

@@ -4,14 +4,18 @@
 import cam72cam.immersiverailroading.inventory.FilteredStackHandler;
 import cam72cam.immersiverailroading.library.GuiTypes;
 import cam72cam.immersiverailroading.library.Permissions;
+import cam72cam.immersiverailroading.model.FreightModel;
+import cam72cam.immersiverailroading.model.part.CargoUnload;
 import cam72cam.immersiverailroading.registry.FreightDefinition;
 import cam72cam.mod.entity.Entity;
 import cam72cam.mod.entity.Living;
 import cam72cam.mod.entity.Player;
+import cam72cam.mod.entity.boundingbox.IBoundingBox;
 import cam72cam.mod.entity.sync.TagSync;
 import cam72cam.mod.item.ClickResult;
 import cam72cam.mod.item.Fuzzy;
 import cam72cam.mod.item.ItemStack;
+import cam72cam.mod.math.Vec3d;
 import cam72cam.mod.serialization.TagField;
 
 import java.util.List;
@@ -28,6 +32,8 @@ public abstract class Freight extends EntityCoupleableRollingStock {
 	@TagField("PERCENT_FULL")
 	private int percentFull = 0;
 
+    protected transient int ticks = 0;
+
 	public abstract int getInventorySize();
 	public abstract int getInventoryWidth();
 
@@ -37,10 +43,10 @@ public FreightDefinition getDefinition() {
 	}
 
 	/*
-	 * 
+	 *
 	 * EntityRollingStock Overrides
 	 */
-	
+
 	@Override
 	public void onAssemble() {
 		super.onAssemble();
@@ -52,7 +58,7 @@ public void onAssemble() {
 		}
 		initContainerFilter();
 	}
-	
+
 	@Override
 	public void onDissassemble() {
 		super.onDissassemble();
@@ -75,7 +81,6 @@ public ClickResult onClick(Player player, Player.Hand hand) {
 		if (clickRes != ClickResult.PASS) {
 			return clickRes;
 		}
-
 		if (!this.isBuilt()) {
 			return ClickResult.PASS;
 		}
@@ -121,7 +126,52 @@ public ClickResult onClick(Player player, Player.Hand hand) {
 		return ClickResult.PASS;
 	}
 
-	protected boolean openGui(Player player) {
+    @Override
+    public void onTick() {
+        super.onTick();
+        ticks++;
+        FreightModel<?, ?> model = (FreightModel<?, ?>) this.getDefinition().getModel();
+        if(getWorld().isServer){
+            //inputs
+            if (this.getCurrentSpeed().metric() <= 10.8 && ticks % 2 == 0) {//3m/s and don't refresh it every tick
+				double temp = this.getDefinition().getLength(this.gauge) / 2;
+				Vec3d bound = new Vec3d(temp, temp, temp);
+				List<ItemStack> stacks = model.getItemsWithin(this, getWorld().getItemEntitiesWithinBB(IBoundingBox.from(
+						this.getPosition().add(bound), this.getPosition().subtract(bound))));
+
+                if (!stacks.isEmpty()) {
+                    //transfer to this.cargoItems
+                    for (int fromSlot = 0; fromSlot < stacks.size(); fromSlot++) {
+                        ItemStack stack = stacks.get(fromSlot);
+                        int origCount = stack.getCount();
+
+                        if (stack.isEmpty()) {
+                            continue;
+                        }
+
+                        for (int toSlot = 0; toSlot < this.cargoItems.getSlotCount(); toSlot++) {
+                            stack.setCount(this.cargoItems.insert(toSlot, stack, false).getCount());
+                            if (stack.isEmpty()) {
+                                break;
+                            }
+                        }
+
+                        if (origCount != stack.getCount()) {
+                            stacks.set(fromSlot, stack);
+                        }
+                    }
+                }
+            }
+            //outputs
+            if (model.getUnloadingPoints() != null) {
+                for (CargoUnload point : model.getUnloadingPoints()) {
+					point.tryToUnload(this);
+				}
+            }
+        }
+    }
+
+    protected boolean openGui(Player player) {
 		if (getInventorySize() == 0) {
 			return false;
 		}
@@ -146,13 +196,13 @@ protected void handleMass() {
 		itemCount = itemInsideCount;
 		percentFull = this.getInventorySize() > 0 ? stacksWithStuff * 100 / this.getInventorySize() : 100;
 	}
-	
+
 	public int getPercentCargoFull() {
 		return percentFull;
 	}
 
 	protected void initContainerFilter() {
-		
+
 	}
 
 	@Override

src/main/java/cam72cam/immersiverailroading/entity/Locomotive.java

@@ -257,7 +257,7 @@ public void onDragRelease(Control<?> control) {
 	}
 
 	@Override
-	protected float defaultControlPosition(Control<?> control) {
+    public float defaultControlPosition(Control<?> control) {
 		switch (control.part.type) {
 			case THROTTLE_BRAKE_X:
 			case REVERSER_X: