From 62b1fe82b7545a3ed9b90c0803d78237d75601ce Mon Sep 17 00:00:00 2001
From: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Sat, 3 Apr 2021 23:49:59 +0200
Subject: [PATCH] Fix-ups Cont'd

- Fixed Spawners losing nbt data when moved
- Nixie tubes now update their texts starting from the clicked block, rather than the leftmost one in the chain
- Fixed inconsistency between block and item model of the furnace engine
---
 .../block/redstone/NixieTubeBlock.java          | 12 ++++++------
 .../ponder/content/RedstoneScenes.java          |  5 +++--
 .../foundation/utility/NBTProcessors.java       |  3 +++
 .../models/block/furnace_engine/item.json       | 17 +++++++++++++++--
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeBlock.java
index fcd47f20d..32b20f9b9 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeBlock.java
@@ -63,12 +63,12 @@ public class NixieTubeBlock extends HorizontalBlock implements ITE<NixieTubeTile
 					return ActionResultType.SUCCESS;
 
 				BlockPos currentPos = pos;
-				while (true) {
-					BlockPos nextPos = currentPos.offset(left);
-					if (world.getBlockState(nextPos) != state)
-						break;
-					currentPos = nextPos;
-				}
+//				while (true) {
+//					BlockPos nextPos = currentPos.offset(left);
+//					if (world.getBlockState(nextPos) != state)
+//						break;
+//					currentPos = nextPos;
+//				}
 
 				int index = 0;
 
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/RedstoneScenes.java b/src/main/java/com/simibubi/create/foundation/ponder/content/RedstoneScenes.java
index 22745512b..a63e347cb 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/RedstoneScenes.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/content/RedstoneScenes.java
@@ -651,7 +651,7 @@ public class RedstoneScenes {
 		scene.world.showSection(tubes, Direction.DOWN);
 		scene.idle(20);
 
-		scene.overlay.showControls(new InputWindowElement(centerTube.add(0, .35, 0), Pointing.DOWN).rightClick()
+		scene.overlay.showControls(new InputWindowElement(centerTube.add(1, .35, 0), Pointing.DOWN).rightClick()
 			.withItem(new ItemStack(Items.NAME_TAG)), 40);
 		scene.idle(7);
 
@@ -673,8 +673,9 @@ public class RedstoneScenes {
 		scene.idle(20);
 		scene.overlay.showText(80)
 			.attachKeyFrame()
+			.placeNearTarget()
 			.text("Using name tags edited with an anvil, custom text can be displayed")
-			.pointAt(util.vector.topOf(util.grid.at(2, 1, 3))
+			.pointAt(util.vector.topOf(util.grid.at(3, 1, 3))
 				.add(.25, -.05f, 0));
 		scene.idle(70);
 	}
diff --git a/src/main/java/com/simibubi/create/foundation/utility/NBTProcessors.java b/src/main/java/com/simibubi/create/foundation/utility/NBTProcessors.java
index 4cbf86483..73077cc17 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/NBTProcessors.java
+++ b/src/main/java/com/simibubi/create/foundation/utility/NBTProcessors.java
@@ -11,6 +11,7 @@ import com.simibubi.create.content.logistics.item.filter.FilterItem;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.tileentity.MobSpawnerTileEntity;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.text.ITextComponent;
@@ -61,6 +62,8 @@ public final class NBTProcessors {
 			compound = survivalProcessors.get(type).apply(compound);
 		if (compound != null && processors.containsKey(type))
 			return processors.get(type).apply(compound);
+		if (tileEntity instanceof MobSpawnerTileEntity)
+			return compound;
 		if (tileEntity.onlyOpsCanSetNbt())
 			return null;
 		return compound;
diff --git a/src/main/resources/assets/create/models/block/furnace_engine/item.json b/src/main/resources/assets/create/models/block/furnace_engine/item.json
index ac8647000..3ec9466c0 100644
--- a/src/main/resources/assets/create/models/block/furnace_engine/item.json
+++ b/src/main/resources/assets/create/models/block/furnace_engine/item.json
@@ -2,7 +2,6 @@
 	"credit": "Made with Blockbench",
 	"textures": {
 		"5": "create:block/brass_casing",
-		"particle": "create:block/brass_block",
 		"1_1": "create:block/furnace_cylinder"
 	},
 	"elements": [
@@ -55,6 +54,20 @@
 				"down": {"uv": [3, 13, 4.5, 15], "rotation": 270, "texture": "#1_1"}
 			}
 		},
+		{
+			"name": "LowerPort",
+			"from": [1.5, 0.1, 13.9],
+			"to": [5.5, 4.1, 16.9],
+			"rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]},
+			"faces": {
+				"north": {"uv": [14, 0, 10, 4], "texture": "#1_1"},
+				"east": {"uv": [4.5, 13, 3, 15], "texture": "#1_1"},
+				"south": {"uv": [4.5, 13, 2.5, 15], "texture": "#1_1"},
+				"west": {"uv": [4.5, 13, 3, 15], "rotation": 180, "texture": "#1_1"},
+				"up": {"uv": [3, 15, 4.5, 13], "rotation": 90, "texture": "#1_1"},
+				"down": {"uv": [3, 15, 4.5, 13], "rotation": 270, "texture": "#1_1"}
+			}
+		},
 		{
 			"name": "Port",
 			"from": [4, 4, 15.8],
@@ -104,7 +117,7 @@
 		{
 			"name": "SteamCylinder",
 			"origin": [8, 8, 8],
-			"children": [0, 1, 2, 3, 4]
+			"children": [0, 1, 2, 3, 4, 5]
 		}
 	]
 }
\ No newline at end of file