Skip to content

Commit e988b7a

Browse files
Paul19988Paul19988
committed
Git is complaining about changes
1 parent f5bdab7 commit e988b7a

File tree

3 files changed

+53
-41
lines changed

3 files changed

+53
-41
lines changed

‎slimeworldmanager-nms-v1_16_R1/src/main/java/com/grinderwolf/swm/nms/v1_16_R1/v1_16_R1SlimeNMS.java‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,11 @@
6060
import java.io.IOException;
6161
import java.nio.file.Files;
6262
import java.nio.file.Path;
63-
import java.util.*;
63+
import java.util.Arrays;
64+
import java.util.Collections;
65+
import java.util.Locale;
66+
import java.util.Properties;
67+
import java.util.UUID;
6468

6569
@Getter
6670
public class v1_16_R1SlimeNMS implements SlimeNMS {
@@ -199,26 +203,29 @@ private World.Environment getEnvironment(SlimeWorld world) {
199203
}
200204

201205
private WorldDataServer createWorldData(SlimeWorld world) {
206+
String worldName = world.getName();
207+
CompoundTag extraData = world.getExtraData();
202208
WorldDataServer worldDataServer;
203-
NBTTagCompound extraTag = (NBTTagCompound) Converter.convertTag(world.getExtraData());
209+
NBTTagCompound extraTag = (NBTTagCompound) Converter.convertTag(extraData);
204210
MinecraftServer mcServer = MinecraftServer.getServer();
205211

206-
SlimePropertyMap propertyMap = world.getPropertyMap();
207-
Properties properties = new Properties();
208-
String defaultBiome = propertyMap.getString(SlimeProperties.DEFAULT_BIOME);
209-
String generatorString = "{\"structures\":{\"structures\":{}},\"biome\":\"" + defaultBiome + "\",\"layers\":[]}";
210-
211-
properties.put("generator-settings", generatorString);
212-
properties.put("level-type", "FLAT");
213-
214-
GeneratorSettings generatorSettings = GeneratorSettings.a(properties);
215-
216212
if (extraTag.hasKeyOfType("LevelData", CraftMagicNumbers.NBT.TAG_COMPOUND)) {
217213
NBTTagCompound levelData = extraTag.getCompound("LevelData");
218214
int dataVersion = levelData.hasKeyOfType("DataVersion", 99) ? levelData.getInt("DataVersion") : -1;
219215
Dynamic<NBTBase> dynamic = mcServer.getDataFixer().update(DataFixTypes.LEVEL.a(),
220216
new Dynamic<>(DynamicOpsNBT.a, levelData), dataVersion, SharedConstants.getGameVersion()
221217
.getWorldVersion());
218+
219+
SlimePropertyMap propertyMap = world.getPropertyMap();
220+
Properties properties = new Properties();
221+
String defaultBiome = propertyMap.getString(SlimeProperties.DEFAULT_BIOME);
222+
String generatorString = "{\"structures\":{\"structures\":{}},\"biome\":\"" + defaultBiome + "\",\"layers\":[]}";
223+
224+
properties.put("generator-settings", generatorString);
225+
properties.put("level-type", "FLAT");
226+
227+
GeneratorSettings generatorSettings = GeneratorSettings.a(properties);
228+
222229
Lifecycle lifecycle = Lifecycle.stable();
223230
LevelVersion levelVersion = LevelVersion.a(dynamic);
224231
WorldSettings worldSettings = WorldSettings.a(dynamic, mcServer.datapackconfiguration);
@@ -228,12 +235,13 @@ private WorldDataServer createWorldData(SlimeWorld world) {
228235
} else {
229236
EnumDifficulty difficulty = ((DedicatedServer) mcServer).getDedicatedServerProperties().difficulty;
230237
EnumGamemode defaultGamemode = ((DedicatedServer) mcServer).getDedicatedServerProperties().gamemode;
231-
WorldSettings worldSettings = new WorldSettings(world.getName(), defaultGamemode, false,
238+
WorldSettings worldSettings = new WorldSettings(worldName, defaultGamemode, false,
232239
difficulty, false, new GameRules(), mcServer.datapackconfiguration);
233-
worldDataServer = new WorldDataServer(worldSettings, generatorSettings, Lifecycle.stable());
240+
worldDataServer = new WorldDataServer(worldSettings, ((DedicatedServer) mcServer)
241+
.getDedicatedServerProperties().generatorSettings, Lifecycle.stable());
234242
}
235243

236-
worldDataServer.checkName(world.getName());
244+
worldDataServer.checkName(worldName);
237245
worldDataServer.a(mcServer.getServerModName(), mcServer.getModded().isPresent());
238246
worldDataServer.c(true);
239247

‎slimeworldmanager-nms-v1_16_R2/src/main/java/com/grinderwolf/swm/nms/v1_16_R2/v1_16_R2SlimeNMS.java‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -168,26 +168,28 @@ private World.Environment getEnvironment(SlimeWorld world) {
168168
}
169169

170170
private WorldDataServer createWorldData(SlimeWorld world) {
171+
String worldName = world.getName();
172+
CompoundTag extraData = world.getExtraData();
171173
WorldDataServer worldDataServer;
172-
NBTTagCompound extraTag = (NBTTagCompound) Converter.convertTag(world.getExtraData());
174+
NBTTagCompound extraTag = (NBTTagCompound) Converter.convertTag(extraData);
173175
MinecraftServer mcServer = MinecraftServer.getServer();
174176

175-
SlimePropertyMap propertyMap = world.getPropertyMap();
176-
Properties properties = new Properties();
177-
String defaultBiome = propertyMap.getString(SlimeProperties.DEFAULT_BIOME);
178-
String generatorString = "{\"structures\":{\"structures\":{}},\"biome\":\"" + defaultBiome + "\",\"layers\":[]}";
179-
180-
properties.put("generator-settings", generatorString);
181-
properties.put("level-type", "FLAT");
182-
183-
GeneratorSettings generatorSettings = GeneratorSettings.a(mcServer.getCustomRegistry(), properties);
184-
185177
if (extraTag.hasKeyOfType("LevelData", CraftMagicNumbers.NBT.TAG_COMPOUND)) {
186178
NBTTagCompound levelData = extraTag.getCompound("LevelData");
187179
int dataVersion = levelData.hasKeyOfType("DataVersion", 99) ? levelData.getInt("DataVersion") : -1;
188180
Dynamic<NBTBase> dynamic = mcServer.getDataFixer().update(DataFixTypes.LEVEL.a(),
189181
new Dynamic<>(DynamicOpsNBT.a, levelData), dataVersion, SharedConstants.getGameVersion()
190182
.getWorldVersion());
183+
184+
SlimePropertyMap propertyMap = world.getPropertyMap();
185+
Properties properties = new Properties();
186+
String defaultBiome = propertyMap.getString(SlimeProperties.DEFAULT_BIOME);
187+
String generatorString = "{\"structures\":{\"structures\":{}},\"biome\":\"" + defaultBiome + "\",\"layers\":[]}";
188+
189+
properties.put("generator-settings", generatorString);
190+
properties.put("level-type", "FLAT");
191+
192+
GeneratorSettings generatorSettings = GeneratorSettings.a(mcServer.getCustomRegistry(), properties);
191193
Lifecycle lifecycle = Lifecycle.stable();
192194
LevelVersion levelVersion = LevelVersion.a(dynamic);
193195
WorldSettings worldSettings = WorldSettings.a(dynamic, mcServer.datapackconfiguration);
@@ -197,13 +199,13 @@ private WorldDataServer createWorldData(SlimeWorld world) {
197199
} else {
198200
EnumDifficulty difficulty = ((DedicatedServer) mcServer).getDedicatedServerProperties().difficulty;
199201
EnumGamemode defaultGamemode = ((DedicatedServer) mcServer).getDedicatedServerProperties().gamemode;
200-
WorldSettings worldSettings = new WorldSettings(world.getName(), defaultGamemode, false,
202+
WorldSettings worldSettings = new WorldSettings(worldName, defaultGamemode, false,
201203
difficulty, false, new GameRules(), mcServer.datapackconfiguration);
202204
worldDataServer = new WorldDataServer(worldSettings, ((DedicatedServer) mcServer)
203205
.getDedicatedServerProperties().generatorSettings, Lifecycle.stable());
204206
}
205207

206-
worldDataServer.checkName(world.getName());
208+
worldDataServer.checkName(worldName);
207209
worldDataServer.a(mcServer.getServerModName(), mcServer.getModded().isPresent());
208210
worldDataServer.c(true);
209211

‎slimeworldmanager-nms-v1_16_R3/src/main/java/com/grinderwolf/swm/nms/v1_16_R3/v1_16_R3SlimeNMS.java‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -168,26 +168,28 @@ private World.Environment getEnvironment(SlimeWorld world) {
168168
}
169169

170170
private WorldDataServer createWorldData(SlimeWorld world) {
171+
String worldName = world.getName();
172+
CompoundTag extraData = world.getExtraData();
171173
WorldDataServer worldDataServer;
172-
NBTTagCompound extraTag = (NBTTagCompound) Converter.convertTag(world.getExtraData());
174+
NBTTagCompound extraTag = (NBTTagCompound) Converter.convertTag(extraData);
173175
MinecraftServer mcServer = MinecraftServer.getServer();
174176

175-
SlimePropertyMap propertyMap = world.getPropertyMap();
176-
Properties properties = new Properties();
177-
String defaultBiome = propertyMap.getString(SlimeProperties.DEFAULT_BIOME);
178-
String generatorString = "{\"structures\":{\"structures\":{}},\"biome\":\"" + defaultBiome + "\",\"layers\":[]}";
179-
180-
properties.put("generator-settings", generatorString);
181-
properties.put("level-type", "FLAT");
182-
183-
GeneratorSettings generatorSettings = GeneratorSettings.a(mcServer.getCustomRegistry(), properties);
184-
185177
if (extraTag.hasKeyOfType("LevelData", CraftMagicNumbers.NBT.TAG_COMPOUND)) {
186178
NBTTagCompound levelData = extraTag.getCompound("LevelData");
187179
int dataVersion = levelData.hasKeyOfType("DataVersion", 99) ? levelData.getInt("DataVersion") : -1;
188180
Dynamic<NBTBase> dynamic = mcServer.getDataFixer().update(DataFixTypes.LEVEL.a(),
189181
new Dynamic<>(DynamicOpsNBT.a, levelData), dataVersion, SharedConstants.getGameVersion()
190182
.getWorldVersion());
183+
184+
SlimePropertyMap propertyMap = world.getPropertyMap();
185+
Properties properties = new Properties();
186+
String defaultBiome = propertyMap.getString(SlimeProperties.DEFAULT_BIOME);
187+
String generatorString = "{\"structures\":{\"structures\":{}},\"biome\":\"" + defaultBiome + "\",\"layers\":[]}";
188+
189+
properties.put("generator-settings", generatorString);
190+
properties.put("level-type", "FLAT");
191+
192+
GeneratorSettings generatorSettings = GeneratorSettings.a(mcServer.getCustomRegistry(), properties);
191193
Lifecycle lifecycle = Lifecycle.stable();
192194
LevelVersion levelVersion = LevelVersion.a(dynamic);
193195
WorldSettings worldSettings = WorldSettings.a(dynamic, mcServer.datapackconfiguration);
@@ -197,13 +199,13 @@ private WorldDataServer createWorldData(SlimeWorld world) {
197199
} else {
198200
EnumDifficulty difficulty = ((DedicatedServer) mcServer).getDedicatedServerProperties().difficulty;
199201
EnumGamemode defaultGamemode = ((DedicatedServer) mcServer).getDedicatedServerProperties().gamemode;
200-
WorldSettings worldSettings = new WorldSettings(world.getName(), defaultGamemode, false,
202+
WorldSettings worldSettings = new WorldSettings(worldName, defaultGamemode, false,
201203
difficulty, false, new GameRules(), mcServer.datapackconfiguration);
202204
worldDataServer = new WorldDataServer(worldSettings, ((DedicatedServer) mcServer)
203205
.getDedicatedServerProperties().generatorSettings, Lifecycle.stable());
204206
}
205207

206-
worldDataServer.checkName(world.getName());
208+
worldDataServer.checkName(worldName);
207209
worldDataServer.a(mcServer.getServerModName(), mcServer.getModded().isPresent());
208210
worldDataServer.c(true);
209211

0 commit comments

Comments
 (0)