Merge remote-tracking branch 'origin/mc1.20.1/dev' into mc1.20.1/dev

Author: IThundxr

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

@@ -173,9 +173,7 @@ protected ItemStack doExecute(ItemStack stack, MovementContext context, BlockPos
 	};
 
 	public static void registerDefaults() {
-		for (SpawnEggItem egg : SpawnEggItem.eggs()) {
-			MountedDispenseBehavior.REGISTRY.register(egg, SPAWN_EGG);
-		}
+		MountedDispenseBehavior.REGISTRY.registerProvider(item -> item instanceof SpawnEggItem ? SPAWN_EGG : null);
 
 		MountedDispenseBehavior.REGISTRY.register(Items.TNT, TNT);
 		MountedDispenseBehavior.REGISTRY.register(Items.FIREWORK_ROCKET, FIREWORK);

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

@@ -247,9 +247,13 @@ public void applyLocalTransforms(PoseStack matrixStack, float partialTicks) {
 		float angle = getAngle(partialTicks);
 		Axis axis = getRotationAxis();
 
+		// Always apply a nudge to prevent Z fighting for translating contraptions.
+		// This is particularly noticeable in elevators.
+		TransformStack.of(matrixStack)
+			.nudge(getId());
+
 		if (axis != null) {
 			TransformStack.of(matrixStack)
-				.nudge(getId())
 				.center()
 				.rotateDegrees(angle, axis)
 				.uncenter();

src/main/java/com/simibubi/create/content/logistics/filter/AbstractFilterMenu.java

@@ -1,17 +1,13 @@
 package com.simibubi.create.content.logistics.filter;
 
-import com.simibubi.create.foundation.gui.menu.GhostItemMenu;
+import com.simibubi.create.foundation.gui.menu.HeldItemGhostItemMenu;
 
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.ClickType;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-public abstract class AbstractFilterMenu extends GhostItemMenu<ItemStack> {
+public abstract class AbstractFilterMenu extends HeldItemGhostItemMenu {
 
 	protected AbstractFilterMenu(MenuType<?> type, int id, Inventory inv, FriendlyByteBuf extraData) {
 		super(type, id, inv, extraData);
@@ -21,24 +17,11 @@ protected AbstractFilterMenu(MenuType<?> type, int id, Inventory inv, ItemStack
 		super(type, id, inv, contentHolder);
 	}
 
-	@Override
-	public void clicked(int slotId, int dragType, ClickType clickTypeIn, Player player) {
-		if (slotId == playerInventory.selected && clickTypeIn != ClickType.THROW)
-			return;
-		super.clicked(slotId, dragType, clickTypeIn, player);
-	}
-
 	@Override
 	protected boolean allowRepeats() {
 		return false;
 	}
 
-	@Override
-	@OnlyIn(Dist.CLIENT)
-	protected ItemStack createOnClient(FriendlyByteBuf extraData) {
-		return extraData.readItem();
-	}
-
 	protected abstract int getPlayerInventoryXOffset();
 
 	protected abstract int getPlayerInventoryYOffset();
@@ -57,9 +40,4 @@ protected void saveData(ItemStack contentHolder) {
 				.put("Items", ghostInventory.serializeNBT());
 	}
 
-	@Override
-	public boolean stillValid(Player player) {
-		return playerInventory.getSelected() == contentHolder;
-	}
-
 }

src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerMenu.java

@@ -1,18 +1,17 @@
 package com.simibubi.create.content.redstone.link.controller;
 
 import com.simibubi.create.AllMenuTypes;
-import com.simibubi.create.foundation.gui.menu.GhostItemMenu;
+import com.simibubi.create.foundation.gui.menu.HeldItemGhostItemMenu;
 
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.ClickType;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.item.ItemStack;
+
 import net.minecraftforge.items.ItemStackHandler;
 import net.minecraftforge.items.SlotItemHandler;
 
-public class LinkedControllerMenu extends GhostItemMenu<ItemStack> {
+public class LinkedControllerMenu extends HeldItemGhostItemMenu {
 
 	public LinkedControllerMenu(MenuType<?> type, int id, Inventory inv, FriendlyByteBuf extraData) {
 		super(type, id, inv, extraData);
@@ -26,11 +25,6 @@ public static LinkedControllerMenu create(int id, Inventory inv, ItemStack filte
 		return new LinkedControllerMenu(AllMenuTypes.LINKED_CONTROLLER.get(), id, inv, filterItem);
 	}
 
-	@Override
-	protected ItemStack createOnClient(FriendlyByteBuf extraData) {
-		return extraData.readItem();
-	}
-
 	@Override
 	protected ItemStackHandler createGhostInventory() {
 		return LinkedControllerItem.getFrequencyItems(contentHolder);
@@ -64,16 +58,4 @@ protected boolean allowRepeats() {
 		return true;
 	}
 
-	@Override
-	public void clicked(int slotId, int dragType, ClickType clickTypeIn, Player player) {
-		if (slotId == playerInventory.selected && clickTypeIn != ClickType.THROW)
-			return;
-		super.clicked(slotId, dragType, clickTypeIn, player);
-	}
-
-	@Override
-	public boolean stillValid(Player playerIn) {
-		return playerInventory.getSelected() == contentHolder;
-	}
-
 }

src/main/java/com/simibubi/create/content/trains/schedule/ScheduleMenu.java

@@ -1,12 +1,10 @@
 package com.simibubi.create.content.trains.schedule;
 
-import com.simibubi.create.foundation.gui.menu.GhostItemMenu;
+import com.simibubi.create.foundation.gui.menu.HeldItemGhostItemMenu;
 
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.Container;
 import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.ClickType;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
@@ -15,7 +13,7 @@
 import net.minecraftforge.items.ItemStackHandler;
 import net.minecraftforge.items.SlotItemHandler;
 
-public class ScheduleMenu extends GhostItemMenu<ItemStack> {
+public class ScheduleMenu extends HeldItemGhostItemMenu {
 
 	public boolean slotsActive = true;
 	public int targetSlotsActive = 1;
@@ -35,23 +33,11 @@ protected ItemStackHandler createGhostInventory() {
 		return new ItemStackHandler(slots);
 	}
 
-	@Override
-	public void clicked(int index, int dragType, ClickType clickType, Player player) {
-		if (!this.isInSlot(index) || clickType == ClickType.THROW || clickType == ClickType.CLONE) {
-			super.clicked(index, dragType, clickType, player);
-		}
-	}
-
 	@Override
 	protected boolean allowRepeats() {
 		return true;
 	}
 
-	@Override
-	protected ItemStack createOnClient(FriendlyByteBuf extraData) {
-		return extraData.readItem();
-	}
-
 	@Override
 	protected void addSlots() {
 		addPlayerSlots(46, 140);
@@ -67,22 +53,6 @@ protected Slot createPlayerSlot(Inventory inventory, int index, int x, int y) {
 	@Override
 	protected void saveData(ItemStack contentHolder) {}
 
-	@Override
-	public boolean stillValid(Player player) {
-		return playerInventory.getSelected() == contentHolder;
-	}
-
-	@Override
-	public boolean canTakeItemForPickAll(ItemStack stack, Slot slot) {
-		// prevent pick-all from taking this schedule out of its slot
-		return super.canTakeItemForPickAll(stack, slot) && !this.isInSlot(slot.index);
-	}
-
-	protected boolean isInSlot(int index) {
-		// Inventory has the hotbar as 0-8, but menus put the hotbar at 27-35
-		return index >= 27 && index - 27 == playerInventory.selected;
-	}
-
 	class InactiveSlot extends Slot {
 
 		public InactiveSlot(Container pContainer, int pIndex, int pX, int pY) {

src/main/java/com/simibubi/create/content/trains/signal/SignalBlock.java

@@ -1,7 +1,6 @@
 package com.simibubi.create.content.trains.signal;
 
 import java.util.Optional;
-import java.util.Random;
 
 import javax.annotation.Nullable;
 
@@ -82,7 +81,7 @@ public void neighborChanged(BlockState pState, Level pLevel, BlockPos pPos, Bloc
 		Optional<SignalBlockEntity> ste = getBlockEntityOptional(pLevel, pPos);
 		boolean neighborPowered = false;
 		if (ste.isEmpty() || !ste.get().computerBehaviour.hasAttachedComputer()) {
-			powered = pLevel.hasNeighborSignal(pPos);
+			neighborPowered = pLevel.hasNeighborSignal(pPos);
 		}
 		if (powered == neighborPowered)
 			return;

src/main/java/com/simibubi/create/foundation/gui/menu/HeldItemGhostItemMenu.java

@@ -0,0 +1,54 @@
+package com.simibubi.create.foundation.gui.menu;
+
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.ClickType;
+import net.minecraft.world.inventory.MenuType;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
+
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+
+/**
+ * A {@link GhostItemMenu} that is linked to the item in a player's main hand. Prevents its owner item from being manipulated.
+ */
+public abstract class HeldItemGhostItemMenu extends GhostItemMenu<ItemStack> {
+	protected HeldItemGhostItemMenu(MenuType<?> type, int id, Inventory inv, FriendlyByteBuf extraData) {
+		super(type, id, inv, extraData);
+	}
+
+	protected HeldItemGhostItemMenu(MenuType<?> type, int id, Inventory inv, ItemStack contentHolder) {
+		super(type, id, inv, contentHolder);
+	}
+
+	@Override
+	@OnlyIn(Dist.CLIENT)
+	protected ItemStack createOnClient(FriendlyByteBuf extraData) {
+		return extraData.readItem();
+	}
+
+	@Override
+	public void clicked(int index, int dragType, ClickType clickType, Player player) {
+		if (!this.isInSlot(index) || clickType == ClickType.THROW || clickType == ClickType.CLONE) {
+			super.clicked(index, dragType, clickType, player);
+		}
+	}
+
+	@Override
+	public boolean canTakeItemForPickAll(ItemStack stack, Slot slot) {
+		// prevent pick-all from taking the owner item out of its slot
+		return super.canTakeItemForPickAll(stack, slot) && !this.isInSlot(slot.index);
+	}
+
+	@Override
+	public boolean stillValid(Player player) {
+		return playerInventory.getSelected() == contentHolder;
+	}
+
+	protected boolean isInSlot(int index) {
+		// Inventory has the hotbar as 0-8, but menus put the hotbar at 27-35
+		return index >= 27 && index - 27 == playerInventory.selected;
+	}
+}

src/main/java/com/simibubi/create/impl/registry/SimpleRegistryImpl.java

@@ -29,8 +29,10 @@ public synchronized void register(K object, V value) {
 
 		V existing = this.registrations.get(object);
 		if (existing != null) {
-			String message = String.format("Tried to register duplicate values for object %s: old=%s, new=%s", object, existing, value);
-			throw new IllegalArgumentException(message);
+			throw new IllegalArgumentException(String.format(
+				"Tried to register duplicate values for object %s (%s): old=%s, new=%s",
+				object, object.getClass(), existing, value
+			));
 		}
 
 		this.registrations.put(object, value);

src/main/resources/assets/create/lang/lt_LT.json

@@ -51,4 +51,4 @@
   "block.create.gearshift": "Pavarų svirtis",
   "block.create.large_cogwheel": "Didelis Dantratis",
   "item.create.vertical_gearbox": "Vertikali Pavarų Dėžė"
-}
+}