Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

More 1.16.1 support

Browse source
This commit is contained in:
Mike Primm 2020-06-30 23:51:00 -05:00
parent afdd9a550e
commit 6a3c19485c
2 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/DynmapPlugin.java
View file

@ -1898,7 +1898,6 @@ public class DynmapPlugin
File f = new File(core.getDataFolder(), "forgeworlds.yml"); File f = new File(core.getDataFolder(), "forgeworlds.yml");
if(f.canRead() == false) { if(f.canRead() == false) {
useSaveFolder = true; useSaveFolder = true;
ForgeWorld.setSaveFolderMapping();
return; return;
} }
ConfigurationNode cn = new ConfigurationNode(f); ConfigurationNode cn = new ConfigurationNode(f);
@ -1910,9 +1909,6 @@ public class DynmapPlugin
if (cn.containsKey("useSaveFolderAsName")) { if (cn.containsKey("useSaveFolderAsName")) {
useSaveFolder = cn.getBoolean("useSaveFolderAsName", useSaveFolder); useSaveFolder = cn.getBoolean("useSaveFolderAsName", useSaveFolder);
} }
if (useSaveFolder) {
ForgeWorld.setSaveFolderMapping();
}
List<Map<String,Object>> lst = cn.getMapList("worlds"); List<Map<String,Object>> lst = cn.getMapList("worlds");
if(lst == null) { if(lst == null) {
Log.warning("Discarding bad forgeworlds.yml"); Log.warning("Discarding bad forgeworlds.yml");

8
forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/ForgeWorld.java
View file

@ -1,16 +1,12 @@
package org.dynmap.forge_1_16_1; package org.dynmap.forge_1_16_1;
import java.io.File;
/** /**
* Forge specific implementation of DynmapWorld * Forge specific implementation of DynmapWorld
*/ */
import java.util.List; import java.util.List;
import net.minecraft.client.Minecraft;
import net.minecraft.util.RegistryKey; import net.minecraft.util.RegistryKey;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.gen.Heightmap.Type; import net.minecraft.world.gen.Heightmap.Type;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.DimensionType;
import net.minecraft.world.IWorld; import net.minecraft.world.IWorld;
import net.minecraft.world.LightType; import net.minecraft.world.LightType;
import net.minecraft.world.World; import net.minecraft.world.World;
@ -30,12 +26,8 @@ public class ForgeWorld extends DynmapWorld
private final boolean istheend; private final boolean istheend;
private final String env; private final String env;
private DynmapLocation spawnloc = new DynmapLocation(); private DynmapLocation spawnloc = new DynmapLocation();
private static boolean doSaveFolderMapping = false;
private static int maxWorldHeight = 256; // Maximum allows world height private static int maxWorldHeight = 256; // Maximum allows world height
public static void setSaveFolderMapping() {
doSaveFolderMapping = true;
}
public static int getMaxWorldHeight() { public static int getMaxWorldHeight() {
return maxWorldHeight; return maxWorldHeight;
} }