Watch where you're going

- Fixed package entity yaw being inverted
- Added missing lang entry for train status
- Stock ticker now shows a tooltip when trying to use it without a keeper
- Fixed ornate iron window not connecting textures
- Copper roof item models now use the copper block texture
This commit is contained in:
simibubi 2025-01-20 10:44:32 +01:00
parent a8c8b4cfea
commit 065fb15ac3
14 changed files with 24 additions and 8 deletions

View file

@ -1,4 +1,4 @@
// 1.20.1 2025-01-18T17:58:23.8133105 Registrate Provider for create [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
// 1.20.1 2025-01-20T10:31:13.8923616 Registrate Provider for create [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
60bbdf92d2ac9824ea6144955c74043a6005f79d assets/create/blockstates/acacia_window.json
6a67703c2697d81b7dc83e9d72a66f9c9ff08383 assets/create/blockstates/acacia_window_pane.json
c3ae87b62e81d8e9476eccd793bb1548d74c66a1 assets/create/blockstates/adjustable_chain_gearshift.json
@ -642,8 +642,8 @@ b0d8f08968763a5f74e5cd5644377a76a9f39753 assets/create/blockstates/yellow_toolbo
fe8c497aacc641c2f01cec90bba9f19e59cc2ed2 assets/create/blockstates/yellow_valve_handle.json
e819e93fdcbe9fd9c050a052d2718ff3b3539365 assets/create/blockstates/zinc_block.json
64121dcb216381c83b4fe28aa361ea07c24c9ad0 assets/create/blockstates/zinc_ore.json
1c24597f2b10409d8b8cf6819dd8dfe41f2861f2 assets/create/lang/en_ud.json
575042f88772cd1553c19a924aa1d95d38cd93ba assets/create/lang/en_us.json
0934b657da0d6042201c4a876b371e4fd02dda0c assets/create/lang/en_ud.json
1058b0dd870b8625d455991288794049a0dd58ee assets/create/lang/en_us.json
a97e1060e00ae701a02e39cd4ef8054cf345fac4 assets/create/models/block/acacia_window.json
103e032c0b1a0a6a27c67da8c91179a564bd281c assets/create/models/block/acacia_window_pane_noside.json
fb00b627abda76ad4fea867ca57dbfadd24fffa3 assets/create/models/block/acacia_window_pane_noside_alt.json

View file

@ -2899,6 +2899,7 @@
"create.stock_keeper.use_list_to_add_purchases": "ǝsɐɥɔɹnd ɹnoʎ oʇ ǝɹoɯ ppɐ oʇ ʇsıן sıɥʇ ǝs∩",
"create.stock_ticker.click_to_retrieve": "ǝʌǝıɹʇǝɹ oʇ ʞɔıןƆ",
"create.stock_ticker.contains_payments": ":sʇuǝɯʎɐd suıɐʇuoƆ",
"create.stock_ticker.keeper_missing": "ʇı ǝsn oʇ ʞɔoןq sıɥʇ oʇ ʇxǝu ɹǝuɹnq ǝzɐןq ɹo qoɯ ɐ ʇɐǝS",
"create.subtitle.blaze_munch": "sǝɥɔunɯ ɹǝuɹnᗺ ǝzɐןᗺ",
"create.subtitle.cardboard_bonk": "ʞuoq ʇuɐuosǝᴚ",
"create.subtitle.cogs": ןqɯnɹ sןǝǝɥʍboƆ",
@ -3072,6 +3073,7 @@
"create.train.status.missing_driver": "buıssıɯ ǝuob sɐɥ ɹǝʌıɹᗡ",
"create.train.status.navigation_success": "pǝpǝǝɔɔns uoıʇɐbıʌɐN",
"create.train.status.no_match": ",%1$s, sǝɥɔʇɐɯ ɥdɐɹb uo uoıʇɐʇs oN",
"create.train.status.no_package_target": "ssǝɹppɐ sʇı sǝɥɔʇɐɯ ʇɐɥʇ xoqʇsod ou sɐɥ obɹɐɔ uı ǝbɐʞɔɐd Ɐ",
"create.train.status.no_path": "punoɟ ǝq pןnoɔ uoıʇɐuıʇsǝp pǝןnpǝɥɔS ʇxǝu ǝɥʇ oʇ ɥʇɐd ǝןqɐʇıns oN",
"create.train.status.opposite_driver": "uoıʇɔǝɹıp ǝʇısoddo ǝɥʇ buıɔɐɟ ɹǝʌıɹp ɐ sǝɹınbǝɹ ɥʇɐԀ",
"create.train.status.paused_for_manual": "sןoɹʇuoɔ ןɐnuɐɯ ɹoɟ pǝsnɐd ǝןnpǝɥɔS",

View file

@ -2899,6 +2899,7 @@
"create.stock_keeper.use_list_to_add_purchases": "Use this list to add more to your purchase",
"create.stock_ticker.click_to_retrieve": "Click to retrieve",
"create.stock_ticker.contains_payments": "Contains payments:",
"create.stock_ticker.keeper_missing": "Seat a mob or blaze burner next to this block to use it",
"create.subtitle.blaze_munch": "Blaze Burner munches",
"create.subtitle.cardboard_bonk": "Resonant bonk",
"create.subtitle.cogs": "Cogwheels rumble",
@ -3072,6 +3073,7 @@
"create.train.status.missing_driver": "Driver has gone missing",
"create.train.status.navigation_success": "Navigation succeeded",
"create.train.status.no_match": "No station on graph matches '%1$s'",
"create.train.status.no_package_target": "A package in cargo has no postbox that matches its address",
"create.train.status.no_path": "No suitable path to the next Scheduled destination could be found",
"create.train.status.opposite_driver": "Path requires a driver facing the opposite direction",
"create.train.status.paused_for_manual": "Schedule paused for manual controls",

View file

@ -81,8 +81,9 @@ public class AllPaletteBlocks {
WARPED_WINDOW = woodenWindowBlock(WoodType.WARPED, Blocks.WARPED_PLANKS),
CHERRY_WINDOW = woodenWindowBlock(WoodType.CHERRY, Blocks.CHERRY_PLANKS),
BAMBOO_WINDOW = woodenWindowBlock(WoodType.BAMBOO, Blocks.BAMBOO_PLANKS),
ORNATE_IRON_WINDOW = customWindowBlock("ornate_iron_window", () -> Items.IRON_NUGGET, null,
() -> RenderType::cutout, false, () -> MapColor.TERRACOTTA_LIGHT_GRAY),
ORNATE_IRON_WINDOW =
customWindowBlock("ornate_iron_window", () -> Items.IRON_NUGGET, () -> AllSpriteShifts.ORNATE_IRON_WINDOW,
() -> RenderType::cutout, false, () -> MapColor.TERRACOTTA_LIGHT_GRAY),
INDUSTRIAL_IRON_WINDOW = customWindowBlock("industrial_iron_window", AllBlocks.INDUSTRIAL_IRON_BLOCK,
() -> AllSpriteShifts.INDUSTRIAL_IRON_WINDOW, () -> RenderType::cutout, false, () -> MapColor.COLOR_GRAY),
WEATHERED_IRON_WINDOW = WindowGen

View file

@ -75,6 +75,7 @@ public class PackageEntity extends LivingEntity implements IEntityAdditionalSpaw
super((EntityType<? extends LivingEntity>) entityTypeIn, worldIn);
box = ItemStack.EMPTY;
setYRot(this.random.nextFloat() * 360.0F);
setYHeadRot(getYRot());
yRotO = getYRot();
insertionDelay = 30;
}

View file

@ -42,7 +42,7 @@ public class PackageRenderer extends EntityRenderer<PackageEntity> {
return;
SuperByteBuffer sbb = CachedBuffers.partial(model, Blocks.AIR.defaultBlockState());
sbb.translate(-.5, 0, -.5)
.rotateCentered(AngleHelper.rad(yaw), Direction.UP)
.rotateCentered(-AngleHelper.rad(yaw + 90), Direction.UP)
.light(light)
.nudge(entity.getId());
sbb.renderInto(ms, buffer.getBuffer(RenderType.solid()));

View file

@ -7,6 +7,7 @@ import com.simibubi.create.AllSoundEvents;
import com.simibubi.create.content.equipment.wrench.IWrenchable;
import com.simibubi.create.content.logistics.packagerLink.LogisticallyLinkedBlockItem;
import com.simibubi.create.foundation.block.IBE;
import com.simibubi.create.foundation.utility.CreateLang;
import dev.engine_room.flywheel.lib.model.baked.PartialModel;
import net.minecraft.core.BlockPos;
@ -74,8 +75,13 @@ public class StockTickerBlock extends HorizontalDirectionalBlock implements IBE<
return InteractionResult.SUCCESS;
}
if (pPlayer instanceof ServerPlayer sp && stbe.isKeeperPresent())
NetworkHooks.openScreen(sp, stbe.new CategoryMenuProvider(), stbe.getBlockPos());
if (pPlayer instanceof ServerPlayer sp) {
if (stbe.isKeeperPresent())
NetworkHooks.openScreen(sp, stbe.new CategoryMenuProvider(), stbe.getBlockPos());
else
CreateLang.translate("stock_ticker.keeper_missing")
.sendStatus(pPlayer);
}
return InteractionResult.SUCCESS;
});

View file

@ -31,6 +31,7 @@ public class PostboxScenes {
scene.title("postbox", "Transporting packages between Postboxes");
scene.configureBasePlate(0, 1, 9);
scene.scaleSceneView(.875f);
scene.removeShadow();
scene.setSceneOffsetY(-0.5f);
BlockPos station = util.grid()

View file

@ -342,6 +342,7 @@ public class TrackScenes {
scene.title("track_chunks", "Traversing unloaded Chunks");
scene.configureBasePlate(0, 0, 9);
scene.scaleSceneView(.65f);
scene.removeShadow();
scene.setSceneOffsetY(-1);
scene.world().cycleBlockProperty(util.grid().at(5, 3, 4), BlazeBurnerBlock.HEAT_LEVEL);

View file

@ -350,6 +350,7 @@
"create.stock_ticker.contains_payments": "Contains payments:",
"create.stock_ticker.click_to_retrieve": "Click to retrieve",
"create.stock_ticker.keeper_missing": "Seat a mob or blaze burner next to this block to use it",
"create.gui.stock_ticker.category_editor": "Category Editor",
"create.gui.stock_ticker.shift_moves_top": "Shift moves to top",
@ -991,6 +992,7 @@
"create.train.status.navigation_success": "Navigation succeeded",
"create.train.status.no_match": "No station on graph matches '%1$s'",
"create.train.status.no_path": "No suitable path to the next Scheduled destination could be found",
"create.train.status.no_package_target": "A package in cargo has no postbox that matches its address",
"create.track_signal.cannot_change_mode": "Unable to switch mode of this Signal",
"create.track_signal.mode_change.entry_signal": "-> Allow passage if section unoccupied",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 502 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 419 B

After

Width:  |  Height:  |  Size: 494 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 453 B

After

Width:  |  Height:  |  Size: 496 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 455 B

After

Width:  |  Height:  |  Size: 502 B