diff --git a/src/main/java/tauri/dev/jsg/config/stargate/StargateDimensionConfig.java b/src/main/java/tauri/dev/jsg/config/stargate/StargateDimensionConfig.java index 39dd9065..fd2c9b28 100644 --- a/src/main/java/tauri/dev/jsg/config/stargate/StargateDimensionConfig.java +++ b/src/main/java/tauri/dev/jsg/config/stargate/StargateDimensionConfig.java @@ -22,6 +22,12 @@ public class StargateDimensionConfig { private static File dimensionConfigFile; private static Map dimensionIntMap; private static Map dimensionMap; + //new code sparcky + public static Map getDimensionMap() { + return dimensionMap; + } + //end + static { DEFAULTS_MAP.put("overworld", new StargateDimensionConfigEntry("overworld", 0, new ArrayList() {{ diff --git a/src/main/java/tauri/dev/jsg/worldgen/StargateDimensionGenerator.java b/src/main/java/tauri/dev/jsg/worldgen/StargateDimensionGenerator.java index 9d6017e1..b6559ef2 100644 --- a/src/main/java/tauri/dev/jsg/worldgen/StargateDimensionGenerator.java +++ b/src/main/java/tauri/dev/jsg/worldgen/StargateDimensionGenerator.java @@ -6,6 +6,10 @@ import tauri.dev.jsg.JSG; import tauri.dev.jsg.config.JSGConfig; import tauri.dev.jsg.config.JSGConfigUtil; +//new sparcky +import tauri.dev.jsg.config.stargate.StargateDimensionConfig; +import tauri.dev.jsg.config.stargate.StargateDimensionConfigEntry; +//end import tauri.dev.jsg.stargate.network.StargateAddress; import tauri.dev.jsg.stargate.network.StargateNetwork; import tauri.dev.jsg.stargate.network.StargatePos; @@ -49,6 +53,16 @@ public static void tryGenerate(@Nonnull World worldServer) { continue; } if(id == 1) symbolType = SymbolTypeEnum.UNIVERSE; + //new code sparcky + StargateDimensionConfigEntry data = StargateDimensionConfig.getDimensionMap().get(id); + if (data.groups.contains("milkyway")) { + symbolType = SymbolTypeEnum.MILKYWAY; + } else if (data.groups.contains("pegasus")) { + symbolType = SymbolTypeEnum.PEGASUS; + } else if (data.groups.contains("universe")){ + symbolType = SymbolTypeEnum.UNIVERSE; + } + //end if (id == 0 || id == -1) { JSG.debug("Dim " + id + " is internally blacklisted. Skipping..."); continue; @@ -76,6 +90,7 @@ public static void tryGenerate(@Nonnull World worldServer) { } } + GeneratedStargate gs = generateAndPutAddresses(sgn, id, symbolType); JSG.debug("Found unknown dimension " + id + "! This is it's address:"); JSG.debug(gs.address.toString()); @@ -104,4 +119,4 @@ public static GeneratedStargate generateAndPutAddresses(StargateNetwork sgn, int } return gs; } -} +} \ No newline at end of file