XevianLight/Aphelion
1
0
Fork 0
mirror of https://github.com/XevianLight/Aphelion.git synced 2026-05-11 01:50:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

GravitySavedData now reads from Planet jsons for default values

Browse Source
This commit is contained in:
XevianLight
2026-02-07 17:03:05 -07:00
parent 9356c43ea7
commit d9bd26e8a0
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/net/xevianlight/aphelion/core/saveddata/GravitySavedData.java
View File

@@ -32,12 +32,18 @@ import java.util.List;
*/ */
public class GravitySavedData extends SavedData { public class GravitySavedData extends SavedData {
private Level level;
private final Long2IntOpenHashMap gravityData = new Long2IntOpenHashMap(); private final Long2IntOpenHashMap gravityData = new Long2IntOpenHashMap();
private static final String NAME = "aphelion_gravity"; private static final String NAME = "aphelion_gravity";
public static GravitySavedData create() { public static GravitySavedData create(Level level) {
return new GravitySavedData(); return new GravitySavedData(level);
}
public GravitySavedData(Level level) {
this.level = level;
} }
@Override @Override
@@ -60,18 +66,18 @@ public class GravitySavedData extends SavedData {
return tag; return tag;
} }
public static GravitySavedData load(CompoundTag tag, HolderLookup.Provider lookupProvider) { public static GravitySavedData load(CompoundTag tag, HolderLookup.Provider lookupProvider, Level level) {
GravitySavedData data = create(); GravitySavedData data = new GravitySavedData(level);
if (!tag.contains("Position", Tag.TAG_LONG_ARRAY) || !tag.contains("Value", Tag.TAG_INT_ARRAY)) { return data; } if (!tag.contains("Position", Tag.TAG_LONG_ARRAY) || !tag.contains("Value", Tag.TAG_INT_ARRAY)) {
return data;
}
long[] positions = tag.getLongArray("Position"); long[] positions = tag.getLongArray("Position");
int[] values = tag.getIntArray("Value"); int[] values = tag.getIntArray("Value");
int length = Math.min(positions.length, values.length); int length = Math.min(positions.length, values.length);
data.gravityData.ensureCapacity(length); data.gravityData.ensureCapacity(length);
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
data.gravityData.put(positions[i], values[i]); data.gravityData.put(positions[i], values[i]);
} }
@@ -81,7 +87,7 @@ public class GravitySavedData extends SavedData {
private static final int ABSENT = Integer.MIN_VALUE; private static final int ABSENT = Integer.MIN_VALUE;
public @Nullable GravityData getGravityRegionData (Level level, BlockPos center) { public @Nullable GravityData getGravityRegionData (BlockPos center) {
GravityData data = GravityData.unpack(gravityData.getOrDefault(center.asLong(), ABSENT)); GravityData data = GravityData.unpack(gravityData.getOrDefault(center.asLong(), ABSENT));
return data.pack() == ABSENT ? null : data; return data.pack() == ABSENT ? null : data;
} }
@@ -128,7 +134,7 @@ public class GravitySavedData extends SavedData {
} }
if (max == -1) { if (max == -1) {
max = GravityData.DEFAULT_GRAVITY; max = defaultGravity(this.level);
} }
return max; return max;
@@ -165,7 +171,10 @@ public class GravitySavedData extends SavedData {
public static GravitySavedData get(ServerLevel level) { public static GravitySavedData get(ServerLevel level) {
return level.getDataStorage().computeIfAbsent( return level.getDataStorage().computeIfAbsent(
new Factory<>(GravitySavedData::create, GravitySavedData::load), new Factory<>(
() -> new GravitySavedData(level),
(tag, provider) -> GravitySavedData.load(tag, provider, level)
),
NAME NAME
); );
} }

2
src/main/resources/data/aphelion/planet/overworld.json
View File

@@ -2,6 +2,6 @@
"dimension": "minecraft:overworld", "dimension": "minecraft:overworld",
"orbit_distance": 1, "orbit_distance": 1,
"star_system": "aphelon:sol", "star_system": "aphelon:sol",
"gravity": 1, "gravity": 9.8,
"oxygen": false "oxygen": false
} }