Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/dev

build.gradle

@@ -53,6 +53,7 @@ minecraft {
             workingDirectory project.file('run')
             arg '-mixin.config=create.mixins.json'
             //jvmArgs '-XX:+UnlockCommercialFeatures' // uncomment for profiling
+            //jvmArgs '-XX:+IgnoreUnrecognizedVMOptions', '-XX:+AllowEnhancedClassRedefinition' // uncomment with jbr
             property 'forge.logging.console.level', 'info'
             mods {
                 create {
@@ -204,8 +205,18 @@ dependencies {
     // runtimeOnly fg.deobf("maven.modrinth:rubidium:0.5.3")
     // implementation fg.deobf("com.railwayteam.railways:railways-1.18.2-1.1.1:all") { transitive = false }
     // runtimeOnly fg.deobf("maven.modrinth:spark:1.10.38-forge")
-    //runtimeOnly fg.deobf("curse.maven:forbidden-arcanus-309858:4729924")
+    // runtimeOnly fg.deobf("curse.maven:forbidden-arcanus-309858:4729924")
-    //runtimeOnly fg.deobf("curse.maven:valhelsia-core-416935:3886212")
+    // runtimeOnly fg.deobf("curse.maven:valhelsia-core-416935:3886212")
+    // implementation fg.deobf("curse.maven:modern-ui-352491:5229350")
+    // runtimeOnly fg.deobf("curse.maven:sophisticated-storage-619320:5194748")
+    // runtimeOnly fg.deobf("curse.maven:sophisticated-core-618298:5296312")
+    // runtimeOnly fg.deobf("curse.maven:functional-storage-556861:5271589")
+    // runtimeOnly fg.deobf("curse.maven:titanium-287342:5151207")
+    // runtimeOnly fg.deobf("curse.maven:storage-drawers-223852:3807626")
+    // implementation fg.deobf("curse.maven:ftb-chunks-forge-314906:4494633")
+    // implementation fg.deobf("curse.maven:architectury-api-419699:4521465")
+    // implementation fg.deobf("curse.maven:ftb-library-forge-404465:4396792")
+    // implementation fg.deobf("curse.maven:ftb-teams-forge-404468:4579981")
 
     // https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497
     // Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings

src/generated/resources/.cache/cache

@@ -3329,7 +3329,7 @@ c2b075008849e152f20e8da946e89c9722325df6 data/create/loot_tables/blocks/content_
 69b4b25d7d271458177fbbaeba2c797daccc38a2 data/create/loot_tables/blocks/contraption_controls.json
 28856dc862efc6bcc421d035d26386740458f868 data/create/loot_tables/blocks/controller_rail.json
 2c2785e39e1891dff2c50cba93e814b56d935154 data/create/loot_tables/blocks/controls.json
-3abf04f6132955275ad490668cd28f481afb4ec2 data/create/loot_tables/blocks/copper_backtank.json
+ac15351000c44cf0924e8e3b3c6d92e3d54bb084 data/create/loot_tables/blocks/copper_backtank.json
 6697e619d5c6dcb81aad4f5c88ba319d13665b35 data/create/loot_tables/blocks/copper_bars.json
 8010db6b2427536c74312c85425b3ba83abc363c data/create/loot_tables/blocks/copper_casing.json
 ea5fb942c8dfb792daac538e09d286ac120aa199 data/create/loot_tables/blocks/copper_door.json
@@ -3590,7 +3590,7 @@ afdff197c9d1a6940e988c00435135f9705fd0e5 data/create/loot_tables/blocks/metal_gi
 b83a90fbe83906b171fc0de6bdc2d9aa3a8c542e data/create/loot_tables/blocks/millstone.json
 5c1df8443043b3fe3b665dba348e2ff188bcbe31 data/create/loot_tables/blocks/minecart_anchor.json
 1e73d28fdd2e54910074aeadbe5617425a8ae656 data/create/loot_tables/blocks/mysterious_cuckoo_clock.json
-a5fa8fdc10efe534e5c7d8bdb687f226b39f63ef data/create/loot_tables/blocks/netherite_backtank.json
+188de41337119f55117c48eeb8d31cdf12cebd76 data/create/loot_tables/blocks/netherite_backtank.json
 2e21a06c0d671e543bffecb0b67d97b51fa83ddc data/create/loot_tables/blocks/nixie_tube.json
 f6b4095a518a01081f3663d7268d67063bdb44ee data/create/loot_tables/blocks/nozzle.json
 d378be8f13fc7ed625813eae3a50b68e8706a297 data/create/loot_tables/blocks/oak_window.json
@@ -4251,7 +4251,7 @@ fe6620822b1c90527c6b77ab6f6e25873d19487c data/create/recipes/crushing/compat/the
 2670e2454e82fd7dc44e896e40771bce9c515285 data/create/recipes/crushing/copper_ore.json
 4106006671af487158d165c8211553028585ebb3 data/create/recipes/crushing/crimsite.json
 b2ba06eb5bcc907f16e4605fc53f31aa35bc2cfd data/create/recipes/crushing/crimsite_recycling.json
-c0f2d4de4d00504607a8f3e2d1327d754835eebe data/create/recipes/crushing/deepslate_coal_ore.json
+57a02cc2631a232a6bad5e772b622983087ecb18 data/create/recipes/crushing/deepslate_coal_ore.json
 81ae6cf7b0f7dbf8f4966a4670121919de7b5391 data/create/recipes/crushing/deepslate_copper_ore.json
 2f9f26daadda2d291989bccd2b0ea5f85e3ef5ae data/create/recipes/crushing/deepslate_diamond_ore.json
 ae3070fc3ae237192949ad06ebb8a4c157f7e832 data/create/recipes/crushing/deepslate_emerald_ore.json
@@ -4265,6 +4265,7 @@ c42d105c8567c0844fcd811349093c2d754ea7d0 data/create/recipes/crushing/diamond_or
 f2b1c52cde3ecd83f021eff5114375e2f6526d90 data/create/recipes/crushing/diorite.json
 38e958ba2e12daeed2fb0bc65a9ab9e04c98b816 data/create/recipes/crushing/diorite_recycling.json
 1327589e844cb587a02167e4428fd604350d60e1 data/create/recipes/crushing/emerald_ore.json
+23623c1aa357e96b791019d64bdaf0124652baaf data/create/recipes/crushing/gilded_blackstone.json
 b26b1f0dccf2ffb194ce12173890a83e93369b39 data/create/recipes/crushing/glowstone.json
 159ac6c38b0232fa9bf3ed5e7ea8e23854c96f22 data/create/recipes/crushing/gold_ore.json
 55c0656723bd5a87089965651fe268b2d2956771 data/create/recipes/crushing/golden_horse_armor.json
@@ -5012,7 +5013,7 @@ e6aa8895186358e9d069f5a99909132be49f3bf1 data/create/recipes/diorite_from_stone_
 a90268d38f976327ff5e1b87ff1d72ca2d1ebad6 data/create/recipes/dripstone_block_from_stone_types_dripstone_stonecutting.json
 27d9bf05a610447e90314e658dbbcd191f378fc9 data/create/recipes/dripstone_pillar_from_stone_types_dripstone_stonecutting.json
 d81ceba2946286d374801e698a4ca2116395cbad data/create/recipes/emptying/builders_tea.json
-318ab703224ff1d6f7200675e1e0a4c138b28456 data/create/recipes/emptying/compat/alexsmobs/lava_bottle.json
+d62f4682fe6cc61df5a1c0231a2004a4ee78a329 data/create/recipes/emptying/compat/alexsmobs/lava_bottle.json
 c26d003e921720308c05ad7b9f3cb57de94a10a8 data/create/recipes/emptying/compat/farmersdelight/milk_bottle.json
 60c0edfb5b759e4f13427b631861f503f8552923 data/create/recipes/emptying/compat/neapolitan/milk_bottle.json
 20b7c7c62fa2e33199e08188dd8836844a6d9cfd data/create/recipes/emptying/honey_bottle.json
@@ -5027,7 +5028,7 @@ c2f40d447fbac4b4975e578fe32635658b73ebf7 data/create/recipes/exposed_copper_tile
 133e79f78a7f2c2f63ac7695d2be57d56e8955f4 data/create/recipes/filling/blaze_cake.json
 642e96ce5dd2f31e7a33c6ef4060eecb0bf2aa86 data/create/recipes/filling/builders_tea.json
 1367357fc36adc4b67467d90589ef91e657380a4 data/create/recipes/filling/chocolate_glazed_berries.json
-61a770607d872ace2be80c3391fba4225182282f data/create/recipes/filling/compat/alexsmobs/milk_bottle.json
+61a770607d872ace2be80c3391fba4225182282f data/create/recipes/filling/compat/alexsmobs/lava_bottle.json
 08dde80a4761e430eaaa18fb813885d307b25bd1 data/create/recipes/filling/compat/byg/lush_grass_block.json
 0e79248178f8c1690b4e5a5ad2ffaf63711ad3c7 data/create/recipes/filling/compat/farmersdelight/milk_bottle.json
 bcfbc3d6617e32732a1e186059694c4880e2d2e4 data/create/recipes/filling/compat/neapolitan/milk_bottle.json

src/generated/resources/data/create/loot_tables/blocks/copper_backtank.json

@@ -8,18 +8,14 @@
         {
           "type": "minecraft:item",
           "functions": [
-            {
-              "function": "minecraft:copy_name",
-              "source": "block_entity"
-            },
             {
               "function": "minecraft:copy_nbt",
               "source": "block_entity",
               "ops": [
                 {
-                  "source": "Air",
+                  "source": "VanillaTag",
-                  "target": "Air",
+                  "target": "{}",
-                  "op": "replace"
+                  "op": "merge"
                 }
               ]
             },
@@ -28,8 +24,8 @@
               "source": "block_entity",
               "ops": [
                 {
-                  "source": "Enchantments",
+                  "source": "Air",
-                  "target": "Enchantments",
+                  "target": "Air",
                   "op": "replace"
                 }
               ]

src/generated/resources/data/create/loot_tables/blocks/netherite_backtank.json

@@ -8,18 +8,14 @@
         {
           "type": "minecraft:item",
           "functions": [
-            {
-              "function": "minecraft:copy_name",
-              "source": "block_entity"
-            },
             {
               "function": "minecraft:copy_nbt",
               "source": "block_entity",
               "ops": [
                 {
-                  "source": "Air",
+                  "source": "VanillaTag",
-                  "target": "Air",
+                  "target": "{}",
-                  "op": "replace"
+                  "op": "merge"
                 }
               ]
             },
@@ -28,8 +24,8 @@
               "source": "block_entity",
               "ops": [
                 {
-                  "source": "Enchantments",
+                  "source": "Air",
-                  "target": "Enchantments",
+                  "target": "Air",
                   "op": "replace"
                 }
               ]

src/generated/resources/data/create/recipes/crushing/deepslate_coal_ore.json

@@ -7,11 +7,12 @@
   ],
   "results": [
     {
-      "item": "minecraft:coal"
+      "item": "minecraft:coal",
+      "count": 2
     },
     {
       "item": "minecraft:coal",
-      "chance": 0.75
+      "chance": 0.25
     },
     {
       "item": "create:experience_nugget",
@@ -22,5 +23,5 @@
       "chance": 0.125
     }
   ],
-  "processingTime": 250
+  "processingTime": 300
 }

src/generated/resources/data/create/recipes/crushing/gilded_blackstone.json

@@ -0,0 +1,23 @@
+{
+  "type": "create:crushing",
+  "ingredients": [
+    {
+      "item": "minecraft:gilded_blackstone"
+    }
+  ],
+  "results": [
+    {
+      "item": "minecraft:gold_nugget",
+      "count": 18
+    },
+    {
+      "item": "create:experience_nugget",
+      "chance": 0.75
+    },
+    {
+      "item": "minecraft:blackstone",
+      "chance": 0.125
+    }
+  ],
+  "processingTime": 400
+}

src/generated/resources/data/create/recipes/emptying/compat/alexsmobs/lava_bottle.json

@@ -16,7 +16,7 @@
   ],
   "conditions": [
     {
-      "modid": "atmospheric",
+      "modid": "alexsmobs",
       "type": "forge:mod_loaded"
     }
   ]

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

@@ -3,6 +3,8 @@ package com.simibubi.create;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.simibubi.create.content.contraptions.behaviour.FenceGateMovingInteraction;
+
 import org.jetbrains.annotations.Nullable;
 
 import com.simibubi.create.content.contraptions.behaviour.DoorMovingInteraction;
@@ -75,6 +77,15 @@ public class AllInteractionBehaviours {
 			}
 			return null;
 		});
+
+		FenceGateMovingInteraction fenceGateBehavior = new FenceGateMovingInteraction();
+		registerBehaviourProvider(state -> {
+			if (state.is(BlockTags.FENCE_GATES)) {
+				return fenceGateBehavior;
+			}
+			return null;
+		});
+
 	}
 
 	public interface BehaviourProvider {

src/main/java/com/simibubi/create/compat/Mods.java

@@ -18,11 +18,15 @@ public enum Mods {
 	CONNECTIVITY,
 	CURIOS,
 	DYNAMICTREES,
+	FUNCTIONALSTORAGE,
 	OCCULTISM,
 	PACKETFIXER,
+	SOPHISTICATEDBACKPACKS,
+	SOPHISTICATEDSTORAGE,
 	STORAGEDRAWERS,
 	TCONSTRUCT,
-	XLPACKETS;
+	XLPACKETS,
+	MODERNUI;
 
 	private final String id;
 

src/main/java/com/simibubi/create/compat/curios/Curios.java

@@ -43,13 +43,16 @@ public class Curios {
 		modEventBus.addListener(Curios::onClientSetup);
 
 		GogglesItem.addIsWearingPredicate(player -> resolveCuriosMap(player)
-			.map(curiosMap -> curiosMap.get("head"))
+			.map(curiosMap -> {
-			.map(stacksHandler -> {
+				for (ICurioStacksHandler stacksHandler : curiosMap.values()) {
-				// Check all the Head slots for Goggles existing
+					// Search all the curio slots for Goggles existing
-				int slots = stacksHandler.getSlots();
+					int slots = stacksHandler.getSlots();
-				for (int slot = 0; slot < slots; slot++)
+					for (int slot = 0; slot < slots; slot++) {
-					if (AllItems.GOGGLES.isIn(stacksHandler.getStacks().getStackInSlot(slot)))
+						if (AllItems.GOGGLES.isIn(stacksHandler.getStacks().getStackInSlot(slot))) {
-						return true;
+							return true;
+						}
+					}
+				}
 
 				return false;
 			})

src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java

@@ -99,16 +99,21 @@ public class MechanicalCraftingCategory extends CreateRecipeCategory<CraftingRec
 		matrixStack.translate(getXPadding(recipe), getYPadding(recipe), 0);
 
 		for (int row = 0; row < getHeight(recipe); row++)
-			for (int col = 0; col < getWidth(recipe); col++)
+			for (int col = 0; col < getWidth(recipe); col++) {
-				if (!recipe.getIngredients()
+				int pIndex = row * getWidth(recipe) + col;
-					.get(row * getWidth(recipe) + col)
+				if (pIndex >= recipe.getIngredients()
-					.isEmpty()) {
+					.size())
-					matrixStack.pushPose();
+					break;
-					matrixStack.translate(col * 19 * scale, row * 19 * scale, 0);
+				if (recipe.getIngredients()
-					matrixStack.scale(scale, scale, scale);
+					.get(pIndex)
-					AllGuiTextures.JEI_SLOT.render(matrixStack, 0, 0);
+					.isEmpty())
-					matrixStack.popPose();
+					continue;
-				}
+				matrixStack.pushPose();
+				matrixStack.translate(col * 19 * scale, row * 19 * scale, 0);
+				matrixStack.scale(scale, scale, scale);
+				AllGuiTextures.JEI_SLOT.render(matrixStack, 0, 0);
+				matrixStack.popPose();
+			}
 
 		matrixStack.popPose();
 

src/main/java/com/simibubi/create/compat/storageDrawers/StorageDrawers.java

@@ -1,41 +0,0 @@
-package com.simibubi.create.compat.storageDrawers;
-
-import com.simibubi.create.compat.Mods;
-import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
-
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraftforge.items.IItemHandler;
-
-public class StorageDrawers {
-
-	public static boolean isDrawer(BlockEntity be) {
-		return be != null && Mods.STORAGEDRAWERS.id()
-			.equals(be.getType()
-				.getRegistryName()
-				.getNamespace());
-	}
-
-	public static float getTrueFillLevel(IItemHandler inv, FilteringBehaviour filtering) {
-		float occupied = 0;
-		float totalSpace = 0;
-		
-		for (int slot = 1; slot < inv.getSlots(); slot++) {
-			ItemStack stackInSlot = inv.getStackInSlot(slot);
-			int space = inv.getSlotLimit(slot);
-			int count = stackInSlot.getCount();
-			if (space == 0)
-				continue;
-
-			totalSpace += 1;
-			if (filtering.test(stackInSlot))
-				occupied += count * (1f / space);
-		}
-		
-		if (totalSpace == 0)
-			return 0;
-
-		return occupied / totalSpace;
-	}
-	
-}

src/main/java/com/simibubi/create/compat/thresholdSwitch/FunctionalStorage.java

@@ -0,0 +1,22 @@
+package com.simibubi.create.compat.thresholdSwitch;
+
+import com.simibubi.create.compat.Mods;
+
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraftforge.items.IItemHandler;
+
+public class FunctionalStorage implements ThresholdSwitchCompat {
+
+	@Override
+	public boolean isFromThisMod(BlockEntity blockEntity) {
+		return blockEntity != null && Mods.FUNCTIONALSTORAGE.id()
+			.equals(blockEntity.getType()
+				.getRegistryName()
+				.getNamespace());
+	}
+
+	@Override
+	public long getSpaceInSlot(IItemHandler inv, int slot) {
+		return inv.getSlotLimit(slot);
+	}
+}

src/main/java/com/simibubi/create/compat/thresholdSwitch/SophisticatedStorage.java

@@ -0,0 +1,29 @@
+package com.simibubi.create.compat.thresholdSwitch;
+
+import com.simibubi.create.compat.Mods;
+
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraftforge.items.IItemHandler;
+
+public class SophisticatedStorage implements ThresholdSwitchCompat {
+
+	@Override
+	public boolean isFromThisMod(BlockEntity be) {
+		if (be == null)
+			return false;
+
+		String namespace = be.getType()
+			.getRegistryName()
+			.getNamespace();
+
+		return
+			Mods.SOPHISTICATEDSTORAGE.id().equals(namespace)
+			|| Mods.SOPHISTICATEDBACKPACKS.id().equals(namespace);
+	}
+
+	@Override
+	public long getSpaceInSlot(IItemHandler inv, int slot) {
+		return ((long) inv.getSlotLimit(slot) * inv.getStackInSlot(slot).getMaxStackSize()) / 64;
+	}
+
+}

src/main/java/com/simibubi/create/compat/thresholdSwitch/StorageDrawers.java

@@ -0,0 +1,25 @@
+package com.simibubi.create.compat.thresholdSwitch;
+
+import com.simibubi.create.compat.Mods;
+
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraftforge.items.IItemHandler;
+
+public class StorageDrawers implements ThresholdSwitchCompat {
+
+	@Override
+	public boolean isFromThisMod(BlockEntity blockEntity) {
+		return blockEntity != null && Mods.STORAGEDRAWERS.id()
+			.equals(blockEntity.getType()
+				.getRegistryName()
+				.getNamespace());
+	}
+
+	@Override
+	public long getSpaceInSlot(IItemHandler inv, int slot) {
+		if (slot == 0)
+			return 0;
+
+		return inv.getSlotLimit(slot);
+	}
+}

src/main/java/com/simibubi/create/compat/thresholdSwitch/ThresholdSwitchCompat.java

@@ -0,0 +1,12 @@
+package com.simibubi.create.compat.thresholdSwitch;
+
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraftforge.items.IItemHandler;
+
+public interface ThresholdSwitchCompat {
+
+	boolean isFromThisMod(BlockEntity blockEntity);
+
+	long getSpaceInSlot(IItemHandler inv, int slot);
+
+}

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

@@ -212,8 +212,12 @@ public abstract class AbstractContraptionEntity extends Entity implements IEntit
 		Vec3 transformedVector = getPassengerPosition(passenger, 1);
 		if (transformedVector == null)
 			return;
+
+		float offset = -1 / 8f;
+		if (passenger instanceof AbstractContraptionEntity)
+			offset = 0.0f;
 		callback.accept(passenger, transformedVector.x,
-			transformedVector.y + SeatEntity.getCustomEntitySeatOffset(passenger) - 1 / 8f, transformedVector.z);
+			transformedVector.y + SeatEntity.getCustomEntitySeatOffset(passenger) + offset, transformedVector.z);
 	}
 
 	public Vec3 getPassengerPosition(Entity passenger, float partialTicks) {

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

@@ -22,15 +22,13 @@ public interface IDisplayAssemblyExceptions {
 		if (!tooltip.isEmpty())
 			tooltip.add(Components.immutableEmpty());
 
-		tooltip.add(IHaveGoggleInformation.componentSpacing.plainCopy()
+		Lang.translate("gui.assembly.exception").style(ChatFormatting.GOLD)
-			.append(Lang.translateDirect("gui.assembly.exception")
+			.forGoggles(tooltip);
-				.withStyle(ChatFormatting.GOLD)));
 
 		String text = e.component.getString();
 		Arrays.stream(text.split("\n"))
 			.forEach(l -> TooltipHelper.cutStringTextComponent(l, Palette.GRAY_AND_WHITE)
-				.forEach(c -> tooltip.add(IHaveGoggleInformation.componentSpacing.plainCopy()
+				.forEach(c -> Lang.text(c.getString()).forGoggles(tooltip)));
-					.append(c))));
 
 		return true;
 	}

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

@@ -1,6 +1,7 @@
 package com.simibubi.create.content.contraptions;
 
 import static com.simibubi.create.foundation.utility.AngleHelper.angleLerp;
+import static com.simibubi.create.foundation.utility.AngleHelper.wrapAngle180;
 
 import java.util.Optional;
 import java.util.UUID;
@@ -353,7 +354,7 @@ public class OrientedContraptionEntity extends AbstractContraptionEntity {
 				return false;
 			OrientedContraptionEntity parent = (OrientedContraptionEntity) riding;
 			prevYaw = yaw;
-			yaw = -parent.getViewYRot(1);
+			yaw = wrapAngle180(getInitialYaw() - parent.getInitialYaw()) - parent.getViewYRot(1);
 			return false;
 		}
 

src/main/java/com/simibubi/create/content/contraptions/behaviour/FenceGateMovingInteraction.java

@@ -0,0 +1,28 @@
+package com.simibubi.create.content.contraptions.behaviour;
+
+import com.simibubi.create.content.contraptions.Contraption;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.block.FenceGateBlock;
+import net.minecraft.world.level.block.state.BlockState;
+
+public class FenceGateMovingInteraction extends SimpleBlockMovingInteraction {
+
+	@Override
+	protected BlockState handle(Player player, Contraption contraption, BlockPos pos, BlockState currentState) {
+		SoundEvent sound = currentState.getValue(FenceGateBlock.OPEN) ? SoundEvents.FENCE_GATE_CLOSE
+				: SoundEvents.FENCE_GATE_OPEN;
+		float pitch = player.level.random.nextFloat() * 0.1F + 0.9F;
+		playSound(player, sound, pitch);
+		return currentState.cycle(FenceGateBlock.OPEN);
+	}
+
+	@Override
+	protected boolean updateColliders() {
+		return true;
+	}
+
+}

src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorContactEditPacket.java

@@ -27,14 +27,14 @@ public class ElevatorContactEditPacket extends BlockEntityConfigurationPacket<El
 	@Override
 	protected void writeSettings(FriendlyByteBuf buffer) {
 		buffer.writeUtf(shortName, 4);
-		buffer.writeUtf(longName, 30);
+		buffer.writeUtf(longName, 90);
 		buffer.writeVarInt(doorControl.ordinal());
 	}
 
 	@Override
 	protected void readSettings(FriendlyByteBuf buffer) {
 		shortName = buffer.readUtf(4);
-		longName = buffer.readUtf(30);
+		longName = buffer.readUtf(90);
 		doorControl = DoorControl.values()[Mth.clamp(buffer.readVarInt(), 0, DoorControl.values().length)];
 	}
 

src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueEntity.java

@@ -36,6 +36,7 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LightningBolt;
+import net.minecraft.world.entity.Marker;
 import net.minecraft.world.entity.MoverType;
 import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.player.Player;
@@ -161,7 +162,13 @@ public class SuperGlueEntity extends Entity implements IEntityAdditionalSpawnDat
 
 	@Override
 	public void tick() {
-		super.tick();
+		xRotO = getXRot();
+		yRotO = getYRot();
+		walkDistO = walkDist;
+		xo = getX();
+		yo = getY();
+		zo = getZ();
+
 		if (getBoundingBox().getXsize() == 0)
 			discard();
 	}

src/main/java/com/simibubi/create/content/decoration/encasing/EncasableBlock.java

@@ -3,12 +3,14 @@ package com.simibubi.create.content.decoration.encasing;
 import java.util.List;
 
 import net.minecraft.core.BlockPos;
+import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
 
@@ -31,9 +33,16 @@ public interface EncasableBlock {
 					return InteractionResult.SUCCESS;
 
 				encased.handleEncasing(state, level, pos, heldItem, player, hand, ray);
+				playEncaseSound(level, pos);
 				return InteractionResult.SUCCESS;
 			}
 		}
 		return InteractionResult.PASS;
 	}
+
+	default void playEncaseSound(Level level, BlockPos pos) {
+		BlockState newState = level.getBlockState(pos);
+		SoundType soundType = newState.getSoundType();
+		level.playSound(null, pos, soundType.getPlaceSound(), SoundSource.BLOCKS, (soundType.getVolume() + 1.0F) / 2.0F, soundType.getPitch() * 0.8F);
+	}
 }

src/main/java/com/simibubi/create/content/decoration/placard/PlacardRenderer.java

@@ -10,6 +10,7 @@ import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.block.model.ItemTransforms.TransformType;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.client.renderer.entity.ItemRenderer;
+import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.Direction;
 import net.minecraft.util.Mth;
 import net.minecraft.world.item.ItemStack;
@@ -33,8 +34,8 @@ public class PlacardRenderer extends SafeBlockEntityRenderer<PlacardBlockEntity>
 
 		ItemRenderer itemRenderer = Minecraft.getInstance()
 			.getItemRenderer();
-		boolean blockItem = itemRenderer.getModel(heldItem, null, null, 0)
+		BakedModel bakedModel = itemRenderer.getModel(heldItem, null, null, 0);
-			.isGui3d();
+		boolean blockItem = bakedModel.isGui3d();
 
 		ms.pushPose();
 		TransformStack.cast(ms)
@@ -46,7 +47,7 @@ public class PlacardRenderer extends SafeBlockEntityRenderer<PlacardBlockEntity>
 			.translate(0, 0, 4.5 / 16f)
 			.scale(blockItem ? .5f : .375f);
 
-		itemRenderer.renderStatic(heldItem, TransformType.FIXED, light, overlay, ms, buffer, 0);
+		itemRenderer.render(heldItem, TransformType.FIXED, false, ms, buffer, light, overlay, bakedModel);
 		ms.popPose();
 	}
 

src/main/java/com/simibubi/create/content/decoration/steamWhistle/WhistleBlockEntity.java

@@ -112,8 +112,7 @@ public class WhistleBlockEntity extends SmartBlockEntity implements IHaveGoggleI
 		String[] pitches = Lang.translateDirect("generic.notes")
 			.getString()
 			.split(";");
-		MutableComponent textComponent = Components.literal(spacing);
+		Lang.translate("generic.pitch", pitches[pitch % pitches.length]).forGoggles(tooltip);
-		tooltip.add(textComponent.append(Lang.translateDirect("generic.pitch", pitches[pitch % pitches.length])));
 		return true;
 	}
 

src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlock.java

@@ -1,11 +1,15 @@
 package com.simibubi.create.content.equipment.armor;
 
+import java.util.List;
 import java.util.Optional;
 
 import com.simibubi.create.AllBlockEntityTypes;
 import com.simibubi.create.AllEnchantments;
 import com.simibubi.create.AllShapes;
 import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock;
+import com.simibubi.create.content.schematics.requirement.ISpecialBlockItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement;
+import com.simibubi.create.content.schematics.requirement.ItemRequirement.ItemUseType;
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.core.BlockPos;
@@ -13,8 +17,6 @@ import net.minecraft.core.Direction;
 import net.minecraft.core.Direction.Axis;
 import net.minecraft.core.NonNullList;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.network.chat.Component;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.InteractionHand;
@@ -34,6 +36,7 @@ import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.SimpleWaterloggedBlock;
+import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition.Builder;
@@ -41,13 +44,14 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.pathfinder.PathComputationType;
+import net.minecraft.world.level.storage.loot.LootContext;
+import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraftforge.common.util.FakePlayer;
 
-public class BacktankBlock extends HorizontalKineticBlock
+public class BacktankBlock extends HorizontalKineticBlock implements IBE<BacktankBlockEntity>, SimpleWaterloggedBlock, ISpecialBlockItemRequirement {
-	implements IBE<BacktankBlockEntity>, SimpleWaterloggedBlock {
 
 	public BacktankBlock(Properties properties) {
 		super(properties);
@@ -81,8 +85,8 @@ public class BacktankBlock extends HorizontalKineticBlock
 	}
 
 	@Override
-	public BlockState updateShape(BlockState state, Direction direction, BlockState neighbourState,
+	public BlockState updateShape(BlockState state, Direction direction, BlockState neighbourState, LevelAccessor world,
-		LevelAccessor world, BlockPos pos, BlockPos neighbourPos) {
+		BlockPos pos, BlockPos neighbourPos) {
 		if (state.getValue(BlockStateProperties.WATERLOGGED))
 			world.scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world));
 		return state;
@@ -114,16 +118,46 @@ public class BacktankBlock extends HorizontalKineticBlock
 		if (stack == null)
 			return;
 		withBlockEntityDo(worldIn, pos, be -> {
-			be.setCapacityEnchantLevel(EnchantmentHelper.getItemEnchantmentLevel(AllEnchantments.CAPACITY.get(), stack));
+			be.setCapacityEnchantLevel(
-			be.setAirLevel(stack.getOrCreateTag()
+				EnchantmentHelper.getItemEnchantmentLevel(AllEnchantments.CAPACITY.get(), stack));
-				.getInt("Air"));
+			CompoundTag vanillaTag = stack.getOrCreateTag();
-			if (stack.isEnchanted())
+			be.setAirLevel(vanillaTag.getInt("Air"));
-				be.setEnchantmentTag(stack.getEnchantmentTags());
 			if (stack.hasCustomHoverName())
 				be.setCustomName(stack.getHoverName());
+
+			CompoundTag nbt = stack.serializeNBT();
+			CompoundTag forgeCapsTag = nbt.contains("ForgeCaps") ? nbt.getCompound("ForgeCaps") : null;
+			be.setTags(vanillaTag, forgeCapsTag);
 		});
 	}
 
+	@Override
+	@SuppressWarnings("deprecation")
+	// Re-adding ForgeCaps to item here as there is no loot function that can modify
+	// outside of the vanilla tag
+	public List<ItemStack> getDrops(BlockState pState, LootContext.Builder pBuilder) {
+		List<ItemStack> lootDrops = super.getDrops(pState, pBuilder);
+
+		BlockEntity blockEntity = pBuilder.getOptionalParameter(LootContextParams.BLOCK_ENTITY);
+		if (!(blockEntity instanceof BacktankBlockEntity bbe))
+			return lootDrops;
+
+		CompoundTag forgeCapsTag = bbe.getForgeCapsTag();
+		if (forgeCapsTag == null)
+			return lootDrops;
+
+		return lootDrops.stream()
+			.map(stack -> {
+				if (!(stack.getItem() instanceof BacktankItem))
+					return stack;
+
+				ItemStack modifiedStack = new ItemStack(stack.getItem(), stack.getCount(), forgeCapsTag.copy());
+				modifiedStack.setTag(stack.getTag());
+				return modifiedStack;
+			})
+			.toList();
+	}
+
 	@Override
 	public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand,
 		BlockHitResult hit) {
@@ -150,30 +184,21 @@ public class BacktankBlock extends HorizontalKineticBlock
 	@Override
 	public ItemStack getCloneItemStack(BlockGetter blockGetter, BlockPos pos, BlockState state) {
 		Item item = asItem();
-		if (item instanceof BacktankItem.BacktankBlockItem placeable) {
+		if (item instanceof BacktankItem.BacktankBlockItem placeable)
 			item = placeable.getActualItem();
-		}
 
-		ItemStack stack = new ItemStack(item);
 		Optional<BacktankBlockEntity> blockEntityOptional = getBlockEntityOptional(blockGetter, pos);
 
+		CompoundTag forgeCapsTag = blockEntityOptional.map(BacktankBlockEntity::getForgeCapsTag)
+			.orElse(null);
+		CompoundTag vanillaTag = blockEntityOptional.map(BacktankBlockEntity::getVanillaTag)
+			.orElse(new CompoundTag());
 		int air = blockEntityOptional.map(BacktankBlockEntity::getAirLevel)
 			.orElse(0);
-		CompoundTag tag = stack.getOrCreateTag();
-		tag.putInt("Air", air);
 
-		ListTag enchants = blockEntityOptional.map(BacktankBlockEntity::getEnchantmentTag)
+		ItemStack stack = new ItemStack(item, 1, forgeCapsTag);
-			.orElse(new ListTag());
+		vanillaTag.putInt("Air", air);
-		if (!enchants.isEmpty()) {
+		stack.setTag(vanillaTag);
-			ListTag enchantmentTagList = stack.getEnchantmentTags();
-			enchantmentTagList.addAll(enchants);
-			tag.put("Enchantments", enchantmentTagList);
-		}
-
-		Component customName = blockEntityOptional.map(BacktankBlockEntity::getCustomName)
-			.orElse(null);
-		if (customName != null)
-			stack.setHoverName(customName);
 		return stack;
 	}
 
@@ -198,4 +223,12 @@ public class BacktankBlock extends HorizontalKineticBlock
 		return false;
 	}
 
+	@Override
+	public ItemRequirement getRequiredItems(BlockState state, BlockEntity blockEntity) {
+		Item item = asItem();
+		if (item instanceof BacktankItem.BacktankBlockItem placeable)
+			item = placeable.getActualItem();
+		return new ItemRequirement(ItemUseType.CONSUME, item);
+	}
+
 }

src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlockEntity.java

@@ -2,6 +2,8 @@ package com.simibubi.create.content.equipment.armor;
 
 import java.util.List;
 
+import javax.annotation.Nullable;
+
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllSoundEvents;
@@ -16,8 +18,6 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction.Axis;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.nbt.Tag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.Mth;
 import net.minecraft.world.Nameable;
@@ -35,20 +35,25 @@ public class BacktankBlockEntity extends KineticBlockEntity implements Nameable
 	private Component customName;
 
 	private int capacityEnchantLevel;
-	private ListTag enchantmentTag;
+
+	private CompoundTag vanillaTag;
+	private CompoundTag forgeCapsTag;
 
 	public BacktankBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
 		super(type, pos, state);
 		defaultName = getDefaultName(state);
-		enchantmentTag = new ListTag();
+		vanillaTag = new CompoundTag();
+		forgeCapsTag = null;
 	}
 
 	public static Component getDefaultName(BlockState state) {
 		if (AllBlocks.NETHERITE_BACKTANK.has(state)) {
-			AllItems.NETHERITE_BACKTANK.get().getDescription();
+			AllItems.NETHERITE_BACKTANK.get()
+				.getDescription();
 		}
 
-		return AllItems.COPPER_BACKTANK.get().getDescription();
+		return AllItems.COPPER_BACKTANK.get()
+			.getDescription();
 	}
 
 	@Override
@@ -115,21 +120,29 @@ public class BacktankBlockEntity extends KineticBlockEntity implements Nameable
 		compound.putInt("Air", airLevel);
 		compound.putInt("Timer", airLevelTimer);
 		compound.putInt("CapacityEnchantment", capacityEnchantLevel);
+		
 		if (this.customName != null)
 			compound.putString("CustomName", Component.Serializer.toJson(this.customName));
-		compound.put("Enchantments", enchantmentTag);
+		
+		compound.put("VanillaTag", vanillaTag);
+		if (forgeCapsTag != null)
+			compound.put("ForgeCapsTag", forgeCapsTag);
 	}
 
 	@Override
 	protected void read(CompoundTag compound, boolean clientPacket) {
 		super.read(compound, clientPacket);
 		int prev = airLevel;
-		capacityEnchantLevel = compound.getInt("CapacityEnchantment");
 		airLevel = compound.getInt("Air");
 		airLevelTimer = compound.getInt("Timer");
-		enchantmentTag = compound.getList("Enchantments", Tag.TAG_COMPOUND);
+		capacityEnchantLevel = compound.getInt("CapacityEnchantment");
+		
 		if (compound.contains("CustomName", 8))
 			this.customName = Component.Serializer.fromJson(compound.getString("CustomName"));
+		
+		vanillaTag = compound.getCompound("VanillaTag");
+		forgeCapsTag = compound.contains("ForgeCapsTag") ? compound.getCompound("ForgeCapsTag") : null;
+
 		if (prev != 0 && prev != airLevel && airLevel == BacktankUtil.maxAir(capacityEnchantLevel) && clientPacket)
 			playFilledEffect();
 	}
@@ -149,8 +162,7 @@ public class BacktankBlockEntity extends KineticBlockEntity implements Nameable
 
 	@Override
 	public Component getName() {
-		return this.customName != null ? this.customName
+		return this.customName != null ? this.customName : defaultName;
-			: defaultName;
 	}
 
 	public int getAirLevel() {
@@ -166,20 +178,21 @@ public class BacktankBlockEntity extends KineticBlockEntity implements Nameable
 		this.customName = customName;
 	}
 
-	public Component getCustomName() {
-		return customName;
-	}
-
-	public ListTag getEnchantmentTag() {
-		return enchantmentTag;
-	}
-
-	public void setEnchantmentTag(ListTag enchantmentTag) {
-		this.enchantmentTag = enchantmentTag;
-	}
-
 	public void setCapacityEnchantLevel(int capacityEnchantLevel) {
 		this.capacityEnchantLevel = capacityEnchantLevel;
 	}
 	
+	public void setTags(CompoundTag vanillaTag, @Nullable CompoundTag forgeCapsTag) {
+		this.vanillaTag = vanillaTag;
+		this.forgeCapsTag = forgeCapsTag;
+	}
+
+	public CompoundTag getVanillaTag() {
+		return vanillaTag;
+	}
+	
+	public CompoundTag getForgeCapsTag() {
+		return forgeCapsTag;
+	}
+
 }

src/main/java/com/simibubi/create/content/equipment/goggles/GoggleOverlayRenderer.java

@@ -4,10 +4,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import com.mojang.blaze3d.platform.Window;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.CreateClient;
+import com.simibubi.create.compat.Mods;
 import com.simibubi.create.content.contraptions.IDisplayAssemblyExceptions;
 import com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock;
 import com.simibubi.create.content.contraptions.piston.PistonExtensionPoleBlock;
@@ -16,6 +18,7 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox;
 import com.simibubi.create.foundation.gui.RemovedGuiUtils;
 import com.simibubi.create.foundation.gui.Theme;
 import com.simibubi.create.foundation.gui.element.GuiGameElement;
+import com.simibubi.create.foundation.mixin.accessor.MouseHandlerAccessor;
 import com.simibubi.create.foundation.outliner.Outline;
 import com.simibubi.create.foundation.outliner.Outliner.OutlineEntry;
 import com.simibubi.create.foundation.utility.Color;
@@ -26,6 +29,7 @@ import com.simibubi.create.infrastructure.config.AllConfigs;
 import com.simibubi.create.infrastructure.config.CClient;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.MouseHandler;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -154,9 +158,8 @@ public class GoggleOverlayRenderer {
 			if (!tooltip.isEmpty())
 				tooltip.add(Components.immutableEmpty());
 
-			tooltip.add(IHaveGoggleInformation.componentSpacing.plainCopy()
+			Lang.translate("gui.goggles.pole_length").text(" " + poles)
-				.append(Lang.translateDirect("gui.goggles.pole_length"))
+				.forGoggles(tooltip);
-				.append(Components.literal(" " + poles)));
 		}
 
 		if (tooltip.isEmpty()) {
@@ -205,14 +208,44 @@ public class GoggleOverlayRenderer {
 			colorBorderBot.scaleAlpha(fade);
 		}
 
-		RemovedGuiUtils.drawHoveringText(poseStack, tooltip, posX, posY, width, height, -1, colorBackground.getRGB(),
-			colorBorderTop.getRGB(), colorBorderBot.getRGB(), mc.font);
-
-
 		GuiGameElement.of(item)
 			.at(posX + 10, posY - 16, 450)
 			.render(poseStack);
+
+		if (!Mods.MODERNUI.isLoaded()) {
+			// default tooltip rendering when modernUI is not loaded
+			RemovedGuiUtils.drawHoveringText(poseStack, tooltip, posX, posY, width, height, -1, colorBackground.getRGB(),
+				colorBorderTop.getRGB(), colorBorderBot.getRGB(), mc.font);
+
+			poseStack.popPose();
+
+			return;
+		}
+
+		/*
+		 * special handling for modernUI
+		 *
+		 * their tooltip handler causes the overlay to jiggle each frame,
+		 * if the mouse is moving, guiScale is anything but 1 and exactPositioning is enabled
+		 *
+		 * this is a workaround to fix this behavior
+		 */
+		MouseHandler mouseHandler = Minecraft.getInstance().mouseHandler;
+		Window window = Minecraft.getInstance().getWindow();
+		double guiScale = window.getGuiScale();
+		double cursorX = mouseHandler.xpos();
+		double cursorY = mouseHandler.ypos();
+		((MouseHandlerAccessor) mouseHandler).create$setXPos(Math.round(cursorX / guiScale) * guiScale);
+		((MouseHandlerAccessor) mouseHandler).create$setYPos(Math.round(cursorY / guiScale) * guiScale);
+
+		RemovedGuiUtils.drawHoveringText(poseStack, tooltip, posX, posY, width, height, -1, colorBackground.getRGB(),
+			colorBorderTop.getRGB(), colorBorderBot.getRGB(), mc.font);
+
+		((MouseHandlerAccessor) mouseHandler).create$setXPos(cursorX);
+		((MouseHandlerAccessor) mouseHandler).create$setYPos(cursorY);
+
 		poseStack.popPose();
+
 	}
 
 	public static BlockPos proxiedOverlayPosition(Level level, BlockPos pos) {

src/main/java/com/simibubi/create/content/equipment/wrench/IWrenchable.java

@@ -22,6 +22,8 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.world.BlockEvent;
 
 public interface IWrenchable {
 
@@ -54,16 +56,26 @@ public interface IWrenchable {
 		Level world = context.getLevel();
 		BlockPos pos = context.getClickedPos();
 		Player player = context.getPlayer();
-		if (world instanceof ServerLevel) {
+
-			if (player != null && !player.isCreative())
+		if (!(world instanceof ServerLevel serverLevel))
-				Block.getDrops(state, (ServerLevel) world, pos, world.getBlockEntity(pos), player, context.getItemInHand())
+			return InteractionResult.SUCCESS;
-					.forEach(itemStack -> {
+
-						player.getInventory().placeItemBackInInventory(itemStack);
+		BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, pos, world.getBlockState(pos), player);
-					});
+		MinecraftForge.EVENT_BUS.post(event);
-			state.spawnAfterBreak((ServerLevel) world, pos, ItemStack.EMPTY);
+		if (event.isCanceled())
-			world.destroyBlock(pos, false);
+			return InteractionResult.SUCCESS;
-			playRemoveSound(world, pos);
+
+		if (player != null && !player.isCreative()) {
+			Block.getDrops(state, serverLevel, pos, world.getBlockEntity(pos), player, context.getItemInHand())
+				.forEach(itemStack -> {
+					player.getInventory()
+						.placeItemBackInInventory(itemStack);
+				});
 		}
+
+		state.spawnAfterBreak(serverLevel, pos, ItemStack.EMPTY);
+		world.destroyBlock(pos, false);
+		playRemoveSound(world, pos);
 		return InteractionResult.SUCCESS;
 	}
 

src/main/java/com/simibubi/create/content/fluids/FluidPropagator.java

@@ -174,7 +174,7 @@ public class FluidPropagator {
 		if (PumpBlock.isPump(connectedState) && connectedState.getValue(PumpBlock.FACING)
 			.getAxis() == side.getAxis())
 			return false;
-		if (VanillaFluidTargets.shouldPipesConnectTo(connectedState))
+		if (VanillaFluidTargets.canProvideFluidWithoutCapability(connectedState))
 			return true;
 		if (BlockHelper.hasBlockSolidSide(connectedState, reader, connectedPos, side.getOpposite())
 			&& !AllBlockTags.FAN_TRANSPARENT.matches(connectedState))

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

@@ -19,6 +19,7 @@ import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.block.model.ItemTransforms.TransformType;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.client.renderer.entity.ItemRenderer;
+import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Direction.Axis;
 import net.minecraft.util.Mth;
@@ -78,8 +79,8 @@ public class ItemDrainRenderer extends SmartBlockEntityRenderer<ItemDrainBlockEn
 			.getItemRenderer();
 		int count = (int) (Mth.log2((int) (itemStack.getCount()))) / 2;
 		boolean renderUpright = BeltHelper.isItemUpright(itemStack);
-		boolean blockItem = itemRenderer.getModel(itemStack, null, null, 0)
+		BakedModel bakedModel = itemRenderer.getModel(itemStack, null, null, 0);
-			.isGui3d();
+		boolean blockItem = bakedModel.isGui3d();
 
 		if (renderUpright)
 			ms.translate(0, 3 / 32d, 0);
@@ -117,7 +118,7 @@ public class ItemDrainRenderer extends SmartBlockEntityRenderer<ItemDrainBlockEn
 			ms.scale(.5f, .5f, .5f);
 			if (!blockItem && !renderUpright)
 				msr.rotateX(90);
-			itemRenderer.renderStatic(itemStack, TransformType.FIXED, light, overlay, ms, buffer, 0);
+			itemRenderer.render(itemStack, TransformType.FIXED, false, ms, buffer, light, overlay, bakedModel);
 			ms.popPose();
 
 			if (!renderUpright) {

src/main/java/com/simibubi/create/content/fluids/pipes/FluidPipeBlock.java

@@ -183,7 +183,7 @@ public class FluidPipeBlock extends PipeBlock implements SimpleWaterloggedBlock,
 		Direction direction) {
 		if (FluidPropagator.hasFluidCapability(world, neighbourPos, direction.getOpposite()))
 			return true;
-		if (VanillaFluidTargets.shouldPipesConnectTo(neighbour))
+		if (VanillaFluidTargets.canProvideFluidWithoutCapability(neighbour))
 			return true;
 		FluidTransportBehaviour transport = BlockEntityBehaviour.get(world, neighbourPos, FluidTransportBehaviour.TYPE);
 		BracketedBlockEntityBehaviour bracket =

src/main/java/com/simibubi/create/content/fluids/pipes/VanillaFluidTargets.java

@@ -5,9 +5,9 @@ import static net.minecraft.world.level.block.state.properties.BlockStatePropert
 import com.simibubi.create.AllFluids;
 
 import net.minecraft.core.BlockPos;
-import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.LayeredCauldronBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.material.Fluids;
@@ -15,10 +15,14 @@ import net.minecraftforge.fluids.FluidStack;
 
 public class VanillaFluidTargets {
 
-	public static boolean shouldPipesConnectTo(BlockState state) {
+	public static boolean canProvideFluidWithoutCapability(BlockState state) {
 		if (state.hasProperty(BlockStateProperties.LEVEL_HONEY))
 			return true;
-		if (state.is(BlockTags.CAULDRONS))
+		if (state.is(Blocks.CAULDRON))
+			return true;
+		if (state.is(Blocks.LAVA_CAULDRON))
+			return true;
+		if (state.is(Blocks.WATER_CAULDRON))
 			return true;
 		return false;
 	}
@@ -31,13 +35,15 @@ public class VanillaFluidTargets {
 				.getSource(), 250);
 		}
 		
-		if (state.getBlock() == Blocks.LAVA_CAULDRON) {
+		if (state.is(Blocks.LAVA_CAULDRON)) {
 			if (!simulate)
 				level.setBlock(pos, Blocks.CAULDRON.defaultBlockState(), 3);
 			return new FluidStack(Fluids.LAVA, 1000);
 		}
 		
-		if (state.getBlock() == Blocks.WATER_CAULDRON) {
+		if (state.is(Blocks.WATER_CAULDRON) && state.getBlock() instanceof LayeredCauldronBlock lcb) {
+			if (!lcb.isFull(state))
+				return FluidStack.EMPTY;
 			if (!simulate)
 				level.setBlock(pos, Blocks.CAULDRON.defaultBlockState(), 3);
 			return new FluidStack(Fluids.WATER, 1000);

src/main/java/com/simibubi/create/content/fluids/tank/BoilerData.java

@@ -147,20 +147,13 @@ public class BoilerData {
 		if (!isActive())
 			return false;
 
-		Component indent = Components.literal(IHaveGoggleInformation.spacing);
-		Component indent2 = Components.literal(IHaveGoggleInformation.spacing + " ");
-
 		calcMinMaxForSize(boilerSize);
 
-		tooltip.add(indent.plainCopy()
+		Lang.translate("boiler.status", getHeatLevelTextComponent().withStyle(ChatFormatting.GREEN))
-			.append(
+						.forGoggles(tooltip);
-				Lang.translateDirect("boiler.status", getHeatLevelTextComponent().withStyle(ChatFormatting.GREEN))));
+		Lang.text(getSizeComponent(true, false).getString()).forGoggles(tooltip, 1);
-		tooltip.add(indent2.plainCopy()
+		Lang.text(getWaterComponent(true, false).getString()).forGoggles(tooltip, 1);
-			.append(getSizeComponent(true, false)));
+		Lang.text(getHeatComponent(true, false).getString()).forGoggles(tooltip, 1);
-		tooltip.add(indent2.plainCopy()
-			.append(getWaterComponent(true, false)));
-		tooltip.add(indent2.plainCopy()
-			.append(getHeatComponent(true, false)));
 
 		if (attachedEngines == 0)
 			return true;

src/main/java/com/simibubi/create/content/kinetics/BlockStressDefaults.java

@@ -1,7 +1,7 @@
 package com.simibubi.create.content.kinetics;
 
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
 
 import com.simibubi.create.foundation.utility.Couple;
@@ -20,9 +20,9 @@ public class BlockStressDefaults {
 	 */
 	public static final int FORCED_UPDATE_VERSION = 2;
 
-	public static final Map<ResourceLocation, Double> DEFAULT_IMPACTS = new HashMap<>();
+	public static final Map<ResourceLocation, Double> DEFAULT_IMPACTS = new ConcurrentHashMap<>();
-	public static final Map<ResourceLocation, Double> DEFAULT_CAPACITIES = new HashMap<>();
+	public static final Map<ResourceLocation, Double> DEFAULT_CAPACITIES = new ConcurrentHashMap<>();
-	public static final Map<ResourceLocation, Supplier<Couple<Integer>>> GENERATOR_SPEEDS = new HashMap<>();
+	public static final Map<ResourceLocation, Supplier<Couple<Integer>>> GENERATOR_SPEEDS = new ConcurrentHashMap<>();
 
 	public static void setDefaultImpact(ResourceLocation blockId, double impact) {
 		DEFAULT_IMPACTS.put(blockId, impact);

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

@@ -30,6 +30,7 @@ import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.block.model.ItemTransforms.TransformType;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.client.renderer.entity.ItemRenderer;
+import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Direction.Axis;
 import net.minecraft.core.Direction.AxisDirection;
@@ -194,14 +195,12 @@ public class BeltRenderer extends SafeBlockEntityRenderer<BeltBlockEntity> {
 		boolean slopeAlongX = beltFacing
 								.getAxis() == Axis.X;
 
+		Minecraft mc = Minecraft.getInstance();
+		ItemRenderer itemRenderer = mc.getItemRenderer();
 		boolean onContraption = be.getLevel() instanceof WrappedWorld;
 
 		for (TransportedItemStack transported : be.getInventory()
 			.getTransportedItems()) {
-			ms.pushPose();
-            TransformStack.cast(ms)
-				.nudge(transported.angle);
-
 			float offset;
 			float sideOffset;
 			float verticalMovement;
@@ -228,6 +227,18 @@ public class BeltRenderer extends SafeBlockEntityRenderer<BeltBlockEntity> {
 																														.getAxis() == Axis.Z);
 			float slopeAngle = onSlope ? tiltForward ? -45 : 45 : 0;
 
+			Vec3 itemPos = beltStartOffset.add(
+					be.getBlockPos().getX(),
+					be.getBlockPos().getY(),
+					be.getBlockPos().getZ())
+				.add(offsetVec);
+
+			if (this.shouldCullItem(itemPos)) {
+				continue;
+			}
+
+			ms.pushPose();
+			TransformStack.cast(ms).nudge(transported.angle);
 			ms.translate(offsetVec.x, offsetVec.y, offsetVec.z);
 
 			boolean alongX = beltFacing
@@ -238,12 +249,15 @@ public class BeltRenderer extends SafeBlockEntityRenderer<BeltBlockEntity> {
 			ms.translate(alongX ? sideOffset : 0, 0, alongX ? 0 : sideOffset);
 
 			int stackLight = onContraption ? light : getPackedLight(be, offset);
-			ItemRenderer itemRenderer = Minecraft.getInstance()
+
-				.getItemRenderer();
 			boolean renderUpright = BeltHelper.isItemUpright(transported.stack);
-			boolean blockItem = itemRenderer.getModel(transported.stack, be.getLevel(), null, 0)
+			BakedModel bakedModel = itemRenderer.getModel(transported.stack, be.getLevel(), null, 0);
-				.isGui3d();
+			boolean blockItem = bakedModel.isGui3d();
-			int count = (int) (Mth.log2((int) (transported.stack.getCount()))) / 2;
+
+			int count = 0;
+			if (mc.player.getEyePosition(1.0F).distanceTo(itemPos) < 16)
+				count = (int) (Mth.log2((int) (transported.stack.getCount()))) / 2;
+
 			Random r = new Random(transported.angle);
 
 			boolean slopeShadowOnly = renderUpright && onSlope;
@@ -264,7 +278,7 @@ public class BeltRenderer extends SafeBlockEntityRenderer<BeltBlockEntity> {
 			}
 
 			if (renderUpright) {
-				Entity renderViewEntity = Minecraft.getInstance().cameraEntity;
+				Entity renderViewEntity = mc.cameraEntity;
 				if (renderViewEntity != null) {
 					Vec3 positionVec = renderViewEntity.position();
 					Vec3 vectorForOffset = BeltHelper.getVectorForOffset(be, offset);
@@ -289,7 +303,7 @@ public class BeltRenderer extends SafeBlockEntityRenderer<BeltBlockEntity> {
 				}
 
 				ms.scale(.5f, .5f, .5f);
-				itemRenderer.renderStatic(null, transported.stack, TransformType.FIXED, false, ms, buffer, be.getLevel(), stackLight, overlay, 0);
+				itemRenderer.render(transported.stack, TransformType.FIXED, false, ms, buffer, stackLight, overlay, bakedModel);
 				ms.popPose();
 
 				if (!renderUpright) {

src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltInventory.java

@@ -378,6 +378,8 @@ public class BeltInventory {
 		float min = offset;
 		float max = offset + 1;
 		for (TransportedItemStack stack : items) {
+			if (toRemove.contains(stack))
+				continue;
 			if (stack.beltPosition > max)
 				continue;
 			if (stack.beltPosition > min)

src/main/java/com/simibubi/create/content/kinetics/belt/transport/ItemHandlerBeltSegment.java

@@ -50,13 +50,15 @@ public class ItemHandlerBeltSegment implements IItemHandler {
 			return ItemStack.EMPTY;
 
 		amount = Math.min(amount, transported.stack.getCount());
-		ItemStack extracted = simulate ? transported.stack.copy().split(amount) : transported.stack.split(amount);
+		ItemStack extracted = simulate ? transported.stack.copy()
+			.split(amount) : transported.stack.split(amount);
 		if (!simulate) {
 			if (transported.stack.isEmpty())
-				this.beltInventory.toRemove.add(transported);
+				beltInventory.toRemove.add(transported);
-			this.beltInventory.belt.setChanged();
+			else
-			this.beltInventory.belt.sendData();
+				beltInventory.belt.notifyUpdate();
 		}
+
 		return extracted;
 	}
 

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

@@ -34,6 +34,7 @@ import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.block.model.ItemTransforms.TransformType;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.client.renderer.entity.ItemRenderer;
+import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Direction.Axis;
@@ -89,9 +90,8 @@ public class DeployerRenderer extends SafeBlockEntityRenderer<DeployerBlockEntit
 			.getItemRenderer();
 
 		TransformType transform = TransformType.NONE;
-		boolean isBlockItem = (be.heldItem.getItem() instanceof BlockItem)
+		BakedModel bakedModel = itemRenderer.getModel(be.heldItem, be.getLevel(), null, 0);
-			&& itemRenderer.getModel(be.heldItem, be.getLevel(), null, 0)
+		boolean isBlockItem = (be.heldItem.getItem() instanceof BlockItem) && bakedModel.isGui3d();
-				.isGui3d();
 
 		if (displayMode) {
 			float scale = isBlockItem ? 1.25f : 1;
@@ -106,7 +106,7 @@ public class DeployerRenderer extends SafeBlockEntityRenderer<DeployerBlockEntit
 			transform = punching ? TransformType.THIRD_PERSON_RIGHT_HAND : TransformType.FIXED;
 		}
 
-		itemRenderer.renderStatic(be.heldItem, transform, light, overlay, ms, buffer, 0);
+		itemRenderer.render(be.heldItem, transform, false, ms, buffer, light, overlay, bakedModel);
 		ms.popPose();
 	}
 

src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeBlockEntity.java

@@ -48,7 +48,7 @@ public abstract class GaugeBlockEntity extends KineticBlockEntity implements IHa
 
 	@Override
 	public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
-		tooltip.add(componentSpacing.plainCopy().append(Lang.translateDirect("gui.gauge.info_header")));
+		Lang.translate("gui.gauge.info_header").forGoggles(tooltip);
 
 		return true;
 	}

src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmRenderer.java

@@ -19,6 +19,7 @@ import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.block.model.ItemTransforms.TransformType;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.client.renderer.entity.ItemRenderer;
+import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.util.Mth;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.ItemStack;
@@ -45,9 +46,8 @@ public class ArmRenderer extends KineticBlockEntityRenderer<ArmBlockEntity> {
 		ItemRenderer itemRenderer = Minecraft.getInstance()
 			.getItemRenderer();
 
-		boolean isBlockItem =
+		BakedModel bakedModel = itemRenderer.getModel(item, be.getLevel(), null, 0);
-			hasItem && (item.getItem() instanceof BlockItem) && itemRenderer.getModel(item, be.getLevel(), null, 0)
+		boolean isBlockItem = hasItem && (item.getItem() instanceof BlockItem) && bakedModel.isGui3d();
-				.isGui3d();
 
 		VertexConsumer builder = buffer.getBuffer(be.goggles ? RenderType.cutout() : RenderType.solid());
 		BlockState blockState = be.getBlockState();
@@ -102,7 +102,7 @@ public class ArmRenderer extends KineticBlockEntityRenderer<ArmBlockEntity> {
 				.multiply(msLocal.last()
 					.pose());
 
-			itemRenderer.renderStatic(item, TransformType.FIXED, light, overlay, ms, buffer, 0);
+			itemRenderer.render(item, TransformType.FIXED, false, ms, buffer, light, overlay, bakedModel);
 			ms.popPose();
 		}
 

src/main/java/com/simibubi/create/content/kinetics/saw/SawRenderer.java

@@ -134,7 +134,7 @@ public class SawRenderer extends SafeBlockEntityRenderer<SawBlockEntity> {
 				if (alongZ)
 					ms.mulPose(Vector3f.YP.rotationDegrees(90));
 				ms.mulPose(Vector3f.XP.rotationDegrees(90));
-				itemRenderer.renderStatic(stack, ItemTransforms.TransformType.FIXED, light, overlay, ms, buffer, 0);
+				itemRenderer.render(stack, ItemTransforms.TransformType.FIXED, false, ms, buffer, light, overlay, modelWithOverrides);
 				break;
 			}
 

src/main/java/com/simibubi/create/content/logistics/depot/DepotRenderer.java

@@ -16,6 +16,7 @@ import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.block.model.ItemTransforms.TransformType;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.client.renderer.entity.ItemRenderer;
+import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.Direction.Axis;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
@@ -104,8 +105,8 @@ public class DepotRenderer extends SafeBlockEntityRenderer<DepotBlockEntity> {
 		TransformStack msr = TransformStack.cast(ms);
 		int count = (int) (Mth.log2((int) (itemStack.getCount()))) / 2;
 		boolean renderUpright = BeltHelper.isItemUpright(itemStack);
-		boolean blockItem = itemRenderer.getModel(itemStack, null, null, 0)
+		BakedModel bakedModel = itemRenderer.getModel(itemStack, null, null, 0);
-			.isGui3d();
+		boolean blockItem = bakedModel.isGui3d();
 
 		ms.pushPose();
 		msr.rotateY(angle);
@@ -131,7 +132,7 @@ public class DepotRenderer extends SafeBlockEntityRenderer<DepotBlockEntity> {
 				ms.translate(0, -3 / 16f, 0);
 				msr.rotateX(90);
 			}
-			itemRenderer.renderStatic(itemStack, TransformType.FIXED, light, overlay, ms, buffer, 0);
+			itemRenderer.render(itemStack, TransformType.FIXED, false, ms, buffer, light, overlay, bakedModel);
 			ms.popPose();
 
 			if (!renderUpright) {

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

@@ -74,8 +74,7 @@ public class FunnelMovementBehaviour implements MovementBehaviour {
 		FilterItemStack filter = context.getFilterFromBE();
 		int filterAmount = context.blockEntityData.getInt("FilterAmount");
 		boolean upTo = context.blockEntityData.getBoolean("UpTo");
-		if (filterAmount <= 0)
+		filterAmount = hasFilter ? filterAmount : 1;
-			filterAmount = hasFilter ? 64 : 1;
 
 		ItemStack extract = ItemHelper.extract(context.contraption.getSharedInventory(),
 			s -> filter.test(world, s),

src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelBlockEntity.java

@@ -784,20 +784,13 @@ public class BrassTunnelBlockEntity extends BeltTunnelBlockEntity implements IHa
 		if (allStacks.isEmpty())
 			return false;
 
-		tooltip.add(componentSpacing.plainCopy()
+		Lang.translate("tooltip.brass_tunnel.contains").style(ChatFormatting.WHITE).forGoggles(tooltip);
-			.append(Lang.translateDirect("tooltip.brass_tunnel.contains"))
-			.withStyle(ChatFormatting.WHITE));
 		for (ItemStack item : allStacks) {
-			tooltip.add(componentSpacing.plainCopy()
+			Lang.translate("tooltip.brass_tunnel.contains_entry",
-				.append(Lang.translateDirect("tooltip.brass_tunnel.contains_entry",
+					Components.translatable(item.getDescriptionId()).getString(), item.getCount())
-					Components.translatable(item.getDescriptionId())
+					.style(ChatFormatting.GRAY).forGoggles(tooltip);
-						.getString(),
-					item.getCount()))
-				.withStyle(ChatFormatting.GRAY));
 		}
-		tooltip.add(componentSpacing.plainCopy()
+		Lang.translate("tooltip.brass_tunnel.retrieve").style(ChatFormatting.DARK_GRAY).forGoggles(tooltip);
-			.append(Lang.translateDirect("tooltip.brass_tunnel.retrieve"))
-			.withStyle(ChatFormatting.DARK_GRAY));
 
 		return true;
 	}

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

@@ -380,6 +380,9 @@ public class BasinBlockEntity extends SmartBlockEntity implements IHaveGoggleInf
 			inserter = BlockEntityBehaviour.get(level, be.getBlockPos(), InvManipulationBehaviour.TYPE);
 		}
 
+		if (be instanceof BasinBlockEntity)
+			filter = null; // Do not test spout outputs against the recipe filter
+
 		IItemHandler targetInv = be == null ? null
 			: be.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, direction.getOpposite())
 				.orElse(inserter == null ? null : inserter.getInventory());
@@ -402,16 +405,21 @@ public class BasinBlockEntity extends SmartBlockEntity implements IHaveGoggleInf
 
 			if (targetInv == null)
 				break;
-			if (!ItemHandlerHelper.insertItemStacked(targetInv, itemStack, true)
+
-				.isEmpty())
+			ItemStack remainder = ItemHandlerHelper.insertItemStacked(targetInv, itemStack, true);
+			if (remainder.getCount() == itemStack.getCount())
 				continue;
 			if (filter != null && !filter.test(itemStack))
 				continue;
 
-			update = true;
-			ItemHandlerHelper.insertItemStacked(targetInv, itemStack.copy(), false);
-			iterator.remove();
 			visualizedOutputItems.add(IntAttached.withZero(itemStack));
+			update = true;
+
+			remainder = ItemHandlerHelper.insertItemStacked(targetInv, itemStack.copy(), false);
+			if (remainder.isEmpty())
+				iterator.remove();
+			else
+				itemStack.setCount(remainder.getCount());
 		}
 
 		for (Iterator<FluidStack> iterator = spoutputFluidBuffer.iterator(); iterator.hasNext();) {
@@ -547,9 +555,9 @@ public class BasinBlockEntity extends SmartBlockEntity implements IHaveGoggleInf
 
 			if (simulate)
 				return true;
-			for (ItemStack itemStack : outputItems) {
+			for (ItemStack itemStack : outputItems)
-				spoutputBuffer.add(itemStack.copy());
+				if (!itemStack.isEmpty())
-			}
+					spoutputBuffer.add(itemStack.copy());
 			if (!externalTankNotPresent)
 				for (FluidStack fluidStack : outputFluids)
 					spoutputFluidBuffer.add(fluidStack.copy());
@@ -604,7 +612,9 @@ public class BasinBlockEntity extends SmartBlockEntity implements IHaveGoggleInf
 	public static HeatLevel getHeatLevelOf(BlockState state) {
 		if (state.hasProperty(BlazeBurnerBlock.HEAT_LEVEL))
 			return state.getValue(BlazeBurnerBlock.HEAT_LEVEL);
-		return AllTags.AllBlockTags.PASSIVE_BOILER_HEATERS.matches(state) && BlockHelper.isNotUnheated(state) ? HeatLevel.SMOULDERING : HeatLevel.NONE;
+		return AllTags.AllBlockTags.PASSIVE_BOILER_HEATERS.matches(state) && BlockHelper.isNotUnheated(state)
+			? HeatLevel.SMOULDERING
+			: HeatLevel.NONE;
 	}
 
 	public Couple<SmartFluidTankBehaviour> getTanks() {

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

@@ -16,10 +16,23 @@ public class BasinInventory extends SmartInventory {
 
 	@Override
 	public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) {
-		// Only insert if no other slot already has a stack of this item
+		int firstFreeSlot = -1;
-		for (int i = 0; i < getSlots(); i++) 
+
+		for (int i = 0; i < getSlots(); i++) {
+			// Only insert if no other slot already has a stack of this item
 			if (i != slot && ItemHandlerHelper.canItemStacksStack(stack, inv.getStackInSlot(i)))
 				return stack;
+			if (inv.getStackInSlot(i)
+				.isEmpty() && firstFreeSlot == -1)
+				firstFreeSlot = i;
+		}
+
+		// Only insert if this is the first empty slot, prevents overfilling in the
+		// simulation pass
+		if (inv.getStackInSlot(slot)
+			.isEmpty() && firstFreeSlot != slot)
+			return stack;
+
 		return super.insertItem(slot, stack, simulate);
 	}
 

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

@@ -149,13 +149,22 @@ public class BasinRecipe extends ProcessingRecipe<SmartInventory> {
 			if (simulate) {
 				if (recipe instanceof BasinRecipe basinRecipe) {
 					recipeOutputItems.addAll(basinRecipe.rollResults());
-					recipeOutputFluids.addAll(basinRecipe.getFluidResults());
+					
-					recipeOutputItems.addAll(basinRecipe.getRemainingItems(basin.getInputInventory()));
+					for (FluidStack fluidStack : basinRecipe.getFluidResults())
+						if (!fluidStack.isEmpty())
+							recipeOutputFluids.add(fluidStack);
+					for (ItemStack stack : basinRecipe.getRemainingItems(basin.getInputInventory()))
+						if (!stack.isEmpty())
+							recipeOutputItems.add(stack);
+					
 				} else {
 					recipeOutputItems.add(recipe.getResultItem());
 
 					if (recipe instanceof CraftingRecipe craftingRecipe) {
-						recipeOutputItems.addAll(craftingRecipe.getRemainingItems(new DummyCraftingContainer(availableItems, extractedItemsFromSlot)));
+						for (ItemStack stack : craftingRecipe
+							.getRemainingItems(new DummyCraftingContainer(availableItems, extractedItemsFromSlot)))
+							if (!stack.isEmpty())
+								recipeOutputItems.add(stack);
 					}
 				}
 			}

src/main/java/com/simibubi/create/content/redstone/analogLever/AnalogLeverBlockEntity.java

@@ -79,7 +79,7 @@ public class AnalogLeverBlockEntity extends SmartBlockEntity implements IHaveGog
 
 	@Override
 	public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
-		tooltip.add(componentSpacing.plainCopy().append(Lang.translateDirect("tooltip.analogStrength", this.state)));
+		Lang.translate("tooltip.analogStrength", this.state).forGoggles(tooltip);
 
 		return true;
 	}

src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchBlockEntity.java

@@ -2,7 +2,10 @@ package com.simibubi.create.content.redstone.thresholdSwitch;
 
 import java.util.List;
 
-import com.simibubi.create.compat.storageDrawers.StorageDrawers;
+import com.simibubi.create.compat.thresholdSwitch.FunctionalStorage;
+import com.simibubi.create.compat.thresholdSwitch.SophisticatedStorage;
+import com.simibubi.create.compat.thresholdSwitch.StorageDrawers;
+import com.simibubi.create.compat.thresholdSwitch.ThresholdSwitchCompat;
 import com.simibubi.create.content.redstone.DirectedDirectionalBlock;
 import com.simibubi.create.content.redstone.FilteredDetectorFilterSlot;
 import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlock;
@@ -42,6 +45,12 @@ public class ThresholdSwitchBlockEntity extends SmartBlockEntity {
 	private TankManipulationBehaviour observedTank;
 	private VersionedInventoryTrackerBehaviour invVersionTracker;
 
+	private static final List<ThresholdSwitchCompat> COMPAT = List.of(
+		new FunctionalStorage(),
+		new SophisticatedStorage(),
+		new StorageDrawers()
+	);
+
 	public ThresholdSwitchBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
 		super(type, pos, state);
 		onWhenAbove = .75f;
@@ -104,9 +113,6 @@ public class ThresholdSwitchBlockEntity extends SmartBlockEntity {
 		if (targetBlockEntity instanceof ThresholdSwitchObservable observable) {
 			currentLevel = observable.getPercent() / 100f;
 
-		} else if (StorageDrawers.isDrawer(targetBlockEntity) && observedInventory.hasInventory()) {
-			currentLevel = StorageDrawers.getTrueFillLevel(observedInventory.getInventory(), filtering);
-
 		} else if (observedInventory.hasInventory() || observedTank.hasInventory()) {
 			if (observedInventory.hasInventory()) {
 
@@ -120,7 +126,15 @@ public class ThresholdSwitchBlockEntity extends SmartBlockEntity {
 					invVersionTracker.awaitNewVersion(inv);
 					for (int slot = 0; slot < inv.getSlots(); slot++) {
 						ItemStack stackInSlot = inv.getStackInSlot(slot);
-						int space = Math.min(stackInSlot.getMaxStackSize(), inv.getSlotLimit(slot));
+
+						int finalSlot = slot;
+						long space = COMPAT
+							.stream()
+							.filter(compat -> compat.isFromThisMod(targetBlockEntity))
+							.map(compat -> compat.getSpaceInSlot(inv, finalSlot))
+							.findFirst()
+							.orElseGet(() -> (long) Math.min(stackInSlot.getMaxStackSize(), inv.getSlotLimit(finalSlot)));
+
 						int count = stackInSlot.getCount();
 						if (space == 0)
 							continue;

src/main/java/com/simibubi/create/foundation/blockEntity/renderer/SafeBlockEntityRenderer.java

@@ -2,10 +2,14 @@ package com.simibubi.create.foundation.blockEntity.renderer;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
+import net.minecraft.client.renderer.culling.Frustum;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.Vec3;
 
 public abstract class SafeBlockEntityRenderer<T extends BlockEntity> implements BlockEntityRenderer<T> {
 	@Override
@@ -23,4 +27,21 @@ public abstract class SafeBlockEntityRenderer<T extends BlockEntity> implements
 		return !be.hasLevel() || be.getBlockState()
 			.getBlock() == Blocks.AIR;
 	}
+
+	public boolean shouldCullItem(Vec3 itemPos) {
+		Frustum frustum = Minecraft.getInstance().levelRenderer.capturedFrustum != null ?
+				Minecraft.getInstance().levelRenderer.capturedFrustum :
+				Minecraft.getInstance().levelRenderer.cullingFrustum;
+
+		AABB itemBB = new AABB(
+				itemPos.x - 0.25,
+				itemPos.y - 0.25,
+				itemPos.z - 0.25,
+				itemPos.x + 0.25,
+				itemPos.y + 0.25,
+				itemPos.z + 0.25
+		);
+
+		return !frustum.isVisible(itemBB);
+	}
 }

src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java

@@ -435,11 +435,10 @@ public class BuilderTransformers {
 					.when(survivesExplosion)
 					.setRolls(ConstantValue.exactly(1))
 					.add(LootItem.lootTableItem(drop.get())
-						.apply(CopyNameFunction.copyName(CopyNameFunction.NameSource.BLOCK_ENTITY))
 						.apply(CopyNbtFunction.copyData(ContextNbtProvider.BLOCK_ENTITY)
-							.copy("Air", "Air"))
+							.copy("VanillaTag", "{}", CopyNbtFunction.MergeStrategy.MERGE))
 						.apply(CopyNbtFunction.copyData(ContextNbtProvider.BLOCK_ENTITY)
-							.copy("Enchantments", "Enchantments")))));
+							.copy("Air", "Air")))));
 			});
 	}
 

src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java

@@ -93,13 +93,15 @@ public class CrushingRecipeGen extends ProcessingRecipeGen {
 		DEEP_GOLD_ORE = deepslateOre(() -> Items.DEEPSLATE_GOLD_ORE, AllItems.CRUSHED_GOLD::get, 2.25f, 350),
 		DEEP_DIAMOND_ORE = deepslateOre(() -> Items.DEEPSLATE_DIAMOND_ORE, () -> Items.DIAMOND, 2.25f, 450),
 		DEEP_EMERALD_ORE = deepslateOre(() -> Items.DEEPSLATE_EMERALD_ORE, () -> Items.EMERALD, 2.25f, 450),
-		DEEP_COAL_ORE = deepslateOre(() -> Items.DEEPSLATE_COAL_ORE, () -> Items.COAL, 1.75f, 250),
+		DEEP_COAL_ORE = deepslateOre(() -> Items.DEEPSLATE_COAL_ORE, () -> Items.COAL, 2.25f, 300),
 		DEEP_REDSTONE_ORE = deepslateOre(() -> Items.DEEPSLATE_REDSTONE_ORE, () -> Items.REDSTONE, 7.5f, 350),
 		DEEP_LAPIS_ORE = deepslateOre(() -> Items.DEEPSLATE_LAPIS_ORE, () -> Items.LAPIS_LAZULI, 12.5f, 350),
 
 		NETHER_GOLD_ORE = netherOre(() -> Items.NETHER_GOLD_ORE, () -> Items.GOLD_NUGGET, 18, 350),
 		NETHER_QUARTZ_ORE = netherOre(() -> Items.NETHER_QUARTZ_ORE, () -> Items.QUARTZ, 2.25f, 350),
 
+		GILDED_BLACKSTONE = ore(Items.BLACKSTONE, () -> Items.GILDED_BLACKSTONE, () -> Items.GOLD_NUGGET, 18, 400),
+
 		RAW_COPPER_ORE = rawOre(() -> Items.RAW_COPPER, AllItems.CRUSHED_COPPER::get, 1),
 		RAW_ZINC_ORE = rawOre(AllItems.RAW_ZINC::get, AllItems.CRUSHED_ZINC::get, 1),
 		RAW_IRON_ORE = rawOre(() -> Items.RAW_IRON, AllItems.CRUSHED_IRON::get, 1),

src/main/java/com/simibubi/create/foundation/data/recipe/FillingRecipeGen.java

@@ -62,7 +62,7 @@ public class FillingRecipeGen extends ProcessingRecipeGen {
 			.output(Items.GLOWSTONE_DUST)),
 
 
-		AM_LAVA = create(Mods.AM.recipeId("milk_bottle"), b -> b.require(Fluids.LAVA, 250)
+		AM_LAVA = create(Mods.AM.recipeId("lava_bottle"), b -> b.require(Fluids.LAVA, 250)
 			.require(Items.GLASS_BOTTLE)
 			.output(1, Mods.AM, "lava_bottle", 1)
 			.whenModLoaded(Mods.AM.getId())),

src/main/java/com/simibubi/create/foundation/fluid/FluidHelper.java

@@ -50,6 +50,14 @@ public class FluidHelper {
 		return convertToStill(fluid) == Fluids.LAVA;
 	}
 	
+	public static boolean isSame(FluidStack fluidStack, FluidStack fluidStack2) {
+		return fluidStack.getFluid() == fluidStack2.getFluid();
+	}
+	
+	public static boolean isSame(FluidStack fluidStack, Fluid fluid) {
+		return fluidStack.getFluid() == fluid;
+	}
+
 	@SuppressWarnings("deprecation")
 	public static boolean isTag(Fluid fluid, TagKey<Fluid> tag) {
 		return fluid.is(tag);

src/main/java/com/simibubi/create/foundation/fluid/FluidIngredient.java

@@ -152,8 +152,7 @@ public abstract class FluidIngredient implements Predicate<FluidStack> {
 
 		@Override
 		protected boolean testInternal(FluidStack t) {
-			if (!t.getFluid()
+			if (!FluidHelper.isSame(t, fluid))
-				.isSame(fluid))
 				return false;
 			if (tagToMatch.isEmpty())
 				return true;
@@ -201,17 +200,14 @@ public abstract class FluidIngredient implements Predicate<FluidStack> {
 
 		protected TagKey<Fluid> tag;
 
-		@SuppressWarnings("deprecation")
 		@Override
 		protected boolean testInternal(FluidStack t) {
-			if (tag == null) {
+			if (tag != null)
-				for (FluidStack accepted : getMatchingFluidStacks())
+				return FluidHelper.isTag(t, tag);
-					if (accepted.getFluid()
+			for (FluidStack accepted : getMatchingFluidStacks())
-						.isSame(t.getFluid()))
+				if (FluidHelper.isSame(accepted, t))
-						return true;
+					return true;
-				return false;
+			return false;
-			}
-			return t.getFluid().is(tag);
 		}
 
 		@Override

src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java

@@ -6,7 +6,6 @@ import java.util.LinkedList;
 import java.util.List;
 
 import com.google.common.base.Strings;
-import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
 import com.simibubi.create.foundation.utility.Components;
 import com.simibubi.create.foundation.utility.Couple;
 import com.simibubi.create.foundation.utility.Lang;
@@ -30,15 +29,11 @@ public class TooltipHelper {
 	}
 
 	public static void addHint(List<Component> tooltip, String hintKey, Object... messageParams) {
-		Component spacing = IHaveGoggleInformation.componentSpacing;
+		Lang.translate(hintKey + ".title").style(ChatFormatting.GOLD).forGoggles(tooltip);
-		tooltip.add(spacing.plainCopy()
-			.append(Lang.translateDirect(hintKey + ".title"))
-			.withStyle(ChatFormatting.GOLD));
 		Component hint = Lang.translateDirect(hintKey);
 		List<Component> cutComponent = cutTextComponent(hint, Palette.GRAY_AND_WHITE);
 		for (Component component : cutComponent)
-			tooltip.add(spacing.plainCopy()
+			Lang.text(component.getString()).forGoggles(tooltip);
-				.append(component));
 	}
 
 	public static String makeProgressBar(int length, int filledLength) {

src/main/java/com/simibubi/create/foundation/mixin/accessor/MouseHandlerAccessor.java

@@ -0,0 +1,16 @@
+package com.simibubi.create.foundation.mixin.accessor;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import net.minecraft.client.MouseHandler;
+
+@Mixin(MouseHandler.class)
+public interface MouseHandlerAccessor {
+
+	@Accessor("xpos")
+	void create$setXPos(double xPos);
+
+	@Accessor("ypos")
+	void create$setYPos(double yPos);
+}

src/main/java/com/simibubi/create/foundation/utility/AngleHelper.java

@@ -49,4 +49,7 @@ public class AngleHelper {
 		return diff;
 	}
 
+	public static float wrapAngle180(float angle) {
+		return (angle + 180) % 360 - 180;
+	}
 }

src/main/java/com/simibubi/create/foundation/utility/LangBuilder.java

@@ -2,10 +2,15 @@ package com.simibubi.create.foundation.utility;
 
 import java.util.List;
 
+import com.simibubi.create.compat.Mods;
+
 import joptsimple.internal.Strings;
 import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Font;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.util.Mth;
 import net.minecraft.world.entity.player.Player;
 
 public class LangBuilder {
@@ -150,11 +155,20 @@ public class LangBuilder {
 
 	public void forGoggles(List<? super MutableComponent> tooltip, int indents) {
 		tooltip.add(Lang.builder()
-			.text(Strings.repeat(' ', 4 + indents))
+			.text(Strings.repeat(' ', getIndents(Minecraft.getInstance().font, 4 + indents)))
 			.add(this)
 			.component());
 	}
 
+	public static final float DEFAULT_SPACE_WIDTH = 4.0F; // space width in vanilla's default font
+	static int getIndents(Font font, int defaultIndents) {
+		int spaceWidth = font.width(" ");
+		if (DEFAULT_SPACE_WIDTH == spaceWidth) {
+			return defaultIndents;
+		}
+		return Mth.ceil(DEFAULT_SPACE_WIDTH * defaultIndents / spaceWidth);
+	}
+
 	//
 
 	private void assertComponent() {

src/main/java/com/simibubi/create/infrastructure/debugInfo/DebugInformation.java

@@ -26,6 +26,7 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.forgespi.language.IModInfo;
+import oshi.SystemInfo;
 
 /**
  * Allows for providing easily accessible debugging information.
@@ -86,6 +87,7 @@ public class DebugInformation {
 				.put("Java Version", SystemReportAccessor.getJAVA_VERSION())
 				.put("JVM Flags", getMcSystemInfo("JVM Flags"))
 				.put("Memory", () -> getMcSystemInfo("Memory"))
+				.put("Total Memory", getTotalRam())
 				.put("CPU", getCpuInfo())
 				.putAll(listAllGraphicsCards())
 				.buildTo(DebugInformation::registerBothInfo);
@@ -129,6 +131,13 @@ public class DebugInformation {
 		return cards.isEmpty() ? List.of(new InfoEntry("Graphics cards", "none")) : cards;
 	}
 
+	public static String getTotalRam() {
+		long availableMemory = new SystemInfo().getHardware().getMemory().getAvailable();
+		long totalMemory = new SystemInfo().getHardware().getMemory().getTotal();
+		long usedMemory = totalMemory - availableMemory;
+		return String.format("%s bytes (%s MiB) / %s bytes (%s MiB)", usedMemory, usedMemory / 1049000, totalMemory, totalMemory / 1049000);
+	}
+
 	public static String getCpuInfo() {
 		String name = tryTrim(getMcSystemInfo("Processor Name"));
 		String freq = getMcSystemInfo("Frequency (GHz)");

src/main/resources/META-INF/accesstransformer.cfg

@@ -42,3 +42,6 @@ public net.minecraft.client.model.AgeableListModel f_102012_ # bodyYOffset
 
 public net.minecraft.client.gui.components.CommandSuggestions f_93866_ # suggestions
 public net.minecraft.client.gui.components.CommandSuggestions$SuggestionsList <init>(Lnet/minecraft/client/gui/components/CommandSuggestions;IIILjava/util/List;Z)V # <init>
+
+public net.minecraft.client.renderer.LevelRenderer f_172938_ # cullingFrustum
+public net.minecraft.client.renderer.LevelRenderer f_109442_ # capturedFrustum

src/main/resources/create.mixins.json

@@ -29,6 +29,7 @@
     "accessor.AgeableListModelAccessor",
     "accessor.GameRendererAccessor",
     "accessor.HumanoidArmorLayerAccessor",
+    "accessor.MouseHandlerAccessor",
     "accessor.ParticleEngineAccessor",
     "client.BlockDestructionProgressMixin",
     "client.CameraMixin",