Airlock overhaul using new machine lib api #505

maxryan008 · 2025-08-12T12:17:41Z

Airlocks are new and improved

src/main/java/dev/galacticraft/mod/content/block/entity/AirlockControllerBlockEntity.java

…n tab are present

… feature/airlock-overhaul # Conflicts: # src/main/generated/assets/galacticraft/lang/en_us.json

src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/AirlockControllerScreen.java

src/main/java/dev/galacticraft/mod/content/block/machine/airlock/AirlockFrameScanner.java

src/main/java/dev/galacticraft/mod/content/block/entity/AirlockControllerBlockEntity.java

…ess.

… resistance, hard to break etc.

Roelymole · 2025-11-15T15:40:49Z

src/main/java/dev/galacticraft/mod/content/block/special/AirlockSealBlock.java

    public static final MapCodec<AirlockSealBlock> CODEC = simpleCodec(AirlockSealBlock::new);
-    public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING;
-
+    public static final DirectionProperty FACING = BlockStateProperties.FACING;


If you are treating opposite directions in the same way (which seems to be the case), using BlockStateProperties.AXIS would probably be a more appropriate choice.

Roelymole · 2025-11-15T15:43:17Z

src/main/java/dev/galacticraft/mod/content/block/special/AirlockSealBlock.java

    @Override
-    protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
-        builder.add(FACING);
+    public BlockState mirror(BlockState state, Mirror mirror) {


This method wouldn't need overriding with the AXIS block state property.

Roelymole · 2025-11-15T15:58:10Z

src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/BubbleAirlockControllerScreen.java

+        if (enabled.equals(AirlockState.ALL))      { label = Component.translatable(Translations.Ui.AIRLOCK_ENABLED);  color = ChatFormatting.DARK_GREEN.getColor(); }
+        else if (enabled.equals(AirlockState.PARTIAL)) { label = Component.translatable(Translations.Ui.AIRLOCK_PARTIAL); color = ChatFormatting.DARK_PURPLE.getColor(); }
+        else                                       { label = Component.translatable(Translations.Ui.AIRLOCK_DISABLED); color = ChatFormatting.RED.getColor(); }
+        drawCenteredString(g, this.font, label, this.leftPos + 90, this.topPos + 18, color, false);


This is going to give me nightmares!

Roelymole · 2025-11-15T16:14:42Z

src/main/java/dev/galacticraft/mod/client/gui/screen/ingame/BubbleAirlockControllerScreen.java

There is a lot of duplicated code between AirlockControllerScreen and BubbleAirlockControllerScreen, which is a good sign that abstraction is needed.

Roelymole · 2025-11-15T16:17:58Z

src/main/java/dev/galacticraft/mod/data/tag/GCBlockTagProvider.java

                GCBlocks.FOOD_CANNER,
-                GCBlocks.ROCKET_WORKBENCH
+                GCBlocks.ROCKET_WORKBENCH,
+                GCBlocks.BUBBLE_AIR_LOCK_CONTROLLER


Is there a reason why GCBlocks.AIR_LOCK_CONTROLLER and GCBlocks.REINFORCED_AIR_LOCK_CONTROLLER are not included here as well?

Roelymole · 2025-11-15T18:19:12Z

src/main/java/dev/galacticraft/mod/util/Translations.java


-        String AIRLOCK_REDSTONE_SIGNAL = "ui.galacticraft.airlock.redstone_signal";
-        String AIRLOCK_OWNER = "ui.galacticraft.airlock.owner";
+        String AIRLOCK_PROXIMITY_LABEL = "ui.galacticraft.airlock_proximity_label";


All the other translation keys are ui.galacticraft.airlock.something.

Suggested change

String AIRLOCK_PROXIMITY_LABEL = "ui.galacticraft.airlock_proximity_label";

String AIRLOCK_PROXIMITY_LABEL = "ui.galacticraft.airlock.proximity_label";

Roelymole · 2025-11-15T18:21:51Z

src/main/java/dev/galacticraft/mod/screen/BubbleAirlockControllerMenu.java

+        data.registerInt(() -> this.be.getDisplayState().ordinal(), i -> this.state = AirlockState.values()[i]);
+        data.registerInt(() -> this.be.getAccess().ordinal(),        i -> this.access = ProximityAccess.values()[i]);


What's the point of the extra spaces if they don't even line up...

Roelymole · 2025-11-15T18:23:00Z

src/main/java/dev/galacticraft/mod/screen/BubbleAirlockControllerMenu.java

This file doesn't have a license header, so it looks like you need to quickly run ./gradlew spotlessApply.

Roelymole · 2025-11-15T18:26:41Z

src/main/java/dev/galacticraft/mod/network/c2s/AirlockSetProximityPayload.java

+        if (context.player().containerMenu instanceof AirlockControllerMenu menu) {
+            AirlockControllerBlockEntity be = menu.be;
+            if (be != null && be.getLevel() != null && be.getLevel().isLoaded(be.getBlockPos())) {
+                if (!(be instanceof dev.galacticraft.machinelib.api.block.entity.MachineBlockEntity mb)


Add import dev.galacticraft.machinelib.api.block.entity.MachineBlockEntity; at the top, please.

Roelymole · 2025-11-15T18:27:17Z

src/main/java/dev/galacticraft/mod/network/c2s/AirlockSetProximityAccessPayload.java

+        if (context.player().containerMenu instanceof AirlockControllerMenu menu) {
+            AirlockControllerBlockEntity be = menu.be;
+            if (be != null && be.getLevel() != null && be.getLevel().isLoaded(be.getBlockPos())) {
+                if (!(be instanceof dev.galacticraft.machinelib.api.block.entity.MachineBlockEntity mb)


Add import dev.galacticraft.machinelib.api.block.entity.MachineBlockEntity; at the top, please.

Airlock overhaul using new machine lib api

d9d9ca0

maxryan008 marked this pull request as draft August 12, 2025 12:18

Roelymole reviewed Aug 12, 2025

View reviewed changes

src/main/java/dev/galacticraft/mod/content/block/entity/AirlockControllerBlockEntity.java Outdated Show resolved Hide resolved

Roelymole and others added 5 commits August 12, 2025 14:43

fix: update model provider so that the faces in the side configuratio…

3b56cb3

…n tab are present

Better screen implementation for airlock

706ab49

Merge remote-tracking branch 'upstream/feature/airlock-overhaul' into…

ff4405c

… feature/airlock-overhaul # Conflicts: # src/main/generated/assets/galacticraft/lang/en_us.json

Even better logic

8d3c59c

Apply spotless quickly

2c8dc3d

Roelymole requested changes Aug 12, 2025

View reviewed changes

marcus8448 reviewed Aug 12, 2025

View reviewed changes

maxryan008 added 6 commits August 13, 2025 10:29

Revised all suggestions to fix code

f65a6b8

Ran spotlessApply

463f047

Fixed airlock player proximity opening to be separate from player acc…

a7a3799

…ess.

Reinforced Airlocks with matching properties of obsidian. E.G., Blast…

5813530

… resistance, hard to break etc.

Prototype of Bubble Airlock

5ebd7c8

updated Glasswork version

1fbf1ad

Roelymole reviewed Nov 15, 2025

View reviewed changes

	String AIRLOCK_PROXIMITY_LABEL = "ui.galacticraft.airlock_proximity_label";
	String AIRLOCK_PROXIMITY_LABEL = "ui.galacticraft.airlock.proximity_label";

		data.registerInt(() -> this.be.getDisplayState().ordinal(), i -> this.state = AirlockState.values()[i]);
		data.registerInt(() -> this.be.getAccess().ordinal(), i -> this.access = ProximityAccess.values()[i]);

Airlock overhaul using new machine lib api #505

Are you sure you want to change the base?

Airlock overhaul using new machine lib api #505

Uh oh!

Conversation

maxryan008 commented Aug 12, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants