mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove debug prints & add warning, replace throwable with exception

Browse Source
This commit is contained in:
CocoTheOwner 2021-02-28 17:52:54 +01:00
parent e5ca66305c
commit 6a4a25db40
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/volmit/iris/generator/IrisEngineCompound.java
View File

@ -75,22 +75,18 @@ public class IrisEngineCompound implements EngineCompound {
{ {
if(!(world instanceof FakeWorld || world instanceof HeightedFakeWorld)) if(!(world instanceof FakeWorld || world instanceof HeightedFakeWorld))
{ {
Iris.info("Got this far (0)");
List<IrisPosition> strongholds = new ArrayList<>(); List<IrisPosition> strongholds = new ArrayList<>();
Object nmsWorld = new V(world).invoke("getHandle"); Object nmsWorld = new V(world).invoke("getHandle");
Object chunkProvider = new V(nmsWorld).invoke("getChunkProvider"); Object chunkProvider = new V(nmsWorld).invoke("getChunkProvider");
Object chunkGenerator = new V(chunkProvider).invoke("getChunkGenerator"); Object chunkGenerator = new V(chunkProvider).invoke("getChunkGenerator");
try { try {
Iris.info("Got this far (1)");
Class<?> clazz = Class.forName("net.minecraft.server." + INMS.getNMSTag() + ".ChunkGenerator"); Class<?> clazz = Class.forName("net.minecraft.server." + INMS.getNMSTag() + ".ChunkGenerator");
Class<?> clazzSG = Class.forName("net.minecraft.server." + INMS.getNMSTag() + ".StructureGenerator"); Class<?> clazzSG = Class.forName("net.minecraft.server." + INMS.getNMSTag() + ".StructureGenerator");
Class<?> clazzBP = Class.forName("net.minecraft.server." + INMS.getNMSTag() + ".BlockPosition"); Class<?> clazzBP = Class.forName("net.minecraft.server." + INMS.getNMSTag() + ".BlockPosition");
CompletableFuture<Object> cf = new CompletableFuture<>(); CompletableFuture<Object> cf = new CompletableFuture<>();
Object BP = null; Object BP = null;
getBPSafe(clazz, clazzSG, clazzBP, nmsWorld, chunkGenerator).thenAccept(bp -> { getBPSafe(clazz, clazzSG, clazzBP, nmsWorld, chunkGenerator).thenAccept(bp -> {
Iris.info("Got this far (2)");
strongholds.add(new IrisPosition((int) new V(bp, false).invoke("getX"), (int) new V(bp, false).invoke("getY"), (int) new V(bp, false).invoke("getZ"))); strongholds.add(new IrisPosition((int) new V(bp, false).invoke("getX"), (int) new V(bp, false).invoke("getY"), (int) new V(bp, false).invoke("getZ")));
Iris.info("Got this far (3)");
String positions = ""; String positions = "";
for (IrisPosition pos : strongholds){ for (IrisPosition pos : strongholds){
positions += "(" + pos.getX() + "," + pos.getY() + "," + pos.getZ() + ") "; positions += "(" + pos.getX() + "," + pos.getY() + "," + pos.getZ() + ") ";
@ -102,7 +98,7 @@ public class IrisEngineCompound implements EngineCompound {
} catch (Throwable ignored) { } catch (Throwable ignored) {
strongholds.add( new IrisPosition(10337, 32, -1337) ); strongholds.add( new IrisPosition(10337, 32, -1337) );
engineMetadata.setStrongholdPositions(strongholds); engineMetadata.setStrongholdPositions(strongholds);
Iris.warn("Couldn't properly find the stronghold position for this world. Is this headless mode?"); Iris.warn("Couldn't properly find the stronghold position for this world. Is this headless mode? Are you not using 1.16 or higher?");
Iris.warn(" -> Setting default stronghold position"); Iris.warn(" -> Setting default stronghold position");
ignored.printStackTrace(); ignored.printStackTrace();
Iris.info("Got this far (3)"); Iris.info("Got this far (3)");
@ -196,9 +192,8 @@ public class IrisEngineCompound implements EngineCompound {
Bukkit.getScheduler().runTask(Iris.instance, () -> { Bukkit.getScheduler().runTask(Iris.instance, () -> {
try { try {
cf.complete(getBP(clazz, clazzSG, clazzBP, nmsWorld, chunkGenerator)); cf.complete(getBP(clazz, clazzSG, clazzBP, nmsWorld, chunkGenerator));
} catch (Throwable e){ } catch (Exception e){
cf.complete(null); cf.complete(null);
e.printStackTrace();
} }
}); });
return cf; return cf;