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

Author: IThundxr

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -49,6 +49,7 @@ body:
             label: Mod Version
             description: The version of the mod you were using when the bug occured
             options:
+                - "0.5.1f"
                 - "0.5.1e"
                 - "0.5.1d"
                 - "0.5.1c"

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.jvmargs = -Xmx3G
 org.gradle.daemon = false
 
 # mod version info
-mod_version = 0.5.1.e
+mod_version = 0.5.1.f
 artifact_minecraft_version = 1.18.2
 
 minecraft_version = 1.18.2

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

@@ -61,7 +61,7 @@ public class Create {
 
 	public static final String ID = "create";
 	public static final String NAME = "Create";
-	public static final String VERSION = "0.5.1e";
+	public static final String VERSION = "0.5.1f";
 
 	public static final Logger LOGGER = LogUtils.getLogger();
 

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

@@ -217,6 +217,9 @@ public void positionRider(Entity passenger, MoveFunction callback) {
 	}
 
 	public Vec3 getPassengerPosition(Entity passenger, float partialTicks) {
+		if (contraption == null)
+			return null;
+		
 		UUID id = passenger.getUUID();
 		if (passenger instanceof OrientedContraptionEntity) {
 			BlockPos localPos = contraption.getBearingPosOf(id);
@@ -231,6 +234,7 @@ public Vec3 getPassengerPosition(Entity passenger, float partialTicks) {
 		BlockPos seat = contraption.getSeatOf(id);
 		if (seat == null)
 			return null;
+		
 		Vec3 transformedVector = toGlobalVector(Vec3.atLowerCornerOf(seat)
 			.add(.5, passenger.getMyRidingOffset() + ySize - .15f, .5), partialTicks)
 				.add(VecHelper.getCenterOf(BlockPos.ZERO))

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

@@ -569,6 +569,9 @@ private void repositionOnCart(PoseStack matrixStack, float partialTicks, Entity
 	private Vec3 getContraptionOffset(float partialTicks, Entity ridingEntity) {
 		AbstractContraptionEntity parent = (AbstractContraptionEntity) ridingEntity;
 		Vec3 passengerPosition = parent.getPassengerPosition(this, partialTicks);
+		if (passengerPosition == null)
+			return Vec3.ZERO;
+		
 		double x = passengerPosition.x - Mth.lerp(partialTicks, this.xOld, this.getX());
 		double y = passengerPosition.y - Mth.lerp(partialTicks, this.yOld, this.getY());
 		double z = passengerPosition.z - Mth.lerp(partialTicks, this.zOld, this.getZ());

src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerBlockEntity.java

@@ -117,7 +117,7 @@ public void searchForSharedValues() {
 
 	protected void acceptSharedValues(int mode, ItemStack filter) {
 		dontPropagate = true;
-		this.filtering.setFilter(filter);
+		this.filtering.setFilter(filter.copy());
 		this.mode.setValue(mode);
 		dontPropagate = false;
 		notifyUpdate();

src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java

@@ -19,7 +19,7 @@
 import com.simibubi.create.content.contraptions.render.ContraptionMatrices;
 import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher;
 import com.simibubi.create.content.kinetics.base.BlockBreakingMovementBehaviour;
-import com.simibubi.create.content.logistics.filter.FilterItem;
+import com.simibubi.create.content.logistics.filter.FilterItemStack;
 import com.simibubi.create.content.trains.bogey.StandardBogeyBlock;
 import com.simibubi.create.content.trains.entity.Carriage;
 import com.simibubi.create.content.trains.entity.CarriageBogey;
@@ -193,10 +193,10 @@ protected List<BlockPos> getPositionsToBreak(MovementContext context, BlockPos v
 
 		int startingY = 1;
 		if (!getStateToPaveWith(context).isAir()) {
-			ItemStack filter = ItemStack.of(context.blockEntityData.getCompound("Filter"));
-			if (!ItemHelper
+			FilterItemStack filter = context.getFilterFromBE();
+			if (!ItemHelper	
 				.extract(context.contraption.getSharedInventory(),
-					stack -> FilterItem.test(context.world, stack, filter), 1, true)
+					stack -> filter.test(context.world, stack), 1, true)
 				.isEmpty())
 				startingY = 0;
 		}
@@ -473,9 +473,9 @@ protected PaveResult tryFill(MovementContext context, BlockPos targetPos, BlockS
 				.isEmpty())
 			return PaveResult.FAIL;
 
-		ItemStack filter = ItemStack.of(context.blockEntityData.getCompound("Filter"));
+		FilterItemStack filter = context.getFilterFromBE();
 		ItemStack held = ItemHelper.extract(context.contraption.getSharedInventory(),
-			stack -> FilterItem.test(context.world, stack, filter), 1, false);
+			stack -> filter.test(context.world, stack), 1, false);
 		if (held.isEmpty())
 			return PaveResult.FAIL;
 

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

@@ -3,6 +3,7 @@
 import java.util.function.UnaryOperator;
 
 import com.simibubi.create.content.contraptions.Contraption;
+import com.simibubi.create.content.logistics.filter.FilterItemStack;
 import com.simibubi.create.foundation.utility.VecHelper;
 
 import net.minecraft.core.BlockPos;
@@ -31,6 +32,8 @@ public class MovementContext {
 	public CompoundTag data;
 	public Contraption contraption;
 	public Object temporaryData;
+	
+	private FilterItemStack filter;
 
 	public MovementContext(Level world, StructureBlockInfo info, Contraption contraption) {
 		this.world = world;
@@ -47,6 +50,7 @@ public MovementContext(Level world, StructureBlockInfo info, Contraption contrap
 		position = null;
 		data = new CompoundTag();
 		stall = false;
+		filter = null;
 	}
 
 	public float getAnimationSpeed() {
@@ -83,5 +87,11 @@ public CompoundTag writeToNBT(CompoundTag nbt) {
 		nbt.put("Data", data.copy());
 		return nbt;
 	}
+	
+	public FilterItemStack getFilterFromBE() {
+		if (filter != null)
+			return filter;
+		return filter = FilterItemStack.of(blockEntityData.getCompound("Filter"));
+	}
 
 }

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

@@ -8,6 +8,7 @@
 import com.simibubi.create.AllSoundEvents;
 import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.content.logistics.filter.FilterItem;
+import com.simibubi.create.content.logistics.filter.FilterItemStack;
 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;
@@ -132,9 +133,9 @@ public InteractionResult use(BlockState pState, Level pLevel, BlockPos pPos, Pla
 					return InteractionResult.FAIL;
 				if (pState.getValue(POWERED))
 					return InteractionResult.FAIL;
-				
-				boolean test = inBlock.getItem() instanceof FilterItem ? FilterItem.test(pLevel, inHand, inBlock)
-					: ItemHandlerHelper.canItemStacksStack(inHand, inBlock);
+
+				boolean test = inBlock.getItem() instanceof FilterItem ? FilterItemStack.of(inBlock)
+					.test(pLevel, inHand) : ItemHandlerHelper.canItemStacksStack(inHand, inBlock);
 				if (!test) {
 					AllSoundEvents.DENY.play(pLevel, null, pPos, 1, 1);
 					return InteractionResult.SUCCESS;

src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintEntity.java

@@ -13,6 +13,7 @@
 import com.simibubi.create.AllItems;
 import com.simibubi.create.Create;
 import com.simibubi.create.content.logistics.filter.FilterItem;
+import com.simibubi.create.content.logistics.filter.FilterItemStack;
 import com.simibubi.create.content.schematics.requirement.ISpecialEntityItemRequirement;
 import com.simibubi.create.content.schematics.requirement.ItemRequirement;
 import com.simibubi.create.content.schematics.requirement.ItemRequirement.ItemUseType;
@@ -365,14 +366,14 @@ public InteractionResult interactAt(Player player, Vec3 vec, InteractionHand han
 				boolean success = true;
 
 				Search: for (int i = 0; i < 9; i++) {
-					ItemStack requestedItem = items.getStackInSlot(i);
+					FilterItemStack requestedItem = FilterItemStack.of(items.getStackInSlot(i));
 					if (requestedItem.isEmpty()) {
 						craftingGrid.put(i, ItemStack.EMPTY);
 						continue;
 					}
 
 					for (int slot = 0; slot < playerInv.getSlots(); slot++) {
-						if (!FilterItem.test(level, playerInv.getStackInSlot(slot), requestedItem))
+						if (!requestedItem.test(level, playerInv.getStackInSlot(slot)))
 							continue;
 						ItemStack currentItem = playerInv.extractItem(slot, 1, false);
 						if (stacksTaken.containsKey(slot))