mirror of
https://github.com/VolmitSoftware/Iris.git
synced 2025-07-18 18:23:06 +00:00
JFC paper chill it on the patches
This commit is contained in:
parent
9b910b26a9
commit
72d07fc3fb
@ -3,18 +3,22 @@ package com.volmit.iris.nms.v17_1;
|
|||||||
import com.google.common.base.Preconditions;
|
import com.google.common.base.Preconditions;
|
||||||
import com.google.common.collect.ImmutableList;
|
import com.google.common.collect.ImmutableList;
|
||||||
import com.google.common.collect.ImmutableSet;
|
import com.google.common.collect.ImmutableSet;
|
||||||
|
import com.mojang.serialization.DynamicOps;
|
||||||
import com.mojang.serialization.Lifecycle;
|
import com.mojang.serialization.Lifecycle;
|
||||||
import com.volmit.iris.nms.INMSBinding;
|
import com.volmit.iris.nms.INMSBinding;
|
||||||
import com.volmit.iris.pregen.Pregenerator;
|
import com.volmit.iris.pregen.Pregenerator;
|
||||||
import com.volmit.iris.util.J;
|
import com.volmit.iris.util.J;
|
||||||
import com.volmit.iris.util.KMap;
|
import com.volmit.iris.util.KMap;
|
||||||
|
import io.papermc.lib.PaperLib;
|
||||||
import net.minecraft.core.IRegistry;
|
import net.minecraft.core.IRegistry;
|
||||||
|
import net.minecraft.core.IRegistryCustom;
|
||||||
import net.minecraft.core.RegistryMaterials;
|
import net.minecraft.core.RegistryMaterials;
|
||||||
import net.minecraft.nbt.DynamicOpsNBT;
|
import net.minecraft.nbt.DynamicOpsNBT;
|
||||||
import net.minecraft.nbt.NBTBase;
|
import net.minecraft.nbt.NBTBase;
|
||||||
import net.minecraft.resources.MinecraftKey;
|
import net.minecraft.resources.MinecraftKey;
|
||||||
import net.minecraft.resources.RegistryReadOps;
|
import net.minecraft.resources.RegistryReadOps;
|
||||||
import net.minecraft.resources.ResourceKey;
|
import net.minecraft.resources.ResourceKey;
|
||||||
|
import net.minecraft.server.Main;
|
||||||
import net.minecraft.server.MinecraftServer;
|
import net.minecraft.server.MinecraftServer;
|
||||||
import net.minecraft.server.dedicated.DedicatedServer;
|
import net.minecraft.server.dedicated.DedicatedServer;
|
||||||
import net.minecraft.server.level.WorldServer;
|
import net.minecraft.server.level.WorldServer;
|
||||||
@ -31,24 +35,30 @@ import net.minecraft.world.level.biome.BiomeBase;
|
|||||||
import net.minecraft.world.level.biome.BiomeManager;
|
import net.minecraft.world.level.biome.BiomeManager;
|
||||||
import net.minecraft.world.level.dimension.DimensionManager;
|
import net.minecraft.world.level.dimension.DimensionManager;
|
||||||
import net.minecraft.world.level.dimension.WorldDimension;
|
import net.minecraft.world.level.dimension.WorldDimension;
|
||||||
|
import net.minecraft.world.level.levelgen.ChunkGeneratorAbstract;
|
||||||
import net.minecraft.world.level.levelgen.GeneratorSettings;
|
import net.minecraft.world.level.levelgen.GeneratorSettings;
|
||||||
import net.minecraft.world.level.levelgen.MobSpawnerPatrol;
|
import net.minecraft.world.level.levelgen.MobSpawnerPatrol;
|
||||||
import net.minecraft.world.level.levelgen.MobSpawnerPhantom;
|
import net.minecraft.world.level.levelgen.MobSpawnerPhantom;
|
||||||
import net.minecraft.world.level.storage.Convertable;
|
import net.minecraft.world.level.storage.Convertable;
|
||||||
|
import net.minecraft.world.level.storage.IWorldDataServer;
|
||||||
|
import net.minecraft.world.level.storage.SaveData;
|
||||||
import net.minecraft.world.level.storage.WorldDataServer;
|
import net.minecraft.world.level.storage.WorldDataServer;
|
||||||
import org.apache.commons.lang.Validate;
|
import org.apache.commons.lang.Validate;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.NamespacedKey;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import org.bukkit.WorldCreator;
|
import org.bukkit.WorldCreator;
|
||||||
import org.bukkit.block.Biome;
|
import org.bukkit.block.Biome;
|
||||||
import org.bukkit.craftbukkit.v1_17_R1.CraftServer;
|
import org.bukkit.craftbukkit.v1_17_R1.CraftServer;
|
||||||
import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
|
import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
|
||||||
|
import org.bukkit.event.Event;
|
||||||
import org.bukkit.event.world.WorldLoadEvent;
|
import org.bukkit.event.world.WorldLoadEvent;
|
||||||
import org.bukkit.generator.ChunkGenerator;
|
import org.bukkit.generator.ChunkGenerator;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
|
import java.lang.reflect.Method;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
public class NMSBinding17_1 implements INMSBinding
|
public class NMSBinding17_1 implements INMSBinding
|
||||||
@ -61,6 +71,43 @@ public class NMSBinding17_1 implements INMSBinding
|
|||||||
return getBiomeBase(((CraftWorld)world).getHandle().t().d(IRegistry.aO), biome);
|
return getBiomeBase(((CraftWorld)world).getHandle().t().d(IRegistry.aO), biome);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private Class<?>[] classify(Object...par)
|
||||||
|
{
|
||||||
|
Class<?>[] g = new Class<?>[par.length];
|
||||||
|
for(int i = 0; i < g.length; i++)
|
||||||
|
{
|
||||||
|
g[i] = par[i].getClass();
|
||||||
|
}
|
||||||
|
|
||||||
|
return g;
|
||||||
|
}
|
||||||
|
|
||||||
|
private <T> T invoke(Object from, String name, Object...par)
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
Method f = from.getClass().getDeclaredMethod(name, classify(par));
|
||||||
|
f.setAccessible(true);
|
||||||
|
return (T) f.invoke(from, par);
|
||||||
|
} catch (Throwable e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private <T> T invokeStatic(Class<?> from, String name, Object...par)
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
Method f = from.getDeclaredMethod(name, classify(par));
|
||||||
|
f.setAccessible(true);
|
||||||
|
return (T) f.invoke(null, par);
|
||||||
|
} catch (Throwable e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
private <T> T getField(Object from, String name)
|
private <T> T getField(Object from, String name)
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
@ -74,8 +121,26 @@ public class NMSBinding17_1 implements INMSBinding
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private <T> T getStaticField(Class<?> t, String name)
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
Field f = t.getDeclaredField(name);
|
||||||
|
f.setAccessible(true);
|
||||||
|
return (T) f.get(null);
|
||||||
|
} catch (Throwable e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public World createWorld(WorldCreator creator) {
|
public World createWorld(WorldCreator creator) {
|
||||||
|
if(PaperLib.isPaper())
|
||||||
|
{
|
||||||
|
return createWorldPaper17(creator);
|
||||||
|
}
|
||||||
|
|
||||||
CraftServer cs = (CraftServer) Bukkit.getServer();
|
CraftServer cs = (CraftServer) Bukkit.getServer();
|
||||||
DedicatedServer console = getField(cs, "console");
|
DedicatedServer console = getField(cs, "console");
|
||||||
Map<String, World> worlds = getField(cs, "worlds");
|
Map<String, World> worlds = getField(cs, "worlds");
|
||||||
@ -184,6 +249,114 @@ public class NMSBinding17_1 implements INMSBinding
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public World createWorldPaper17(WorldCreator creator) {
|
||||||
|
CraftServer cs = (CraftServer) Bukkit.getServer();
|
||||||
|
DedicatedServer console = getField(cs, "console");
|
||||||
|
Map<String, World> worlds = getField(cs, "worlds");
|
||||||
|
ResourceKey<WorldDimension> actualDimension;
|
||||||
|
Convertable.ConversionSession worldSession;
|
||||||
|
DimensionManager dimensionmanager;
|
||||||
|
net.minecraft.world.level.chunk.ChunkGenerator chunkgenerator = null;
|
||||||
|
ResourceKey<net.minecraft.world.level.World> worldKey = null;
|
||||||
|
Preconditions.checkState(!console.R.isEmpty(), "Cannot create additional worlds on STARTUP");
|
||||||
|
Validate.notNull(creator, "Creator may not be null");
|
||||||
|
String name = creator.name();
|
||||||
|
ChunkGenerator generator = creator.generator();
|
||||||
|
File folder = new File(cs.getWorldContainer(), name);
|
||||||
|
World world = cs.getWorld(name);
|
||||||
|
if (world != null)
|
||||||
|
return world;
|
||||||
|
if (folder.exists() && !folder.isDirectory())
|
||||||
|
throw new IllegalArgumentException("File exists with the name '" + name + "' and isn't a folder");
|
||||||
|
if (generator == null)
|
||||||
|
generator = cs.getGenerator(name);
|
||||||
|
|
||||||
|
if(creator.environment().name().equals("IP") || creator.environment().name().equals("NORMAL"))
|
||||||
|
{
|
||||||
|
actualDimension = WorldDimension.b;
|
||||||
|
}
|
||||||
|
|
||||||
|
else if(creator.environment().name().equals("NAME") || creator.environment().name().equals("NETHER"))
|
||||||
|
{
|
||||||
|
actualDimension = WorldDimension.c;
|
||||||
|
}
|
||||||
|
|
||||||
|
else if(creator.environment().name().equals("THE_END"))
|
||||||
|
{
|
||||||
|
actualDimension = WorldDimension.d;
|
||||||
|
}
|
||||||
|
|
||||||
|
else
|
||||||
|
{
|
||||||
|
throw new IllegalArgumentException("Illegal dimension: " + creator.environment().name());
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
worldSession = Convertable.a(cs.getWorldContainer().toPath()).c(name, actualDimension);
|
||||||
|
} catch (IOException ex) {
|
||||||
|
throw new RuntimeException(ex);
|
||||||
|
}
|
||||||
|
MinecraftServer.convertWorld(worldSession);
|
||||||
|
boolean hardcore = creator.hardcore();
|
||||||
|
RegistryReadOps<NBTBase> registryreadops = RegistryReadOps.a((DynamicOps)DynamicOpsNBT.a, console.aC.i(), (IRegistryCustom) console.l);
|
||||||
|
WorldDataServer worlddata = invoke(worldSession, "getDataTag", (DynamicOps)registryreadops, console.datapackconfiguration);
|
||||||
|
if (worlddata == null) {
|
||||||
|
Properties properties = new Properties();
|
||||||
|
properties.put("generator-settings", Objects.toString(creator.generatorSettings()));
|
||||||
|
properties.put("level-seed", Objects.toString(Long.valueOf(creator.seed())));
|
||||||
|
properties.put("generate-structures", Objects.toString(Boolean.valueOf(creator.generateStructures())));
|
||||||
|
properties.put("level-type", Objects.toString(creator.type().getName()));
|
||||||
|
GeneratorSettings generatorsettings = GeneratorSettings.a(console.getCustomRegistry(), properties);
|
||||||
|
WorldSettings worldSettings = new WorldSettings(name, EnumGamemode.getById(cs.getDefaultGameMode().getValue()), hardcore, EnumDifficulty.b, false, new GameRules(), console.datapackconfiguration);
|
||||||
|
worlddata = new WorldDataServer(worldSettings, generatorsettings, Lifecycle.stable());
|
||||||
|
}
|
||||||
|
worlddata.checkName(name);
|
||||||
|
worlddata.a(console.getServerModName(), console.getModded().isPresent());
|
||||||
|
long j = BiomeManager.a(creator.seed());
|
||||||
|
ImmutableList immutableList = ImmutableList.of(new MobSpawnerPhantom(), new MobSpawnerPatrol(), new MobSpawnerCat(), new VillageSiege(), new MobSpawnerTrader((IWorldDataServer)worlddata));
|
||||||
|
RegistryMaterials<WorldDimension> registrymaterials = worlddata.getGeneratorSettings().d();
|
||||||
|
WorldDimension worlddimension = (WorldDimension)registrymaterials.a(actualDimension);
|
||||||
|
if (worlddimension == null) {
|
||||||
|
dimensionmanager = (DimensionManager)console.l.d(IRegistry.P).d(DimensionManager.k);
|
||||||
|
ChunkGeneratorAbstract chunkGeneratorAbstract = GeneratorSettings.a(console.l.d(IRegistry.aO), console.l.d(IRegistry.aH), (new Random()).nextLong());
|
||||||
|
} else {
|
||||||
|
dimensionmanager = worlddimension.b();
|
||||||
|
chunkgenerator = worlddimension.c();
|
||||||
|
}
|
||||||
|
if (console.options.has("forceUpgrade")) {
|
||||||
|
ResourceKey<WorldDimension> dimkey = invokeStatic(World.class, "getDimensionKey", dimensionmanager);
|
||||||
|
invokeStatic(Main.class, "convertWorldButItWorks", actualDimension, dimkey,
|
||||||
|
worldSession.getLevelName(), DataConverterRegistry.a(), console.options.has("eraseCache"));
|
||||||
|
}
|
||||||
|
String levelName = (cs.getServer().getDedicatedServerProperties()).p;
|
||||||
|
if (name.equals(levelName + "_nether")) {
|
||||||
|
worldKey = invokeStatic(World.class, "g");
|
||||||
|
} else if (name.equals(levelName + "_the_end")) {
|
||||||
|
worldKey = invokeStatic(World.class, "h");
|
||||||
|
} else {
|
||||||
|
worldKey = ResourceKey.a(IRegistry.Q, new MinecraftKey(((NamespacedKey)invoke(creator, "key"))
|
||||||
|
.getNamespace().toLowerCase(Locale.ENGLISH), ((NamespacedKey)invoke(creator, "key"))
|
||||||
|
.getKey().toLowerCase(Locale.ENGLISH)));
|
||||||
|
}
|
||||||
|
WorldServer internal = new WorldServer((MinecraftServer)console, console.aA, worldSession, (IWorldDataServer) worlddata,
|
||||||
|
worldKey,
|
||||||
|
dimensionmanager, (cs.getServer()).L.create(11), chunkgenerator, worlddata.getGeneratorSettings().isDebugWorld(), j, (creator.environment() == World.Environment.NORMAL) ? (List)immutableList : (List)ImmutableList.of(), true, creator.environment(), generator);
|
||||||
|
if (!worlds.containsKey(name.toLowerCase(Locale.ENGLISH))) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
console.initWorld(internal, (IWorldDataServer)worlddata, (SaveData) worlddata, worlddata.getGeneratorSettings());
|
||||||
|
internal.setSpawnFlags(true, true);
|
||||||
|
console.R.put(internal.getDimensionKey(), internal);
|
||||||
|
// cs.getServer().loadSpawn((internal.getChunkProvider()).a.z, internal);
|
||||||
|
cs.getLogger().info("Preparing start region for dime... Oh right, This is Iris.");
|
||||||
|
internal.G.a();
|
||||||
|
cs.getPluginManager().callEvent((org.bukkit.event.Event) new WorldLoadEvent(internal.getWorld()));
|
||||||
|
J.a(() -> {
|
||||||
|
new Pregenerator(internal.getWorld(), 256);
|
||||||
|
});
|
||||||
|
return internal.getWorld();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Object getBiomeBase(Object registry, Biome biome) {
|
public Object getBiomeBase(Object registry, Biome biome) {
|
||||||
Object v = baseBiomeCache.get(biome);
|
Object v = baseBiomeCache.get(biome);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user