Rocket refactoring + starting some features / fixes

src/main/java/dev/galacticraft/api/rocket/entity/RequiresFuel.java

@@ -0,0 +1,22 @@
+package dev.galacticraft.api.rocket.entity;
+
+import dev.galacticraft.mod.content.entity.ScalableFuelLevel;
+import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
+import net.fabricmc.fabric.api.transfer.v1.storage.Storage;
+import net.minecraft.world.level.material.Fluid;
+import org.jetbrains.annotations.Nullable;
+
+public interface RequiresFuel extends ScalableFuelLevel {
+
+    @Nullable
+    Fluid getFuelTankFluid();
+
+    long getFuelTankAmount();
+
+    long getFuelTankCapacity();
+
+    boolean isTankEmpty();
+
+    Storage<FluidVariant> getFuelTank();
+
+}

src/main/java/dev/galacticraft/api/rocket/entity/Rocket.java

@@ -25,16 +25,15 @@
 import dev.galacticraft.api.rocket.LaunchStage;
 import dev.galacticraft.api.rocket.RocketData;
 import dev.galacticraft.api.rocket.part.*;
-import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
-import net.fabricmc.fabric.api.transfer.v1.storage.Storage;
+import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.material.Fluid;
+import net.minecraft.world.entity.HasCustomInventoryScreen;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public interface Rocket extends RocketData {
+public interface Rocket extends RocketData, RequiresFuel, HasCustomInventoryScreen, ExtendedScreenHandlerFactory {
     /**
      * Returns the launch stage of this rocket.
      * @return the launch stage of this rocket.
@@ -79,10 +78,5 @@ public interface Rocket extends RocketData {
      */
     void dropItems(DamageSource source, boolean exploded);
 
-    @Nullable Fluid getFuelTankFluid();
-    long getFuelTankAmount();
-    long getFuelTankCapacity();
-    Storage<FluidVariant> getFuelTank();
-
     Entity asEntity();
 }

src/main/java/dev/galacticraft/mod/GalacticraftClient.java

@@ -44,7 +44,7 @@
 import dev.galacticraft.mod.content.GCBlocks;
 import dev.galacticraft.mod.content.GCEntityTypes;
 import dev.galacticraft.mod.content.block.environment.FallenMeteorBlock;
-import dev.galacticraft.mod.content.entity.orbital.RocketEntity;
+import dev.galacticraft.mod.content.entity.vehicle.RocketEntity;
 import dev.galacticraft.mod.content.item.GCItems;
 import dev.galacticraft.mod.events.ClientEventHandler;
 import dev.galacticraft.mod.misc.cape.CapesLoader;

src/main/java/dev/galacticraft/mod/client/GCKeyBinds.java

@@ -23,6 +23,7 @@
 package dev.galacticraft.mod.client;
 
 import dev.galacticraft.mod.client.gui.screen.ingame.CelestialSelectionScreen;
+import dev.galacticraft.mod.content.entity.vehicle.RocketEntity;
 import dev.galacticraft.mod.util.Translations;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.KeyMapping;
@@ -31,20 +32,40 @@
 
 public class GCKeyBinds {
     public static final KeyMapping OPEN_CELESTIAL_SCREEN = new KeyMapping(Translations.Keybindings.OPEN_CELESTIAL_SCREEN, GLFW.GLFW_KEY_M, KeyMapping.CATEGORY_MISC);
-    public static final KeyMapping OPEN_ROCKET_INVENTORY = new KeyMapping(Translations.Keybindings.ROCKET_INVENTORY, GLFW.GLFW_KEY_F, KeyMapping.CATEGORY_INVENTORY);
+    //public static final KeyMapping OPEN_ROCKET_INVENTORY = new KeyMapping(Translations.Keybindings.ROCKET_INVENTORY, GLFW.GLFW_KEY_G, KeyMapping.CATEGORY_INVENTORY);
 
     public static void register() {
         KeyBindingHelper.registerKeyBinding(OPEN_CELESTIAL_SCREEN);
-        KeyBindingHelper.registerKeyBinding(OPEN_ROCKET_INVENTORY);
+        //KeyBindingHelper.registerKeyBinding(OPEN_ROCKET_INVENTORY);
     }
 
     public static void handleKeybinds(Minecraft client) {
         if (client.level != null && client.player != null) {
-            if (client.screen == null) {
-                while (OPEN_CELESTIAL_SCREEN.consumeClick()) {
+            while (OPEN_CELESTIAL_SCREEN.consumeClick()) {
+                if (client.screen == null) {
                     client.setScreen(new CelestialSelectionScreen(true, null, false, null));
                 }
             }
+//            while (OPEN_ROCKET_INVENTORY.consumeClick()) {
+//                if (client.player.getVehicle() instanceof RocketEntity rocket) {
+//                    rocket.openCustomInventoryScreen(client.player);
+//                }
+//            }
+//            if (client.screen == null) {
+//                while (OPEN_CELESTIAL_SCREEN.consumeClick()) {
+//                    client.setScreen(new CelestialSelectionScreen(true, null, false, null));
+//                }
+//            }
+//            if (client.player.getVehicle() instanceof RocketEntity rocket) {
+//                while (OPEN_ROCKET_INVENTORY.consumeClick()) {
+//                    rocket.openCustomInventoryScreen(client.player);
+//                }
+//            }
+//            if (OPEN_CELESTIAL_SCREEN.consumeClick() && client.screen == null) {
+//                client.setScreen(new CelestialSelectionScreen(true, null, false, null));
+//            } else if (OPEN_ROCKET_INVENTORY.consumeClick() && client.player.getVehicle() instanceof RocketEntity rocket) {
+//                rocket.openCustomInventoryScreen(client.player);
+//            }
         }
     }
 }

src/main/java/dev/galacticraft/mod/client/gui/overlay/CountdownOverlay.java

@@ -23,7 +23,7 @@
 package dev.galacticraft.mod.client.gui.overlay;
 
 import dev.galacticraft.api.rocket.LaunchStage;
-import dev.galacticraft.mod.content.entity.orbital.RocketEntity;
+import dev.galacticraft.mod.content.entity.vehicle.RocketEntity;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.util.FastColor;

src/main/java/dev/galacticraft/mod/client/gui/overlay/LanderOverlay.java

@@ -23,7 +23,7 @@
 package dev.galacticraft.mod.client.gui.overlay;
 
 import com.mojang.blaze3d.platform.Window;
-import dev.galacticraft.mod.content.entity.orbital.lander.LanderEntity;
+import dev.galacticraft.mod.content.entity.vehicle.LanderEntity;
 import dev.galacticraft.mod.util.Translations;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;

src/main/java/dev/galacticraft/mod/client/gui/overlay/RocketOverlay.java

@@ -26,7 +26,7 @@
 import com.mojang.blaze3d.vertex.*;
 import com.mojang.math.Axis;
 import dev.galacticraft.mod.Constant;
-import dev.galacticraft.mod.content.entity.orbital.RocketEntity;
+import dev.galacticraft.mod.content.entity.vehicle.RocketEntity;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.renderer.GameRenderer;

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

@@ -33,7 +33,7 @@
 import net.minecraft.world.entity.player.Inventory;
 
 public class ParachestScreen extends AbstractContainerScreen<ParachestMenu> {
-    private static ResourceLocation[] parachestTexture = new ResourceLocation[4];
+    private static final ResourceLocation[] parachestTexture = new ResourceLocation[4];
 
     static {
         for (int i = 0; i < 4; i++) {

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

@@ -33,6 +33,7 @@
 import net.minecraft.world.entity.player.Inventory;
 
 public class RocketInventoryScreen extends AbstractContainerScreen<RocketMenu> {
+
     public RocketInventoryScreen(RocketMenu abstractContainerMenu, Inventory inventory, Component component) {
         super(abstractContainerMenu, inventory, component);
     }

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

@@ -34,7 +34,7 @@
 import dev.galacticraft.mod.content.GCEntityTypes;
 import dev.galacticraft.mod.content.GCRocketParts;
 import dev.galacticraft.mod.content.block.entity.RocketWorkbenchBlockEntity;
-import dev.galacticraft.mod.content.entity.orbital.RocketEntity;
+import dev.galacticraft.mod.content.entity.vehicle.RocketEntity;
 import dev.galacticraft.mod.machine.storage.VariableSizedContainer;
 import dev.galacticraft.mod.network.packets.SelectPartPacket;
 import dev.galacticraft.mod.screen.RocketWorkbenchMenu;

src/main/java/dev/galacticraft/mod/client/model/entity/LanderModel.java

@@ -24,7 +24,7 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import dev.galacticraft.mod.content.entity.orbital.lander.LanderEntity;
+import dev.galacticraft.mod.content.entity.vehicle.LanderEntity;
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;

src/main/java/dev/galacticraft/mod/client/render/entity/BuggyRenderer.java

@@ -30,7 +30,7 @@
 import dev.galacticraft.mod.client.model.GCModelLoader;
 import dev.galacticraft.mod.client.model.GCModelState;
 import dev.galacticraft.mod.client.model.GCSheets;
-import dev.galacticraft.mod.content.entity.Buggy;
+import dev.galacticraft.mod.content.entity.vehicle.Buggy;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.entity.EntityRenderer;
 import net.minecraft.client.renderer.entity.EntityRendererProvider;

src/main/java/dev/galacticraft/mod/client/render/entity/LanderEntityRenderer.java

@@ -27,13 +27,12 @@
 import dev.galacticraft.mod.Constant;
 import dev.galacticraft.mod.client.model.entity.LanderModel;
 import dev.galacticraft.mod.client.render.entity.model.GCEntityModelLayer;
-import dev.galacticraft.mod.content.entity.orbital.lander.LanderEntity;
+import dev.galacticraft.mod.content.entity.vehicle.LanderEntity;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.entity.EntityRenderer;
 import net.minecraft.client.renderer.entity.EntityRendererProvider;
 import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.resources.ResourceLocation;
-import org.lwjgl.opengl.GL11;
 
 public class LanderEntityRenderer extends EntityRenderer<LanderEntity> {
     protected final LanderModel model;

src/main/java/dev/galacticraft/mod/client/render/entity/rocket/RocketEntityRenderer.java

@@ -27,7 +27,7 @@
 import dev.galacticraft.api.entity.rocket.render.RocketPartRendererRegistry;
 import dev.galacticraft.api.rocket.LaunchStage;
 import dev.galacticraft.api.rocket.part.RocketPart;
-import dev.galacticraft.mod.content.entity.orbital.RocketEntity;
+import dev.galacticraft.mod.content.entity.vehicle.RocketEntity;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.culling.Frustum;

src/main/java/dev/galacticraft/mod/client/render/item/RocketItemRenderer.java

@@ -29,7 +29,7 @@
 import dev.galacticraft.api.rocket.RocketData;
 import dev.galacticraft.api.rocket.part.RocketPart;
 import dev.galacticraft.mod.content.GCEntityTypes;
-import dev.galacticraft.mod.content.entity.orbital.RocketEntity;
+import dev.galacticraft.mod.content.entity.vehicle.RocketEntity;
 import net.fabricmc.fabric.api.client.rendering.v1.BuiltinItemRendererRegistry;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;

src/main/java/dev/galacticraft/mod/client/sounds/RocketSound.java

@@ -25,7 +25,7 @@
 import dev.galacticraft.api.rocket.LaunchStage;
 import dev.galacticraft.mod.Constant;
 import dev.galacticraft.mod.content.GCSounds;
-import dev.galacticraft.mod.content.entity.orbital.RocketEntity;
+import dev.galacticraft.mod.content.entity.vehicle.RocketEntity;
 import net.minecraft.client.resources.sounds.AbstractTickableSoundInstance;
 import net.minecraft.client.resources.sounds.SoundInstance;
 import net.minecraft.sounds.SoundSource;

src/main/java/dev/galacticraft/mod/content/GCEntityTypes.java

@@ -27,8 +27,9 @@
 import dev.galacticraft.mod.Constant.Entity;
 import dev.galacticraft.mod.content.entity.*;
 import dev.galacticraft.mod.content.entity.boss.SkeletonBoss;
-import dev.galacticraft.mod.content.entity.orbital.RocketEntity;
-import dev.galacticraft.mod.content.entity.orbital.lander.LanderEntity;
+import dev.galacticraft.mod.content.entity.vehicle.Buggy;
+import dev.galacticraft.mod.content.entity.vehicle.RocketEntity;
+import dev.galacticraft.mod.content.entity.vehicle.LanderEntity;
 import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry;
 import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder;
 import net.minecraft.core.registries.BuiltInRegistries;

src/main/java/dev/galacticraft/mod/content/advancements/critereon/LaunchRocketTrigger.java

@@ -25,7 +25,7 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import dev.galacticraft.api.rocket.LaunchStage;
-import dev.galacticraft.mod.content.entity.orbital.RocketEntity;
+import dev.galacticraft.mod.content.entity.vehicle.RocketEntity;
 import net.minecraft.advancements.critereon.ContextAwarePredicate;
 import net.minecraft.advancements.critereon.EntityPredicate;
 import net.minecraft.advancements.critereon.SimpleCriterionTrigger;