update, try to fix thing

Argent-Matter · Nov 3, 2023 · 8748332 · 8748332
1 parent 9a467b8
commit 8748332
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,2 +1,5 @@
 - add satellite packaging machine (slightly nonfunctional)
-- make space not have the starting platform, rocket places it from the package.
+- make space not have the starting platform, rocket places it from the package.
+- fix GT compat.
+
+WARNING: space station doesn't build correctly just yet.
diff --git a/common/src/main/java/argent_matter/gcyr/api/space/station/StationWorldSavedData.java b/common/src/main/java/argent_matter/gcyr/api/space/station/StationWorldSavedData.java
@@ -2,6 +2,7 @@
 
 import argent_matter.gcyr.GCyR;
 import argent_matter.gcyr.api.capability.ISpaceStationHolder;
+import argent_matter.gcyr.api.space.planet.Planet;
 import argent_matter.gcyr.common.worldgen.SpaceLevelSource;
 import argent_matter.gcyr.data.loader.PlanetData;
 import argent_matter.gcyr.util.Vec2i;
@@ -26,7 +27,13 @@
 public class StationWorldSavedData extends SavedData implements ISpaceStationHolder {
     @Nullable
     public static StationWorldSavedData getOrCreate(@Nullable ServerLevel serverLevel) {
-        if (serverLevel == null || !PlanetData.isOrbitLevel(serverLevel.dimension())) return null;
+        if (serverLevel == null) return null;
+        if (!PlanetData.isOrbitLevel(serverLevel.dimension())) {
+            Planet planet = PlanetData.getPlanetFromLevel(serverLevel.dimension()).orElse(null);
+            if (planet == null) return null;
+            ServerLevel orbit = serverLevel.getServer().getLevel(planet.orbitWorld());
+            return getOrCreate(orbit);
+        }
         return serverLevel.getDataStorage().computeIfAbsent(tag -> new StationWorldSavedData(serverLevel, tag), () -> new StationWorldSavedData(serverLevel), GCyR.MOD_ID + "_space_stations");
     }
 

diff --git a/common/src/main/java/argent_matter/gcyr/common/entity/RocketEntity.java b/common/src/main/java/argent_matter/gcyr/common/entity/RocketEntity.java
@@ -558,7 +558,7 @@ public void unBuild() {
     private void buildSpaceStation(ItemStack stack, BlockPos origin) {
         if (!GCyRItems.SPACE_STATION_PACKAGE.isIn(stack)) return;
         Set<PosWithState> blocks = StationContainerBehaviour.getSatelliteBlocks(stack);
-        if (blocks == null) return;
+        if (blocks == null || blocks.isEmpty()) return;
 
         boolean start = true;
         BlockPos original = origin;

diff --git a/common/src/main/java/argent_matter/gcyr/common/item/StationContainerBehaviour.java b/common/src/main/java/argent_matter/gcyr/common/item/StationContainerBehaviour.java
@@ -29,7 +29,7 @@ public static Set<PosWithState> getSatelliteBlocks(ItemStack stack) {
         if (!stack.hasTag() || !stack.getTag().contains(SATELLITE_BLOCKS_KEY, Tag.TAG_LIST)) return null;
 
         Set<PosWithState> states = new HashSet<>();
-        ListTag blocks = stack.getOrCreateTag().getList("blocks", Tag.TAG_COMPOUND);
+        ListTag blocks = stack.getOrCreateTag().getList(SATELLITE_BLOCKS_KEY, Tag.TAG_COMPOUND);
         for (int i = 0; i < blocks.size(); ++i) {
             states.add(PosWithState.readFromTag(blocks.getCompound(i)));
         }