mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-12-16 21:23:42 +01:00
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
This commit is contained in:
parent
ba91eaa4ef
commit
62b1fe82b7
4 changed files with 27 additions and 10 deletions
|
@ -63,12 +63,12 @@ public class NixieTubeBlock extends HorizontalBlock implements ITE<NixieTubeTile
|
||||||
return ActionResultType.SUCCESS;
|
return ActionResultType.SUCCESS;
|
||||||
|
|
||||||
BlockPos currentPos = pos;
|
BlockPos currentPos = pos;
|
||||||
while (true) {
|
// while (true) {
|
||||||
BlockPos nextPos = currentPos.offset(left);
|
// BlockPos nextPos = currentPos.offset(left);
|
||||||
if (world.getBlockState(nextPos) != state)
|
// if (world.getBlockState(nextPos) != state)
|
||||||
break;
|
// break;
|
||||||
currentPos = nextPos;
|
// currentPos = nextPos;
|
||||||
}
|
// }
|
||||||
|
|
||||||
int index = 0;
|
int index = 0;
|
||||||
|
|
||||||
|
|
|
@ -651,7 +651,7 @@ public class RedstoneScenes {
|
||||||
scene.world.showSection(tubes, Direction.DOWN);
|
scene.world.showSection(tubes, Direction.DOWN);
|
||||||
scene.idle(20);
|
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);
|
.withItem(new ItemStack(Items.NAME_TAG)), 40);
|
||||||
scene.idle(7);
|
scene.idle(7);
|
||||||
|
|
||||||
|
@ -673,8 +673,9 @@ public class RedstoneScenes {
|
||||||
scene.idle(20);
|
scene.idle(20);
|
||||||
scene.overlay.showText(80)
|
scene.overlay.showText(80)
|
||||||
.attachKeyFrame()
|
.attachKeyFrame()
|
||||||
|
.placeNearTarget()
|
||||||
.text("Using name tags edited with an anvil, custom text can be displayed")
|
.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));
|
.add(.25, -.05f, 0));
|
||||||
scene.idle(70);
|
scene.idle(70);
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,6 +11,7 @@ import com.simibubi.create.content.logistics.item.filter.FilterItem;
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.CompoundNBT;
|
import net.minecraft.nbt.CompoundNBT;
|
||||||
|
import net.minecraft.tileentity.MobSpawnerTileEntity;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.tileentity.TileEntityType;
|
import net.minecraft.tileentity.TileEntityType;
|
||||||
import net.minecraft.util.text.ITextComponent;
|
import net.minecraft.util.text.ITextComponent;
|
||||||
|
@ -61,6 +62,8 @@ public final class NBTProcessors {
|
||||||
compound = survivalProcessors.get(type).apply(compound);
|
compound = survivalProcessors.get(type).apply(compound);
|
||||||
if (compound != null && processors.containsKey(type))
|
if (compound != null && processors.containsKey(type))
|
||||||
return processors.get(type).apply(compound);
|
return processors.get(type).apply(compound);
|
||||||
|
if (tileEntity instanceof MobSpawnerTileEntity)
|
||||||
|
return compound;
|
||||||
if (tileEntity.onlyOpsCanSetNbt())
|
if (tileEntity.onlyOpsCanSetNbt())
|
||||||
return null;
|
return null;
|
||||||
return compound;
|
return compound;
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"textures": {
|
"textures": {
|
||||||
"5": "create:block/brass_casing",
|
"5": "create:block/brass_casing",
|
||||||
"particle": "create:block/brass_block",
|
|
||||||
"1_1": "create:block/furnace_cylinder"
|
"1_1": "create:block/furnace_cylinder"
|
||||||
},
|
},
|
||||||
"elements": [
|
"elements": [
|
||||||
|
@ -55,6 +54,20 @@
|
||||||
"down": {"uv": [3, 13, 4.5, 15], "rotation": 270, "texture": "#1_1"}
|
"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",
|
"name": "Port",
|
||||||
"from": [4, 4, 15.8],
|
"from": [4, 4, 15.8],
|
||||||
|
@ -104,7 +117,7 @@
|
||||||
{
|
{
|
||||||
"name": "SteamCylinder",
|
"name": "SteamCylinder",
|
||||||
"origin": [8, 8, 8],
|
"origin": [8, 8, 8],
|
||||||
"children": [0, 1, 2, 3, 4]
|
"children": [0, 1, 2, 3, 4, 5]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
Loading…
Reference in a new issue