Merge remote-tracking branch 'refs/remotes/forge/mc1.20.1/dev' into mc1.20.1/fabric/dev

# Conflicts:
#	.github/workflows/build.yml
#	build.gradle
#	gradle.properties
#	src/main/java/com/simibubi/create/Create.java
#	src/main/java/com/simibubi/create/compat/Mods.java
#	src/main/java/com/simibubi/create/content/equipment/tool/CardboardSwordItem.java
#	src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java
#	src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlock.java
#	src/main/java/com/simibubi/create/content/logistics/redstoneRequester/RedstoneRequesterMenu.java
#	src/main/java/com/simibubi/create/foundation/mixin/client/HeavyBootsOnPlayerMixin.java
#	src/main/java/com/simibubi/create/infrastructure/debugInfo/DebugInformation.java
#	src/main/resources/META-INF/mods.toml

Author: TropheusJ

changelog.md

@@ -1,3 +1,27 @@
+------------------------------------------------------
+Create 6.0.1
+------------------------------------------------------
+
+#### Bug Fixes
+
+- Fixed Shopping lists not updating when adding purchases (1.21) #7449 #7393
+- Fixed Frogport ponder scene not animating correctly (1.21)
+- Fixed broken address filter in second stock ticker ponder scene (1.21)
+- Added a tooltip for the stock keeper address input
+- Fixed crash when re-packaging a duplicated package fragment #7456
+- Fixed crash when ctrl-click copying a gauge #7431
+- Safety check for unexpected string modifications in address edit boxes #7409
+- Fixed crash with fluid propagator
+- Fixed a crash when using factory gauges
+- Fixed debug info command not translating the graphics mode text
+- Fixed cardboard sword not being able to damage arthropod mobs other than the spider
+- Fixed a crash that occurred when placing a stock link on a re-packager
+- Fixed an issue where wearing diving boots and sprinting would force you into the swim position and then out of it
+  right away
+- Fixed item group attribute filters crashing
+- Fixed mixin conflict with immersive portals
+- Fixed processing output not supporting itemstack components
+
 ------------------------------------------------------
 Create 6.0.0
 ------------------------------------------------------

gradle/property_loader.gradle

@@ -0,0 +1,48 @@
+/*
+ This module can inject build properties from a JSON file. Each property in the
+ JSON file will be mapped to a build property using the key of that property.
+ Property keys ending with _comment will be skipped.
+
+ If a secretFile property exists and points to a valid JSON file that file will
+ be automatically loaded. You can manually load a file using the loadProperties
+ method.
+*/
+import groovy.json.JsonSlurper
+
+// Auto detects a secret file and injects it.
+if (project.rootProject.hasProperty("secretFile")) {
+    project.logger.lifecycle("Automatically loading properties from the secretFile")
+    final def secretsFile = project.rootProject.file(project.rootProject.getProperty("secretFile"))
+
+    if (secretsFile.exists() && secretsFile.name.endsWith(".json")) {
+        loadProperties(secretsFile)
+    }
+}
+
+// Loads properties using a specified json file.
+def loadProperties(propertyFile) {
+    if (propertyFile.exists()) {
+        propertyFile.withReader {
+            Map propMap = new JsonSlurper().parse it
+
+            for (entry in propMap) {
+
+                // Filter entries that use _comment in the key.
+                if (!entry.key.endsWith("_comment")) {
+
+                    project.ext.set(entry.key, entry.value)
+                }
+            }
+
+            project.logger.lifecycle("Successfully loaded " + propMap.size() + " properties")
+            propMap.clear()
+        }
+    } else {
+        project.logger.warn("The property file " + propertyFile.getName() + " could not be loaded. It does not exist.")
+    }
+}
+
+// Allows other scripts to use these methods.
+ext {
+    loadProperties = this.&loadProperties
+}

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

@@ -2,6 +2,8 @@
 
 import java.util.Random;
 
+import com.simibubi.create.compat.inventorySorter.InventorySorterCompat;
+
 import org.slf4j.Logger;
 
 import com.google.gson.Gson;

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

@@ -35,6 +35,7 @@ public enum Mods {
 	FTBCHUNKS,
 	JOURNEYMAP,
 	FTBLIBRARY,
+	INVENTORYSORTER,
 
 	// fabric mods
 	SANDWICHABLE,

src/main/java/com/simibubi/create/compat/inventorySorter/InventorySorterCompat.java

@@ -0,0 +1,25 @@
+package com.simibubi.create.compat.inventorySorter;
+
+import com.simibubi.create.compat.Mods;
+
+import com.simibubi.create.content.logistics.redstoneRequester.RedstoneRequesterMenu.SorterProofSlot;
+
+import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.fml.InterModComms;
+import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
+
+/**
+ * Compatibility with cpw's InventorySorter.
+ * We need to stop it from interfering with scrolling in the Redstone Requester's screen.
+ */
+public class InventorySorterCompat {
+	public static final String SLOT_BLACKLIST = "slotblacklist";
+
+	public static void init(IEventBus bus) {
+		bus.addListener(InventorySorterCompat::sendImc);
+	}
+
+	private static void sendImc(InterModEnqueueEvent event) {
+		InterModComms.sendTo(Mods.INVENTORYSORTER.id(), SLOT_BLACKLIST, SorterProofSlot.class::getName);
+	}
+}

src/main/java/com/simibubi/create/content/contraptions/render/ContraptionVisual.java

@@ -14,6 +14,8 @@
 import com.simibubi.create.foundation.utility.worldWrappers.WrappedBlockAndTintGetter;
 import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld;
 
+import net.minecraftforge.client.model.data.ModelData;
+
 import dev.engine_room.flywheel.api.material.CardinalLightingMode;
 import dev.engine_room.flywheel.api.model.Model;
 import dev.engine_room.flywheel.api.task.Plan;
@@ -132,7 +134,7 @@ private void setupActors(float partialTick, Contraption contraption) {
 	}
 
 	@SuppressWarnings("unchecked")
-	protected  <T extends BlockEntity> void setupVisualizer(T be, float partialTicks) {
+	protected <T extends BlockEntity> void setupVisualizer(T be, float partialTicks) {
 		BlockEntityVisualizer<? super T> visualizer = (BlockEntityVisualizer<? super T>) VisualizerRegistry.getVisualizer(be.getType());
 		if (visualizer == null) {
 			return;
@@ -182,17 +184,17 @@ private void setupActor(MutablePair<StructureTemplate.StructureBlockInfo, Moveme
 	@Override
 	public Plan<TickableVisual.Context> planTick() {
 		return NestedPlan.of(
-				ForEachPlan.of(() -> actors, ActorVisual::tick),
-				tickableVisuals
+			ForEachPlan.of(() -> actors, ActorVisual::tick),
+			tickableVisuals
 		);
 	}
 
 	@Override
 	public Plan<DynamicVisual.Context> planFrame() {
 		return NestedPlan.of(
-				RunnablePlan.of(this::beginFrame),
-				ForEachPlan.of(() -> actors, ActorVisual::beginFrame),
-				dynamicVisuals
+			RunnablePlan.of(this::beginFrame),
+			ForEachPlan.of(() -> actors, ActorVisual::beginFrame),
+			dynamicVisuals
 		);
 	}
 
@@ -201,7 +203,7 @@ protected void beginFrame(DynamicVisual.Context context) {
 		setEmbeddingMatrices(partialTick);
 
 		if (hasMovedSections()) {
- 			sectionCollector.sections(collectLightSections());
+			sectionCollector.sections(collectLightSections());
 		}
 
 		if (hasMovedBlocks()) {
@@ -282,13 +284,13 @@ protected boolean hasMovedBlocks() {
 		int maxY = maxLight(boundingBox.maxY);
 		int maxZ = maxLight(boundingBox.maxZ);
 
-		return minBlock != BlockPos.asLong(minX, minY, minZ) || maxBlock !=  BlockPos.asLong(maxX, maxY, maxZ);
+		return minBlock != BlockPos.asLong(minX, minY, minZ) || maxBlock != BlockPos.asLong(maxX, maxY, maxZ);
 	}
 
 	protected boolean hasMovedSections() {
 		var boundingBox = entity.getBoundingBox();
 
-        var minSectionX = minLightSection(boundingBox.minX);
+		var minSectionX = minLightSection(boundingBox.minX);
 		var minSectionY = minLightSection(boundingBox.minY);
 		var minSectionZ = minLightSection(boundingBox.minZ);
 		int maxSectionX = maxLightSection(boundingBox.maxX);

src/main/java/com/simibubi/create/content/equipment/tool/CardboardSwordItem.java

@@ -17,12 +17,13 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.MobCategory;
+import net.minecraft.world.entity.MobType;
 import net.minecraft.world.entity.ai.attributes.Attributes;
-import net.minecraft.world.entity.monster.Spider;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.ItemStack.TooltipPart;
 import net.minecraft.world.item.SwordItem;
+import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.item.enchantment.Enchantments;
@@ -67,7 +68,7 @@ public static void cardboardSwordsCannotHurtYou(LivingAttackEvent event) {
 		Entity attacker = event.getSource()
 			.getEntity();
 		LivingEntity target = event.getEntity();
-		if (target == null || target instanceof Spider)
+		if (target == null || target.getMobType() == MobType.ARTHROPOD)
 			return;
 		if (!(attacker instanceof LivingEntity livingAttacker
 			&& AllItems.CARDBOARD_SWORD.isIn(livingAttacker.getItemInHand(InteractionHand.MAIN_HAND))))

src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java

@@ -47,6 +47,11 @@
 import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
 import com.simibubi.create.foundation.utility.CreateLang;
 
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.network.NetworkHooks;
+
 import net.createmod.catnip.animation.LerpedFloat;
 import net.createmod.catnip.animation.LerpedFloat.Chaser;
 import net.createmod.catnip.gui.ScreenOpener;
@@ -731,13 +736,16 @@ public int getPromised() {
 		}
 
 		RequestPromiseQueue promises = Create.LOGISTICS.getQueuedPromises(network);
+		if (promises == null)
+			return 0;
+
 		if (forceClearPromises) {
 			promises.forceClear(item);
 			resetTimerSlightly();
 		}
 		forceClearPromises = false;
 
-		return promises == null ? 0 : promises.getTotalPromisedAndRemoveExpired(item, getPromiseExpiryTimeInTicks());
+		return promises.getTotalPromisedAndRemoveExpired(item, getPromiseExpiryTimeInTicks());
 	}
 
 	public void resetTimer() {

src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBlock.java

@@ -124,16 +124,16 @@ public BlockState getStateForPlacement(BlockPlaceContext pContext) {
 		if (blockState.is(this) && location != null && fpbe != null) {
 			if (!level.isClientSide()) {
 				PanelSlot targetedSlot = getTargetedSlot(pos, blockState, location);
-				UUID networkFromStack = LogisticallyLinkedBlockItem.networkFromStack(pContext.getItemInHand());
+				ItemStack panelItem = FactoryPanelBlockItem.fixCtrlCopiedStack(pContext.getItemInHand());
+				UUID networkFromStack = LogisticallyLinkedBlockItem.networkFromStack(panelItem);
 				Player pPlayer = pContext.getPlayer();
 
 				if (fpbe.addPanel(targetedSlot, networkFromStack) && pPlayer != null) {
 					pPlayer.displayClientMessage(CreateLang.translateDirect("logistically_linked.connected"), true);
 
 					if (!pPlayer.isCreative()) {
-						ItemStack item = pContext.getItemInHand();
-						item.shrink(1);
-						if (item.isEmpty())
+						panelItem.shrink(1);
+						if (panelItem.isEmpty())
 							pPlayer.setItemInHand(pContext.getHand(), ItemStack.EMPTY);
 					}
 				}
@@ -215,7 +215,7 @@ public InteractionResult use(BlockState pState, Level pLevel, BlockPos pPos, Pla
 
 		PanelSlot newSlot = getTargetedSlot(pPos, pState, location);
 		withBlockEntityDo(pLevel, pPos, fpbe -> {
-			if (!fpbe.addPanel(newSlot, LogisticallyLinkedBlockItem.networkFromStack(item)))
+			if (!fpbe.addPanel(newSlot, LogisticallyLinkedBlockItem.networkFromStack(FactoryPanelBlockItem.fixCtrlCopiedStack(item))))
 				return;
 			pPlayer.displayClientMessage(CreateLang.translateDirect("logistically_linked.connected"), true);
 			pLevel.playSound(null, pPos, soundType.getPlaceSound(), SoundSource.BLOCKS);

src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBlockEntity.java

@@ -133,7 +133,8 @@ public boolean addPanel(PanelSlot slot, UUID frequency) {
 		FactoryPanelBehaviour behaviour = panels.get(slot);
 		if (behaviour != null && !behaviour.isActive()) {
 			behaviour.enable();
-			behaviour.setNetwork(frequency);
+			if (frequency != null)
+				behaviour.setNetwork(frequency);
 			redraw = true;
 			lastShape = null;
 

src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBlockItem.java

@@ -1,13 +1,21 @@
 package com.simibubi.create.content.logistics.factoryBoard;
 
+import java.util.UUID;
+
 import com.simibubi.create.AllSoundEvents;
+import com.simibubi.create.content.logistics.factoryBoard.FactoryPanelBlock.PanelSlot;
 import com.simibubi.create.content.logistics.packagerLink.LogisticallyLinkedBlockItem;
 import com.simibubi.create.foundation.utility.CreateLang;
 
+import net.minecraft.core.BlockPos;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.BlockPlaceContext;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
 
 public class FactoryPanelBlockItem extends LogisticallyLinkedBlockItem {
 
@@ -29,5 +37,31 @@ public InteractionResult place(BlockPlaceContext pContext) {
 
 		return super.place(pContext);
 	}
+	
+	@Override
+	protected boolean updateCustomBlockEntityTag(BlockPos pos, Level level, Player player, ItemStack stack,
+		BlockState state) {
+		return super.updateCustomBlockEntityTag(pos, level, player, fixCtrlCopiedStack(stack), state);
+	}
+
+	public static ItemStack fixCtrlCopiedStack(ItemStack stack) {
+		// Salvage frequency data from one of the panel slots
+		if (isTuned(stack) && networkFromStack(stack) == null) {
+			CompoundTag bet = stack.getTagElement(BLOCK_ENTITY_TAG);
+			UUID frequency = UUID.randomUUID();
+			
+			for (PanelSlot slot : PanelSlot.values()) {
+				CompoundTag panelTag = bet.getCompound(CreateLang.asId(slot.name()));
+				if (panelTag.hasUUID("Freq"))
+					frequency = panelTag.getUUID("Freq");
+			}
+			
+			bet = new CompoundTag();
+			bet.putUUID("Freq", frequency);
+			stack.getTag().put(BLOCK_ENTITY_TAG, bet);
+		}
+		
+		return stack;
+	}
 
 }

src/main/java/com/simibubi/create/content/logistics/packager/PackageDefragmenter.java

@@ -114,7 +114,8 @@ public List<ItemStack> repack(int orderId) {
 
 					ItemStack output = ItemHandlerHelper.copyStackWithSize(entry.stack, removedAmount);
 					targetAmount -= removedAmount;
-					targetedEntry.count = targetAmount;
+					if (targetedEntry != null)
+						targetedEntry.count = targetAmount;
 					entry.count -= removedAmount;
 					outputSlots.add(output);
 				}