Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.18/fabric…

…/dev

# Conflicts:
#	gradle.properties
#	src/generated/resources/.cache/cache
#	src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxInventory.java
#	src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainItemHandler.java
#	src/main/java/com/simibubi/create/content/kinetics/belt/BeltBlock.java
#	src/main/java/com/simibubi/create/content/kinetics/belt/transport/ItemHandlerBeltSegment.java
#	src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerItemHandler.java
#	src/main/java/com/simibubi/create/content/logistics/chute/ChuteItemHandler.java
#	src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelItemHandler.java
#	src/main/java/com/simibubi/create/content/processing/basin/BasinBlockEntity.java
#	src/main/java/com/simibubi/create/foundation/item/ItemHelper.java
#	src/main/java/com/simibubi/create/foundation/ponder/PonderWorld.java

gradle.properties

@@ -8,7 +8,7 @@ loader_version = 0.15.7
 fabric_version = 0.77.0+1.18.2
 
 # Mod Properties
-mod_version = 0.5.1-h
+mod_version = 0.5.1-i
 maven_group = com.simibubi.create
 
 # Dependencies

src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_ic2.json → src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_aluminium_compat_ic2.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "create:blasting/ingot_aluminum_compat_ic2"
+      "create:blasting/ingot_aluminium_compat_ic2"
     ]
   },
   "criteria": {
@@ -21,7 +21,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "create:blasting/ingot_aluminum_compat_ic2"
+        "recipe": "create:blasting/ingot_aluminium_compat_ic2"
       }
     }
   },

src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_aluminum_compat_ic2.json → src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_aluminium_compat_ic2.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "create:smelting/ingot_aluminum_compat_ic2"
+      "create:smelting/ingot_aluminium_compat_ic2"
     ]
   },
   "criteria": {
@@ -21,7 +21,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "create:smelting/ingot_aluminum_compat_ic2"
+        "recipe": "create:smelting/ingot_aluminium_compat_ic2"
       }
     }
   },

src/generated/resources/data/create/recipes/blasting/ingot_aluminum_compat_ic2.json → src/generated/resources/data/create/recipes/blasting/ingot_aluminium_compat_ic2.json

@@ -3,7 +3,7 @@
   "ingredient": {
     "item": "create:crushed_raw_aluminum"
   },
-  "result": "ic2:ingot_aluminum",
+  "result": "ic2:ingot_aluminium",
   "experience": 0.1,
   "cookingtime": 100,
   "fabric:load_conditions": [

src/generated/resources/data/create/recipes/smelting/ingot_aluminum_compat_ic2.json → src/generated/resources/data/create/recipes/smelting/ingot_aluminium_compat_ic2.json

@@ -3,7 +3,7 @@
   "ingredient": {
     "item": "create:crushed_raw_aluminum"
   },
-  "result": "ic2:ingot_aluminum",
+  "result": "ic2:ingot_aluminium",
   "experience": 0.1,
   "cookingtime": 200,
   "fabric:load_conditions": [

src/generated/resources/data/create/recipes/splashing/ic2/crushed_raw_aluminum.json

@@ -7,7 +7,7 @@
   ],
   "results": [
     {
-      "item": "ic2:nugget_aluminum",
+      "item": "ic2:nugget_aluminium",
       "count": 9
     }
   ],

src/main/java/com/simibubi/create/Create.java

@@ -63,7 +63,7 @@ public class Create implements ModInitializer {
 
 	public static final String ID = "create";
 	public static final String NAME = "Create";
-	public static final String VERSION = "0.5.1h";
+	public static final String VERSION = "0.5.1i";
 
 	public static final Logger LOGGER = LogUtils.getLogger();
 

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

@@ -1138,6 +1138,7 @@ public void addBlocksToWorld(Level world, StructureTransform transform) {
 					if (blockEntity instanceof IMultiBlockEntityContainer) {
 						if (tag.contains("LastKnownPos") || capturedMultiblocks.isEmpty()) {
 							tag.put("LastKnownPos", NbtUtils.writeBlockPos(BlockPos.ZERO.below(Integer.MAX_VALUE - 1)));
+							tag.remove("Controller");
 						}
 					}
 
@@ -1194,6 +1195,9 @@ protected void translateMultiblockControllers(StructureTransform transform) {
 			// swap nbt data to the new controller position
 			StructureBlockInfo prevControllerInfo = blocks.get(controllerPos);
 			StructureBlockInfo newControllerInfo = blocks.get(otherPos);
+			if (prevControllerInfo == null || newControllerInfo == null)
+				return;
+
 			blocks.put(otherPos, new StructureBlockInfo(newControllerInfo.pos, newControllerInfo.state, prevControllerInfo.nbt));
 			blocks.put(controllerPos, new StructureBlockInfo(prevControllerInfo.pos, prevControllerInfo.state, newControllerInfo.nbt));
 		});
@@ -1385,6 +1389,9 @@ public void invalidateColliders() {
 
 	private void gatherBBsOffThread() {
 		getContraptionWorld();
+		if (simplifiedEntityColliderProvider != null) {
+			simplifiedEntityColliderProvider.cancel(false);
+		}
 		simplifiedEntityColliderProvider = CompletableFuture.supplyAsync(() -> {
 			VoxelShape combinedShape = Shapes.empty();
 			for (Entry<BlockPos, StructureBlockInfo> entry : blocks.entrySet()) {
@@ -1401,7 +1408,6 @@ private void gatherBBsOffThread() {
 		})
 			.thenAccept(r -> {
 				simplifiedEntityColliders = Optional.of(r);
-				simplifiedEntityColliderProvider = null;
 			});
 	}
 

src/main/java/com/simibubi/create/content/contraptions/MountedStorage.java

@@ -4,6 +4,7 @@
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllTags.AllBlockTags;
+import com.simibubi.create.content.equipment.toolbox.ToolboxInventory;
 import com.simibubi.create.content.kinetics.crafter.MechanicalCrafterBlockEntity;
 import com.simibubi.create.content.logistics.crate.BottomlessItemHandler;
 import com.simibubi.create.content.logistics.vault.ItemVaultBlockEntity;
@@ -185,6 +186,8 @@ public CompoundTag serialize() {
 		CompoundTag tag = handler.serializeNBT();
 		if (noFuel)
 			NBTHelper.putMarker(tag, "NoFuel");
+		if (handler instanceof ToolboxInventory)
+			NBTHelper.putMarker(tag, "Toolbox");
 		if (!(handler instanceof BottomlessItemHandler))
 			return tag;
 
@@ -198,6 +201,9 @@ public static MountedStorage deserialize(CompoundTag nbt) {
 		storage.handler = new ItemStackHandler();
 		if (nbt == null)
 			return storage;
+		if (nbt.contains("Toolbox"))
+			storage.handler = new ToolboxInventory(null);
+
 		storage.valid = true;
 		storage.noFuel = nbt.contains("NoFuel");
 

src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardBlockEntity.java

@@ -69,6 +69,8 @@ protected void write(CompoundTag tag, boolean clientPacket) {
 	protected void read(CompoundTag tag, boolean clientPacket) {
 		super.read(tag, clientPacket);
 		dataContainer = ItemStack.of(tag.getCompound("Item"));
+		if (!AllBlocks.CLIPBOARD.isIn(dataContainer))
+			dataContainer = AllBlocks.CLIPBOARD.asStack();
 
 		if (clientPacket)
 			EnvExecutor.runWhenOn(EnvType.CLIENT, () -> () -> readClientSide(tag));

src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxInventory.java

@@ -88,7 +88,7 @@ else if (!stackInSlot.isEmpty()) {
 			}
 		}
 		settling = false;
-		blockEntity.sendData();
+		notifyUpdate();
 	}
 
 	@Override
@@ -131,8 +131,8 @@ private void updateCompartmentFilters(int slot, ItemStack stack, @Nullable Trans
 		if (!stack.isEmpty() && filters.get(compartment)
 				.isEmpty()) {
 			filters.set(compartment, ItemHandlerHelper.copyStackWithSize(stack, 1));
-			if (ctx != null) TransactionCallback.onSuccess(ctx, blockEntity::sendData);
-			else blockEntity.sendData();
+			if (ctx != null) TransactionCallback.onSuccess(ctx, blockEntity::notifyUpdate);
+			else notifyUpdate();
 		}
 	}
 
@@ -145,10 +145,9 @@ public CompoundTag serializeNBT() {
 
 	@Override
 	protected void onContentsChanged(int slot) {
-		if (!settling && !blockEntity.getLevel().isClientSide)
+		if (!settling && (blockEntity == null || !blockEntity.getLevel().isClientSide))
 			settle(slot / STACKS_PER_COMPARTMENT);
-		blockEntity.sendData();
-		blockEntity.setChanged();
+		notifyUpdate();
 		super.onContentsChanged(slot);
 	}
 
@@ -240,6 +239,11 @@ public static boolean canItemsShareCompartment(ItemStack stack1, ItemStack stack
 		return ItemHandlerHelper.canItemStacksStack(stack1, stack2);
 	}
 
+	private void notifyUpdate() {
+		if (blockEntity != null)
+			blockEntity.notifyUpdate();
+	}
+
 	public static class ToolboxSnapshotData implements ItemStackHandlerSnapshot {
 		public final ItemStackHandlerSnapshot base;
 		public final List<ItemStack> filters;

src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainItemHandler.java

@@ -2,6 +2,7 @@
 
 import com.simibubi.create.content.fluids.transfer.GenericItemEmptying;
 import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack;
+import com.simibubi.create.foundation.item.ItemHelper;
 
 import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
 import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;

src/main/java/com/simibubi/create/content/kinetics/base/GeneratingKineticBlockEntity.java

@@ -73,9 +73,8 @@ public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneak
 		float speed = getTheoreticalSpeed();
 		if (speed != getGeneratedSpeed() && speed != 0)
 			stressBase *= getGeneratedSpeed() / speed;
-		speed = Math.abs(speed);
 
-		float stressTotal = stressBase * speed;
+		float stressTotal = Math.abs(stressBase * speed);
 
 		Lang.number(stressTotal)
 			.translate("generic.unit.stress")

src/main/java/com/simibubi/create/content/kinetics/belt/BeltRenderer.java

@@ -235,7 +235,7 @@ protected void renderItems(BeltBlockEntity be, float partialTicks, PoseStack ms,
 					be.getBlockPos().getZ())
 				.add(offsetVec);
 
-			if (this.shouldCullItem(itemPos)) {
+			if (this.shouldCullItem(itemPos, be.getLevel())) {
 				continue;
 			}
 

src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerItemHandler.java

@@ -6,6 +6,7 @@
 import java.util.function.Supplier;
 
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
+import com.simibubi.create.foundation.item.ItemHelper;
 
 import io.github.fabricators_of_create.porting_lib.transfer.item.ItemHandlerHelper;
 import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;

src/main/java/com/simibubi/create/content/logistics/chute/ChuteItemHandler.java

@@ -2,6 +2,8 @@
 
 import com.simibubi.create.foundation.item.ItemHelper;
 
+import com.simibubi.create.foundation.item.ItemHelper;
+
 import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
 import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleVariantStorage;
 import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;

src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlock.java

@@ -96,7 +96,7 @@ public InteractionResult use(BlockState state, Level worldIn, BlockPos pos, Play
 				withBlockEntityDo(worldIn, pos, be -> {
 					ItemStack toInsert = heldItem.copy();
 					ItemStack remainder = tryInsert(worldIn, pos, toInsert, false);
-					if (!ItemStack.matches(remainder, toInsert))
+					if (!ItemStack.matches(remainder, toInsert) || remainder.getCount() != heldItem.getCount())
 						player.setItemInHand(handIn, remainder);
 				});
 			return InteractionResult.SUCCESS;

src/main/java/com/simibubi/create/content/processing/basin/BasinBlockEntity.java

@@ -461,7 +461,8 @@ private void tryClearingSpoutputOverflow() {
 			if (filter != null && !filter.test(itemStack))
 				continue;
 
-			visualizedOutputItems.add(LongAttached.withZero(itemStack));
+			if (visualizedOutputItems.size() < 3)
+				visualizedOutputItems.add(LongAttached.withZero(itemStack));
 			update = true;
 
 			inserted = TransferUtil.insertItem(targetInv, itemStack.copy());
@@ -492,6 +493,7 @@ private void tryClearingSpoutputOverflow() {
 
 					update = true;
 					iterator.remove();
+					if (visualizedOutputFluids.size() < 3)
 					visualizedOutputFluids.add(LongAttached.withZero(fluidStack));
 					nested.commit();
 				}

src/main/java/com/simibubi/create/content/redstone/displayLink/source/DisplaySource.java

@@ -13,6 +13,7 @@
 import com.simibubi.create.content.trains.display.FlapDisplayLayout;
 import com.simibubi.create.foundation.gui.ModularGuiLineBuilder;
 import com.simibubi.create.foundation.utility.Components;
+import com.simibubi.create.foundation.utility.NBTProcessors;
 
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
@@ -38,6 +39,12 @@ public void transferData(DisplayLinkContext context, DisplayTarget activeTarget,
 		List<MutableComponent> text = provideText(context, stats);
 		if (text.isEmpty())
 			text = EMPTY;
+
+		if (activeTarget.requiresComponentSanitization())
+			for (MutableComponent component : text)
+				if (NBTProcessors.textComponentHasClickEvent(component))
+					return; // Naughty
+
 		activeTarget.acceptText(line, text, context);
 	}
 

src/main/java/com/simibubi/create/content/redstone/displayLink/target/DisplayTarget.java

@@ -67,5 +67,9 @@ public boolean isReserved(int line, BlockEntity target, DisplayLinkContext conte
 			tag.remove("DisplayLink");
 		return false;
 	}
+
+	public boolean requiresComponentSanitization() {
+		return false;
+	}
 
 }

src/main/java/com/simibubi/create/content/redstone/displayLink/target/LecternDisplayTarget.java

@@ -80,5 +80,10 @@ private ItemStack signBook(ItemStack book) {
 
 		return written;
 	}
+
+	@Override
+	public boolean requiresComponentSanitization() {
+		return true;
+	}
 
 }

src/main/java/com/simibubi/create/content/redstone/displayLink/target/SignDisplayTarget.java

@@ -35,5 +35,10 @@ public void acceptText(int line, List<MutableComponent> text, DisplayLinkContext
 	public DisplayTargetStats provideStats(DisplayLinkContext context) {
 		return new DisplayTargetStats(4, 15, this);
 	}
+
+	@Override
+	public boolean requiresComponentSanitization() {
+		return true;
+	}
 
 }

src/main/java/com/simibubi/create/content/schematics/SchematicWorld.java

@@ -10,6 +10,8 @@
 import java.util.stream.Stream;
 
 import com.simibubi.create.Create;
+import com.simibubi.create.foundation.blockEntity.IMultiBlockEntityContainer;
+import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.utility.BBHelper;
 import com.simibubi.create.foundation.utility.NBTProcessors;
 import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld;
@@ -250,5 +252,25 @@ public ServerLevel getLevel() {
 		}
 		throw new IllegalStateException("Cannot use IServerWorld#getWorld in a client environment");
 	}
+
+	public void fixControllerBlockEntities() {
+		for (BlockEntity blockEntity : blockEntities.values()) {
+			if (!(blockEntity instanceof IMultiBlockEntityContainer multiBlockEntity))
+				continue;
+			BlockPos lastKnown = multiBlockEntity.getLastKnownPos();
+			BlockPos current = blockEntity.getBlockPos();
+			if (lastKnown == null || current == null)
+				continue;
+			if (multiBlockEntity.isController())
+				continue;
+			if (!lastKnown.equals(current)) {
+				BlockPos newControllerPos = multiBlockEntity.getController()
+					.offset(current.subtract(lastKnown));
+				if (multiBlockEntity instanceof SmartBlockEntity sbe)
+					sbe.markVirtual();
+				multiBlockEntity.setController(newControllerPos);
+			}
+		}
+	}
 
 }

src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java

@@ -165,6 +165,7 @@ private void setupRenderer() {
 			schematic.placeInWorld(w, pos, pos, placementSettings, w.getRandom(), Block.UPDATE_CLIENTS);
 			for (BlockEntity blockEntity : w.getBlockEntities())
 				blockEntity.setLevel(w);
+			w.fixControllerBlockEntities();
 		} catch (Exception e) {
 			Minecraft.getInstance().player.displayClientMessage(Lang.translate("schematic.error")
 				.component(), false);
@@ -179,6 +180,7 @@ private void setupRenderer() {
 			placementSettings.getMirror());
 		for (BlockEntity be : wMirroredFB.getRenderedBlockEntities())
 			transform.apply(be);
+		wMirroredFB.fixControllerBlockEntities();
 
 		placementSettings.setMirror(Mirror.LEFT_RIGHT);
 		pos = BlockPos.ZERO.south(size.getZ() - 1);
@@ -187,6 +189,7 @@ private void setupRenderer() {
 			placementSettings.getMirror());
 		for (BlockEntity be : wMirroredLR.getRenderedBlockEntities())
 			transform.apply(be);
+		wMirroredLR.fixControllerBlockEntities();
 
 		renderers.get(0)
 			.display(w);