diff --git a/lint/ChangeLog.txt b/lint/ChangeLog.txt index bd441ca0f..99682969e 100644 --- a/lint/ChangeLog.txt +++ b/lint/ChangeLog.txt @@ -6,13 +6,13 @@ Package: com NameNotChanged Package: com.volmit NameNotChanged Package: com.volmit.iris NameNotChanged Package: com.volmit.iris.activation NameNotChanged -Package: com.volmit.iris.command NameNotChanged -Package: com.volmit.iris.gen NameNotChanged -Package: com.volmit.iris.gen.atomics NameNotChanged -Package: com.volmit.iris.gen.layer NameNotChanged -Package: com.volmit.iris.gen.post NameNotChanged -Package: com.volmit.iris.gui NameNotChanged -Package: com.volmit.iris.noise NameNotChanged +Package: com.volmit.iris.manager.command NameNotChanged +Package: com.volmit.iris.generator NameNotChanged +Package: com.volmit.iris.generator.legacy.atomics NameNotChanged +Package: com.volmit.iris.generator.legacy.layer NameNotChanged +Package: com.volmit.iris.generator.legacy.post NameNotChanged +Package: com.volmit.iris.manager.gui NameNotChanged +Package: com.volmit.iris.generator.noise NameNotChanged Package: com.volmit.iris.object NameNotChanged Package: com.volmit.iris.util NameNotChanged Package: org NameNotChanged @@ -28,13 +28,13 @@ Class: public com.volmit.iris.Iris NameNotChanged FieldsOf: com.volmit.iris.Iris private static boolean b => h public static com.volmit.iris.IrisBoardManager board NameNotChanged - public com.volmit.iris.command.CommandIris commandIris NameNotChanged + public com.volmit.iris.manager.command.CommandIris commandIris NameNotChanged public static com.volmit.iris.util.KList executors NameNotChanged public static com.volmit.iris.IrisDataManager globaldata NameNotChanged public static com.volmit.iris.IrisHotloadManager hotloader NameNotChanged public static com.volmit.iris.Iris instance NameNotChanged private static com.volmit.iris.util.IrisLock lock => i - public static com.volmit.iris.command.PermissionIris perm NameNotChanged + public static com.volmit.iris.manager.command.PermissionIris perm NameNotChanged public static com.volmit.iris.ProjectManager proj NameNotChanged public static com.volmit.iris.StructureManager struct NameNotChanged public static com.volmit.iris.WandManager wand NameNotChanged @@ -569,7 +569,7 @@ Class: public com.volmit.iris.IrisSettings NameNotChanged Class: public com.volmit.iris.ProjectManager NameNotChanged Source: "ProjectManager.java" FieldsOf: com.volmit.iris.ProjectManager - private com.volmit.iris.gen.IrisChunkGenerator currentProject => a + private com.volmit.iris.generator.IrisChunkGenerator currentProject => a private java.util.concurrent.locks.ReentrantLock lock => b private com.volmit.iris.util.TaskExecutor tx => c MethodsOf: com.volmit.iris.ProjectManager @@ -587,7 +587,7 @@ Class: public com.volmit.iris.ProjectManager NameNotChanged public boolean equals(java.lang.Object) SignatureNotChanged private void ex(com.volmit.iris.util.JSONArray, java.lang.Class, com.volmit.iris.IrisDataManager, java.lang.String) => a(com.volmit.iris.util.JSONArray, java.lang.Class, com.volmit.iris.IrisDataManager, java.lang.String) private java.lang.String[] getBiomeList(com.volmit.iris.IrisDataManager) => d(com.volmit.iris.IrisDataManager) - public com.volmit.iris.gen.IrisChunkGenerator getCurrentProject() SignatureNotChanged + public com.volmit.iris.generator.IrisChunkGenerator getCurrentProject() SignatureNotChanged private java.lang.String[] getDimensionList(com.volmit.iris.IrisDataManager) => e(com.volmit.iris.IrisDataManager) private java.lang.String[] getFontList() => b() private java.lang.String[] getGeneratorList(com.volmit.iris.IrisDataManager) => f(com.volmit.iris.IrisDataManager) @@ -641,7 +641,7 @@ Class: public com.volmit.iris.ProjectManager NameNotChanged private static synthetic void lambda$null$32(com.volmit.iris.util.KMap, java.io.File, java.lang.StringBuilder, com.volmit.iris.util.O, com.volmit.iris.util.ChronoLatch, com.volmit.iris.util.MortarSender, com.volmit.iris.object.IrisObjectPlacement) SignatureNotChanged private static synthetic void lambda$open$1() SignatureNotChanged private synthetic void lambda$open$3(com.volmit.iris.object.IrisDimension, com.volmit.iris.util.MortarSender) SignatureNotChanged - private static synthetic void lambda$open$4(com.volmit.iris.util.O, com.volmit.iris.gen.IrisChunkGenerator, com.volmit.iris.util.MortarSender) SignatureNotChanged + private static synthetic void lambda$open$4(com.volmit.iris.util.O, com.volmit.iris.generator.IrisChunkGenerator, com.volmit.iris.util.MortarSender) SignatureNotChanged private static synthetic void lambda$open$5(com.volmit.iris.util.MortarSender, java.lang.Runnable) SignatureNotChanged private synthetic void lambda$updateWorkspace$34(java.io.File) SignatureNotChanged private com.volmit.iris.util.JSONObject newWorkspaceConfig() => a() @@ -1735,20 +1735,20 @@ Class: public com.volmit.iris.activation.IrisActivation2 NameNotChanged 133 => 51 135 => 7 -Class: public com.volmit.iris.command.CommandIris NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIris NameNotChanged Source: "CommandIris.java" - FieldsOf: com.volmit.iris.command.CommandIris - private com.volmit.iris.command.CommandIrisCreate create => j - private com.volmit.iris.command.CommandIrisObject object => k - private com.volmit.iris.command.CommandIrisStructure structure => g - private com.volmit.iris.command.CommandIrisStudio studio => i - private com.volmit.iris.command.CommandIrisWhat what => h - MethodsOf: com.volmit.iris.command.CommandIris + FieldsOf: com.volmit.iris.manager.command.CommandIris + private com.volmit.iris.manager.command.CommandIrisCreate create => j + private com.volmit.iris.manager.command.CommandIrisObject object => k + private com.volmit.iris.manager.command.CommandIrisStructure structure => g + private com.volmit.iris.manager.command.CommandIrisStudio studio => i + private com.volmit.iris.manager.command.CommandIrisWhat what => h + MethodsOf: com.volmit.iris.manager.command.CommandIris static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIris + LineNumbersOf: com.volmit.iris.manager.command.CommandIris 27 => 5 28 => 4 29 => 6 @@ -1757,19 +1757,19 @@ Class: public com.volmit.iris.command.CommandIris NameNotChanged 36 => 1 42 => 3 -Class: public com.volmit.iris.command.CommandIrisCreate NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisCreate NameNotChanged Source: "CommandIrisCreate.java" - FieldsOf: com.volmit.iris.command.CommandIrisCreate - MethodsOf: com.volmit.iris.command.CommandIrisCreate + FieldsOf: com.volmit.iris.manager.command.CommandIrisCreate + MethodsOf: com.volmit.iris.manager.command.CommandIrisCreate static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - private static synthetic void lambda$handle$0(com.volmit.iris.util.O, com.volmit.iris.gen.IrisChunkGenerator, com.volmit.iris.util.MortarSender) SignatureNotChanged + private static synthetic void lambda$handle$0(com.volmit.iris.util.O, com.volmit.iris.generator.IrisChunkGenerator, com.volmit.iris.util.MortarSender) SignatureNotChanged private static synthetic void lambda$handle$1(com.volmit.iris.util.O) SignatureNotChanged private static synthetic void lambda$handle$3(com.volmit.iris.util.O, org.bukkit.World, com.volmit.iris.util.MortarSender, boolean, java.io.File) SignatureNotChanged private static synthetic void lambda$null$2(org.bukkit.World, com.volmit.iris.util.MortarSender, boolean, java.io.File) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisCreate + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisCreate 28 => 34 29 => 63 30 => 43 @@ -1864,15 +1864,15 @@ Class: public com.volmit.iris.command.CommandIrisCreate NameNotChanged 191 => 45 197 => 62 -Class: public com.volmit.iris.command.CommandIrisEditBiome NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisEditBiome NameNotChanged Source: "CommandIrisEditBiome.java" - FieldsOf: com.volmit.iris.command.CommandIrisEditBiome - MethodsOf: com.volmit.iris.command.CommandIrisEditBiome + FieldsOf: com.volmit.iris.manager.command.CommandIrisEditBiome + MethodsOf: com.volmit.iris.manager.command.CommandIrisEditBiome static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisEditBiome + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisEditBiome 16 => 2 17 => 6 18 => 14 @@ -1890,15 +1890,15 @@ Class: public com.volmit.iris.command.CommandIrisEditBiome NameNotChanged 48 => 8 54 => 13 -Class: public com.volmit.iris.command.CommandIrisGoto NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisGoto NameNotChanged Source: "CommandIrisGoto.java" - FieldsOf: com.volmit.iris.command.CommandIrisGoto - MethodsOf: com.volmit.iris.command.CommandIrisGoto + FieldsOf: com.volmit.iris.manager.command.CommandIrisGoto + MethodsOf: com.volmit.iris.manager.command.CommandIrisGoto static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisGoto + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisGoto 18 => 20 19 => 33 20 => 55 @@ -1955,15 +1955,15 @@ Class: public com.volmit.iris.command.CommandIrisGoto NameNotChanged 127 => 26 133 => 38 -Class: public com.volmit.iris.command.CommandIrisHotload NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisHotload NameNotChanged Source: "CommandIrisHotload.java" - FieldsOf: com.volmit.iris.command.CommandIrisHotload - MethodsOf: com.volmit.iris.command.CommandIrisHotload + FieldsOf: com.volmit.iris.manager.command.CommandIrisHotload + MethodsOf: com.volmit.iris.manager.command.CommandIrisHotload static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisHotload + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisHotload 13 => 7 14 => 13 15 => 8 @@ -1983,16 +1983,16 @@ Class: public com.volmit.iris.command.CommandIrisHotload NameNotChanged 40 => 5 45 => 1 -Class: public com.volmit.iris.command.CommandIrisLoot NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisLoot NameNotChanged Source: "CommandIrisLoot.java" - FieldsOf: com.volmit.iris.command.CommandIrisLoot - MethodsOf: com.volmit.iris.command.CommandIrisLoot + FieldsOf: com.volmit.iris.manager.command.CommandIrisLoot + MethodsOf: com.volmit.iris.manager.command.CommandIrisLoot static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged private static synthetic void lambda$handle$0(org.bukkit.entity.Player, com.volmit.iris.util.O, boolean, org.bukkit.inventory.Inventory, com.volmit.iris.util.KList) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisLoot + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisLoot 21 => 23 22 => 2 23 => 20 @@ -2031,15 +2031,15 @@ Class: public com.volmit.iris.command.CommandIrisLoot NameNotChanged 88 => 18 94 => 16 -Class: public com.volmit.iris.command.CommandIrisMap NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisMap NameNotChanged Source: "CommandIrisMap.java" - FieldsOf: com.volmit.iris.command.CommandIrisMap - MethodsOf: com.volmit.iris.command.CommandIrisMap + FieldsOf: com.volmit.iris.manager.command.CommandIrisMap + MethodsOf: com.volmit.iris.manager.command.CommandIrisMap static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisMap + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisMap 13 => 3 14 => 9 15 => 1 @@ -2051,15 +2051,15 @@ Class: public com.volmit.iris.command.CommandIrisMap NameNotChanged 25 => 6 31 => 10 -Class: public com.volmit.iris.command.CommandIrisMetrics NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisMetrics NameNotChanged Source: "CommandIrisMetrics.java" - FieldsOf: com.volmit.iris.command.CommandIrisMetrics - MethodsOf: com.volmit.iris.command.CommandIrisMetrics + FieldsOf: com.volmit.iris.manager.command.CommandIrisMetrics + MethodsOf: com.volmit.iris.manager.command.CommandIrisMetrics static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisMetrics + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisMetrics 18 => 4 19 => 15 20 => 18 @@ -2081,25 +2081,25 @@ Class: public com.volmit.iris.command.CommandIrisMetrics NameNotChanged 48 => 17 54 => 19 -Class: public com.volmit.iris.command.CommandIrisObject NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisObject NameNotChanged Source: "CommandIrisObject.java" - FieldsOf: com.volmit.iris.command.CommandIrisObject - private com.volmit.iris.command.CommandIrisObjectContract contract => m - private com.volmit.iris.command.CommandIrisObjectExpand expand => p - private com.volmit.iris.command.CommandIrisObjectP1 p1 => l - private com.volmit.iris.command.CommandIrisObjectP2 p2 => n - private com.volmit.iris.command.CommandIrisObjectPaste paste => i - private com.volmit.iris.command.CommandIrisObjectSave save => j - private com.volmit.iris.command.CommandIrisObjectShift shift => h - private com.volmit.iris.command.CommandIrisObjectWand wand => g - private com.volmit.iris.command.CommandIrisObjectXAY xay => k - private com.volmit.iris.command.CommandIrisObjectXPY xpy => o - MethodsOf: com.volmit.iris.command.CommandIrisObject + FieldsOf: com.volmit.iris.manager.command.CommandIrisObject + private com.volmit.iris.manager.command.CommandIrisObjectContract contract => m + private com.volmit.iris.manager.command.CommandIrisObjectExpand expand => p + private com.volmit.iris.manager.command.CommandIrisObjectP1 p1 => l + private com.volmit.iris.manager.command.CommandIrisObjectP2 p2 => n + private com.volmit.iris.manager.command.CommandIrisObjectPaste paste => i + private com.volmit.iris.manager.command.CommandIrisObjectSave save => j + private com.volmit.iris.manager.command.CommandIrisObjectShift shift => h + private com.volmit.iris.manager.command.CommandIrisObjectWand wand => g + private com.volmit.iris.manager.command.CommandIrisObjectXAY xay => k + private com.volmit.iris.manager.command.CommandIrisObjectXPY xpy => o + MethodsOf: com.volmit.iris.manager.command.CommandIrisObject static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisObject + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObject 42 => 8 43 => 7 44 => 2 @@ -2110,15 +2110,15 @@ Class: public com.volmit.iris.command.CommandIrisObject NameNotChanged 53 => 1 59 => 3 -Class: public com.volmit.iris.command.CommandIrisObjectContract NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisObjectContract NameNotChanged Source: "CommandIrisObjectContract.java" - FieldsOf: com.volmit.iris.command.CommandIrisObjectContract - MethodsOf: com.volmit.iris.command.CommandIrisObjectContract + FieldsOf: com.volmit.iris.manager.command.CommandIrisObjectContract + MethodsOf: com.volmit.iris.manager.command.CommandIrisObjectContract static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisObjectContract + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObjectContract 18 => 23 19 => 18 20 => 3 @@ -2146,15 +2146,15 @@ Class: public com.volmit.iris.command.CommandIrisObjectContract NameNotChanged 54 => 13 60 => 16 -Class: public com.volmit.iris.command.CommandIrisObjectExpand NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisObjectExpand NameNotChanged Source: "CommandIrisObjectExpand.java" - FieldsOf: com.volmit.iris.command.CommandIrisObjectExpand - MethodsOf: com.volmit.iris.command.CommandIrisObjectExpand + FieldsOf: com.volmit.iris.manager.command.CommandIrisObjectExpand + MethodsOf: com.volmit.iris.manager.command.CommandIrisObjectExpand static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisObjectExpand + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObjectExpand 18 => 3 19 => 2 20 => 17 @@ -2182,15 +2182,15 @@ Class: public com.volmit.iris.command.CommandIrisObjectExpand NameNotChanged 54 => 5 60 => 12 -Class: public com.volmit.iris.command.CommandIrisObjectP1 NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisObjectP1 NameNotChanged Source: "CommandIrisObjectP1.java" - FieldsOf: com.volmit.iris.command.CommandIrisObjectP1 - MethodsOf: com.volmit.iris.command.CommandIrisObjectP1 + FieldsOf: com.volmit.iris.manager.command.CommandIrisObjectP1 + MethodsOf: com.volmit.iris.manager.command.CommandIrisObjectP1 static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisObjectP1 + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObjectP1 19 => 18 20 => 7 21 => 17 @@ -2213,15 +2213,15 @@ Class: public com.volmit.iris.command.CommandIrisObjectP1 NameNotChanged 58 => 1 64 => 21 -Class: public com.volmit.iris.command.CommandIrisObjectP2 NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisObjectP2 NameNotChanged Source: "CommandIrisObjectP2.java" - FieldsOf: com.volmit.iris.command.CommandIrisObjectP2 - MethodsOf: com.volmit.iris.command.CommandIrisObjectP2 + FieldsOf: com.volmit.iris.manager.command.CommandIrisObjectP2 + MethodsOf: com.volmit.iris.manager.command.CommandIrisObjectP2 static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisObjectP2 + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObjectP2 19 => 10 20 => 18 21 => 12 @@ -2244,15 +2244,15 @@ Class: public com.volmit.iris.command.CommandIrisObjectP2 NameNotChanged 58 => 20 64 => 7 -Class: public com.volmit.iris.command.CommandIrisObjectPaste NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisObjectPaste NameNotChanged Source: "CommandIrisObjectPaste.java" - FieldsOf: com.volmit.iris.command.CommandIrisObjectPaste - MethodsOf: com.volmit.iris.command.CommandIrisObjectPaste + FieldsOf: com.volmit.iris.manager.command.CommandIrisObjectPaste + MethodsOf: com.volmit.iris.manager.command.CommandIrisObjectPaste static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisObjectPaste + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObjectPaste 22 => 1 23 => 9 24 => 8 @@ -2286,16 +2286,16 @@ Class: public com.volmit.iris.command.CommandIrisObjectPaste NameNotChanged 77 => 3 83 => 33 -Class: public com.volmit.iris.command.CommandIrisObjectSave NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisObjectSave NameNotChanged Source: "CommandIrisObjectSave.java" - FieldsOf: com.volmit.iris.command.CommandIrisObjectSave - MethodsOf: com.volmit.iris.command.CommandIrisObjectSave + FieldsOf: com.volmit.iris.manager.command.CommandIrisObjectSave + MethodsOf: com.volmit.iris.manager.command.CommandIrisObjectSave static void () SignatureNotChanged public void () SignatureNotChanged private static java.lang.Throwable a(java.lang.Throwable) SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisObjectSave + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObjectSave 19 => 22 20 => 1 21 => 7 @@ -2330,15 +2330,15 @@ Class: public com.volmit.iris.command.CommandIrisObjectSave NameNotChanged 79 => 10 85 => 4 -Class: public com.volmit.iris.command.CommandIrisObjectShift NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisObjectShift NameNotChanged Source: "CommandIrisObjectShift.java" - FieldsOf: com.volmit.iris.command.CommandIrisObjectShift - MethodsOf: com.volmit.iris.command.CommandIrisObjectShift + FieldsOf: com.volmit.iris.manager.command.CommandIrisObjectShift + MethodsOf: com.volmit.iris.manager.command.CommandIrisObjectShift static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisObjectShift + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObjectShift 18 => 26 19 => 12 20 => 19 @@ -2367,15 +2367,15 @@ Class: public com.volmit.iris.command.CommandIrisObjectShift NameNotChanged 55 => 8 61 => 21 -Class: public com.volmit.iris.command.CommandIrisObjectWand NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisObjectWand NameNotChanged Source: "CommandIrisObjectWand.java" - FieldsOf: com.volmit.iris.command.CommandIrisObjectWand - MethodsOf: com.volmit.iris.command.CommandIrisObjectWand + FieldsOf: com.volmit.iris.manager.command.CommandIrisObjectWand + MethodsOf: com.volmit.iris.manager.command.CommandIrisObjectWand static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisObjectWand + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObjectWand 14 => 4 15 => 5 16 => 2 @@ -2389,15 +2389,15 @@ Class: public com.volmit.iris.command.CommandIrisObjectWand NameNotChanged 32 => 12 38 => 1 -Class: public com.volmit.iris.command.CommandIrisObjectXAY NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisObjectXAY NameNotChanged Source: "CommandIrisObjectXAY.java" - FieldsOf: com.volmit.iris.command.CommandIrisObjectXAY - MethodsOf: com.volmit.iris.command.CommandIrisObjectXAY + FieldsOf: com.volmit.iris.manager.command.CommandIrisObjectXAY + MethodsOf: com.volmit.iris.manager.command.CommandIrisObjectXAY static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisObjectXAY + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObjectXAY 20 => 44 21 => 37 22 => 20 @@ -2444,15 +2444,15 @@ Class: public com.volmit.iris.command.CommandIrisObjectXAY NameNotChanged 83 => 22 89 => 26 -Class: public com.volmit.iris.command.CommandIrisObjectXPY NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisObjectXPY NameNotChanged Source: "CommandIrisObjectXPY.java" - FieldsOf: com.volmit.iris.command.CommandIrisObjectXPY - MethodsOf: com.volmit.iris.command.CommandIrisObjectXPY + FieldsOf: com.volmit.iris.manager.command.CommandIrisObjectXPY + MethodsOf: com.volmit.iris.manager.command.CommandIrisObjectXPY static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisObjectXPY + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisObjectXPY 20 => 15 21 => 34 22 => 12 @@ -2492,16 +2492,16 @@ Class: public com.volmit.iris.command.CommandIrisObjectXPY NameNotChanged 71 => 29 77 => 3 -Class: public com.volmit.iris.command.CommandIrisPregen NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisPregen NameNotChanged Source: "CommandIrisPregen.java" - FieldsOf: com.volmit.iris.command.CommandIrisPregen - MethodsOf: com.volmit.iris.command.CommandIrisPregen + FieldsOf: com.volmit.iris.manager.command.CommandIrisPregen + MethodsOf: com.volmit.iris.manager.command.CommandIrisPregen static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged private static synthetic void lambda$handle$0() SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisPregen + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisPregen 15 => 17 16 => 20 17 => 1 @@ -2523,22 +2523,22 @@ Class: public com.volmit.iris.command.CommandIrisPregen NameNotChanged 54 => 5 60 => 14 -Class: public com.volmit.iris.command.CommandIrisStructure NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisStructure NameNotChanged Source: "CommandIrisStructure.java" - FieldsOf: com.volmit.iris.command.CommandIrisStructure - private com.volmit.iris.command.CommandIrisStructureClose close => k - private com.volmit.iris.command.CommandIrisStructureCreate create => i - private com.volmit.iris.command.CommandIrisStructureExpand expand => m - private com.volmit.iris.command.CommandIrisStructureMore more => j - private com.volmit.iris.command.CommandIrisStructureOpen open => h - private com.volmit.iris.command.CommandIrisStructureSave save => l - private com.volmit.iris.command.CommandIrisStructureVariants variants => g - MethodsOf: com.volmit.iris.command.CommandIrisStructure + FieldsOf: com.volmit.iris.manager.command.CommandIrisStructure + private com.volmit.iris.manager.command.CommandIrisStructureClose close => k + private com.volmit.iris.manager.command.CommandIrisStructureCreate create => i + private com.volmit.iris.manager.command.CommandIrisStructureExpand expand => m + private com.volmit.iris.manager.command.CommandIrisStructureMore more => j + private com.volmit.iris.manager.command.CommandIrisStructureOpen open => h + private com.volmit.iris.manager.command.CommandIrisStructureSave save => l + private com.volmit.iris.manager.command.CommandIrisStructureVariants variants => g + MethodsOf: com.volmit.iris.manager.command.CommandIrisStructure static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisStructure + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStructure 33 => 1 34 => 2 35 => 4 @@ -2549,15 +2549,15 @@ Class: public com.volmit.iris.command.CommandIrisStructure NameNotChanged 44 => 3 50 => 6 -Class: public com.volmit.iris.command.CommandIrisStructureClose NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisStructureClose NameNotChanged Source: "CommandIrisStructureClose.java" - FieldsOf: com.volmit.iris.command.CommandIrisStructureClose - MethodsOf: com.volmit.iris.command.CommandIrisStructureClose + FieldsOf: com.volmit.iris.manager.command.CommandIrisStructureClose + MethodsOf: com.volmit.iris.manager.command.CommandIrisStructureClose static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisStructureClose + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStructureClose 14 => 1 15 => 11 16 => 3 @@ -2576,15 +2576,15 @@ Class: public com.volmit.iris.command.CommandIrisStructureClose NameNotChanged 41 => 12 47 => 17 -Class: public com.volmit.iris.command.CommandIrisStructureCreate NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisStructureCreate NameNotChanged Source: "CommandIrisStructureCreate.java" - FieldsOf: com.volmit.iris.command.CommandIrisStructureCreate - MethodsOf: com.volmit.iris.command.CommandIrisStructureCreate + FieldsOf: com.volmit.iris.manager.command.CommandIrisStructureCreate + MethodsOf: com.volmit.iris.manager.command.CommandIrisStructureCreate static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisStructureCreate + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStructureCreate 14 => 1 15 => 5 16 => 7 @@ -2603,15 +2603,15 @@ Class: public com.volmit.iris.command.CommandIrisStructureCreate NameNotChanged 44 => 12 50 => 4 -Class: public com.volmit.iris.command.CommandIrisStructureExpand NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisStructureExpand NameNotChanged Source: "CommandIrisStructureExpand.java" - FieldsOf: com.volmit.iris.command.CommandIrisStructureExpand - MethodsOf: com.volmit.iris.command.CommandIrisStructureExpand + FieldsOf: com.volmit.iris.manager.command.CommandIrisStructureExpand + MethodsOf: com.volmit.iris.manager.command.CommandIrisStructureExpand static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisStructureExpand + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStructureExpand 14 => 2 15 => 5 16 => 8 @@ -2630,15 +2630,15 @@ Class: public com.volmit.iris.command.CommandIrisStructureExpand NameNotChanged 41 => 7 47 => 9 -Class: public com.volmit.iris.command.CommandIrisStructureMore NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisStructureMore NameNotChanged Source: "CommandIrisStructureMore.java" - FieldsOf: com.volmit.iris.command.CommandIrisStructureMore - MethodsOf: com.volmit.iris.command.CommandIrisStructureMore + FieldsOf: com.volmit.iris.manager.command.CommandIrisStructureMore + MethodsOf: com.volmit.iris.manager.command.CommandIrisStructureMore static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisStructureMore + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStructureMore 14 => 2 15 => 13 16 => 17 @@ -2657,15 +2657,15 @@ Class: public com.volmit.iris.command.CommandIrisStructureMore NameNotChanged 41 => 7 47 => 8 -Class: public com.volmit.iris.command.CommandIrisStructureOpen NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisStructureOpen NameNotChanged Source: "CommandIrisStructureOpen.java" - FieldsOf: com.volmit.iris.command.CommandIrisStructureOpen - MethodsOf: com.volmit.iris.command.CommandIrisStructureOpen + FieldsOf: com.volmit.iris.manager.command.CommandIrisStructureOpen + MethodsOf: com.volmit.iris.manager.command.CommandIrisStructureOpen static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisStructureOpen + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStructureOpen 15 => 15 16 => 2 17 => 9 @@ -2684,15 +2684,15 @@ Class: public com.volmit.iris.command.CommandIrisStructureOpen NameNotChanged 43 => 1 49 => 16 -Class: public com.volmit.iris.command.CommandIrisStructureSave NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisStructureSave NameNotChanged Source: "CommandIrisStructureSave.java" - FieldsOf: com.volmit.iris.command.CommandIrisStructureSave - MethodsOf: com.volmit.iris.command.CommandIrisStructureSave + FieldsOf: com.volmit.iris.manager.command.CommandIrisStructureSave + MethodsOf: com.volmit.iris.manager.command.CommandIrisStructureSave static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisStructureSave + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStructureSave 14 => 7 15 => 4 16 => 1 @@ -2711,16 +2711,16 @@ Class: public com.volmit.iris.command.CommandIrisStructureSave NameNotChanged 41 => 15 47 => 13 -Class: public com.volmit.iris.command.CommandIrisStructureVariants NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisStructureVariants NameNotChanged Source: "CommandIrisStructureVariants.java" - FieldsOf: com.volmit.iris.command.CommandIrisStructureVariants - MethodsOf: com.volmit.iris.command.CommandIrisStructureVariants + FieldsOf: com.volmit.iris.manager.command.CommandIrisStructureVariants + MethodsOf: com.volmit.iris.manager.command.CommandIrisStructureVariants static void () SignatureNotChanged public void () SignatureNotChanged private static java.lang.Throwable a(java.lang.Throwable) SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisStructureVariants + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStructureVariants 13 => 3 14 => 11 15 => 9 @@ -2737,31 +2737,31 @@ Class: public com.volmit.iris.command.CommandIrisStructureVariants NameNotChange 40 => 8 46 => 14 -Class: public com.volmit.iris.command.CommandIrisStudio NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisStudio NameNotChanged Source: "CommandIrisStudio.java" - FieldsOf: com.volmit.iris.command.CommandIrisStudio - private com.volmit.iris.command.CommandIrisStudioClose close => g - private com.volmit.iris.command.CommandIrisStudioCreate create => u - private com.volmit.iris.command.CommandIrisEditBiome ebiome => s - private com.volmit.iris.command.CommandIrisGoto got0 => j - private com.volmit.iris.command.CommandIrisHotload hotload => p - private com.volmit.iris.command.CommandIrisStudioList list => i - private com.volmit.iris.command.CommandIrisLoot loot => k - private com.volmit.iris.command.CommandIrisMap map => h - private com.volmit.iris.command.CommandIrisMetrics metrics => q - private com.volmit.iris.command.CommandIrisStudioOpen open => l - private com.volmit.iris.command.CommandIrisStudioPackage pkg => t - private com.volmit.iris.command.CommandIrisPregen pregen => o - private com.volmit.iris.command.CommandIrisTC tc => v - private com.volmit.iris.command.CommandIrisStudioUpdate update => m - private com.volmit.iris.command.CommandIrisStudioVerify verify => r - private com.volmit.iris.command.CommandIrisPregen world => n - MethodsOf: com.volmit.iris.command.CommandIrisStudio + FieldsOf: com.volmit.iris.manager.command.CommandIrisStudio + private com.volmit.iris.manager.command.CommandIrisStudioClose close => g + private com.volmit.iris.manager.command.CommandIrisStudioCreate create => u + private com.volmit.iris.manager.command.CommandIrisEditBiome ebiome => s + private com.volmit.iris.manager.command.CommandIrisGoto got0 => j + private com.volmit.iris.manager.command.CommandIrisHotload hotload => p + private com.volmit.iris.manager.command.CommandIrisStudioList list => i + private com.volmit.iris.manager.command.CommandIrisLoot loot => k + private com.volmit.iris.manager.command.CommandIrisMap map => h + private com.volmit.iris.manager.command.CommandIrisMetrics metrics => q + private com.volmit.iris.manager.command.CommandIrisStudioOpen open => l + private com.volmit.iris.manager.command.CommandIrisStudioPackage pkg => t + private com.volmit.iris.manager.command.CommandIrisPregen pregen => o + private com.volmit.iris.manager.command.CommandIrisTC tc => v + private com.volmit.iris.manager.command.CommandIrisStudioUpdate update => m + private com.volmit.iris.manager.command.CommandIrisStudioVerify verify => r + private com.volmit.iris.manager.command.CommandIrisPregen world => n + MethodsOf: com.volmit.iris.manager.command.CommandIrisStudio static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisStudio + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStudio 60 => 8 61 => 1 62 => 7 @@ -2771,15 +2771,15 @@ Class: public com.volmit.iris.command.CommandIrisStudio NameNotChanged 70 => 2 76 => 6 -Class: public com.volmit.iris.command.CommandIrisStudioClose NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisStudioClose NameNotChanged Source: "CommandIrisStudioClose.java" - FieldsOf: com.volmit.iris.command.CommandIrisStudioClose - MethodsOf: com.volmit.iris.command.CommandIrisStudioClose + FieldsOf: com.volmit.iris.manager.command.CommandIrisStudioClose + MethodsOf: com.volmit.iris.manager.command.CommandIrisStudioClose static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisStudioClose + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStudioClose 15 => 15 16 => 19 17 => 5 @@ -2807,15 +2807,15 @@ Class: public com.volmit.iris.command.CommandIrisStudioClose NameNotChanged 64 => 13 70 => 20 -Class: public com.volmit.iris.command.CommandIrisStudioCreate NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisStudioCreate NameNotChanged Source: "CommandIrisStudioCreate.java" - FieldsOf: com.volmit.iris.command.CommandIrisStudioCreate - MethodsOf: com.volmit.iris.command.CommandIrisStudioCreate + FieldsOf: com.volmit.iris.manager.command.CommandIrisStudioCreate + MethodsOf: com.volmit.iris.manager.command.CommandIrisStudioCreate static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisStudioCreate + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStudioCreate 12 => 12 13 => 10 14 => 11 @@ -2829,16 +2829,16 @@ Class: public com.volmit.iris.command.CommandIrisStudioCreate NameNotChanged 30 => 6 36 => 1 -Class: public com.volmit.iris.command.CommandIrisStudioList NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisStudioList NameNotChanged Source: "CommandIrisStudioList.java" - FieldsOf: com.volmit.iris.command.CommandIrisStudioList - MethodsOf: com.volmit.iris.command.CommandIrisStudioList + FieldsOf: com.volmit.iris.manager.command.CommandIrisStudioList + MethodsOf: com.volmit.iris.manager.command.CommandIrisStudioList static void () SignatureNotChanged public void () SignatureNotChanged private static java.lang.Throwable a(java.lang.Throwable) SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisStudioList + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStudioList 14 => 4 15 => 1 16 => 15 @@ -2858,15 +2858,15 @@ Class: public com.volmit.iris.command.CommandIrisStudioList NameNotChanged 46 => 13 52 => 9 -Class: public com.volmit.iris.command.CommandIrisStudioOpen NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisStudioOpen NameNotChanged Source: "CommandIrisStudioOpen.java" - FieldsOf: com.volmit.iris.command.CommandIrisStudioOpen - MethodsOf: com.volmit.iris.command.CommandIrisStudioOpen + FieldsOf: com.volmit.iris.manager.command.CommandIrisStudioOpen + MethodsOf: com.volmit.iris.manager.command.CommandIrisStudioOpen static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisStudioOpen + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStudioOpen 11 => 5 12 => 8 13 => 10 @@ -2878,16 +2878,16 @@ Class: public com.volmit.iris.command.CommandIrisStudioOpen NameNotChanged 26 => 2 32 => 3 -Class: public com.volmit.iris.command.CommandIrisStudioPackage NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisStudioPackage NameNotChanged Source: "CommandIrisStudioPackage.java" - FieldsOf: com.volmit.iris.command.CommandIrisStudioPackage - MethodsOf: com.volmit.iris.command.CommandIrisStudioPackage + FieldsOf: com.volmit.iris.manager.command.CommandIrisStudioPackage + MethodsOf: com.volmit.iris.manager.command.CommandIrisStudioPackage static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged private static synthetic void lambda$handle$0(java.lang.String[], com.volmit.iris.util.MortarSender) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisStudioPackage + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStudioPackage 12 => 12 13 => 5 14 => 18 @@ -2907,15 +2907,15 @@ Class: public com.volmit.iris.command.CommandIrisStudioPackage NameNotChanged 43 => 6 49 => 3 -Class: public com.volmit.iris.command.CommandIrisStudioUpdate NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisStudioUpdate NameNotChanged Source: "CommandIrisStudioUpdate.java" - FieldsOf: com.volmit.iris.command.CommandIrisStudioUpdate - MethodsOf: com.volmit.iris.command.CommandIrisStudioUpdate + FieldsOf: com.volmit.iris.manager.command.CommandIrisStudioUpdate + MethodsOf: com.volmit.iris.manager.command.CommandIrisStudioUpdate static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisStudioUpdate + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStudioUpdate 9 => 1 10 => 5 11 => 3 @@ -2928,16 +2928,16 @@ Class: public com.volmit.iris.command.CommandIrisStudioUpdate NameNotChanged 24 => 4 29 => 9 -Class: public com.volmit.iris.command.CommandIrisStudioVerify NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisStudioVerify NameNotChanged Source: "CommandIrisStudioVerify.java" - FieldsOf: com.volmit.iris.command.CommandIrisStudioVerify - MethodsOf: com.volmit.iris.command.CommandIrisStudioVerify + FieldsOf: com.volmit.iris.manager.command.CommandIrisStudioVerify + MethodsOf: com.volmit.iris.manager.command.CommandIrisStudioVerify static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged private static synthetic void lambda$handle$0(com.volmit.iris.util.MortarSender, java.lang.String) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisStudioVerify + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisStudioVerify 10 => 14 11 => 15 12 => 18 @@ -2961,15 +2961,15 @@ Class: public com.volmit.iris.command.CommandIrisStudioVerify NameNotChanged 41 => 2 46 => 4 -Class: public com.volmit.iris.command.CommandIrisTC NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisTC NameNotChanged Source: "CommandIrisTC.java" - FieldsOf: com.volmit.iris.command.CommandIrisTC - MethodsOf: com.volmit.iris.command.CommandIrisTC + FieldsOf: com.volmit.iris.manager.command.CommandIrisTC + MethodsOf: com.volmit.iris.manager.command.CommandIrisTC static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisTC + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisTC 15 => 18 16 => 6 17 => 3 @@ -2990,17 +2990,17 @@ Class: public com.volmit.iris.command.CommandIrisTC NameNotChanged 47 => 13 53 => 5 -Class: public com.volmit.iris.command.CommandIrisWhat NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisWhat NameNotChanged Source: "CommandIrisWhat.java" - FieldsOf: com.volmit.iris.command.CommandIrisWhat - private com.volmit.iris.command.CommandIrisWhatBlock block => h - private com.volmit.iris.command.CommandIrisWhatHand hand => g - MethodsOf: com.volmit.iris.command.CommandIrisWhat + FieldsOf: com.volmit.iris.manager.command.CommandIrisWhat + private com.volmit.iris.manager.command.CommandIrisWhatBlock block => h + private com.volmit.iris.manager.command.CommandIrisWhatHand hand => g + MethodsOf: com.volmit.iris.manager.command.CommandIrisWhat static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisWhat + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisWhat 25 => 8 26 => 15 27 => 18 @@ -3022,15 +3022,15 @@ Class: public com.volmit.iris.command.CommandIrisWhat NameNotChanged 55 => 9 61 => 13 -Class: public com.volmit.iris.command.CommandIrisWhatBlock NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisWhatBlock NameNotChanged Source: "CommandIrisWhatBlock.java" - FieldsOf: com.volmit.iris.command.CommandIrisWhatBlock - MethodsOf: com.volmit.iris.command.CommandIrisWhatBlock + FieldsOf: com.volmit.iris.manager.command.CommandIrisWhatBlock + MethodsOf: com.volmit.iris.manager.command.CommandIrisWhatBlock static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisWhatBlock + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisWhatBlock 16 => 7 17 => 3 18 => 6 @@ -3047,15 +3047,15 @@ Class: public com.volmit.iris.command.CommandIrisWhatBlock NameNotChanged 39 => 15 45 => 8 -Class: public com.volmit.iris.command.CommandIrisWhatHand NameNotChanged +Class: public com.volmit.iris.manager.command.CommandIrisWhatHand NameNotChanged Source: "CommandIrisWhatHand.java" - FieldsOf: com.volmit.iris.command.CommandIrisWhatHand - MethodsOf: com.volmit.iris.command.CommandIrisWhatHand + FieldsOf: com.volmit.iris.manager.command.CommandIrisWhatHand + MethodsOf: com.volmit.iris.manager.command.CommandIrisWhatHand static void () SignatureNotChanged public void () SignatureNotChanged protected java.lang.String getArgsUsage() SignatureNotChanged public boolean handle(com.volmit.iris.util.MortarSender, java.lang.String[]) SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.CommandIrisWhatHand + LineNumbersOf: com.volmit.iris.manager.command.CommandIrisWhatHand 15 => 9 16 => 6 17 => 8 @@ -3072,12 +3072,12 @@ Class: public com.volmit.iris.command.CommandIrisWhatHand NameNotChanged 38 => 15 44 => 10 -Class: public com.volmit.iris.command.PermissionIris NameNotChanged +Class: public com.volmit.iris.manager.command.PermissionIris NameNotChanged Source: "PermissionIris.java" - FieldsOf: com.volmit.iris.command.PermissionIris + FieldsOf: com.volmit.iris.manager.command.PermissionIris private static java.lang.String[] a => b - public com.volmit.iris.command.PermissionIrisStudio studio NameNotChanged - MethodsOf: com.volmit.iris.command.PermissionIris + public com.volmit.iris.manager.command.PermissionIrisStudio studio NameNotChanged + MethodsOf: com.volmit.iris.manager.command.PermissionIris static void () SignatureNotChanged public void () SignatureNotChanged public static java.lang.String[] a() => b() @@ -3085,36 +3085,36 @@ Class: public com.volmit.iris.command.PermissionIris NameNotChanged public java.lang.String getDescription() SignatureNotChanged protected java.lang.String getNode() SignatureNotChanged public boolean isDefault() SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.PermissionIris + LineNumbersOf: com.volmit.iris.manager.command.PermissionIris 6 => 2 14 => 1 20 => 3 26 => 4 -Class: public com.volmit.iris.command.PermissionIrisStudio NameNotChanged +Class: public com.volmit.iris.manager.command.PermissionIrisStudio NameNotChanged Source: "PermissionIrisStudio.java" - FieldsOf: com.volmit.iris.command.PermissionIrisStudio - MethodsOf: com.volmit.iris.command.PermissionIrisStudio + FieldsOf: com.volmit.iris.manager.command.PermissionIrisStudio + MethodsOf: com.volmit.iris.manager.command.PermissionIrisStudio static void () SignatureNotChanged public void () SignatureNotChanged public java.lang.String getDescription() SignatureNotChanged protected java.lang.String getNode() SignatureNotChanged public boolean isDefault() SignatureNotChanged - LineNumbersOf: com.volmit.iris.command.PermissionIrisStudio + LineNumbersOf: com.volmit.iris.manager.command.PermissionIrisStudio 5 => 2 10 => 3 16 => 1 22 => 4 -Class: public abstract com.volmit.iris.gen.ContextualChunkGenerator NameNotChanged +Class: public abstract com.volmit.iris.generator.ContextualChunkGenerator NameNotChanged Source: "ContextualChunkGenerator.java" - FieldsOf: com.volmit.iris.gen.ContextualChunkGenerator + FieldsOf: com.volmit.iris.generator.ContextualChunkGenerator private static com.volmit.iris.util.VolmitPlugin[] a => e private com.volmit.iris.util.BlockPosition allowLoot => d - private com.volmit.iris.gen.atomics.AtomicMulticache cache => b + private com.volmit.iris.generator.legacy.atomics.AtomicMulticache cache => b private com.volmit.iris.IrisDataManager data => a protected boolean dev NameNotChanged - private com.volmit.iris.gen.atomics.AtomicCache dimCache => f + private com.volmit.iris.generator.legacy.atomics.AtomicCache dimCache => f protected boolean failing NameNotChanged private boolean fastPregen => c protected int generated NameNotChanged @@ -3131,7 +3131,7 @@ Class: public abstract com.volmit.iris.gen.ContextualChunkGenerator NameNotChang protected com.volmit.iris.util.ChronoLatch tickLatch NameNotChanged protected int ticks NameNotChanged protected org.bukkit.World world NameNotChanged - MethodsOf: com.volmit.iris.gen.ContextualChunkGenerator + MethodsOf: com.volmit.iris.generator.ContextualChunkGenerator static void () SignatureNotChanged public void () SignatureNotChanged public static com.volmit.iris.util.VolmitPlugin[] a() => b() @@ -3148,10 +3148,10 @@ Class: public abstract com.volmit.iris.gen.ContextualChunkGenerator NameNotChang protected org.bukkit.generator.ChunkGenerator$ChunkData generateChunkDataFailure(org.bukkit.World, java.util.Random, int, int, org.bukkit.generator.ChunkGenerator$BiomeGrid) SignatureNotChanged protected org.bukkit.generator.ChunkGenerator$ChunkData generateChunkFastPregen(org.bukkit.World, java.util.Random, int, int, org.bukkit.generator.ChunkGenerator$BiomeGrid) SignatureNotChanged public com.volmit.iris.util.BlockPosition getAllowLoot() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicMulticache getCache() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicMulticache getCache() SignatureNotChanged public com.volmit.iris.IrisDataManager getData() SignatureNotChanged public java.util.List getDefaultPopulators(org.bukkit.World) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getDimCache() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getDimCache() SignatureNotChanged public org.bukkit.Location getFixedSpawnLocation(org.bukkit.World, java.util.Random) SignatureNotChanged public int getGenerated() SignatureNotChanged public long getHlast() SignatureNotChanged @@ -3203,7 +3203,7 @@ Class: public abstract com.volmit.iris.gen.ContextualChunkGenerator NameNotChang public void setHotloadable(boolean) SignatureNotChanged private void tick() => a() public java.lang.String toString() SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.ContextualChunkGenerator + LineNumbersOf: com.volmit.iris.generator.ContextualChunkGenerator 53 => 33, 47, 55, 73, 86, 92, 94, 101, 106, 110, 115, 119, 132, 140, 157, 171, 174, 181, 186, 189, 201, 203 and 215 54 => 56, 68 and 144 75 => 152 @@ -3392,15 +3392,15 @@ Class: public abstract com.volmit.iris.gen.ContextualChunkGenerator NameNotChang 521 => 23 527 => 5 -Class: public abstract com.volmit.iris.gen.DimensionChunkGenerator NameNotChanged +Class: public abstract com.volmit.iris.generator.DimensionChunkGenerator NameNotChanged Source: "DimensionChunkGenerator.java" - FieldsOf: com.volmit.iris.gen.DimensionChunkGenerator + FieldsOf: com.volmit.iris.generator.DimensionChunkGenerator protected static final org.bukkit.block.data.BlockData AIR NameNotChanged protected static final org.bukkit.block.data.BlockData BEDROCK NameNotChanged protected static final org.bukkit.block.data.BlockData CAVE_AIR NameNotChanged protected static final org.bukkit.block.data.BlockData WATER NameNotChanged protected java.lang.String dimensionName NameNotChanged - MethodsOf: com.volmit.iris.gen.DimensionChunkGenerator + MethodsOf: com.volmit.iris.generator.DimensionChunkGenerator static void () SignatureNotChanged public void (java.lang.String) SignatureNotChanged private static java.lang.RuntimeException a(java.lang.RuntimeException) SignatureNotChanged @@ -3417,7 +3417,7 @@ Class: public abstract com.volmit.iris.gen.DimensionChunkGenerator NameNotChange public void onPlayerLeft(org.bukkit.entity.Player) SignatureNotChanged public void onTick(int) SignatureNotChanged public java.lang.String toString() SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.DimensionChunkGenerator + LineNumbersOf: com.volmit.iris.generator.DimensionChunkGenerator 22 => 21 23 => 10, 25 and 52 26 => 41 @@ -3469,19 +3469,19 @@ Class: public abstract com.volmit.iris.gen.DimensionChunkGenerator NameNotChange 131 => 34 136 => 35 -Class: public com.volmit.iris.gen.IrisChunkGenerator NameNotChanged +Class: public com.volmit.iris.generator.IrisChunkGenerator NameNotChanged Source: "IrisChunkGenerator.java" - FieldsOf: com.volmit.iris.gen.IrisChunkGenerator + FieldsOf: com.volmit.iris.generator.IrisChunkGenerator private com.volmit.iris.util.KMap b => z private com.volmit.iris.object.IrisBiome hb => A private com.volmit.iris.object.IrisRegion hr => B private java.lang.reflect.Method initLighting => y - MethodsOf: com.volmit.iris.gen.IrisChunkGenerator + MethodsOf: com.volmit.iris.generator.IrisChunkGenerator static void () SignatureNotChanged public void (int) SignatureNotChanged public void (java.lang.String, int) SignatureNotChanged protected boolean canEqual(java.lang.Object) SignatureNotChanged - public com.volmit.iris.gui.Renderer createRenderer() SignatureNotChanged + public com.volmit.iris.manager.gui.Renderer createRenderer() SignatureNotChanged public boolean equals(java.lang.Object) SignatureNotChanged public org.bukkit.generator.ChunkGenerator$ChunkData generateChunkData(org.bukkit.World, java.util.Random, int, int, org.bukkit.generator.ChunkGenerator$BiomeGrid) SignatureNotChanged public com.volmit.iris.util.KMap getB() SignatureNotChanged @@ -3508,7 +3508,7 @@ Class: public com.volmit.iris.gen.IrisChunkGenerator NameNotChanged public boolean shouldGenerateMobs() SignatureNotChanged public boolean shouldGenerateStructures() SignatureNotChanged public java.lang.String toString() SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.IrisChunkGenerator + LineNumbersOf: com.volmit.iris.generator.IrisChunkGenerator 38 => 11 39 => 27, 103 and 141 42 => 45 @@ -3658,20 +3658,20 @@ Class: public com.volmit.iris.gen.IrisChunkGenerator NameNotChanged 430 => 128 432 => 116 -Class: public abstract com.volmit.iris.gen.ParallaxChunkGenerator NameNotChanged +Class: public abstract com.volmit.iris.generator.ParallaxChunkGenerator NameNotChanged Source: "ParallaxChunkGenerator.java" - FieldsOf: com.volmit.iris.gen.ParallaxChunkGenerator + FieldsOf: com.volmit.iris.generator.ParallaxChunkGenerator private short cacheID => r private com.volmit.iris.util.IrisLock flock => v - private com.volmit.iris.gen.layer.GenLayerText glText => x - private com.volmit.iris.gen.layer.GenLayerUpdate glUpdate => w + private com.volmit.iris.generator.legacy.layer.GenLayerText glText => x + private com.volmit.iris.generator.legacy.layer.GenLayerUpdate glUpdate => w private com.volmit.iris.util.IrisLock lock => u private com.volmit.iris.util.IrisLock lockq => s - private com.volmit.iris.gen.atomics.MasterLock masterLock => t - protected com.volmit.iris.gen.atomics.AtomicWorldData parallaxMap NameNotChanged + private com.volmit.iris.generator.legacy.atomics.MasterLock masterLock => t + protected com.volmit.iris.generator.legacy.atomics.AtomicWorldData parallaxMap NameNotChanged private int sliverBuffer => q protected com.volmit.iris.util.KMap sliverCache NameNotChanged - MethodsOf: com.volmit.iris.gen.ParallaxChunkGenerator + MethodsOf: com.volmit.iris.generator.ParallaxChunkGenerator static void () SignatureNotChanged public void (java.lang.String, int) SignatureNotChanged private static java.lang.Throwable c(java.lang.Throwable) SignatureNotChanged @@ -3681,15 +3681,15 @@ Class: public abstract com.volmit.iris.gen.ParallaxChunkGenerator NameNotChanged public short getCacheID() SignatureNotChanged public java.util.List getDefaultPopulators(org.bukkit.World) SignatureNotChanged public com.volmit.iris.util.IrisLock getFlock() SignatureNotChanged - public com.volmit.iris.gen.layer.GenLayerText getGlText() SignatureNotChanged - public com.volmit.iris.gen.layer.GenLayerUpdate getGlUpdate() SignatureNotChanged + public com.volmit.iris.generator.legacy.layer.GenLayerText getGlText() SignatureNotChanged + public com.volmit.iris.generator.legacy.layer.GenLayerUpdate getGlUpdate() SignatureNotChanged public int getHighest(int, int, boolean) SignatureNotChanged public com.volmit.iris.util.IrisLock getLock() SignatureNotChanged public com.volmit.iris.util.IrisLock getLockq() SignatureNotChanged - public com.volmit.iris.gen.atomics.MasterLock getMasterLock() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicSliverMap getParallaxChunk(int, int) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicWorldData getParallaxMap() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicSliver getParallaxSliver(int, int) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.MasterLock getMasterLock() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicSliverMap getParallaxChunk(int, int) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicWorldData getParallaxMap() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicSliver getParallaxSliver(int, int) SignatureNotChanged public int getSliverBuffer() SignatureNotChanged protected com.volmit.iris.util.KMap getSliverCache() SignatureNotChanged public com.volmit.iris.util.IrisStructureResult getStructure(int, int, int) SignatureNotChanged @@ -3711,15 +3711,15 @@ Class: public abstract com.volmit.iris.gen.ParallaxChunkGenerator NameNotChanged protected void onGenerateParallax(com.volmit.iris.util.RNG, int, int) SignatureNotChanged public void onHotload() SignatureNotChanged public void onInit(org.bukkit.World, com.volmit.iris.util.RNG) SignatureNotChanged - protected void onPostGenerate(com.volmit.iris.util.RNG, int, int, org.bukkit.generator.ChunkGenerator$ChunkData, org.bukkit.generator.ChunkGenerator$BiomeGrid, com.volmit.iris.util.HeightMap, com.volmit.iris.util.BiomeMap, com.volmit.iris.gen.atomics.AtomicSliverMap) SignatureNotChanged + protected void onPostGenerate(com.volmit.iris.util.RNG, int, int, org.bukkit.generator.ChunkGenerator$ChunkData, org.bukkit.generator.ChunkGenerator$BiomeGrid, com.volmit.iris.util.HeightMap, com.volmit.iris.util.BiomeMap, com.volmit.iris.generator.legacy.atomics.AtomicSliverMap) SignatureNotChanged public void placeCaveObject(com.volmit.iris.object.IrisObjectPlacement, int, int, com.volmit.iris.util.RNG) SignatureNotChanged public void placeObject(com.volmit.iris.object.IrisObjectPlacement, int, int, com.volmit.iris.util.RNG) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicSliver sampleSliver(int, int) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicSliver sampleSliver(int, int) SignatureNotChanged public void set(int, int, int, org.bukkit.block.data.BlockData) SignatureNotChanged public void setSliverBuffer(int) SignatureNotChanged public void setSliverCache(com.volmit.iris.util.KMap) SignatureNotChanged public java.lang.String toString() SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.ParallaxChunkGenerator + LineNumbersOf: com.volmit.iris.generator.ParallaxChunkGenerator 38 => 12, 42, 55, 84, 88, 94, 97, 102, 196, 207 and 215 39 => 59, 139 and 159 42 => 203 @@ -3909,15 +3909,15 @@ Class: public abstract com.volmit.iris.gen.ParallaxChunkGenerator NameNotChanged 439 => 1 445 => 52 -Class: public abstract com.volmit.iris.gen.ParallelChunkGenerator NameNotChanged +Class: public abstract com.volmit.iris.generator.ParallelChunkGenerator NameNotChanged Source: "ParallelChunkGenerator.java" - FieldsOf: com.volmit.iris.gen.ParallelChunkGenerator + FieldsOf: com.volmit.iris.generator.ParallelChunkGenerator private com.volmit.iris.util.GroupedExecutor accelerant => i protected int cacheX NameNotChanged protected int cacheZ NameNotChanged protected boolean cachingAllowed NameNotChanged private int threads => j - MethodsOf: com.volmit.iris.gen.ParallelChunkGenerator + MethodsOf: com.volmit.iris.generator.ParallelChunkGenerator static void () SignatureNotChanged public void (java.lang.String, int) SignatureNotChanged protected boolean canEqual(java.lang.Object) SignatureNotChanged @@ -3930,15 +3930,15 @@ Class: public abstract com.volmit.iris.gen.ParallelChunkGenerator NameNotChanged public int hashCode() SignatureNotChanged public boolean isCachingAllowed() SignatureNotChanged public boolean isParallelCapable() SignatureNotChanged - private synthetic void lambda$onGenerate$0(int, int, int, int, int, int, com.volmit.iris.gen.atomics.AtomicSliver, com.volmit.iris.util.BiomeMap) SignatureNotChanged + private synthetic void lambda$onGenerate$0(int, int, int, int, int, int, com.volmit.iris.generator.legacy.atomics.AtomicSliver, com.volmit.iris.util.BiomeMap) SignatureNotChanged protected void onClose() SignatureNotChanged protected void onGenerate(com.volmit.iris.util.RNG, int, int, org.bukkit.generator.ChunkGenerator$ChunkData, org.bukkit.generator.ChunkGenerator$BiomeGrid) SignatureNotChanged - protected void onGenerateColumn(int, int, int, int, int, int, com.volmit.iris.gen.atomics.AtomicSliver, com.volmit.iris.util.BiomeMap) SignatureNotChanged - protected abstract void onGenerateColumn(int, int, int, int, int, int, com.volmit.iris.gen.atomics.AtomicSliver, com.volmit.iris.util.BiomeMap, boolean) SignatureNotChanged + protected void onGenerateColumn(int, int, int, int, int, int, com.volmit.iris.generator.legacy.atomics.AtomicSliver, com.volmit.iris.util.BiomeMap) SignatureNotChanged + protected abstract void onGenerateColumn(int, int, int, int, int, int, com.volmit.iris.generator.legacy.atomics.AtomicSliver, com.volmit.iris.util.BiomeMap, boolean) SignatureNotChanged public void onInit(org.bukkit.World, com.volmit.iris.util.RNG) SignatureNotChanged - protected abstract void onPostGenerate(com.volmit.iris.util.RNG, int, int, org.bukkit.generator.ChunkGenerator$ChunkData, org.bukkit.generator.ChunkGenerator$BiomeGrid, com.volmit.iris.util.HeightMap, com.volmit.iris.util.BiomeMap, com.volmit.iris.gen.atomics.AtomicSliverMap) SignatureNotChanged + protected abstract void onPostGenerate(com.volmit.iris.util.RNG, int, int, org.bukkit.generator.ChunkGenerator$ChunkData, org.bukkit.generator.ChunkGenerator$BiomeGrid, com.volmit.iris.util.HeightMap, com.volmit.iris.util.BiomeMap, com.volmit.iris.generator.legacy.atomics.AtomicSliverMap) SignatureNotChanged public java.lang.String toString() SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.ParallelChunkGenerator + LineNumbersOf: com.volmit.iris.generator.ParallelChunkGenerator 17 => 16 18 => 15, 44 and 49 21 => 26 @@ -3997,14 +3997,14 @@ Class: public abstract com.volmit.iris.gen.ParallelChunkGenerator NameNotChanged 122 => 14 127 => 13 -Class: public abstract com.volmit.iris.gen.PostBlockChunkGenerator NameNotChanged +Class: public abstract com.volmit.iris.generator.PostBlockChunkGenerator NameNotChanged Source: "PostBlockChunkGenerator.java" - FieldsOf: com.volmit.iris.gen.PostBlockChunkGenerator + FieldsOf: com.volmit.iris.generator.PostBlockChunkGenerator private com.volmit.iris.util.IrisLock lock NameNotChanged private int maxPhase NameNotChanged private int minPhase NameNotChanged private java.lang.String postKey NameNotChanged - MethodsOf: com.volmit.iris.gen.PostBlockChunkGenerator + MethodsOf: com.volmit.iris.generator.PostBlockChunkGenerator static void () SignatureNotChanged public void (java.lang.String, int) SignatureNotChanged private static java.lang.Throwable a(java.lang.Throwable) SignatureNotChanged @@ -4026,7 +4026,7 @@ Class: public abstract com.volmit.iris.gen.PostBlockChunkGenerator NameNotChange public void setPostBlock(int, int, int, org.bukkit.block.data.BlockData, int, int, org.bukkit.generator.ChunkGenerator$ChunkData) SignatureNotChanged public java.lang.String toString() SignatureNotChanged public void updateHeight(int, int, int) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.PostBlockChunkGenerator + LineNumbersOf: com.volmit.iris.generator.PostBlockChunkGenerator 24 => 4, 11 and 22 25 => 30, 54 and 62 28 => 6 @@ -4099,40 +4099,40 @@ Class: public abstract com.volmit.iris.gen.PostBlockChunkGenerator NameNotChange 182 => 75 193 => 36 -Class: public abstract com.volmit.iris.gen.TerrainChunkGenerator NameNotChanged +Class: public abstract com.volmit.iris.generator.TerrainChunkGenerator NameNotChanged Source: "TerrainChunkGenerator.java" - FieldsOf: com.volmit.iris.gen.TerrainChunkGenerator + FieldsOf: com.volmit.iris.generator.TerrainChunkGenerator protected com.volmit.iris.util.ChronoLatch cwarn NameNotChanged private com.volmit.iris.util.KMap generators => l - protected com.volmit.iris.gen.layer.GenLayerBiome glBiome NameNotChanged - private com.volmit.iris.gen.layer.GenLayerCarve glCarve => m - private com.volmit.iris.gen.layer.GenLayerCave glCave => n + protected com.volmit.iris.generator.legacy.layer.GenLayerBiome glBiome NameNotChanged + private com.volmit.iris.generator.legacy.layer.GenLayerCarve glCarve => m + private com.volmit.iris.generator.legacy.layer.GenLayerCave glCave => n private long lastChunkLoad => o private long lastUpdateRequest => p - protected com.volmit.iris.noise.CNG masterFracture NameNotChanged + protected com.volmit.iris.generator.noise.CNG masterFracture NameNotChanged protected com.volmit.iris.util.IrisLock regLock NameNotChanged private com.volmit.iris.util.RNG rockRandom => k - MethodsOf: com.volmit.iris.gen.TerrainChunkGenerator + MethodsOf: com.volmit.iris.generator.TerrainChunkGenerator static void () SignatureNotChanged public void (java.lang.String, int) SignatureNotChanged private static java.lang.RuntimeException b(java.lang.RuntimeException) SignatureNotChanged private void buildGenLayers(com.volmit.iris.util.RNG) => a(com.volmit.iris.util.RNG) protected boolean canEqual(java.lang.Object) SignatureNotChanged - private void decorateCave(com.volmit.iris.object.IrisBiome, com.volmit.iris.gen.atomics.AtomicSliver, double, int, double, int, int, org.bukkit.block.data.BlockData) => c(com.volmit.iris.object.IrisBiome, com.volmit.iris.gen.atomics.AtomicSliver, double, int, double, int, int, org.bukkit.block.data.BlockData) - private void decorateLand(com.volmit.iris.object.IrisBiome, com.volmit.iris.gen.atomics.AtomicSliver, double, int, double, int, int, org.bukkit.block.data.BlockData) => a(com.volmit.iris.object.IrisBiome, com.volmit.iris.gen.atomics.AtomicSliver, double, int, double, int, int, org.bukkit.block.data.BlockData) - private void decorateUnderwater(com.volmit.iris.object.IrisBiome, com.volmit.iris.gen.atomics.AtomicSliver, double, int, double, int, int, org.bukkit.block.data.BlockData) => b(com.volmit.iris.object.IrisBiome, com.volmit.iris.gen.atomics.AtomicSliver, double, int, double, int, int, org.bukkit.block.data.BlockData) + private void decorateCave(com.volmit.iris.object.IrisBiome, com.volmit.iris.generator.legacy.atomics.AtomicSliver, double, int, double, int, int, org.bukkit.block.data.BlockData) => c(com.volmit.iris.object.IrisBiome, com.volmit.iris.generator.legacy.atomics.AtomicSliver, double, int, double, int, int, org.bukkit.block.data.BlockData) + private void decorateLand(com.volmit.iris.object.IrisBiome, com.volmit.iris.generator.legacy.atomics.AtomicSliver, double, int, double, int, int, org.bukkit.block.data.BlockData) => a(com.volmit.iris.object.IrisBiome, com.volmit.iris.generator.legacy.atomics.AtomicSliver, double, int, double, int, int, org.bukkit.block.data.BlockData) + private void decorateUnderwater(com.volmit.iris.object.IrisBiome, com.volmit.iris.generator.legacy.atomics.AtomicSliver, double, int, double, int, int, org.bukkit.block.data.BlockData) => b(com.volmit.iris.object.IrisBiome, com.volmit.iris.generator.legacy.atomics.AtomicSliver, double, int, double, int, int, org.bukkit.block.data.BlockData) public boolean equals(java.lang.Object) SignatureNotChanged protected double getBiomeHeight(double, double) SignatureNotChanged public com.volmit.iris.util.KList getCaves(int, int) SignatureNotChanged public com.volmit.iris.util.ChronoLatch getCwarn() SignatureNotChanged public int getFluidHeight() SignatureNotChanged protected com.volmit.iris.util.KMap getGenerators() SignatureNotChanged - public com.volmit.iris.gen.layer.GenLayerBiome getGlBiome() SignatureNotChanged - public com.volmit.iris.gen.layer.GenLayerCarve getGlCarve() SignatureNotChanged - public com.volmit.iris.gen.layer.GenLayerCave getGlCave() SignatureNotChanged + public com.volmit.iris.generator.legacy.layer.GenLayerBiome getGlBiome() SignatureNotChanged + public com.volmit.iris.generator.legacy.layer.GenLayerCarve getGlCarve() SignatureNotChanged + public com.volmit.iris.generator.legacy.layer.GenLayerCave getGlCave() SignatureNotChanged public long getLastChunkLoad() SignatureNotChanged public long getLastUpdateRequest() SignatureNotChanged - public com.volmit.iris.noise.CNG getMasterFracture() SignatureNotChanged + public com.volmit.iris.generator.noise.CNG getMasterFracture() SignatureNotChanged private double getNoiseHeight(int, int) => b(int, int) protected double getRawBiomeHeight(double, double) SignatureNotChanged public com.volmit.iris.util.IrisLock getRegLock() SignatureNotChanged @@ -4153,12 +4153,12 @@ Class: public abstract com.volmit.iris.gen.TerrainChunkGenerator NameNotChanged protected void loadGenerators() SignatureNotChanged protected void loadGenerators(com.volmit.iris.object.IrisDimension) SignatureNotChanged protected void onGenerate(com.volmit.iris.util.RNG, int, int, org.bukkit.generator.ChunkGenerator$ChunkData, org.bukkit.generator.ChunkGenerator$BiomeGrid) SignatureNotChanged - protected void onGenerateColumn(int, int, int, int, int, int, com.volmit.iris.gen.atomics.AtomicSliver, com.volmit.iris.util.BiomeMap, boolean) SignatureNotChanged + protected void onGenerateColumn(int, int, int, int, int, int, com.volmit.iris.generator.legacy.atomics.AtomicSliver, com.volmit.iris.util.BiomeMap, boolean) SignatureNotChanged public void onHotload() SignatureNotChanged public void onInit(org.bukkit.World, com.volmit.iris.util.RNG) SignatureNotChanged - protected void onPostGenerate(com.volmit.iris.util.RNG, int, int, org.bukkit.generator.ChunkGenerator$ChunkData, org.bukkit.generator.ChunkGenerator$BiomeGrid, com.volmit.iris.util.HeightMap, com.volmit.iris.util.BiomeMap, com.volmit.iris.gen.atomics.AtomicSliverMap) SignatureNotChanged - protected void onPostParallaxPostGenerate(com.volmit.iris.util.RNG, int, int, org.bukkit.generator.ChunkGenerator$ChunkData, org.bukkit.generator.ChunkGenerator$BiomeGrid, com.volmit.iris.util.HeightMap, com.volmit.iris.util.BiomeMap, com.volmit.iris.gen.atomics.AtomicSliverMap) SignatureNotChanged - protected void onPreParallaxPostGenerate(com.volmit.iris.util.RNG, int, int, org.bukkit.generator.ChunkGenerator$ChunkData, org.bukkit.generator.ChunkGenerator$BiomeGrid, com.volmit.iris.util.HeightMap, com.volmit.iris.util.BiomeMap, com.volmit.iris.gen.atomics.AtomicSliverMap) SignatureNotChanged + protected void onPostGenerate(com.volmit.iris.util.RNG, int, int, org.bukkit.generator.ChunkGenerator$ChunkData, org.bukkit.generator.ChunkGenerator$BiomeGrid, com.volmit.iris.util.HeightMap, com.volmit.iris.util.BiomeMap, com.volmit.iris.generator.legacy.atomics.AtomicSliverMap) SignatureNotChanged + protected void onPostParallaxPostGenerate(com.volmit.iris.util.RNG, int, int, org.bukkit.generator.ChunkGenerator$ChunkData, org.bukkit.generator.ChunkGenerator$BiomeGrid, com.volmit.iris.util.HeightMap, com.volmit.iris.util.BiomeMap, com.volmit.iris.generator.legacy.atomics.AtomicSliverMap) SignatureNotChanged + protected void onPreParallaxPostGenerate(com.volmit.iris.util.RNG, int, int, org.bukkit.generator.ChunkGenerator$ChunkData, org.bukkit.generator.ChunkGenerator$BiomeGrid, com.volmit.iris.util.HeightMap, com.volmit.iris.util.BiomeMap, com.volmit.iris.generator.legacy.atomics.AtomicSliverMap) SignatureNotChanged public void registerGenerator(com.volmit.iris.object.IrisGenerator, com.volmit.iris.object.IrisDimension) SignatureNotChanged public com.volmit.iris.util.BiomeResult sampleBiome(int, int) SignatureNotChanged public com.volmit.iris.util.BiomeResult sampleCaveBiome(int, int) SignatureNotChanged @@ -4169,7 +4169,7 @@ Class: public abstract com.volmit.iris.gen.TerrainChunkGenerator NameNotChanged public com.volmit.iris.util.BiomeResult sampleTrueBiomeBase(int, int, int) SignatureNotChanged public java.lang.String toString() SignatureNotChanged private boolean touchesSea(int, int) => a(int, int) - LineNumbersOf: com.volmit.iris.gen.TerrainChunkGenerator + LineNumbersOf: com.volmit.iris.generator.TerrainChunkGenerator 41 => 38, 84, 89, 118, 179, 202, 203, 270, 305 and 327 42 => 45, 296 and 348 45 => 186 @@ -4516,9 +4516,9 @@ Class: public abstract com.volmit.iris.gen.TerrainChunkGenerator NameNotChanged 823 => 271 825 => 42 -Class: public com.volmit.iris.gen.atomics.AtomicCache NameNotChanged +Class: public com.volmit.iris.generator.legacy.atomics.AtomicCache NameNotChanged Source: "AtomicCache.java" - FieldsOf: com.volmit.iris.gen.atomics.AtomicCache + FieldsOf: com.volmit.iris.generator.legacy.atomics.AtomicCache private volatile transient long a => g private static int b => c private final com.volmit.iris.util.IrisLock check => f @@ -4527,7 +4527,7 @@ Class: public com.volmit.iris.gen.atomics.AtomicCache NameNotChanged private final com.volmit.iris.util.IrisLock time => e private volatile transient int validations => b private final com.volmit.iris.util.IrisLock write => h - MethodsOf: com.volmit.iris.gen.atomics.AtomicCache + MethodsOf: com.volmit.iris.generator.legacy.atomics.AtomicCache static void () SignatureNotChanged public void () SignatureNotChanged public void (boolean) SignatureNotChanged @@ -4537,7 +4537,7 @@ Class: public com.volmit.iris.gen.atomics.AtomicCache NameNotChanged public java.lang.Object aquireNull(java.util.function.Supplier) SignatureNotChanged public static int b() => a() public void reset() SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.atomics.AtomicCache + LineNumbersOf: com.volmit.iris.generator.legacy.atomics.AtomicCache 20 => 34 21 => 9 24 => 8 @@ -4593,9 +4593,9 @@ Class: public com.volmit.iris.gen.atomics.AtomicCache NameNotChanged 116 => 13 117 => 18 -Class: public com.volmit.iris.gen.atomics.AtomicMulticache NameNotChanged +Class: public com.volmit.iris.generator.legacy.atomics.AtomicMulticache NameNotChanged Source: "AtomicMulticache.java" - FieldsOf: com.volmit.iris.gen.atomics.AtomicMulticache + FieldsOf: com.volmit.iris.generator.legacy.atomics.AtomicMulticache private final com.volmit.iris.util.KMap biome => e public static boolean broken NameNotChanged private final com.volmit.iris.util.KMap height => c @@ -4603,7 +4603,7 @@ Class: public com.volmit.iris.gen.atomics.AtomicMulticache NameNotChanged private final com.volmit.iris.util.KMap region => a private final java.util.concurrent.atomic.AtomicInteger x => f private final java.util.concurrent.atomic.AtomicInteger z => d - MethodsOf: com.volmit.iris.gen.atomics.AtomicMulticache + MethodsOf: com.volmit.iris.generator.legacy.atomics.AtomicMulticache static void () SignatureNotChanged public void () SignatureNotChanged public void drop() SignatureNotChanged @@ -4615,7 +4615,7 @@ Class: public com.volmit.iris.gen.atomics.AtomicMulticache NameNotChanged private long pos(int, int) => a(int, int) public void targetChunk(int, int) SignatureNotChanged public void updateHeight(int, int, int) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.atomics.AtomicMulticache + LineNumbersOf: com.volmit.iris.generator.legacy.atomics.AtomicMulticache 13 => 6 22 => 42 23 => 50 @@ -4676,22 +4676,22 @@ Class: public com.volmit.iris.gen.atomics.AtomicMulticache NameNotChanged 145 => 2 146 => 14 -Class: public com.volmit.iris.gen.atomics.AtomicRegionData NameNotChanged +Class: public com.volmit.iris.generator.legacy.atomics.AtomicRegionData NameNotChanged Source: "AtomicRegionData.java" - FieldsOf: com.volmit.iris.gen.atomics.AtomicRegionData + FieldsOf: com.volmit.iris.generator.legacy.atomics.AtomicRegionData private com.volmit.iris.util.Tag[] tag => b private final org.bukkit.World world => a - MethodsOf: com.volmit.iris.gen.atomics.AtomicRegionData + MethodsOf: com.volmit.iris.generator.legacy.atomics.AtomicRegionData static void () SignatureNotChanged public void (org.bukkit.World) SignatureNotChanged private static java.lang.Throwable a(java.lang.Throwable) SignatureNotChanged public boolean contains(int, int) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicSliverMap get(int, int) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicSliverMap get(int, int) SignatureNotChanged public long guessMemoryUsage() SignatureNotChanged public void read(java.io.InputStream) SignatureNotChanged - public void set(int, int, com.volmit.iris.gen.atomics.AtomicSliverMap) SignatureNotChanged + public void set(int, int, com.volmit.iris.generator.legacy.atomics.AtomicSliverMap) SignatureNotChanged public void write(java.io.OutputStream) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.atomics.AtomicRegionData + LineNumbersOf: com.volmit.iris.generator.legacy.atomics.AtomicRegionData 28 => 21 29 => 58 30 => 9 @@ -4751,9 +4751,9 @@ Class: public com.volmit.iris.gen.atomics.AtomicRegionData NameNotChanged 165 => 3 169 => 48 -Class: public com.volmit.iris.gen.atomics.AtomicSliver NameNotChanged +Class: public com.volmit.iris.generator.legacy.atomics.AtomicSliver NameNotChanged Source: "AtomicSliver.java" - FieldsOf: com.volmit.iris.gen.atomics.AtomicSliver + FieldsOf: com.volmit.iris.generator.legacy.atomics.AtomicSliver public static final org.bukkit.block.data.BlockData AIR NameNotChanged private transient com.volmit.iris.util.KMap biome => d private com.volmit.iris.util.KMap block => f @@ -4767,7 +4767,7 @@ Class: public com.volmit.iris.gen.atomics.AtomicSliver NameNotChanged private transient com.volmit.iris.util.KMap truebiome => a private final transient int x => b private final transient int z => c - MethodsOf: com.volmit.iris.gen.atomics.AtomicSliver + MethodsOf: com.volmit.iris.generator.legacy.atomics.AtomicSliver static void () SignatureNotChanged public void (int, int) SignatureNotChanged private static java.io.IOException a(java.io.IOException) SignatureNotChanged @@ -4803,7 +4803,7 @@ Class: public com.volmit.iris.gen.atomics.AtomicSliver NameNotChanged public void write(java.io.DataOutputStream) SignatureNotChanged public void write(org.bukkit.generator.ChunkGenerator$BiomeGrid) SignatureNotChanged public void write(org.bukkit.generator.ChunkGenerator$ChunkData) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.atomics.AtomicSliver + LineNumbersOf: com.volmit.iris.generator.legacy.atomics.AtomicSliver 24 => 25, 97, 134 and 162 27 => 7 28 => 123 @@ -4955,26 +4955,26 @@ Class: public com.volmit.iris.gen.atomics.AtomicSliver NameNotChanged 392 => 120 393 => 17 -Class: public com.volmit.iris.gen.atomics.AtomicSliverMap NameNotChanged +Class: public com.volmit.iris.generator.legacy.atomics.AtomicSliverMap NameNotChanged Source: "AtomicSliverMap.java" - FieldsOf: com.volmit.iris.gen.atomics.AtomicSliverMap + FieldsOf: com.volmit.iris.generator.legacy.atomics.AtomicSliverMap private boolean parallaxGenerated => c - private final com.volmit.iris.gen.atomics.AtomicSliver[] slivers => a + private final com.volmit.iris.generator.legacy.atomics.AtomicSliver[] slivers => a private com.volmit.iris.util.KMap structures => b private boolean worldGenerated => d - MethodsOf: com.volmit.iris.gen.atomics.AtomicSliverMap + MethodsOf: com.volmit.iris.generator.legacy.atomics.AtomicSliverMap static void () SignatureNotChanged public void () SignatureNotChanged private static java.lang.Throwable a(java.lang.Throwable) SignatureNotChanged protected boolean canEqual(java.lang.Object) SignatureNotChanged public boolean equals(java.lang.Object) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicSliver getSliver(int, int) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicSliver[] getSlivers() SignatureNotChanged - public com.volmit.iris.util.IrisStructureResult getStructure(com.volmit.iris.gen.DimensionChunkGenerator, int) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicSliver getSliver(int, int) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicSliver[] getSlivers() SignatureNotChanged + public com.volmit.iris.util.IrisStructureResult getStructure(com.volmit.iris.generator.DimensionChunkGenerator, int) SignatureNotChanged public com.volmit.iris.util.KMap getStructures() SignatureNotChanged public int hashCode() SignatureNotChanged public void inject(org.bukkit.generator.ChunkGenerator$ChunkData) SignatureNotChanged - public void injectUpdates(com.volmit.iris.gen.atomics.AtomicSliverMap) SignatureNotChanged + public void injectUpdates(com.volmit.iris.generator.legacy.atomics.AtomicSliverMap) SignatureNotChanged public boolean isModified() SignatureNotChanged public boolean isParallaxGenerated() SignatureNotChanged public boolean isWorldGenerated() SignatureNotChanged @@ -4985,7 +4985,7 @@ Class: public com.volmit.iris.gen.atomics.AtomicSliverMap NameNotChanged public java.lang.String toString() SignatureNotChanged public void write(java.io.OutputStream) SignatureNotChanged public void write(org.bukkit.generator.ChunkGenerator$ChunkData, org.bukkit.generator.ChunkGenerator$BiomeGrid, com.volmit.iris.util.HeightMap) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.atomics.AtomicSliverMap + LineNumbersOf: com.volmit.iris.generator.legacy.atomics.AtomicSliverMap 22 => 13, 39, 53, 57, 60 and 76 25 => 15 26 => 74 @@ -5071,9 +5071,9 @@ Class: public com.volmit.iris.gen.atomics.AtomicSliverMap NameNotChanged 209 => 92 212 => 4 -Class: public com.volmit.iris.gen.atomics.AtomicWorldData NameNotChanged +Class: public com.volmit.iris.generator.legacy.atomics.AtomicWorldData NameNotChanged Source: "AtomicWorldData.java" - FieldsOf: com.volmit.iris.gen.atomics.AtomicWorldData + FieldsOf: com.volmit.iris.generator.legacy.atomics.AtomicWorldData private long last => h private com.volmit.iris.util.KMap lastChunk => g private com.volmit.iris.util.KMap lastRegion => a @@ -5083,12 +5083,12 @@ Class: public com.volmit.iris.gen.atomics.AtomicWorldData NameNotChanged private com.volmit.iris.util.KList unloadChunks => c private com.volmit.iris.util.KList unloadRegions => e private org.bukkit.World world => b - MethodsOf: com.volmit.iris.gen.atomics.AtomicWorldData + MethodsOf: com.volmit.iris.generator.legacy.atomics.AtomicWorldData static void () SignatureNotChanged public void (org.bukkit.World, java.lang.String) SignatureNotChanged private static java.io.IOException a(java.io.IOException) SignatureNotChanged public void clean(int) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicRegionData createSection(int, int) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicRegionData createSection(int, int) SignatureNotChanged public com.volmit.iris.util.KMap getLoadedChunks() SignatureNotChanged public com.volmit.iris.util.KMap getLoadedRegions() SignatureNotChanged public java.io.File getSubregionFile(int, int) SignatureNotChanged @@ -5097,9 +5097,9 @@ Class: public com.volmit.iris.gen.atomics.AtomicWorldData NameNotChanged private int getUnloadBatchSpeed() => b() public boolean isSectionLoaded(com.volmit.iris.util.ChunkPosition) SignatureNotChanged public boolean isSectionLoaded(int, int) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicSliverMap loadChunk(int, int) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicRegionData loadSection(int, int) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicRegionData loadSection(int, int, boolean) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicSliverMap loadChunk(int, int) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicRegionData loadSection(int, int) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicRegionData loadSection(int, int, boolean) SignatureNotChanged public void saveAll() SignatureNotChanged public void saveChunk(com.volmit.iris.util.ChunkPosition) SignatureNotChanged public void saveChunks() SignatureNotChanged @@ -5107,7 +5107,7 @@ Class: public com.volmit.iris.gen.atomics.AtomicWorldData NameNotChanged public boolean saveSection(com.volmit.iris.util.ChunkPosition) SignatureNotChanged public void unloadAll(boolean) SignatureNotChanged public boolean unloadSection(com.volmit.iris.util.ChunkPosition, boolean) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.atomics.AtomicWorldData + LineNumbersOf: com.volmit.iris.generator.legacy.atomics.AtomicWorldData 25 => 86 29 => 132 30 => 110 @@ -5243,18 +5243,18 @@ Class: public com.volmit.iris.gen.atomics.AtomicWorldData NameNotChanged 341 => 33 346 => 20 -Class: public com.volmit.iris.gen.atomics.MasterLock NameNotChanged +Class: public com.volmit.iris.generator.legacy.atomics.MasterLock NameNotChanged Source: "MasterLock.java" - FieldsOf: com.volmit.iris.gen.atomics.MasterLock + FieldsOf: com.volmit.iris.generator.legacy.atomics.MasterLock private com.volmit.iris.util.IrisLock lock => b private com.volmit.iris.util.KMap locks => a - MethodsOf: com.volmit.iris.gen.atomics.MasterLock + MethodsOf: com.volmit.iris.generator.legacy.atomics.MasterLock static void () SignatureNotChanged public void () SignatureNotChanged public void clear() SignatureNotChanged public void lock(java.lang.String) SignatureNotChanged public void unlock(java.lang.String) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.atomics.MasterLock + LineNumbersOf: com.volmit.iris.generator.legacy.atomics.MasterLock 12 => 11 13 => 9 14 => 13 @@ -5276,25 +5276,25 @@ Class: public com.volmit.iris.gen.atomics.MasterLock NameNotChanged 45 => 4 46 => 17 -Class: public com.volmit.iris.gen.layer.BiomeDataProvider NameNotChanged +Class: public com.volmit.iris.generator.legacy.layer.BiomeDataProvider NameNotChanged Source: "BiomeDataProvider.java" - FieldsOf: com.volmit.iris.gen.layer.BiomeDataProvider - private com.volmit.iris.noise.CNG generator => b - private com.volmit.iris.gen.layer.GenLayerBiome layer => c + FieldsOf: com.volmit.iris.generator.legacy.layer.BiomeDataProvider + private com.volmit.iris.generator.noise.CNG generator => b + private com.volmit.iris.generator.legacy.layer.GenLayerBiome layer => c private com.volmit.iris.object.InferredType type => a - MethodsOf: com.volmit.iris.gen.layer.BiomeDataProvider + MethodsOf: com.volmit.iris.generator.legacy.layer.BiomeDataProvider static void () SignatureNotChanged - public void (com.volmit.iris.gen.layer.GenLayerBiome, com.volmit.iris.object.InferredType, com.volmit.iris.util.RNG) SignatureNotChanged + public void (com.volmit.iris.generator.legacy.layer.GenLayerBiome, com.volmit.iris.object.InferredType, com.volmit.iris.util.RNG) SignatureNotChanged protected boolean canEqual(java.lang.Object) SignatureNotChanged public boolean equals(java.lang.Object) SignatureNotChanged - public com.volmit.iris.util.BiomeResult generateData(com.volmit.iris.gen.ContextualChunkGenerator, double, double, int, int, com.volmit.iris.object.IrisRegion) SignatureNotChanged - public com.volmit.iris.util.BiomeResult generatePureData(com.volmit.iris.gen.ContextualChunkGenerator, double, double, int, int, com.volmit.iris.object.IrisRegion) SignatureNotChanged - public com.volmit.iris.noise.CNG getGenerator() SignatureNotChanged - public com.volmit.iris.gen.layer.GenLayerBiome getLayer() SignatureNotChanged + public com.volmit.iris.util.BiomeResult generateData(com.volmit.iris.generator.ContextualChunkGenerator, double, double, int, int, com.volmit.iris.object.IrisRegion) SignatureNotChanged + public com.volmit.iris.util.BiomeResult generatePureData(com.volmit.iris.generator.ContextualChunkGenerator, double, double, int, int, com.volmit.iris.object.IrisRegion) SignatureNotChanged + public com.volmit.iris.generator.noise.CNG getGenerator() SignatureNotChanged + public com.volmit.iris.generator.legacy.layer.GenLayerBiome getLayer() SignatureNotChanged public com.volmit.iris.object.InferredType getType() SignatureNotChanged public int hashCode() SignatureNotChanged public java.lang.String toString() SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.layer.BiomeDataProvider + LineNumbersOf: com.volmit.iris.generator.legacy.layer.BiomeDataProvider 12 => 2, 3, 5 and 13 15 => 8 16 => 12 @@ -5307,40 +5307,40 @@ Class: public com.volmit.iris.gen.layer.BiomeDataProvider NameNotChanged 28 => 10 33 => 6 -Class: public com.volmit.iris.gen.layer.GenLayerBiome NameNotChanged +Class: public com.volmit.iris.generator.legacy.layer.GenLayerBiome NameNotChanged Source: "GenLayerBiome.java" - FieldsOf: com.volmit.iris.gen.layer.GenLayerBiome - private com.volmit.iris.noise.CNG bridgeGenerator => g - private com.volmit.iris.gen.layer.BiomeDataProvider caveProvider => e - private com.volmit.iris.gen.DimensionChunkGenerator iris => a - private com.volmit.iris.gen.layer.BiomeDataProvider landProvider => b - private com.volmit.iris.noise.CNG regionGenerator => c - private com.volmit.iris.gen.layer.BiomeDataProvider seaProvider => d - private com.volmit.iris.gen.layer.BiomeDataProvider shoreProvider => f - MethodsOf: com.volmit.iris.gen.layer.GenLayerBiome + FieldsOf: com.volmit.iris.generator.legacy.layer.GenLayerBiome + private com.volmit.iris.generator.noise.CNG bridgeGenerator => g + private com.volmit.iris.generator.legacy.layer.BiomeDataProvider caveProvider => e + private com.volmit.iris.generator.DimensionChunkGenerator iris => a + private com.volmit.iris.generator.legacy.layer.BiomeDataProvider landProvider => b + private com.volmit.iris.generator.noise.CNG regionGenerator => c + private com.volmit.iris.generator.legacy.layer.BiomeDataProvider seaProvider => d + private com.volmit.iris.generator.legacy.layer.BiomeDataProvider shoreProvider => f + MethodsOf: com.volmit.iris.generator.legacy.layer.GenLayerBiome static void () SignatureNotChanged - public void (com.volmit.iris.gen.DimensionChunkGenerator, com.volmit.iris.util.RNG) SignatureNotChanged + public void (com.volmit.iris.generator.DimensionChunkGenerator, com.volmit.iris.util.RNG) SignatureNotChanged protected boolean canEqual(java.lang.Object) SignatureNotChanged public boolean equals(java.lang.Object) SignatureNotChanged - public com.volmit.iris.util.BiomeResult generateBiomeData(double, double, com.volmit.iris.object.IrisRegion, com.volmit.iris.noise.CNG, com.volmit.iris.util.KList, com.volmit.iris.object.InferredType, int, int) SignatureNotChanged + public com.volmit.iris.util.BiomeResult generateBiomeData(double, double, com.volmit.iris.object.IrisRegion, com.volmit.iris.generator.noise.CNG, com.volmit.iris.util.KList, com.volmit.iris.object.InferredType, int, int) SignatureNotChanged public com.volmit.iris.util.BiomeResult generateData(com.volmit.iris.object.InferredType, double, double, int, int, com.volmit.iris.object.IrisRegion) SignatureNotChanged public com.volmit.iris.util.BiomeResult generateImpureData(int, int, com.volmit.iris.object.InferredType, com.volmit.iris.object.IrisRegion, com.volmit.iris.util.BiomeResult) SignatureNotChanged public com.volmit.iris.util.BiomeResult generateRegionData(double, double, int, int, com.volmit.iris.object.IrisRegion) SignatureNotChanged - public com.volmit.iris.noise.CNG getBridgeGenerator() SignatureNotChanged - public com.volmit.iris.gen.layer.BiomeDataProvider getCaveProvider() SignatureNotChanged - public com.volmit.iris.gen.DimensionChunkGenerator getIris() SignatureNotChanged - public com.volmit.iris.gen.layer.BiomeDataProvider getLandProvider() SignatureNotChanged - public com.volmit.iris.gen.layer.BiomeDataProvider getProvider(com.volmit.iris.object.InferredType) SignatureNotChanged + public com.volmit.iris.generator.noise.CNG getBridgeGenerator() SignatureNotChanged + public com.volmit.iris.generator.legacy.layer.BiomeDataProvider getCaveProvider() SignatureNotChanged + public com.volmit.iris.generator.DimensionChunkGenerator getIris() SignatureNotChanged + public com.volmit.iris.generator.legacy.layer.BiomeDataProvider getLandProvider() SignatureNotChanged + public com.volmit.iris.generator.legacy.layer.BiomeDataProvider getProvider(com.volmit.iris.object.InferredType) SignatureNotChanged public com.volmit.iris.object.IrisRegion getRegion(double, double) SignatureNotChanged - public com.volmit.iris.noise.CNG getRegionGenerator() SignatureNotChanged - public com.volmit.iris.gen.layer.BiomeDataProvider getSeaProvider() SignatureNotChanged - public com.volmit.iris.gen.layer.BiomeDataProvider getShoreProvider() SignatureNotChanged + public com.volmit.iris.generator.noise.CNG getRegionGenerator() SignatureNotChanged + public com.volmit.iris.generator.legacy.layer.BiomeDataProvider getSeaProvider() SignatureNotChanged + public com.volmit.iris.generator.legacy.layer.BiomeDataProvider getShoreProvider() SignatureNotChanged public com.volmit.iris.object.InferredType getType(double, double, com.volmit.iris.object.IrisRegion) SignatureNotChanged public int hashCode() SignatureNotChanged - public com.volmit.iris.util.BiomeResult implode(double, double, com.volmit.iris.object.IrisRegion, com.volmit.iris.noise.CNG, com.volmit.iris.util.BiomeResult) SignatureNotChanged - public com.volmit.iris.util.BiomeResult implode(double, double, com.volmit.iris.object.IrisRegion, com.volmit.iris.noise.CNG, com.volmit.iris.util.BiomeResult, int) SignatureNotChanged + public com.volmit.iris.util.BiomeResult implode(double, double, com.volmit.iris.object.IrisRegion, com.volmit.iris.generator.noise.CNG, com.volmit.iris.util.BiomeResult) SignatureNotChanged + public com.volmit.iris.util.BiomeResult implode(double, double, com.volmit.iris.object.IrisRegion, com.volmit.iris.generator.noise.CNG, com.volmit.iris.util.BiomeResult, int) SignatureNotChanged public java.lang.String toString() SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.layer.GenLayerBiome + LineNumbersOf: com.volmit.iris.generator.legacy.layer.GenLayerBiome 20 => 10 21 => 38, 68 and 70 24 => 12 @@ -5416,14 +5416,14 @@ Class: public com.volmit.iris.gen.layer.GenLayerBiome NameNotChanged 183 => 21 186 => 45 -Class: public com.volmit.iris.gen.layer.GenLayerCarve NameNotChanged +Class: public com.volmit.iris.generator.legacy.layer.GenLayerCarve NameNotChanged Source: "GenLayerCarve.java" - FieldsOf: com.volmit.iris.gen.layer.GenLayerCarve - private com.volmit.iris.noise.CellGenerator cell => a - MethodsOf: com.volmit.iris.gen.layer.GenLayerCarve - public void (com.volmit.iris.gen.DimensionChunkGenerator, com.volmit.iris.util.RNG) SignatureNotChanged + FieldsOf: com.volmit.iris.generator.legacy.layer.GenLayerCarve + private com.volmit.iris.generator.noise.CellGenerator cell => a + MethodsOf: com.volmit.iris.generator.legacy.layer.GenLayerCarve + public void (com.volmit.iris.generator.DimensionChunkGenerator, com.volmit.iris.util.RNG) SignatureNotChanged public boolean isCarved(int, int, int) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.layer.GenLayerCarve + LineNumbersOf: com.volmit.iris.generator.legacy.layer.GenLayerCarve 16 => 9 17 => 2 18 => 3 @@ -5436,24 +5436,24 @@ Class: public com.volmit.iris.gen.layer.GenLayerCarve NameNotChanged 34 => 7 37 => 6 -Class: public com.volmit.iris.gen.layer.GenLayerCave NameNotChanged +Class: public com.volmit.iris.generator.legacy.layer.GenLayerCave NameNotChanged Source: "GenLayerCave.java" - FieldsOf: com.volmit.iris.gen.layer.GenLayerCave + FieldsOf: com.volmit.iris.generator.legacy.layer.GenLayerCave public static final org.bukkit.block.data.BlockData AIR NameNotChanged public static final org.bukkit.block.data.BlockData CAVE_AIR NameNotChanged private static final com.volmit.iris.util.KList EMPTY => a public static boolean bad NameNotChanged - private com.volmit.iris.noise.FastNoise gg => b - MethodsOf: com.volmit.iris.gen.layer.GenLayerCave + private com.volmit.iris.generator.noise.FastNoise gg => b + MethodsOf: com.volmit.iris.generator.legacy.layer.GenLayerCave static void () SignatureNotChanged - public void (com.volmit.iris.gen.DimensionChunkGenerator, com.volmit.iris.util.RNG) SignatureNotChanged + public void (com.volmit.iris.generator.DimensionChunkGenerator, com.volmit.iris.util.RNG) SignatureNotChanged public boolean can(org.bukkit.Material) SignatureNotChanged public boolean canAir(org.bukkit.Material) SignatureNotChanged public boolean canWater(org.bukkit.Material) SignatureNotChanged - public boolean dig(int, int, int, com.volmit.iris.gen.atomics.AtomicSliver) SignatureNotChanged - public com.volmit.iris.util.KList genCaves(double, double, int, int, com.volmit.iris.gen.atomics.AtomicSliver) SignatureNotChanged - public void generateCave(com.volmit.iris.util.KList, double, double, int, int, com.volmit.iris.gen.atomics.AtomicSliver, com.volmit.iris.object.IrisCaveLayer, int) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.layer.GenLayerCave + public boolean dig(int, int, int, com.volmit.iris.generator.legacy.atomics.AtomicSliver) SignatureNotChanged + public com.volmit.iris.util.KList genCaves(double, double, int, int, com.volmit.iris.generator.legacy.atomics.AtomicSliver) SignatureNotChanged + public void generateCave(com.volmit.iris.util.KList, double, double, int, int, com.volmit.iris.generator.legacy.atomics.AtomicSliver, com.volmit.iris.object.IrisCaveLayer, int) SignatureNotChanged + LineNumbersOf: com.volmit.iris.generator.legacy.layer.GenLayerCave 21 => 20 22 => 55 23 => 57 @@ -5538,18 +5538,18 @@ Class: public com.volmit.iris.gen.layer.GenLayerCave NameNotChanged 187 => 13 192 => 18 -Class: public com.volmit.iris.gen.layer.GenLayerText NameNotChanged +Class: public com.volmit.iris.generator.legacy.layer.GenLayerText NameNotChanged Source: "GenLayerText.java" - FieldsOf: com.volmit.iris.gen.layer.GenLayerText + FieldsOf: com.volmit.iris.generator.legacy.layer.GenLayerText public static final org.bukkit.block.data.BlockData AIR NameNotChanged - private com.volmit.iris.gen.atomics.AtomicCache debug => a - MethodsOf: com.volmit.iris.gen.layer.GenLayerText + private com.volmit.iris.generator.legacy.atomics.AtomicCache debug => a + MethodsOf: com.volmit.iris.generator.legacy.layer.GenLayerText static void () SignatureNotChanged - public void (com.volmit.iris.gen.DimensionChunkGenerator, com.volmit.iris.util.RNG) SignatureNotChanged + public void (com.volmit.iris.generator.DimensionChunkGenerator, com.volmit.iris.util.RNG) SignatureNotChanged public com.volmit.iris.object.IrisObject createTextObject(com.volmit.iris.util.RNG, java.lang.String, int, java.awt.Font, com.volmit.iris.object.IrisMaterialPalette) SignatureNotChanged public com.volmit.iris.object.IrisObject createTextObject(java.lang.String, java.lang.String, int, org.bukkit.block.data.BlockData) SignatureNotChanged private synthetic com.volmit.iris.object.IrisObject lambda$getDebug$0() SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.layer.GenLayerText + LineNumbersOf: com.volmit.iris.generator.legacy.layer.GenLayerText 21 => 29 23 => 1 27 => 17 @@ -5583,15 +5583,15 @@ Class: public com.volmit.iris.gen.layer.GenLayerText NameNotChanged 79 => 32 84 => 22 -Class: public com.volmit.iris.gen.layer.GenLayerUpdate NameNotChanged +Class: public com.volmit.iris.generator.legacy.layer.GenLayerUpdate NameNotChanged Source: "GenLayerUpdate.java" - FieldsOf: com.volmit.iris.gen.layer.GenLayerUpdate + FieldsOf: com.volmit.iris.generator.legacy.layer.GenLayerUpdate private static boolean a => b - private com.volmit.iris.gen.ParallaxChunkGenerator gen => d + private com.volmit.iris.generator.ParallaxChunkGenerator gen => d private com.volmit.iris.util.RNG rng => c - MethodsOf: com.volmit.iris.gen.layer.GenLayerUpdate + MethodsOf: com.volmit.iris.generator.legacy.layer.GenLayerUpdate static void () SignatureNotChanged - public void (com.volmit.iris.gen.ParallaxChunkGenerator, org.bukkit.World) SignatureNotChanged + public void (com.volmit.iris.generator.ParallaxChunkGenerator, org.bukkit.World) SignatureNotChanged public static boolean a() => b() public static void a(boolean) => b(boolean) public void addItems(boolean, org.bukkit.inventory.Inventory, com.volmit.iris.util.RNG, com.volmit.iris.util.KList, com.volmit.iris.object.InventorySlotType, int, int, int, int) SignatureNotChanged @@ -5603,7 +5603,7 @@ Class: public com.volmit.iris.gen.layer.GenLayerUpdate NameNotChanged public void update(org.bukkit.Chunk, int, int, int, int, int, com.volmit.iris.util.RNG) SignatureNotChanged public void updateLight(org.bukkit.block.Block, org.bukkit.block.data.BlockData) SignatureNotChanged public void updateStorage(org.bukkit.block.Block, org.bukkit.block.data.BlockData, int, int, com.volmit.iris.util.RNG) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.layer.GenLayerUpdate + LineNumbersOf: com.volmit.iris.generator.legacy.layer.GenLayerUpdate 36 => 76 37 => 37 38 => 108 @@ -5716,22 +5716,22 @@ Class: public com.volmit.iris.gen.layer.GenLayerUpdate NameNotChanged 252 => 88 253 => 50 -Class: public abstract annotation com.volmit.iris.gen.post.Post NameNotChanged +Class: public abstract annotation com.volmit.iris.generator.legacy.post.Post NameNotChanged Source: "Post.java" - FieldsOf: com.volmit.iris.gen.post.Post - MethodsOf: com.volmit.iris.gen.post.Post + FieldsOf: com.volmit.iris.generator.legacy.post.Post + MethodsOf: com.volmit.iris.generator.legacy.post.Post public abstract java.lang.String value() SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.post.Post + LineNumbersOf: com.volmit.iris.generator.legacy.post.Post -Class: public com.volmit.iris.gen.post.PostFloatingNibDeleter NameNotChanged +Class: public com.volmit.iris.generator.legacy.post.PostFloatingNibDeleter NameNotChanged Source: "PostFloatingNibDeleter.java" - FieldsOf: com.volmit.iris.gen.post.PostFloatingNibDeleter + FieldsOf: com.volmit.iris.generator.legacy.post.PostFloatingNibDeleter private static final org.bukkit.block.data.BlockData AIR => d - MethodsOf: com.volmit.iris.gen.post.PostFloatingNibDeleter + MethodsOf: com.volmit.iris.generator.legacy.post.PostFloatingNibDeleter static void () SignatureNotChanged - public void (com.volmit.iris.gen.PostBlockChunkGenerator, int) SignatureNotChanged + public void (com.volmit.iris.generator.PostBlockChunkGenerator, int) SignatureNotChanged public void onPost(int, int, int, int, org.bukkit.generator.ChunkGenerator$ChunkData) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.post.PostFloatingNibDeleter + LineNumbersOf: com.volmit.iris.generator.legacy.post.PostFloatingNibDeleter 14 => 23 19 => 3 20 => 17 @@ -5755,13 +5755,13 @@ Class: public com.volmit.iris.gen.post.PostFloatingNibDeleter NameNotChanged 57 => 13 61 => 1 -Class: public com.volmit.iris.gen.post.PostNibSmoother NameNotChanged +Class: public com.volmit.iris.generator.legacy.post.PostNibSmoother NameNotChanged Source: "PostNibSmoother.java" - FieldsOf: com.volmit.iris.gen.post.PostNibSmoother - MethodsOf: com.volmit.iris.gen.post.PostNibSmoother - public void (com.volmit.iris.gen.PostBlockChunkGenerator, int) SignatureNotChanged + FieldsOf: com.volmit.iris.generator.legacy.post.PostNibSmoother + MethodsOf: com.volmit.iris.generator.legacy.post.PostNibSmoother + public void (com.volmit.iris.generator.PostBlockChunkGenerator, int) SignatureNotChanged public void onPost(int, int, int, int, org.bukkit.generator.ChunkGenerator$ChunkData) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.post.PostNibSmoother + LineNumbersOf: com.volmit.iris.generator.legacy.post.PostNibSmoother 17 => 5 18 => 12 29 => 11 @@ -5783,13 +5783,13 @@ Class: public com.volmit.iris.gen.post.PostNibSmoother NameNotChanged 49 => 1 52 => 14 -Class: public com.volmit.iris.gen.post.PostPotholeFiller NameNotChanged +Class: public com.volmit.iris.generator.legacy.post.PostPotholeFiller NameNotChanged Source: "PostPotholeFiller.java" - FieldsOf: com.volmit.iris.gen.post.PostPotholeFiller - MethodsOf: com.volmit.iris.gen.post.PostPotholeFiller - public void (com.volmit.iris.gen.PostBlockChunkGenerator, int) SignatureNotChanged + FieldsOf: com.volmit.iris.generator.legacy.post.PostPotholeFiller + MethodsOf: com.volmit.iris.generator.legacy.post.PostPotholeFiller + public void (com.volmit.iris.generator.PostBlockChunkGenerator, int) SignatureNotChanged public void onPost(int, int, int, int, org.bukkit.generator.ChunkGenerator$ChunkData) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.post.PostPotholeFiller + LineNumbersOf: com.volmit.iris.generator.legacy.post.PostPotholeFiller 15 => 5 16 => 2 27 => 7 @@ -5807,18 +5807,18 @@ Class: public com.volmit.iris.gen.post.PostPotholeFiller NameNotChanged 41 => 3 43 => 6 -Class: public com.volmit.iris.gen.post.PostSlabber NameNotChanged +Class: public com.volmit.iris.generator.legacy.post.PostSlabber NameNotChanged Source: "PostSlabber.java" - FieldsOf: com.volmit.iris.gen.post.PostSlabber + FieldsOf: com.volmit.iris.generator.legacy.post.PostSlabber public static final org.bukkit.Material AIR NameNotChanged public static final org.bukkit.Material WATER NameNotChanged private com.volmit.iris.util.RNG rng => d - MethodsOf: com.volmit.iris.gen.post.PostSlabber + MethodsOf: com.volmit.iris.generator.legacy.post.PostSlabber static void () SignatureNotChanged - public void (com.volmit.iris.gen.PostBlockChunkGenerator, int) SignatureNotChanged + public void (com.volmit.iris.generator.PostBlockChunkGenerator, int) SignatureNotChanged private synthetic void lambda$onPost$0(int, int, int, org.bukkit.block.data.BlockData, int, int, org.bukkit.generator.ChunkGenerator$ChunkData) SignatureNotChanged public void onPost(int, int, int, int, org.bukkit.generator.ChunkGenerator$ChunkData) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.post.PostSlabber + LineNumbersOf: com.volmit.iris.generator.legacy.post.PostSlabber 15 => 2 16 => 8 22 => 16 @@ -5845,19 +5845,19 @@ Class: public com.volmit.iris.gen.post.PostSlabber NameNotChanged 68 => 4 72 => 15 -Class: public com.volmit.iris.gen.post.PostWallPatcher NameNotChanged +Class: public com.volmit.iris.generator.legacy.post.PostWallPatcher NameNotChanged Source: "PostWallPatcher.java" - FieldsOf: com.volmit.iris.gen.post.PostWallPatcher + FieldsOf: com.volmit.iris.generator.legacy.post.PostWallPatcher public static final org.bukkit.Material AIR NameNotChanged private static java.lang.String[] a => d private com.volmit.iris.util.RNG rng => e - MethodsOf: com.volmit.iris.gen.post.PostWallPatcher + MethodsOf: com.volmit.iris.generator.legacy.post.PostWallPatcher static void () SignatureNotChanged - public void (com.volmit.iris.gen.PostBlockChunkGenerator, int) SignatureNotChanged + public void (com.volmit.iris.generator.PostBlockChunkGenerator, int) SignatureNotChanged public static java.lang.String[] a() => b() public static void a(java.lang.String[]) => b(java.lang.String[]) public void onPost(int, int, int, int, org.bukkit.generator.ChunkGenerator$ChunkData) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.post.PostWallPatcher + LineNumbersOf: com.volmit.iris.generator.legacy.post.PostWallPatcher 16 => 21 22 => 13 23 => 28 @@ -5886,15 +5886,15 @@ Class: public com.volmit.iris.gen.post.PostWallPatcher NameNotChanged 76 => 9 81 => 22 -Class: public com.volmit.iris.gen.post.PostWaterlogger NameNotChanged +Class: public com.volmit.iris.generator.legacy.post.PostWaterlogger NameNotChanged Source: "PostWaterlogger.java" - FieldsOf: com.volmit.iris.gen.post.PostWaterlogger + FieldsOf: com.volmit.iris.generator.legacy.post.PostWaterlogger private static final org.bukkit.block.data.BlockData WATER => d - MethodsOf: com.volmit.iris.gen.post.PostWaterlogger + MethodsOf: com.volmit.iris.generator.legacy.post.PostWaterlogger static void () SignatureNotChanged - public void (com.volmit.iris.gen.PostBlockChunkGenerator, int) SignatureNotChanged + public void (com.volmit.iris.generator.PostBlockChunkGenerator, int) SignatureNotChanged public void onPost(int, int, int, int, org.bukkit.generator.ChunkGenerator$ChunkData) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gen.post.PostWaterlogger + LineNumbersOf: com.volmit.iris.generator.legacy.post.PostWaterlogger 16 => 10 21 => 9 22 => 18 @@ -5916,14 +5916,14 @@ Class: public com.volmit.iris.gen.post.PostWaterlogger NameNotChanged 62 => 4 65 => 7 -Class: public com.volmit.iris.gui.IrisRenderer NameNotChanged +Class: public com.volmit.iris.manager.gui.IrisRenderer NameNotChanged Source: "IrisRenderer.java" - FieldsOf: com.volmit.iris.gui.IrisRenderer - private com.volmit.iris.gui.Renderer renderer => a - MethodsOf: com.volmit.iris.gui.IrisRenderer - public void (com.volmit.iris.gui.Renderer) SignatureNotChanged + FieldsOf: com.volmit.iris.manager.gui.IrisRenderer + private com.volmit.iris.manager.gui.Renderer renderer => a + MethodsOf: com.volmit.iris.manager.gui.IrisRenderer + public void (com.volmit.iris.manager.gui.Renderer) SignatureNotChanged public java.awt.image.BufferedImage render(double, double, double, int) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gui.IrisRenderer + LineNumbersOf: com.volmit.iris.manager.gui.IrisRenderer 12 => 3 13 => 8 14 => 11 @@ -5935,9 +5935,9 @@ Class: public com.volmit.iris.gui.IrisRenderer NameNotChanged 28 => 9 32 => 7 -Class: public com.volmit.iris.gui.IrisVision NameNotChanged +Class: public com.volmit.iris.manager.gui.IrisVision NameNotChanged Source: "IrisVision.java" - FieldsOf: com.volmit.iris.gui.IrisVision + FieldsOf: com.volmit.iris.manager.gui.IrisVision private static java.lang.String a => j private final java.util.concurrent.ExecutorService e => v private final java.util.concurrent.ExecutorService eh => e @@ -5955,7 +5955,7 @@ Class: public com.volmit.iris.gui.IrisVision NameNotChanged private int posX => q private int posZ => b private com.volmit.iris.util.KMap positions => w - private com.volmit.iris.gui.IrisRenderer renderer => m + private com.volmit.iris.manager.gui.IrisRenderer renderer => m private com.volmit.iris.util.RollingSequence rs => x private double scale => c private static final long serialVersionUID NameNotChanged @@ -5964,32 +5964,32 @@ Class: public com.volmit.iris.gui.IrisVision NameNotChanged private int w => n private com.volmit.iris.util.KSet working => g private com.volmit.iris.util.KSet workingfast => t - MethodsOf: com.volmit.iris.gui.IrisVision + MethodsOf: com.volmit.iris.manager.gui.IrisVision static void () SignatureNotChanged public void () SignatureNotChanged public static java.lang.String a() => b() public static void a(java.lang.String) => b(java.lang.String) - static synthetic int access$000(com.volmit.iris.gui.IrisVision) SignatureNotChanged - static synthetic int access$008(com.volmit.iris.gui.IrisVision) SignatureNotChanged - static synthetic double access$100(com.volmit.iris.gui.IrisVision) SignatureNotChanged - static synthetic double access$102(com.volmit.iris.gui.IrisVision, double) SignatureNotChanged - static synthetic double access$200(com.volmit.iris.gui.IrisVision) SignatureNotChanged - static synthetic double access$202(com.volmit.iris.gui.IrisVision, double) SignatureNotChanged - static synthetic double access$300(com.volmit.iris.gui.IrisVision) SignatureNotChanged - static synthetic double access$302(com.volmit.iris.gui.IrisVision, double) SignatureNotChanged - static synthetic double access$400(com.volmit.iris.gui.IrisVision) SignatureNotChanged - static synthetic double access$500(com.volmit.iris.gui.IrisVision) SignatureNotChanged - static synthetic double access$502(com.volmit.iris.gui.IrisVision, double) SignatureNotChanged - private static void createAndShowGUI(com.volmit.iris.gui.Renderer, short) => a(com.volmit.iris.gui.Renderer, short) + static synthetic int access$000(com.volmit.iris.manager.gui.IrisVision) SignatureNotChanged + static synthetic int access$008(com.volmit.iris.manager.gui.IrisVision) SignatureNotChanged + static synthetic double access$100(com.volmit.iris.manager.gui.IrisVision) SignatureNotChanged + static synthetic double access$102(com.volmit.iris.manager.gui.IrisVision, double) SignatureNotChanged + static synthetic double access$200(com.volmit.iris.manager.gui.IrisVision) SignatureNotChanged + static synthetic double access$202(com.volmit.iris.manager.gui.IrisVision, double) SignatureNotChanged + static synthetic double access$300(com.volmit.iris.manager.gui.IrisVision) SignatureNotChanged + static synthetic double access$302(com.volmit.iris.manager.gui.IrisVision, double) SignatureNotChanged + static synthetic double access$400(com.volmit.iris.manager.gui.IrisVision) SignatureNotChanged + static synthetic double access$500(com.volmit.iris.manager.gui.IrisVision) SignatureNotChanged + static synthetic double access$502(com.volmit.iris.manager.gui.IrisVision, double) SignatureNotChanged + private static void createAndShowGUI(com.volmit.iris.manager.gui.Renderer, short) => a(com.volmit.iris.manager.gui.Renderer, short) public java.awt.image.BufferedImage getTile(com.volmit.iris.util.KSet, int, int, int, com.volmit.iris.util.O) SignatureNotChanged private synthetic void lambda$getTile$0(int, int, int, com.volmit.iris.util.BlockPosition, double, double, short) SignatureNotChanged private synthetic void lambda$getTile$1(int, int, int, com.volmit.iris.util.BlockPosition, double, double, short) SignatureNotChanged - private static synthetic void lambda$launch$3(com.volmit.iris.gen.IrisChunkGenerator) SignatureNotChanged + private static synthetic void lambda$launch$3(com.volmit.iris.generator.IrisChunkGenerator) SignatureNotChanged private synthetic void lambda$paint$2() SignatureNotChanged - public static void launch(com.volmit.iris.gen.IrisChunkGenerator) SignatureNotChanged + public static void launch(com.volmit.iris.generator.IrisChunkGenerator) SignatureNotChanged public void mouseWheelMoved(java.awt.event.MouseWheelEvent) SignatureNotChanged public void paint(java.awt.Graphics) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gui.IrisVision + LineNumbersOf: com.volmit.iris.manager.gui.IrisVision 34 => 53, 70, 97, 98, 109, 131, 136, 138, 145, 149 and 161 38 => 110 39 => 27 @@ -6142,16 +6142,16 @@ Class: public com.volmit.iris.gui.IrisVision NameNotChanged 353 => 86 354 => 147 -Class: com.volmit.iris.gui.IrisVision$1 => com.volmit.iris.gui.IrisVision$d +Class: com.volmit.iris.manager.gui.IrisVision$1 => com.volmit.iris.manager.gui.IrisVision$d Source: "IrisVision.java" - FieldsOf: com.volmit.iris.gui.IrisVision$1 - final synthetic com.volmit.iris.gui.IrisVision this$0 NameNotChanged - MethodsOf: com.volmit.iris.gui.IrisVision$1 + FieldsOf: com.volmit.iris.manager.gui.IrisVision$1 + final synthetic com.volmit.iris.manager.gui.IrisVision this$0 NameNotChanged + MethodsOf: com.volmit.iris.manager.gui.IrisVision$1 static void () SignatureNotChanged - void (com.volmit.iris.gui.IrisVision) SignatureNotChanged + void (com.volmit.iris.manager.gui.IrisVision) SignatureNotChanged private static synthetic void lambda$newThread$0(java.lang.Thread, java.lang.Throwable) SignatureNotChanged public java.lang.Thread newThread(java.lang.Runnable) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gui.IrisVision$1 + LineNumbersOf: com.volmit.iris.manager.gui.IrisVision$1 60 => 4 64 => 10 65 => 6 @@ -6163,16 +6163,16 @@ Class: com.volmit.iris.gui.IrisVision$1 => com.volmit.iris.gui.IrisVision$d 72 => 2 74 => 1 -Class: com.volmit.iris.gui.IrisVision$2 => com.volmit.iris.gui.IrisVision$b +Class: com.volmit.iris.manager.gui.IrisVision$2 => com.volmit.iris.manager.gui.IrisVision$b Source: "IrisVision.java" - FieldsOf: com.volmit.iris.gui.IrisVision$2 - final synthetic com.volmit.iris.gui.IrisVision this$0 NameNotChanged - MethodsOf: com.volmit.iris.gui.IrisVision$2 + FieldsOf: com.volmit.iris.manager.gui.IrisVision$2 + final synthetic com.volmit.iris.manager.gui.IrisVision this$0 NameNotChanged + MethodsOf: com.volmit.iris.manager.gui.IrisVision$2 static void () SignatureNotChanged - void (com.volmit.iris.gui.IrisVision) SignatureNotChanged + void (com.volmit.iris.manager.gui.IrisVision) SignatureNotChanged private static synthetic void lambda$newThread$0(java.lang.Thread, java.lang.Throwable) SignatureNotChanged public java.lang.Thread newThread(java.lang.Runnable) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gui.IrisVision$2 + LineNumbersOf: com.volmit.iris.manager.gui.IrisVision$2 79 => 7 83 => 3 84 => 9 @@ -6184,15 +6184,15 @@ Class: com.volmit.iris.gui.IrisVision$2 => com.volmit.iris.gui.IrisVision$b 91 => 5 93 => 10 -Class: com.volmit.iris.gui.IrisVision$3 => com.volmit.iris.gui.IrisVision$c +Class: com.volmit.iris.manager.gui.IrisVision$3 => com.volmit.iris.manager.gui.IrisVision$c Source: "IrisVision.java" - FieldsOf: com.volmit.iris.gui.IrisVision$3 - final synthetic com.volmit.iris.gui.IrisVision this$0 NameNotChanged - MethodsOf: com.volmit.iris.gui.IrisVision$3 - void (com.volmit.iris.gui.IrisVision) SignatureNotChanged + FieldsOf: com.volmit.iris.manager.gui.IrisVision$3 + final synthetic com.volmit.iris.manager.gui.IrisVision this$0 NameNotChanged + MethodsOf: com.volmit.iris.manager.gui.IrisVision$3 + void (com.volmit.iris.manager.gui.IrisVision) SignatureNotChanged public void mouseDragged(java.awt.event.MouseEvent) SignatureNotChanged public void mouseMoved(java.awt.event.MouseEvent) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gui.IrisVision$3 + LineNumbersOf: com.volmit.iris.manager.gui.IrisVision$3 104 => 3 108 => 7 109 => 5 @@ -6205,27 +6205,27 @@ Class: com.volmit.iris.gui.IrisVision$3 => com.volmit.iris.gui.IrisVision$c 120 => 1 121 => 11 -Class: com.volmit.iris.gui.IrisVision$4 => com.volmit.iris.gui.IrisVision$a +Class: com.volmit.iris.manager.gui.IrisVision$4 => com.volmit.iris.manager.gui.IrisVision$a Source: "IrisVision.java" - FieldsOf: com.volmit.iris.gui.IrisVision$4 - final synthetic com.volmit.iris.gui.IrisVision this$0 NameNotChanged - MethodsOf: com.volmit.iris.gui.IrisVision$4 - void (com.volmit.iris.gui.IrisVision) SignatureNotChanged + FieldsOf: com.volmit.iris.manager.gui.IrisVision$4 + final synthetic com.volmit.iris.manager.gui.IrisVision this$0 NameNotChanged + MethodsOf: com.volmit.iris.manager.gui.IrisVision$4 + void (com.volmit.iris.manager.gui.IrisVision) SignatureNotChanged public boolean imageUpdate(java.awt.Image, int, int, int, int, int) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gui.IrisVision$4 + LineNumbersOf: com.volmit.iris.manager.gui.IrisVision$4 263 => 2 267 => 1 -Class: public abstract com.volmit.iris.gui.Renderer NameNotChanged +Class: public abstract com.volmit.iris.manager.gui.Renderer NameNotChanged Source: "Renderer.java" - FieldsOf: com.volmit.iris.gui.Renderer - MethodsOf: com.volmit.iris.gui.Renderer + FieldsOf: com.volmit.iris.manager.gui.Renderer + MethodsOf: com.volmit.iris.manager.gui.Renderer public abstract java.awt.Color draw(double, double) SignatureNotChanged - LineNumbersOf: com.volmit.iris.gui.Renderer + LineNumbersOf: com.volmit.iris.manager.gui.Renderer -Class: public com.volmit.iris.noise.CNG NameNotChanged +Class: public com.volmit.iris.generator.noise.CNG NameNotChanged Source: "CNG.java" - FieldsOf: com.volmit.iris.noise.CNG + FieldsOf: com.volmit.iris.generator.noise.CNG public static final com.volmit.iris.util.NoiseInjector ADD NameNotChanged public static final com.volmit.iris.util.NoiseInjector DST_MOD NameNotChanged public static final com.volmit.iris.util.NoiseInjector DST_POW NameNotChanged @@ -6240,9 +6240,9 @@ Class: public com.volmit.iris.noise.CNG NameNotChanged private com.volmit.iris.util.KList children => c public static long creates NameNotChanged private double down => i - private com.volmit.iris.noise.CNG fracture => m + private com.volmit.iris.generator.noise.CNG fracture => m private double fscale => g - private com.volmit.iris.noise.NoiseGenerator generator => a + private com.volmit.iris.generator.noise.NoiseGenerator generator => a public static long hits NameNotChanged private com.volmit.iris.util.NoiseInjector injector => n private boolean noscale => k @@ -6253,17 +6253,17 @@ Class: public com.volmit.iris.noise.CNG NameNotChanged private com.volmit.iris.util.RNG rng => e private double scale => f private double up => d - MethodsOf: com.volmit.iris.noise.CNG + MethodsOf: com.volmit.iris.generator.noise.CNG static void () SignatureNotChanged - public void (com.volmit.iris.util.RNG, com.volmit.iris.noise.NoiseType, double, int) SignatureNotChanged + public void (com.volmit.iris.util.RNG, com.volmit.iris.generator.noise.NoiseType, double, int) SignatureNotChanged public void (com.volmit.iris.util.RNG, double, int) SignatureNotChanged private static java.lang.RuntimeException a(java.lang.RuntimeException) SignatureNotChanged - public com.volmit.iris.noise.CNG bake() SignatureNotChanged + public com.volmit.iris.generator.noise.CNG bake() SignatureNotChanged public int fit(int, int, double[]) SignatureNotChanged public java.lang.Object fit(java.util.List, double[]) SignatureNotChanged public double fitDouble(double, double, double[]) SignatureNotChanged public com.volmit.iris.util.IRare fitRarity(com.volmit.iris.util.KList, double[]) SignatureNotChanged - public com.volmit.iris.noise.CNG fractureWith(com.volmit.iris.noise.CNG, double) SignatureNotChanged + public com.volmit.iris.generator.noise.CNG fractureWith(com.volmit.iris.generator.noise.CNG, double) SignatureNotChanged private static synthetic double[] lambda$static$0(double, double) SignatureNotChanged private static synthetic double[] lambda$static$1(double, double) SignatureNotChanged private static synthetic double[] lambda$static$2(double, double) SignatureNotChanged @@ -6275,18 +6275,18 @@ Class: public com.volmit.iris.noise.CNG NameNotChanged private static synthetic double[] lambda$static$8(double, double) SignatureNotChanged private static synthetic double[] lambda$static$9(double, double) SignatureNotChanged public double noise(double[]) SignatureNotChanged - public com.volmit.iris.noise.CNG oct(int) SignatureNotChanged - public com.volmit.iris.noise.CNG pow(double) SignatureNotChanged - public com.volmit.iris.noise.CNG scale(double) SignatureNotChanged - public static com.volmit.iris.noise.CNG signature(com.volmit.iris.util.RNG) SignatureNotChanged - public static com.volmit.iris.noise.CNG signature(com.volmit.iris.util.RNG, com.volmit.iris.noise.NoiseType) SignatureNotChanged - public static com.volmit.iris.noise.CNG signatureDouble(com.volmit.iris.util.RNG) SignatureNotChanged - public static com.volmit.iris.noise.CNG signatureDouble(com.volmit.iris.util.RNG, com.volmit.iris.noise.NoiseType) SignatureNotChanged - public static com.volmit.iris.noise.CNG signatureHalf(com.volmit.iris.util.RNG) SignatureNotChanged - public static com.volmit.iris.noise.CNG signatureHalf(com.volmit.iris.util.RNG, com.volmit.iris.noise.NoiseType) SignatureNotChanged - public static com.volmit.iris.noise.CNG signatureThick(com.volmit.iris.util.RNG) SignatureNotChanged - public static com.volmit.iris.noise.CNG signatureThick(com.volmit.iris.util.RNG, com.volmit.iris.noise.NoiseType) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.CNG + public com.volmit.iris.generator.noise.CNG oct(int) SignatureNotChanged + public com.volmit.iris.generator.noise.CNG pow(double) SignatureNotChanged + public com.volmit.iris.generator.noise.CNG scale(double) SignatureNotChanged + public static com.volmit.iris.generator.noise.CNG signature(com.volmit.iris.util.RNG) SignatureNotChanged + public static com.volmit.iris.generator.noise.CNG signature(com.volmit.iris.util.RNG, com.volmit.iris.generator.noise.NoiseType) SignatureNotChanged + public static com.volmit.iris.generator.noise.CNG signatureDouble(com.volmit.iris.util.RNG) SignatureNotChanged + public static com.volmit.iris.generator.noise.CNG signatureDouble(com.volmit.iris.util.RNG, com.volmit.iris.generator.noise.NoiseType) SignatureNotChanged + public static com.volmit.iris.generator.noise.CNG signatureHalf(com.volmit.iris.util.RNG) SignatureNotChanged + public static com.volmit.iris.generator.noise.CNG signatureHalf(com.volmit.iris.util.RNG, com.volmit.iris.generator.noise.NoiseType) SignatureNotChanged + public static com.volmit.iris.generator.noise.CNG signatureThick(com.volmit.iris.util.RNG) SignatureNotChanged + public static com.volmit.iris.generator.noise.CNG signatureThick(com.volmit.iris.util.RNG, com.volmit.iris.generator.noise.NoiseType) SignatureNotChanged + LineNumbersOf: com.volmit.iris.generator.noise.CNG 13 => 15 14 => 45 15 => 38 and 50 @@ -6409,22 +6409,22 @@ Class: public com.volmit.iris.noise.CNG NameNotChanged 369 => 137 370 => 94 -Class: public abstract com.volmit.iris.noise.CNGFactory NameNotChanged +Class: public abstract com.volmit.iris.generator.noise.CNGFactory NameNotChanged Source: "CNGFactory.java" - FieldsOf: com.volmit.iris.noise.CNGFactory - MethodsOf: com.volmit.iris.noise.CNGFactory - public abstract com.volmit.iris.noise.CNG create(com.volmit.iris.util.RNG) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.CNGFactory + FieldsOf: com.volmit.iris.generator.noise.CNGFactory + MethodsOf: com.volmit.iris.generator.noise.CNGFactory + public abstract com.volmit.iris.generator.noise.CNG create(com.volmit.iris.util.RNG) SignatureNotChanged + LineNumbersOf: com.volmit.iris.generator.noise.CNGFactory -Class: public com.volmit.iris.noise.CellGenerator NameNotChanged +Class: public com.volmit.iris.generator.noise.CellGenerator NameNotChanged Source: "CellGenerator.java" - FieldsOf: com.volmit.iris.noise.CellGenerator + FieldsOf: com.volmit.iris.generator.noise.CellGenerator private double cellScale => a - private com.volmit.iris.noise.CNG cng => d - private com.volmit.iris.noise.FastNoise fd => e - private com.volmit.iris.noise.FastNoise fn => c + private com.volmit.iris.generator.noise.CNG cng => d + private com.volmit.iris.generator.noise.FastNoise fd => e + private com.volmit.iris.generator.noise.FastNoise fn => c private double shuffle => b - MethodsOf: com.volmit.iris.noise.CellGenerator + MethodsOf: com.volmit.iris.generator.noise.CellGenerator public void (com.volmit.iris.util.RNG) SignatureNotChanged public float getDistance(double, double) SignatureNotChanged public float getDistance(double, double, double) SignatureNotChanged @@ -6434,7 +6434,7 @@ Class: public com.volmit.iris.noise.CellGenerator NameNotChanged public float getValue(double, double, int) SignatureNotChanged public void setCellScale(double) SignatureNotChanged public void setShuffle(double) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.CellGenerator + LineNumbersOf: com.volmit.iris.generator.noise.CellGenerator 15 => 28 19 => 27 23 => 34 @@ -6469,15 +6469,15 @@ Class: public com.volmit.iris.noise.CellGenerator NameNotChanged 87 => 1 90 => 15 -Class: public com.volmit.iris.noise.CellHeightNoise NameNotChanged +Class: public com.volmit.iris.generator.noise.CellHeightNoise NameNotChanged Source: "CellHeightNoise.java" - FieldsOf: com.volmit.iris.noise.CellHeightNoise - private final com.volmit.iris.noise.FastNoise n => a - MethodsOf: com.volmit.iris.noise.CellHeightNoise + FieldsOf: com.volmit.iris.generator.noise.CellHeightNoise + private final com.volmit.iris.generator.noise.FastNoise n => a + MethodsOf: com.volmit.iris.generator.noise.CellHeightNoise public void (long) SignatureNotChanged private double filter(double) => a(double) public double noise(double, double, double) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.CellHeightNoise + LineNumbersOf: com.volmit.iris.generator.noise.CellHeightNoise 8 => 1 9 => 4 10 => 2 @@ -6487,14 +6487,14 @@ Class: public com.volmit.iris.noise.CellHeightNoise NameNotChanged 16 => 8 31 => 5 -Class: public com.volmit.iris.noise.CellularNoise NameNotChanged +Class: public com.volmit.iris.generator.noise.CellularNoise NameNotChanged Source: "CellularNoise.java" - FieldsOf: com.volmit.iris.noise.CellularNoise - private final com.volmit.iris.noise.FastNoise n => a - MethodsOf: com.volmit.iris.noise.CellularNoise + FieldsOf: com.volmit.iris.generator.noise.CellularNoise + private final com.volmit.iris.generator.noise.FastNoise n => a + MethodsOf: com.volmit.iris.generator.noise.CellularNoise public void (long) SignatureNotChanged public double noise(double, double, double) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.CellularNoise + LineNumbersOf: com.volmit.iris.generator.noise.CellularNoise 6 => 1 7 => 3 8 => 5 @@ -6503,44 +6503,44 @@ Class: public com.volmit.iris.noise.CellularNoise NameNotChanged 11 => 4 25 => 7 -Class: public com.volmit.iris.noise.CubicNoise NameNotChanged +Class: public com.volmit.iris.generator.noise.CubicNoise NameNotChanged Source: "CubicNoise.java" - FieldsOf: com.volmit.iris.noise.CubicNoise - private final com.volmit.iris.noise.FastNoise n => a - MethodsOf: com.volmit.iris.noise.CubicNoise + FieldsOf: com.volmit.iris.generator.noise.CubicNoise + private final com.volmit.iris.generator.noise.FastNoise n => a + MethodsOf: com.volmit.iris.generator.noise.CubicNoise public void (long) SignatureNotChanged private double f(double) => a(double) public double noise(double, double, double) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.CubicNoise + LineNumbersOf: com.volmit.iris.generator.noise.CubicNoise 6 => 4 7 => 2 8 => 5 11 => 3 26 => 1 -Class: public com.volmit.iris.noise.FastNoise NameNotChanged +Class: public com.volmit.iris.generator.noise.FastNoise NameNotChanged Source: "FastNoise.java" - FieldsOf: com.volmit.iris.noise.FastNoise - private static final com.volmit.iris.noise.FastNoise$Float2[] CELL_2D => r - private static final com.volmit.iris.noise.FastNoise$Float3[] CELL_3D => k - private static final com.volmit.iris.noise.FastNoise$Float2[] GRAD_2D => l - private static final com.volmit.iris.noise.FastNoise$Float3[] GRAD_3D => p + FieldsOf: com.volmit.iris.generator.noise.FastNoise + private static final com.volmit.iris.generator.noise.FastNoise$Float2[] CELL_2D => r + private static final com.volmit.iris.generator.noise.FastNoise$Float3[] CELL_3D => k + private static final com.volmit.iris.generator.noise.FastNoise$Float2[] GRAD_2D => l + private static final com.volmit.iris.generator.noise.FastNoise$Float3[] GRAD_3D => p private static final byte[] SIMPLEX_4D => j private static java.lang.String[] a => m - private com.volmit.iris.noise.FastNoise$CellularDistanceFunction m_cellularDistanceFunction => h - private com.volmit.iris.noise.FastNoise m_cellularNoiseLookup => f - private com.volmit.iris.noise.FastNoise$CellularReturnType m_cellularReturnType => i + private com.volmit.iris.generator.noise.FastNoise$CellularDistanceFunction m_cellularDistanceFunction => h + private com.volmit.iris.generator.noise.FastNoise m_cellularNoiseLookup => f + private com.volmit.iris.generator.noise.FastNoise$CellularReturnType m_cellularReturnType => i private float m_fractalBounding => a - private com.volmit.iris.noise.FastNoise$FractalType m_fractalType => q + private com.volmit.iris.generator.noise.FastNoise$FractalType m_fractalType => q private float m_frequency => n private float m_gain => c private float m_gradientPerturbAmp => g - private com.volmit.iris.noise.FastNoise$Interp m_interp => e + private com.volmit.iris.generator.noise.FastNoise$Interp m_interp => e private float m_lacunarity => o - private com.volmit.iris.noise.FastNoise$NoiseType m_noiseType => b + private com.volmit.iris.generator.noise.FastNoise$NoiseType m_noiseType => b private int m_octaves => d private int m_seed => s - MethodsOf: com.volmit.iris.noise.FastNoise + MethodsOf: com.volmit.iris.generator.noise.FastNoise static void () SignatureNotChanged public void () SignatureNotChanged public void (int) SignatureNotChanged @@ -6570,11 +6570,11 @@ Class: public com.volmit.iris.noise.FastNoise NameNotChanged private static float InterpHermiteFunc(float) => b(float) private static float InterpQuinticFunc(float) => d(float) private static float Lerp(float, float, float) => n(float, float, float) - public void SetCellularDistanceFunction(com.volmit.iris.noise.FastNoise$CellularDistanceFunction) SignatureNotChanged - public void SetCellularReturnType(com.volmit.iris.noise.FastNoise$CellularReturnType) SignatureNotChanged + public void SetCellularDistanceFunction(com.volmit.iris.generator.noise.FastNoise$CellularDistanceFunction) SignatureNotChanged + public void SetCellularReturnType(com.volmit.iris.generator.noise.FastNoise$CellularReturnType) SignatureNotChanged public void SetFractalOctaves(int) SignatureNotChanged - public void SetFractalType(com.volmit.iris.noise.FastNoise$FractalType) SignatureNotChanged - public void SetNoiseType(com.volmit.iris.noise.FastNoise$NoiseType) SignatureNotChanged + public void SetFractalType(com.volmit.iris.generator.noise.FastNoise$FractalType) SignatureNotChanged + public void SetNoiseType(com.volmit.iris.generator.noise.FastNoise$NoiseType) SignatureNotChanged private float SingleCellular(float, float) => m(float, float) private float SingleCellular(float, float, float) => c(float, float, float) private float SingleCellular2Edge(float, float) => l(float, float) @@ -6615,7 +6615,7 @@ Class: public com.volmit.iris.noise.FastNoise NameNotChanged private static float ValCoord3D(int, int, int, int) => b(int, int, int, int) public static java.lang.String[] a() => b() public static void a(java.lang.String[]) => b(java.lang.String[]) - LineNumbersOf: com.volmit.iris.noise.FastNoise + LineNumbersOf: com.volmit.iris.generator.noise.FastNoise 82 => 764 83 => 342 84 => 578 @@ -7469,59 +7469,59 @@ Class: public com.volmit.iris.noise.FastNoise NameNotChanged 2248 => 356 2250 => 27 -Class: synthetic com.volmit.iris.noise.FastNoise$1 => com.volmit.iris.noise.FastNoise$a +Class: synthetic com.volmit.iris.generator.noise.FastNoise$1 => com.volmit.iris.generator.noise.FastNoise$a Source: "FastNoise.java" - FieldsOf: com.volmit.iris.noise.FastNoise$1 + FieldsOf: com.volmit.iris.generator.noise.FastNoise$1 static final synthetic int[] $SwitchMap$com$volmit$iris$noise$FastNoise$CellularDistanceFunction => a static final synthetic int[] $SwitchMap$com$volmit$iris$noise$FastNoise$CellularReturnType => c static final synthetic int[] $SwitchMap$com$volmit$iris$noise$FastNoise$FractalType => b static final synthetic int[] $SwitchMap$com$volmit$iris$noise$FastNoise$Interp => d static final synthetic int[] $SwitchMap$com$volmit$iris$noise$FastNoise$NoiseType => e - MethodsOf: com.volmit.iris.noise.FastNoise$1 + MethodsOf: com.volmit.iris.generator.noise.FastNoise$1 static void () SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.FastNoise$1 + LineNumbersOf: com.volmit.iris.generator.noise.FastNoise$1 463 => 4 468 => 1 508 => 5 785 => 2 1872 => 3 -Class: public final enum com.volmit.iris.noise.FastNoise$CellularDistanceFunction NameNotChanged +Class: public final enum com.volmit.iris.generator.noise.FastNoise$CellularDistanceFunction NameNotChanged Source: "FastNoise.java" - FieldsOf: com.volmit.iris.noise.FastNoise$CellularDistanceFunction - private static final synthetic com.volmit.iris.noise.FastNoise$CellularDistanceFunction[] $VALUES => a - public static final enum com.volmit.iris.noise.FastNoise$CellularDistanceFunction Euclidean NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$CellularDistanceFunction Manhattan NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$CellularDistanceFunction Natural NameNotChanged - MethodsOf: com.volmit.iris.noise.FastNoise$CellularDistanceFunction + FieldsOf: com.volmit.iris.generator.noise.FastNoise$CellularDistanceFunction + private static final synthetic com.volmit.iris.generator.noise.FastNoise$CellularDistanceFunction[] $VALUES => a + public static final enum com.volmit.iris.generator.noise.FastNoise$CellularDistanceFunction Euclidean NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$CellularDistanceFunction Manhattan NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$CellularDistanceFunction Natural NameNotChanged + MethodsOf: com.volmit.iris.generator.noise.FastNoise$CellularDistanceFunction static void () SignatureNotChanged private void (java.lang.String, int) SignatureNotChanged - public static com.volmit.iris.noise.FastNoise$CellularDistanceFunction valueOf(java.lang.String) SignatureNotChanged - public static com.volmit.iris.noise.FastNoise$CellularDistanceFunction[] values() SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.FastNoise$CellularDistanceFunction + public static com.volmit.iris.generator.noise.FastNoise$CellularDistanceFunction valueOf(java.lang.String) SignatureNotChanged + public static com.volmit.iris.generator.noise.FastNoise$CellularDistanceFunction[] values() SignatureNotChanged + LineNumbersOf: com.volmit.iris.generator.noise.FastNoise$CellularDistanceFunction 63 => 2, 3, 6 and 7 65 => 1 66 => 5 67 => 4 -Class: public final enum com.volmit.iris.noise.FastNoise$CellularReturnType NameNotChanged +Class: public final enum com.volmit.iris.generator.noise.FastNoise$CellularReturnType NameNotChanged Source: "FastNoise.java" - FieldsOf: com.volmit.iris.noise.FastNoise$CellularReturnType - private static final synthetic com.volmit.iris.noise.FastNoise$CellularReturnType[] $VALUES => a - public static final enum com.volmit.iris.noise.FastNoise$CellularReturnType CellValue NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$CellularReturnType Distance NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$CellularReturnType Distance2 NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$CellularReturnType Distance2Add NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$CellularReturnType Distance2Div NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$CellularReturnType Distance2Mul NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$CellularReturnType Distance2Sub NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$CellularReturnType NoiseLookup NameNotChanged - MethodsOf: com.volmit.iris.noise.FastNoise$CellularReturnType + FieldsOf: com.volmit.iris.generator.noise.FastNoise$CellularReturnType + private static final synthetic com.volmit.iris.generator.noise.FastNoise$CellularReturnType[] $VALUES => a + public static final enum com.volmit.iris.generator.noise.FastNoise$CellularReturnType CellValue NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$CellularReturnType Distance NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$CellularReturnType Distance2 NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$CellularReturnType Distance2Add NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$CellularReturnType Distance2Div NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$CellularReturnType Distance2Mul NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$CellularReturnType Distance2Sub NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$CellularReturnType NoiseLookup NameNotChanged + MethodsOf: com.volmit.iris.generator.noise.FastNoise$CellularReturnType static void () SignatureNotChanged private void (java.lang.String, int) SignatureNotChanged - public static com.volmit.iris.noise.FastNoise$CellularReturnType valueOf(java.lang.String) SignatureNotChanged - public static com.volmit.iris.noise.FastNoise$CellularReturnType[] values() SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.FastNoise$CellularReturnType + public static com.volmit.iris.generator.noise.FastNoise$CellularReturnType valueOf(java.lang.String) SignatureNotChanged + public static com.volmit.iris.generator.noise.FastNoise$CellularReturnType[] values() SignatureNotChanged + LineNumbersOf: com.volmit.iris.generator.noise.FastNoise$CellularReturnType 70 => 5, 6, 8 and 12 72 => 3 73 => 2 @@ -7532,90 +7532,90 @@ Class: public final enum com.volmit.iris.noise.FastNoise$CellularReturnType Name 78 => 7 79 => 11 -Class: com.volmit.iris.noise.FastNoise$Float2 => com.volmit.iris.noise.FastNoise$c +Class: com.volmit.iris.generator.noise.FastNoise$Float2 => com.volmit.iris.generator.noise.FastNoise$c Source: "FastNoise.java" - FieldsOf: com.volmit.iris.noise.FastNoise$Float2 + FieldsOf: com.volmit.iris.generator.noise.FastNoise$Float2 public final float x NameNotChanged public final float y NameNotChanged - MethodsOf: com.volmit.iris.noise.FastNoise$Float2 + MethodsOf: com.volmit.iris.generator.noise.FastNoise$Float2 public void (float, float) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.FastNoise$Float2 + LineNumbersOf: com.volmit.iris.generator.noise.FastNoise$Float2 223 => 1 224 => 3 225 => 4 226 => 2 -Class: com.volmit.iris.noise.FastNoise$Float3 => com.volmit.iris.noise.FastNoise$b +Class: com.volmit.iris.generator.noise.FastNoise$Float3 => com.volmit.iris.generator.noise.FastNoise$b Source: "FastNoise.java" - FieldsOf: com.volmit.iris.noise.FastNoise$Float3 + FieldsOf: com.volmit.iris.generator.noise.FastNoise$Float3 public final float x NameNotChanged public final float y NameNotChanged public final float z NameNotChanged - MethodsOf: com.volmit.iris.noise.FastNoise$Float3 + MethodsOf: com.volmit.iris.generator.noise.FastNoise$Float3 public void (float, float, float) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.FastNoise$Float3 + LineNumbersOf: com.volmit.iris.generator.noise.FastNoise$Float3 234 => 4 235 => 5 236 => 2 237 => 1 238 => 3 -Class: public final enum com.volmit.iris.noise.FastNoise$FractalType NameNotChanged +Class: public final enum com.volmit.iris.generator.noise.FastNoise$FractalType NameNotChanged Source: "FastNoise.java" - FieldsOf: com.volmit.iris.noise.FastNoise$FractalType - private static final synthetic com.volmit.iris.noise.FastNoise$FractalType[] $VALUES => a - public static final enum com.volmit.iris.noise.FastNoise$FractalType Billow NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$FractalType FBM NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$FractalType RigidMulti NameNotChanged - MethodsOf: com.volmit.iris.noise.FastNoise$FractalType + FieldsOf: com.volmit.iris.generator.noise.FastNoise$FractalType + private static final synthetic com.volmit.iris.generator.noise.FastNoise$FractalType[] $VALUES => a + public static final enum com.volmit.iris.generator.noise.FastNoise$FractalType Billow NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$FractalType FBM NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$FractalType RigidMulti NameNotChanged + MethodsOf: com.volmit.iris.generator.noise.FastNoise$FractalType static void () SignatureNotChanged private void (java.lang.String, int) SignatureNotChanged - public static com.volmit.iris.noise.FastNoise$FractalType valueOf(java.lang.String) SignatureNotChanged - public static com.volmit.iris.noise.FastNoise$FractalType[] values() SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.FastNoise$FractalType + public static com.volmit.iris.generator.noise.FastNoise$FractalType valueOf(java.lang.String) SignatureNotChanged + public static com.volmit.iris.generator.noise.FastNoise$FractalType[] values() SignatureNotChanged + LineNumbersOf: com.volmit.iris.generator.noise.FastNoise$FractalType 56 => 1, 2, 4 and 5 58 => 7 59 => 6 60 => 3 -Class: public final enum com.volmit.iris.noise.FastNoise$Interp NameNotChanged +Class: public final enum com.volmit.iris.generator.noise.FastNoise$Interp NameNotChanged Source: "FastNoise.java" - FieldsOf: com.volmit.iris.noise.FastNoise$Interp - private static final synthetic com.volmit.iris.noise.FastNoise$Interp[] $VALUES => a - public static final enum com.volmit.iris.noise.FastNoise$Interp Hermite NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$Interp Linear NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$Interp Quintic NameNotChanged - MethodsOf: com.volmit.iris.noise.FastNoise$Interp + FieldsOf: com.volmit.iris.generator.noise.FastNoise$Interp + private static final synthetic com.volmit.iris.generator.noise.FastNoise$Interp[] $VALUES => a + public static final enum com.volmit.iris.generator.noise.FastNoise$Interp Hermite NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$Interp Linear NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$Interp Quintic NameNotChanged + MethodsOf: com.volmit.iris.generator.noise.FastNoise$Interp static void () SignatureNotChanged private void (java.lang.String, int) SignatureNotChanged - public static com.volmit.iris.noise.FastNoise$Interp valueOf(java.lang.String) SignatureNotChanged - public static com.volmit.iris.noise.FastNoise$Interp[] values() SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.FastNoise$Interp + public static com.volmit.iris.generator.noise.FastNoise$Interp valueOf(java.lang.String) SignatureNotChanged + public static com.volmit.iris.generator.noise.FastNoise$Interp[] values() SignatureNotChanged + LineNumbersOf: com.volmit.iris.generator.noise.FastNoise$Interp 49 => 2, 5, 6 and 7 51 => 4 52 => 3 53 => 1 -Class: public final enum com.volmit.iris.noise.FastNoise$NoiseType NameNotChanged +Class: public final enum com.volmit.iris.generator.noise.FastNoise$NoiseType NameNotChanged Source: "FastNoise.java" - FieldsOf: com.volmit.iris.noise.FastNoise$NoiseType - private static final synthetic com.volmit.iris.noise.FastNoise$NoiseType[] $VALUES => a - public static final enum com.volmit.iris.noise.FastNoise$NoiseType Cellular NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$NoiseType Cubic NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$NoiseType CubicFractal NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$NoiseType Perlin NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$NoiseType PerlinFractal NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$NoiseType Simplex NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$NoiseType SimplexFractal NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$NoiseType Value NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$NoiseType ValueFractal NameNotChanged - public static final enum com.volmit.iris.noise.FastNoise$NoiseType WhiteNoise NameNotChanged - MethodsOf: com.volmit.iris.noise.FastNoise$NoiseType + FieldsOf: com.volmit.iris.generator.noise.FastNoise$NoiseType + private static final synthetic com.volmit.iris.generator.noise.FastNoise$NoiseType[] $VALUES => a + public static final enum com.volmit.iris.generator.noise.FastNoise$NoiseType Cellular NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$NoiseType Cubic NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$NoiseType CubicFractal NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$NoiseType Perlin NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$NoiseType PerlinFractal NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$NoiseType Simplex NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$NoiseType SimplexFractal NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$NoiseType Value NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$NoiseType ValueFractal NameNotChanged + public static final enum com.volmit.iris.generator.noise.FastNoise$NoiseType WhiteNoise NameNotChanged + MethodsOf: com.volmit.iris.generator.noise.FastNoise$NoiseType static void () SignatureNotChanged private void (java.lang.String, int) SignatureNotChanged - public static com.volmit.iris.noise.FastNoise$NoiseType valueOf(java.lang.String) SignatureNotChanged - public static com.volmit.iris.noise.FastNoise$NoiseType[] values() SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.FastNoise$NoiseType + public static com.volmit.iris.generator.noise.FastNoise$NoiseType valueOf(java.lang.String) SignatureNotChanged + public static com.volmit.iris.generator.noise.FastNoise$NoiseType[] values() SignatureNotChanged + LineNumbersOf: com.volmit.iris.generator.noise.FastNoise$NoiseType 35 => 2, 4, 7 and 9 37 => 5 38 => 10 @@ -7628,27 +7628,27 @@ Class: public final enum com.volmit.iris.noise.FastNoise$NoiseType NameNotChange 45 => 13 46 => 1 -Class: public com.volmit.iris.noise.FlatNoise NameNotChanged +Class: public com.volmit.iris.generator.noise.FlatNoise NameNotChanged Source: "FlatNoise.java" - FieldsOf: com.volmit.iris.noise.FlatNoise - MethodsOf: com.volmit.iris.noise.FlatNoise + FieldsOf: com.volmit.iris.generator.noise.FlatNoise + MethodsOf: com.volmit.iris.generator.noise.FlatNoise public void (long) SignatureNotChanged public double noise(double, double, double) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.FlatNoise + LineNumbersOf: com.volmit.iris.generator.noise.FlatNoise 6 => 2 8 => 3 25 => 1 -Class: public com.volmit.iris.noise.FractalBillowPerlinNoise NameNotChanged +Class: public com.volmit.iris.generator.noise.FractalBillowPerlinNoise NameNotChanged Source: "FractalBillowPerlinNoise.java" - FieldsOf: com.volmit.iris.noise.FractalBillowPerlinNoise - private final com.volmit.iris.noise.FastNoise n => a - MethodsOf: com.volmit.iris.noise.FractalBillowPerlinNoise + FieldsOf: com.volmit.iris.generator.noise.FractalBillowPerlinNoise + private final com.volmit.iris.generator.noise.FastNoise n => a + MethodsOf: com.volmit.iris.generator.noise.FractalBillowPerlinNoise public void (long) SignatureNotChanged public double f(double) SignatureNotChanged public double noise(double, double, double) SignatureNotChanged public void setOctaves(int) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.FractalBillowPerlinNoise + LineNumbersOf: com.volmit.iris.generator.noise.FractalBillowPerlinNoise 9 => 2 10 => 8 11 => 6 @@ -7659,16 +7659,16 @@ Class: public com.volmit.iris.noise.FractalBillowPerlinNoise NameNotChanged 36 => 1 37 => 3 -Class: public com.volmit.iris.noise.FractalBillowSimplexNoise NameNotChanged +Class: public com.volmit.iris.generator.noise.FractalBillowSimplexNoise NameNotChanged Source: "FractalBillowSimplexNoise.java" - FieldsOf: com.volmit.iris.noise.FractalBillowSimplexNoise - private final com.volmit.iris.noise.FastNoise n => a - MethodsOf: com.volmit.iris.noise.FractalBillowSimplexNoise + FieldsOf: com.volmit.iris.generator.noise.FractalBillowSimplexNoise + private final com.volmit.iris.generator.noise.FastNoise n => a + MethodsOf: com.volmit.iris.generator.noise.FractalBillowSimplexNoise public void (long) SignatureNotChanged public double f(double) SignatureNotChanged public double noise(double, double, double) SignatureNotChanged public void setOctaves(int) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.FractalBillowSimplexNoise + LineNumbersOf: com.volmit.iris.generator.noise.FractalBillowSimplexNoise 9 => 3 10 => 4 11 => 5 @@ -7679,15 +7679,15 @@ Class: public com.volmit.iris.noise.FractalBillowSimplexNoise NameNotChanged 36 => 2 37 => 6 -Class: public com.volmit.iris.noise.FractalCubicNoise NameNotChanged +Class: public com.volmit.iris.generator.noise.FractalCubicNoise NameNotChanged Source: "FractalCubicNoise.java" - FieldsOf: com.volmit.iris.noise.FractalCubicNoise - private final com.volmit.iris.noise.FastNoise n => a - MethodsOf: com.volmit.iris.noise.FractalCubicNoise + FieldsOf: com.volmit.iris.generator.noise.FractalCubicNoise + private final com.volmit.iris.generator.noise.FastNoise n => a + MethodsOf: com.volmit.iris.generator.noise.FractalCubicNoise public void (long) SignatureNotChanged private double f(double) => a(double) public double noise(double, double, double) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.FractalCubicNoise + LineNumbersOf: com.volmit.iris.generator.noise.FractalCubicNoise 8 => 3 9 => 6 10 => 2 @@ -7695,16 +7695,16 @@ Class: public com.volmit.iris.noise.FractalCubicNoise NameNotChanged 14 => 5 29 => 4 -Class: public com.volmit.iris.noise.FractalFBMSimplexNoise NameNotChanged +Class: public com.volmit.iris.generator.noise.FractalFBMSimplexNoise NameNotChanged Source: "FractalFBMSimplexNoise.java" - FieldsOf: com.volmit.iris.noise.FractalFBMSimplexNoise - private final com.volmit.iris.noise.FastNoise n => a - MethodsOf: com.volmit.iris.noise.FractalFBMSimplexNoise + FieldsOf: com.volmit.iris.generator.noise.FractalFBMSimplexNoise + private final com.volmit.iris.generator.noise.FastNoise n => a + MethodsOf: com.volmit.iris.generator.noise.FractalFBMSimplexNoise public void (long) SignatureNotChanged public double f(double) SignatureNotChanged public double noise(double, double, double) SignatureNotChanged public void setOctaves(int) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.FractalFBMSimplexNoise + LineNumbersOf: com.volmit.iris.generator.noise.FractalFBMSimplexNoise 9 => 8 10 => 2 11 => 7 @@ -7715,16 +7715,16 @@ Class: public com.volmit.iris.noise.FractalFBMSimplexNoise NameNotChanged 36 => 9 37 => 1 -Class: public com.volmit.iris.noise.FractalRigidMultiSimplexNoise NameNotChanged +Class: public com.volmit.iris.generator.noise.FractalRigidMultiSimplexNoise NameNotChanged Source: "FractalRigidMultiSimplexNoise.java" - FieldsOf: com.volmit.iris.noise.FractalRigidMultiSimplexNoise - private final com.volmit.iris.noise.FastNoise n => a - MethodsOf: com.volmit.iris.noise.FractalRigidMultiSimplexNoise + FieldsOf: com.volmit.iris.generator.noise.FractalRigidMultiSimplexNoise + private final com.volmit.iris.generator.noise.FastNoise n => a + MethodsOf: com.volmit.iris.generator.noise.FractalRigidMultiSimplexNoise public void (long) SignatureNotChanged public double f(double) SignatureNotChanged public double noise(double, double, double) SignatureNotChanged public void setOctaves(int) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.FractalRigidMultiSimplexNoise + LineNumbersOf: com.volmit.iris.generator.noise.FractalRigidMultiSimplexNoise 9 => 8 10 => 7 11 => 4 @@ -7735,15 +7735,15 @@ Class: public com.volmit.iris.noise.FractalRigidMultiSimplexNoise NameNotChanged 36 => 2 37 => 6 -Class: public com.volmit.iris.noise.GlobNoise NameNotChanged +Class: public com.volmit.iris.generator.noise.GlobNoise NameNotChanged Source: "GlobNoise.java" - FieldsOf: com.volmit.iris.noise.GlobNoise - private final com.volmit.iris.noise.FastNoise n => a - MethodsOf: com.volmit.iris.noise.GlobNoise + FieldsOf: com.volmit.iris.generator.noise.GlobNoise + private final com.volmit.iris.generator.noise.FastNoise n => a + MethodsOf: com.volmit.iris.generator.noise.GlobNoise public void (long) SignatureNotChanged private double f(double) => a(double) public double noise(double, double, double) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.GlobNoise + LineNumbersOf: com.volmit.iris.generator.noise.GlobNoise 6 => 1 7 => 5 8 => 6 @@ -7753,60 +7753,60 @@ Class: public com.volmit.iris.noise.GlobNoise NameNotChanged 15 => 4 30 => 3 -Class: public abstract com.volmit.iris.noise.NoiseFactory NameNotChanged +Class: public abstract com.volmit.iris.generator.noise.NoiseFactory NameNotChanged Source: "NoiseFactory.java" - FieldsOf: com.volmit.iris.noise.NoiseFactory - MethodsOf: com.volmit.iris.noise.NoiseFactory - public abstract com.volmit.iris.noise.NoiseGenerator create(long) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.NoiseFactory + FieldsOf: com.volmit.iris.generator.noise.NoiseFactory + MethodsOf: com.volmit.iris.generator.noise.NoiseFactory + public abstract com.volmit.iris.generator.noise.NoiseGenerator create(long) SignatureNotChanged + LineNumbersOf: com.volmit.iris.generator.noise.NoiseFactory -Class: public abstract com.volmit.iris.noise.NoiseGenerator NameNotChanged +Class: public abstract com.volmit.iris.generator.noise.NoiseGenerator NameNotChanged Source: "NoiseGenerator.java" - FieldsOf: com.volmit.iris.noise.NoiseGenerator - MethodsOf: com.volmit.iris.noise.NoiseGenerator + FieldsOf: com.volmit.iris.generator.noise.NoiseGenerator + MethodsOf: com.volmit.iris.generator.noise.NoiseGenerator public abstract double noise(double, double, double) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.NoiseGenerator + LineNumbersOf: com.volmit.iris.generator.noise.NoiseGenerator -Class: public final enum com.volmit.iris.noise.NoiseType NameNotChanged +Class: public final enum com.volmit.iris.generator.noise.NoiseType NameNotChanged Source: "NoiseType.java" - FieldsOf: com.volmit.iris.noise.NoiseType - private static final synthetic com.volmit.iris.noise.NoiseType[] $VALUES => b - public static final enum com.volmit.iris.noise.NoiseType CELLULAR NameNotChanged - public static final enum com.volmit.iris.noise.NoiseType CELLULAR_HEIGHT NameNotChanged - public static final enum com.volmit.iris.noise.NoiseType CUBIC NameNotChanged - public static final enum com.volmit.iris.noise.NoiseType FLAT NameNotChanged - public static final enum com.volmit.iris.noise.NoiseType FRACTAL_BILLOW_PERLIN NameNotChanged - public static final enum com.volmit.iris.noise.NoiseType FRACTAL_BILLOW_SIMPLEX NameNotChanged - public static final enum com.volmit.iris.noise.NoiseType FRACTAL_CUBIC NameNotChanged - public static final enum com.volmit.iris.noise.NoiseType FRACTAL_FBM_SIMPLEX NameNotChanged - public static final enum com.volmit.iris.noise.NoiseType FRACTAL_RIGID_MULTI_SIMPLEX NameNotChanged - public static final enum com.volmit.iris.noise.NoiseType GLOB NameNotChanged - public static final enum com.volmit.iris.noise.NoiseType PERLIN NameNotChanged - public static final enum com.volmit.iris.noise.NoiseType SIMPLEX NameNotChanged - public static final enum com.volmit.iris.noise.NoiseType VASCULAR NameNotChanged - public static final enum com.volmit.iris.noise.NoiseType WHITE NameNotChanged - private com.volmit.iris.noise.NoiseFactory f => a - MethodsOf: com.volmit.iris.noise.NoiseType + FieldsOf: com.volmit.iris.generator.noise.NoiseType + private static final synthetic com.volmit.iris.generator.noise.NoiseType[] $VALUES => b + public static final enum com.volmit.iris.generator.noise.NoiseType CELLULAR NameNotChanged + public static final enum com.volmit.iris.generator.noise.NoiseType CELLULAR_HEIGHT NameNotChanged + public static final enum com.volmit.iris.generator.noise.NoiseType CUBIC NameNotChanged + public static final enum com.volmit.iris.generator.noise.NoiseType FLAT NameNotChanged + public static final enum com.volmit.iris.generator.noise.NoiseType FRACTAL_BILLOW_PERLIN NameNotChanged + public static final enum com.volmit.iris.generator.noise.NoiseType FRACTAL_BILLOW_SIMPLEX NameNotChanged + public static final enum com.volmit.iris.generator.noise.NoiseType FRACTAL_CUBIC NameNotChanged + public static final enum com.volmit.iris.generator.noise.NoiseType FRACTAL_FBM_SIMPLEX NameNotChanged + public static final enum com.volmit.iris.generator.noise.NoiseType FRACTAL_RIGID_MULTI_SIMPLEX NameNotChanged + public static final enum com.volmit.iris.generator.noise.NoiseType GLOB NameNotChanged + public static final enum com.volmit.iris.generator.noise.NoiseType PERLIN NameNotChanged + public static final enum com.volmit.iris.generator.noise.NoiseType SIMPLEX NameNotChanged + public static final enum com.volmit.iris.generator.noise.NoiseType VASCULAR NameNotChanged + public static final enum com.volmit.iris.generator.noise.NoiseType WHITE NameNotChanged + private com.volmit.iris.generator.noise.NoiseFactory f => a + MethodsOf: com.volmit.iris.generator.noise.NoiseType static void () SignatureNotChanged - private void (java.lang.String, int, com.volmit.iris.noise.NoiseFactory) SignatureNotChanged - public com.volmit.iris.noise.NoiseGenerator create(long) SignatureNotChanged - private static synthetic com.volmit.iris.noise.NoiseGenerator lambda$static$0(long) SignatureNotChanged - private static synthetic com.volmit.iris.noise.NoiseGenerator lambda$static$1(long) SignatureNotChanged - private static synthetic com.volmit.iris.noise.NoiseGenerator lambda$static$10(long) SignatureNotChanged - private static synthetic com.volmit.iris.noise.NoiseGenerator lambda$static$11(long) SignatureNotChanged - private static synthetic com.volmit.iris.noise.NoiseGenerator lambda$static$12(long) SignatureNotChanged - private static synthetic com.volmit.iris.noise.NoiseGenerator lambda$static$13(long) SignatureNotChanged - private static synthetic com.volmit.iris.noise.NoiseGenerator lambda$static$2(long) SignatureNotChanged - private static synthetic com.volmit.iris.noise.NoiseGenerator lambda$static$3(long) SignatureNotChanged - private static synthetic com.volmit.iris.noise.NoiseGenerator lambda$static$4(long) SignatureNotChanged - private static synthetic com.volmit.iris.noise.NoiseGenerator lambda$static$5(long) SignatureNotChanged - private static synthetic com.volmit.iris.noise.NoiseGenerator lambda$static$6(long) SignatureNotChanged - private static synthetic com.volmit.iris.noise.NoiseGenerator lambda$static$7(long) SignatureNotChanged - private static synthetic com.volmit.iris.noise.NoiseGenerator lambda$static$8(long) SignatureNotChanged - private static synthetic com.volmit.iris.noise.NoiseGenerator lambda$static$9(long) SignatureNotChanged - public static com.volmit.iris.noise.NoiseType valueOf(java.lang.String) SignatureNotChanged - public static com.volmit.iris.noise.NoiseType[] values() SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.NoiseType + private void (java.lang.String, int, com.volmit.iris.generator.noise.NoiseFactory) SignatureNotChanged + public com.volmit.iris.generator.noise.NoiseGenerator create(long) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.NoiseGenerator lambda$static$0(long) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.NoiseGenerator lambda$static$1(long) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.NoiseGenerator lambda$static$10(long) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.NoiseGenerator lambda$static$11(long) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.NoiseGenerator lambda$static$12(long) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.NoiseGenerator lambda$static$13(long) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.NoiseGenerator lambda$static$2(long) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.NoiseGenerator lambda$static$3(long) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.NoiseGenerator lambda$static$4(long) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.NoiseGenerator lambda$static$5(long) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.NoiseGenerator lambda$static$6(long) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.NoiseGenerator lambda$static$7(long) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.NoiseGenerator lambda$static$8(long) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.NoiseGenerator lambda$static$9(long) SignatureNotChanged + public static com.volmit.iris.generator.noise.NoiseType valueOf(java.lang.String) SignatureNotChanged + public static com.volmit.iris.generator.noise.NoiseType[] values() SignatureNotChanged + LineNumbersOf: com.volmit.iris.generator.noise.NoiseType 3 => 7, 19 and 29 4 => 30 and 35 5 => 14 and 21 @@ -7827,24 +7827,24 @@ Class: public final enum com.volmit.iris.noise.NoiseType NameNotChanged 23 => 26 26 => 1 -Class: public abstract com.volmit.iris.noise.OctaveNoise NameNotChanged +Class: public abstract com.volmit.iris.generator.noise.OctaveNoise NameNotChanged Source: "OctaveNoise.java" - FieldsOf: com.volmit.iris.noise.OctaveNoise - MethodsOf: com.volmit.iris.noise.OctaveNoise + FieldsOf: com.volmit.iris.generator.noise.OctaveNoise + MethodsOf: com.volmit.iris.generator.noise.OctaveNoise public abstract void setOctaves(int) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.OctaveNoise + LineNumbersOf: com.volmit.iris.generator.noise.OctaveNoise -Class: public com.volmit.iris.noise.PerlinNoise NameNotChanged +Class: public com.volmit.iris.generator.noise.PerlinNoise NameNotChanged Source: "PerlinNoise.java" - FieldsOf: com.volmit.iris.noise.PerlinNoise - private final com.volmit.iris.noise.FastNoise n => b + FieldsOf: com.volmit.iris.generator.noise.PerlinNoise + private final com.volmit.iris.generator.noise.FastNoise n => b private int octaves => a - MethodsOf: com.volmit.iris.noise.PerlinNoise + MethodsOf: com.volmit.iris.generator.noise.PerlinNoise public void (long) SignatureNotChanged public double f(double) SignatureNotChanged public double noise(double, double, double) SignatureNotChanged public void setOctaves(int) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.PerlinNoise + LineNumbersOf: com.volmit.iris.generator.noise.PerlinNoise 9 => 9 10 => 16 11 => 8 @@ -7864,17 +7864,17 @@ Class: public com.volmit.iris.noise.PerlinNoise NameNotChanged 75 => 7 76 => 10 -Class: public com.volmit.iris.noise.SimplexNoise NameNotChanged +Class: public com.volmit.iris.generator.noise.SimplexNoise NameNotChanged Source: "SimplexNoise.java" - FieldsOf: com.volmit.iris.noise.SimplexNoise - private final com.volmit.iris.noise.FastNoise n => a + FieldsOf: com.volmit.iris.generator.noise.SimplexNoise + private final com.volmit.iris.generator.noise.FastNoise n => a private int octaves => b - MethodsOf: com.volmit.iris.noise.SimplexNoise + MethodsOf: com.volmit.iris.generator.noise.SimplexNoise public void (long) SignatureNotChanged public double f(double) SignatureNotChanged public double noise(double, double, double) SignatureNotChanged public void setOctaves(int) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.SimplexNoise + LineNumbersOf: com.volmit.iris.generator.noise.SimplexNoise 9 => 9 10 => 17 11 => 19 @@ -7894,15 +7894,15 @@ Class: public com.volmit.iris.noise.SimplexNoise NameNotChanged 75 => 16 76 => 8 -Class: public com.volmit.iris.noise.VascularNoise NameNotChanged +Class: public com.volmit.iris.generator.noise.VascularNoise NameNotChanged Source: "VascularNoise.java" - FieldsOf: com.volmit.iris.noise.VascularNoise - private final com.volmit.iris.noise.FastNoise n => a - MethodsOf: com.volmit.iris.noise.VascularNoise + FieldsOf: com.volmit.iris.generator.noise.VascularNoise + private final com.volmit.iris.generator.noise.FastNoise n => a + MethodsOf: com.volmit.iris.generator.noise.VascularNoise public void (long) SignatureNotChanged private double filter(double) => a(double) public double noise(double, double, double) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.VascularNoise + LineNumbersOf: com.volmit.iris.generator.noise.VascularNoise 8 => 7 9 => 2 10 => 5 @@ -7912,15 +7912,15 @@ Class: public com.volmit.iris.noise.VascularNoise NameNotChanged 16 => 8 31 => 4 -Class: public com.volmit.iris.noise.WhiteNoise NameNotChanged +Class: public com.volmit.iris.generator.noise.WhiteNoise NameNotChanged Source: "WhiteNoise.java" - FieldsOf: com.volmit.iris.noise.WhiteNoise - private final com.volmit.iris.noise.FastNoise n => a - MethodsOf: com.volmit.iris.noise.WhiteNoise + FieldsOf: com.volmit.iris.generator.noise.WhiteNoise + private final com.volmit.iris.generator.noise.FastNoise n => a + MethodsOf: com.volmit.iris.generator.noise.WhiteNoise public void (long) SignatureNotChanged private double f(double) => a(double) public double noise(double, double, double) SignatureNotChanged - LineNumbersOf: com.volmit.iris.noise.WhiteNoise + LineNumbersOf: com.volmit.iris.generator.noise.WhiteNoise 8 => 3 9 => 4 10 => 1 @@ -8191,17 +8191,17 @@ Class: public com.volmit.iris.object.IrisAxisRotationClamp NameNotChanged Class: public com.volmit.iris.object.IrisBiome NameNotChanged Source: "IrisBiome.java" FieldsOf: com.volmit.iris.object.IrisBiome - private transient com.volmit.iris.gen.atomics.AtomicCache biomeGenerator => f + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache biomeGenerator => f private com.volmit.iris.util.KList biomeScatter NameNotChanged private com.volmit.iris.util.KList biomeSkyScatter NameNotChanged private com.volmit.iris.object.IrisGeneratorStyle biomeStyle NameNotChanged private double biomeZoom NameNotChanged private com.volmit.iris.util.KList blockDrops NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache cacheColor => e + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache cacheColor => e private double childShrinkFactor NameNotChanged private com.volmit.iris.object.IrisGeneratorStyle childStyle NameNotChanged private com.volmit.iris.util.KList children NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache childrenCell => d + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache childrenCell => d private java.lang.String debugColor NameNotChanged private com.volmit.iris.util.KList decorators NameNotChanged private com.volmit.iris.util.KList deposits NameNotChanged @@ -8209,17 +8209,17 @@ Class: public com.volmit.iris.object.IrisBiome NameNotChanged private com.volmit.iris.util.KList effects NameNotChanged private com.volmit.iris.util.KList generators NameNotChanged private transient com.volmit.iris.object.InferredType inferredType => i - private transient com.volmit.iris.gen.atomics.AtomicCache layerHeightGenerators => j - private transient com.volmit.iris.gen.atomics.AtomicCache layerSeaHeightGenerators => k + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache layerHeightGenerators => j + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache layerSeaHeightGenerators => k private com.volmit.iris.util.KList layers NameNotChanged private boolean lockLayers NameNotChanged private int lockLayersMax NameNotChanged private com.volmit.iris.object.IrisLootReference loot NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache maxHeight => g + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache maxHeight => g private java.lang.String name NameNotChanged private com.volmit.iris.util.KList objects NameNotChanged private int rarity NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache realChildren => h + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache realChildren => h private com.volmit.iris.util.KList seaLayers NameNotChanged private com.volmit.iris.object.IrisBiomePaletteLayer slab NameNotChanged private com.volmit.iris.util.KList structures NameNotChanged @@ -8234,21 +8234,21 @@ Class: public com.volmit.iris.object.IrisBiome NameNotChanged public com.volmit.iris.util.KList generateLayers(double, double, com.volmit.iris.util.RNG, int, int) SignatureNotChanged public com.volmit.iris.util.KList generateLockedLayers(double, double, com.volmit.iris.util.RNG, int, int) SignatureNotChanged public com.volmit.iris.util.KList generateSeaLayers(double, double, com.volmit.iris.util.RNG, int) SignatureNotChanged - public com.volmit.iris.util.KList getAllChildren(com.volmit.iris.gen.ContextualChunkGenerator, int) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getBiomeGenerator() SignatureNotChanged - public com.volmit.iris.noise.CNG getBiomeGenerator(com.volmit.iris.util.RNG) SignatureNotChanged + public com.volmit.iris.util.KList getAllChildren(com.volmit.iris.generator.ContextualChunkGenerator, int) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getBiomeGenerator() SignatureNotChanged + public com.volmit.iris.generator.noise.CNG getBiomeGenerator(com.volmit.iris.util.RNG) SignatureNotChanged public com.volmit.iris.util.KList getBiomeScatter() SignatureNotChanged public com.volmit.iris.util.KList getBiomeSkyScatter() SignatureNotChanged public com.volmit.iris.object.IrisGeneratorStyle getBiomeStyle() SignatureNotChanged public double getBiomeZoom() SignatureNotChanged public com.volmit.iris.util.KList getBlockDrops() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getCacheColor() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getCacheColor() SignatureNotChanged public java.awt.Color getCachedColor() SignatureNotChanged public double getChildShrinkFactor() SignatureNotChanged public com.volmit.iris.object.IrisGeneratorStyle getChildStyle() SignatureNotChanged public com.volmit.iris.util.KList getChildren() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getChildrenCell() SignatureNotChanged - public com.volmit.iris.noise.CNG getChildrenGenerator(com.volmit.iris.util.RNG, int, double) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getChildrenCell() SignatureNotChanged + public com.volmit.iris.generator.noise.CNG getChildrenGenerator(com.volmit.iris.util.RNG, int, double) SignatureNotChanged public java.lang.String getDebugColor() SignatureNotChanged public com.volmit.iris.util.KList getDecorators() SignatureNotChanged public com.volmit.iris.util.KList getDeposits() SignatureNotChanged @@ -8257,9 +8257,9 @@ Class: public com.volmit.iris.object.IrisBiome NameNotChanged public com.volmit.iris.util.KList getGenerators() SignatureNotChanged public org.bukkit.block.Biome getGroundBiome(com.volmit.iris.util.RNG, double, double, double) SignatureNotChanged public com.volmit.iris.object.InferredType getInferredType() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getLayerHeightGenerators() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getLayerHeightGenerators() SignatureNotChanged public com.volmit.iris.util.KList getLayerHeightGenerators(com.volmit.iris.util.RNG) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getLayerSeaHeightGenerators() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getLayerSeaHeightGenerators() SignatureNotChanged public com.volmit.iris.util.KList getLayerSeaHeightGenerators(com.volmit.iris.util.RNG) SignatureNotChanged public com.volmit.iris.util.KList getLayers() SignatureNotChanged public int getLockLayersMax() SignatureNotChanged @@ -8268,8 +8268,8 @@ Class: public com.volmit.iris.object.IrisBiome NameNotChanged public java.lang.String getName() SignatureNotChanged public com.volmit.iris.util.KList getObjects() SignatureNotChanged public int getRarity() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getRealChildren() SignatureNotChanged - public com.volmit.iris.util.KList getRealChildren(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getRealChildren() SignatureNotChanged + public com.volmit.iris.util.KList getRealChildren(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged public com.volmit.iris.util.KList getSeaLayers() SignatureNotChanged public org.bukkit.block.Biome getSkyBiome(com.volmit.iris.util.RNG, double, double, double) SignatureNotChanged public com.volmit.iris.object.IrisBiomePaletteLayer getSlab() SignatureNotChanged @@ -8283,12 +8283,12 @@ Class: public com.volmit.iris.object.IrisBiome NameNotChanged public boolean isSea() SignatureNotChanged public boolean isShore() SignatureNotChanged private synthetic java.awt.Color lambda$0() SignatureNotChanged - private synthetic com.volmit.iris.noise.CNG lambda$1(com.volmit.iris.util.RNG) SignatureNotChanged - private synthetic com.volmit.iris.noise.CNG lambda$2(com.volmit.iris.util.RNG, int, double) SignatureNotChanged + private synthetic com.volmit.iris.generator.noise.CNG lambda$1(com.volmit.iris.util.RNG) SignatureNotChanged + private synthetic com.volmit.iris.generator.noise.CNG lambda$2(com.volmit.iris.util.RNG, int, double) SignatureNotChanged private synthetic java.lang.Integer lambda$3() SignatureNotChanged private synthetic com.volmit.iris.util.KList lambda$4(com.volmit.iris.util.RNG) SignatureNotChanged private synthetic com.volmit.iris.util.KList lambda$5(com.volmit.iris.util.RNG) SignatureNotChanged - private synthetic com.volmit.iris.util.KList lambda$6(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged + private synthetic com.volmit.iris.util.KList lambda$6(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged public void setInferredType(com.volmit.iris.object.InferredType) SignatureNotChanged public void setName(java.lang.String) SignatureNotChanged public void setRarity(int) SignatureNotChanged @@ -8454,18 +8454,18 @@ Class: public com.volmit.iris.object.IrisBiome NameNotChanged Class: public com.volmit.iris.object.IrisBiomeDecorator NameNotChanged Source: "IrisBiomeDecorator.java" FieldsOf: com.volmit.iris.object.IrisBiomeDecorator - private transient com.volmit.iris.gen.atomics.AtomicCache blockData => b + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache blockData => b private double chance NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache heightGenerator => a + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache heightGenerator => a private com.volmit.iris.object.IrisGeneratorStyle heightVariance NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache layerGenerator => c + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache layerGenerator => c private com.volmit.iris.util.KList palette NameNotChanged private com.volmit.iris.object.DecorationPart partOf NameNotChanged private int stackMax NameNotChanged private int stackMin NameNotChanged private com.volmit.iris.object.IrisGeneratorStyle style NameNotChanged private com.volmit.iris.object.IrisGeneratorStyle variance NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache varianceGenerator => d + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache varianceGenerator => d private double varianceZoom NameNotChanged private double verticalZoom NameNotChanged private double zoom NameNotChanged @@ -8477,28 +8477,28 @@ Class: public com.volmit.iris.object.IrisBiomeDecorator NameNotChanged public com.volmit.iris.util.KList getBlockData() SignatureNotChanged public org.bukkit.block.data.BlockData getBlockData(com.volmit.iris.object.IrisBiome, com.volmit.iris.util.RNG, double, double) SignatureNotChanged public double getChance() SignatureNotChanged - public com.volmit.iris.noise.CNG getGenerator(com.volmit.iris.util.RNG) SignatureNotChanged + public com.volmit.iris.generator.noise.CNG getGenerator(com.volmit.iris.util.RNG) SignatureNotChanged public int getHeight(com.volmit.iris.util.RNG, double, double) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getHeightGenerator() SignatureNotChanged - public com.volmit.iris.noise.CNG getHeightGenerator(com.volmit.iris.util.RNG) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getHeightGenerator() SignatureNotChanged + public com.volmit.iris.generator.noise.CNG getHeightGenerator(com.volmit.iris.util.RNG) SignatureNotChanged public com.volmit.iris.object.IrisGeneratorStyle getHeightVariance() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getLayerGenerator() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getLayerGenerator() SignatureNotChanged public com.volmit.iris.util.KList getPalette() SignatureNotChanged public com.volmit.iris.object.DecorationPart getPartOf() SignatureNotChanged public int getStackMax() SignatureNotChanged public int getStackMin() SignatureNotChanged public com.volmit.iris.object.IrisGeneratorStyle getStyle() SignatureNotChanged public com.volmit.iris.object.IrisGeneratorStyle getVariance() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getVarianceGenerator() SignatureNotChanged - public com.volmit.iris.noise.CNG getVarianceGenerator(com.volmit.iris.util.RNG) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getVarianceGenerator() SignatureNotChanged + public com.volmit.iris.generator.noise.CNG getVarianceGenerator(com.volmit.iris.util.RNG) SignatureNotChanged public double getVarianceZoom() SignatureNotChanged public double getVerticalZoom() SignatureNotChanged public double getZoom() SignatureNotChanged public int hashCode() SignatureNotChanged private synthetic com.volmit.iris.util.KList lambda$getBlockData$3() SignatureNotChanged - private synthetic com.volmit.iris.noise.CNG lambda$getGenerator$1(com.volmit.iris.util.RNG) SignatureNotChanged - private synthetic com.volmit.iris.noise.CNG lambda$getHeightGenerator$0(com.volmit.iris.util.RNG) SignatureNotChanged - private synthetic com.volmit.iris.noise.CNG lambda$getVarianceGenerator$2(com.volmit.iris.util.RNG) SignatureNotChanged + private synthetic com.volmit.iris.generator.noise.CNG lambda$getGenerator$1(com.volmit.iris.util.RNG) SignatureNotChanged + private synthetic com.volmit.iris.generator.noise.CNG lambda$getHeightGenerator$0(com.volmit.iris.util.RNG) SignatureNotChanged + private synthetic com.volmit.iris.generator.noise.CNG lambda$getVarianceGenerator$2(com.volmit.iris.util.RNG) SignatureNotChanged public java.lang.String toString() SignatureNotChanged LineNumbersOf: com.volmit.iris.object.IrisBiomeDecorator 22 => 17, 28, 30, 55 and 64 @@ -8557,7 +8557,7 @@ Class: public com.volmit.iris.object.IrisBiomeDecorator NameNotChanged Class: public com.volmit.iris.object.IrisBiomeGeneratorLink NameNotChanged Source: "IrisBiomeGeneratorLink.java" FieldsOf: com.volmit.iris.object.IrisBiomeGeneratorLink - private transient com.volmit.iris.gen.atomics.AtomicCache gen => a + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache gen => a private java.lang.String generator NameNotChanged private int max NameNotChanged private int min NameNotChanged @@ -8566,13 +8566,13 @@ Class: public com.volmit.iris.object.IrisBiomeGeneratorLink NameNotChanged public void () SignatureNotChanged protected boolean canEqual(java.lang.Object) SignatureNotChanged public boolean equals(java.lang.Object) SignatureNotChanged - public com.volmit.iris.object.IrisGenerator getCachedGenerator(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getGen() SignatureNotChanged + public com.volmit.iris.object.IrisGenerator getCachedGenerator(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getGen() SignatureNotChanged public java.lang.String getGenerator() SignatureNotChanged public int getMax() SignatureNotChanged public int getMin() SignatureNotChanged public int hashCode() SignatureNotChanged - private synthetic com.volmit.iris.object.IrisGenerator lambda$getCachedGenerator$0(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged + private synthetic com.volmit.iris.object.IrisGenerator lambda$getCachedGenerator$0(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged public void setGenerator(java.lang.String) SignatureNotChanged public void setMax(int) SignatureNotChanged public void setMin(int) SignatureNotChanged @@ -8601,9 +8601,9 @@ Class: public com.volmit.iris.object.IrisBiomeMutation NameNotChanged private com.volmit.iris.util.KList objects NameNotChanged private int radius NameNotChanged private com.volmit.iris.util.KList sideA NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache sideACache => a + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache sideACache => a private com.volmit.iris.util.KList sideB NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache sideBCache => b + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache sideBCache => b MethodsOf: com.volmit.iris.object.IrisBiomeMutation static void () SignatureNotChanged public void () SignatureNotChanged @@ -8612,16 +8612,16 @@ Class: public com.volmit.iris.object.IrisBiomeMutation NameNotChanged public int getChecks() SignatureNotChanged public com.volmit.iris.util.KList getObjects() SignatureNotChanged public int getRadius() SignatureNotChanged - public com.volmit.iris.util.KList getRealSideA(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged - public com.volmit.iris.util.KList getRealSideB(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged + public com.volmit.iris.util.KList getRealSideA(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged + public com.volmit.iris.util.KList getRealSideB(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged public com.volmit.iris.util.KList getSideA() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getSideACache() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getSideACache() SignatureNotChanged public com.volmit.iris.util.KList getSideB() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getSideBCache() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getSideBCache() SignatureNotChanged public int hashCode() SignatureNotChanged - private synthetic com.volmit.iris.util.KList lambda$getRealSideA$0(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged - private synthetic com.volmit.iris.util.KList lambda$getRealSideB$1(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged - public com.volmit.iris.util.KList processList(com.volmit.iris.gen.ContextualChunkGenerator, com.volmit.iris.util.KList) SignatureNotChanged + private synthetic com.volmit.iris.util.KList lambda$getRealSideA$0(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged + private synthetic com.volmit.iris.util.KList lambda$getRealSideB$1(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged + public com.volmit.iris.util.KList processList(com.volmit.iris.generator.ContextualChunkGenerator, com.volmit.iris.util.KList) SignatureNotChanged public java.lang.String toString() SignatureNotChanged LineNumbersOf: com.volmit.iris.object.IrisBiomeMutation 19 => 5, 9, 22, 30 and 32 @@ -8662,9 +8662,9 @@ Class: public com.volmit.iris.object.IrisBiomeMutation NameNotChanged Class: public com.volmit.iris.object.IrisBiomePaletteLayer NameNotChanged Source: "IrisBiomePaletteLayer.java" FieldsOf: com.volmit.iris.object.IrisBiomePaletteLayer - private transient com.volmit.iris.gen.atomics.AtomicCache blockData => a - private transient com.volmit.iris.gen.atomics.AtomicCache heightGenerator => c - private transient com.volmit.iris.gen.atomics.AtomicCache layerGenerator => b + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache blockData => a + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache heightGenerator => c + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache layerGenerator => b private int maxHeight NameNotChanged private int minHeight NameNotChanged private com.volmit.iris.util.KList palette NameNotChanged @@ -8677,10 +8677,10 @@ Class: public com.volmit.iris.object.IrisBiomePaletteLayer NameNotChanged public boolean equals(java.lang.Object) SignatureNotChanged public org.bukkit.block.data.BlockData get(com.volmit.iris.util.RNG, double, double, double) SignatureNotChanged public com.volmit.iris.util.KList getBlockData() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getHeightGenerator() SignatureNotChanged - public com.volmit.iris.noise.CNG getHeightGenerator(com.volmit.iris.util.RNG) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getLayerGenerator() SignatureNotChanged - public com.volmit.iris.noise.CNG getLayerGenerator(com.volmit.iris.util.RNG) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getHeightGenerator() SignatureNotChanged + public com.volmit.iris.generator.noise.CNG getHeightGenerator(com.volmit.iris.util.RNG) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getLayerGenerator() SignatureNotChanged + public com.volmit.iris.generator.noise.CNG getLayerGenerator(com.volmit.iris.util.RNG) SignatureNotChanged public int getMaxHeight() SignatureNotChanged public int getMinHeight() SignatureNotChanged public com.volmit.iris.util.KList getPalette() SignatureNotChanged @@ -8688,8 +8688,8 @@ Class: public com.volmit.iris.object.IrisBiomePaletteLayer NameNotChanged public double getZoom() SignatureNotChanged public int hashCode() SignatureNotChanged private synthetic com.volmit.iris.util.KList lambda$getBlockData$2() SignatureNotChanged - private synthetic com.volmit.iris.noise.CNG lambda$getHeightGenerator$0(com.volmit.iris.util.RNG) SignatureNotChanged - private synthetic com.volmit.iris.noise.CNG lambda$getLayerGenerator$1(com.volmit.iris.util.RNG) SignatureNotChanged + private synthetic com.volmit.iris.generator.noise.CNG lambda$getHeightGenerator$0(com.volmit.iris.util.RNG) SignatureNotChanged + private synthetic com.volmit.iris.generator.noise.CNG lambda$getLayerGenerator$1(com.volmit.iris.util.RNG) SignatureNotChanged public java.lang.String toString() SignatureNotChanged public com.volmit.iris.object.IrisBiomePaletteLayer zero() SignatureNotChanged LineNumbersOf: com.volmit.iris.object.IrisBiomePaletteLayer @@ -8732,7 +8732,7 @@ Class: public com.volmit.iris.object.IrisBlockDrops NameNotChanged Source: "IrisBlockDrops.java" FieldsOf: com.volmit.iris.object.IrisBlockDrops private com.volmit.iris.util.KList blocks => b - private transient com.volmit.iris.gen.atomics.AtomicCache data => a + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache data => a private com.volmit.iris.util.KList drops NameNotChanged private boolean exactBlocks NameNotChanged private boolean replaceVanillaDrops NameNotChanged @@ -8744,7 +8744,7 @@ Class: public com.volmit.iris.object.IrisBlockDrops NameNotChanged public boolean equals(java.lang.Object) SignatureNotChanged public void fillDrops(boolean, com.volmit.iris.util.KList) SignatureNotChanged public com.volmit.iris.util.KList getBlocks() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getData() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getData() SignatureNotChanged public com.volmit.iris.util.KList getDrops() SignatureNotChanged public int hashCode() SignatureNotChanged public boolean isExactBlocks() SignatureNotChanged @@ -8826,8 +8826,8 @@ Class: public com.volmit.iris.object.IrisCompatabilityFilter NameNotChanged Source: "IrisCompatabilityFilter.java" FieldsOf: com.volmit.iris.object.IrisCompatabilityFilter private boolean exact NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache findData => a - private transient com.volmit.iris.gen.atomics.AtomicCache replaceData => b + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache findData => a + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache replaceData => b private java.lang.String supplement NameNotChanged private java.lang.String when NameNotChanged MethodsOf: com.volmit.iris.object.IrisCompatabilityFilter @@ -8837,9 +8837,9 @@ Class: public com.volmit.iris.object.IrisCompatabilityFilter NameNotChanged public void (java.lang.String, java.lang.String, boolean) SignatureNotChanged protected boolean canEqual(java.lang.Object) SignatureNotChanged public boolean equals(java.lang.Object) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getFindData() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getFindData() SignatureNotChanged public org.bukkit.block.data.BlockData getReplace() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getReplaceData() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getReplaceData() SignatureNotChanged public java.lang.String getSupplement() SignatureNotChanged public java.lang.String getWhen() SignatureNotChanged public int hashCode() SignatureNotChanged @@ -8873,14 +8873,14 @@ Class: public com.volmit.iris.object.IrisCompatabilityFilter NameNotChanged Class: public com.volmit.iris.object.IrisDepositGenerator NameNotChanged Source: "IrisDepositGenerator.java" FieldsOf: com.volmit.iris.object.IrisDepositGenerator - private transient com.volmit.iris.gen.atomics.AtomicCache blockData => b + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache blockData => b private int maxHeight NameNotChanged private int maxPerChunk NameNotChanged private int maxSize NameNotChanged private int minHeight NameNotChanged private int minPerChunk NameNotChanged private int minSize NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache objects => a + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache objects => a private com.volmit.iris.util.KList palette NameNotChanged private int varience NameNotChanged MethodsOf: com.volmit.iris.object.IrisDepositGenerator @@ -8888,7 +8888,7 @@ Class: public com.volmit.iris.object.IrisDepositGenerator NameNotChanged public void () SignatureNotChanged protected boolean canEqual(java.lang.Object) SignatureNotChanged public boolean equals(java.lang.Object) SignatureNotChanged - public void generate(org.bukkit.generator.ChunkGenerator$ChunkData, com.volmit.iris.util.RNG, com.volmit.iris.gen.TerrainChunkGenerator, int, int) SignatureNotChanged + public void generate(org.bukkit.generator.ChunkGenerator$ChunkData, com.volmit.iris.util.RNG, com.volmit.iris.generator.TerrainChunkGenerator, int, int) SignatureNotChanged private com.volmit.iris.object.IrisObject generateClumpObject(com.volmit.iris.util.RNG) => b(com.volmit.iris.util.RNG) public com.volmit.iris.util.KList getBlockData() SignatureNotChanged public com.volmit.iris.object.IrisObject getClump(com.volmit.iris.util.RNG) SignatureNotChanged @@ -8899,7 +8899,7 @@ Class: public com.volmit.iris.object.IrisDepositGenerator NameNotChanged public int getMinHeight() SignatureNotChanged public int getMinPerChunk() SignatureNotChanged public int getMinSize() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getObjects() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getObjects() SignatureNotChanged public com.volmit.iris.util.KList getPalette() SignatureNotChanged public int getVarience() SignatureNotChanged public int hashCode() SignatureNotChanged @@ -8997,7 +8997,7 @@ Class: public com.volmit.iris.object.IrisDimension NameNotChanged public static final org.bukkit.block.data.BlockData WATER NameNotChanged private double biomeZoom NameNotChanged private com.volmit.iris.util.KList blockDrops NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache cacheFilters => k + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache cacheFilters => k private boolean carving NameNotChanged private double carvingEnvelope NameNotChanged private int carvingMax NameNotChanged @@ -9011,17 +9011,17 @@ Class: public com.volmit.iris.object.IrisDimension NameNotChanged private com.volmit.iris.util.KList compatability NameNotChanged private double continentZoom NameNotChanged private com.volmit.iris.object.IrisGeneratorStyle continentalStyle NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache coordFracture => m + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache coordFracture => m private double coordFractureDistance NameNotChanged private double coordFractureZoom NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache cosr => e + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache cosr => e private boolean decorate NameNotChanged private com.volmit.iris.util.KList deposits NameNotChanged private double dimensionAngleDeg NameNotChanged private org.bukkit.World$Environment environment NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache fluidData => n + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache fluidData => n private int fluidHeight NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache fluidLayerGenerator => j + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache fluidLayerGenerator => j private com.volmit.iris.util.KList fluidPalette NameNotChanged private com.volmit.iris.object.IrisGeneratorStyle fluidStyle NameNotChanged private java.lang.String focus NameNotChanged @@ -9034,24 +9034,24 @@ Class: public com.volmit.iris.object.IrisDimension NameNotChanged private int lootTries NameNotChanged private com.volmit.iris.util.KList mutations NameNotChanged private java.lang.String name NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache parallaxSize => h + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache parallaxSize => h private boolean placeObjects NameNotChanged private boolean postProcessing NameNotChanged private com.volmit.iris.util.KList postProcessors NameNotChanged private boolean preventLeafDecay NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache rad => i + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache rad => i private com.volmit.iris.object.IrisGeneratorStyle regionStyle NameNotChanged private double regionZoom NameNotChanged private com.volmit.iris.util.KList regions NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache rockData => d - private transient com.volmit.iris.gen.atomics.AtomicCache rockLayerGenerator => g + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache rockData => d + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache rockLayerGenerator => g private com.volmit.iris.util.KList rockPalette NameNotChanged private com.volmit.iris.object.IrisGeneratorStyle rockStyle NameNotChanged private double rockZoom NameNotChanged private com.volmit.iris.object.IrisGeneratorStyle seaBiomeStyle NameNotChanged private double seaZoom NameNotChanged private com.volmit.iris.object.IrisGeneratorStyle shoreBiomeStyle NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache sinr => l + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache sinr => l private com.volmit.iris.object.IrisGeneratorStyle skylandBiomeStyle NameNotChanged private double terrainZoom NameNotChanged private com.volmit.iris.util.KList text NameNotChanged @@ -9065,12 +9065,12 @@ Class: public com.volmit.iris.object.IrisDimension NameNotChanged protected boolean canEqual(java.lang.Object) SignatureNotChanged public double cosRotate() SignatureNotChanged public boolean equals(java.lang.Object) SignatureNotChanged - public com.volmit.iris.util.KList getAllBiomes(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged - public com.volmit.iris.util.KList getAllRegions(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged + public com.volmit.iris.util.KList getAllBiomes(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged + public com.volmit.iris.util.KList getAllRegions(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged public com.volmit.iris.object.IrisGeneratorStyle getBiomeStyle(com.volmit.iris.object.InferredType) SignatureNotChanged public double getBiomeZoom() SignatureNotChanged public com.volmit.iris.util.KList getBlockDrops() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getCacheFilters() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getCacheFilters() SignatureNotChanged public double getCarvingEnvelope() SignatureNotChanged public int getCarvingMax() SignatureNotChanged public int getCarvingMin() SignatureNotChanged @@ -9082,11 +9082,11 @@ Class: public com.volmit.iris.object.IrisDimension NameNotChanged public com.volmit.iris.util.KList getCompatability() SignatureNotChanged public double getContinentZoom() SignatureNotChanged public com.volmit.iris.object.IrisGeneratorStyle getContinentalStyle() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getCoordFracture() SignatureNotChanged - public com.volmit.iris.noise.CNG getCoordFracture(com.volmit.iris.util.RNG, int) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getCoordFracture() SignatureNotChanged + public com.volmit.iris.generator.noise.CNG getCoordFracture(com.volmit.iris.util.RNG, int) SignatureNotChanged public double getCoordFractureDistance() SignatureNotChanged public double getCoordFractureZoom() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getCosr() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getCosr() SignatureNotChanged public static com.volmit.iris.util.KList getDefaultCompatability() SignatureNotChanged private com.volmit.iris.util.KList getDefaultPostProcessors() => d() public com.volmit.iris.util.KList getDeposits() SignatureNotChanged @@ -9095,9 +9095,9 @@ Class: public com.volmit.iris.object.IrisDimension NameNotChanged public org.bukkit.World$Environment getEnvironment() SignatureNotChanged public org.bukkit.block.data.BlockData getFluid(com.volmit.iris.util.RNG, double, double, double) SignatureNotChanged public com.volmit.iris.util.KList getFluidData() SignatureNotChanged - public com.volmit.iris.noise.CNG getFluidGenerator(com.volmit.iris.util.RNG) SignatureNotChanged + public com.volmit.iris.generator.noise.CNG getFluidGenerator(com.volmit.iris.util.RNG) SignatureNotChanged public int getFluidHeight() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getFluidLayerGenerator() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getFluidLayerGenerator() SignatureNotChanged public com.volmit.iris.util.KList getFluidPalette() SignatureNotChanged public com.volmit.iris.object.IrisGeneratorStyle getFluidStyle() SignatureNotChanged public java.lang.String getFocus() SignatureNotChanged @@ -9110,25 +9110,25 @@ Class: public com.volmit.iris.object.IrisDimension NameNotChanged public int getLootTries() SignatureNotChanged public com.volmit.iris.util.KList getMutations() SignatureNotChanged public java.lang.String getName() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getParallaxSize() SignatureNotChanged - public com.volmit.iris.util.ChunkPosition getParallaxSize(com.volmit.iris.gen.ParallelChunkGenerator) SignatureNotChanged - public com.volmit.iris.util.KList getPostBlockProcessors(com.volmit.iris.gen.PostBlockChunkGenerator) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getParallaxSize() SignatureNotChanged + public com.volmit.iris.util.ChunkPosition getParallaxSize(com.volmit.iris.generator.ParallelChunkGenerator) SignatureNotChanged + public com.volmit.iris.util.KList getPostBlockProcessors(com.volmit.iris.generator.PostBlockChunkGenerator) SignatureNotChanged public com.volmit.iris.util.KList getPostProcessors() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getRad() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getRad() SignatureNotChanged public com.volmit.iris.object.IrisGeneratorStyle getRegionStyle() SignatureNotChanged public double getRegionZoom() SignatureNotChanged public com.volmit.iris.util.KList getRegions() SignatureNotChanged public org.bukkit.block.data.BlockData getRock(com.volmit.iris.util.RNG, double, double, double) SignatureNotChanged public com.volmit.iris.util.KList getRockData() SignatureNotChanged - public com.volmit.iris.noise.CNG getRockGenerator(com.volmit.iris.util.RNG) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getRockLayerGenerator() SignatureNotChanged + public com.volmit.iris.generator.noise.CNG getRockGenerator(com.volmit.iris.util.RNG) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getRockLayerGenerator() SignatureNotChanged public com.volmit.iris.util.KList getRockPalette() SignatureNotChanged public com.volmit.iris.object.IrisGeneratorStyle getRockStyle() SignatureNotChanged public double getRockZoom() SignatureNotChanged public com.volmit.iris.object.IrisGeneratorStyle getSeaBiomeStyle() SignatureNotChanged public double getSeaZoom() SignatureNotChanged public com.volmit.iris.object.IrisGeneratorStyle getShoreBiomeStyle() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getSinr() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getSinr() SignatureNotChanged public com.volmit.iris.object.IrisGeneratorStyle getSkylandBiomeStyle() SignatureNotChanged public double getTerrainZoom() SignatureNotChanged public com.volmit.iris.util.KList getText() SignatureNotChanged @@ -9141,17 +9141,17 @@ Class: public com.volmit.iris.object.IrisDimension NameNotChanged public boolean isPostProcessing() SignatureNotChanged public boolean isPreventLeafDecay() SignatureNotChanged public boolean isVanillaStructures() SignatureNotChanged - private synthetic com.volmit.iris.util.KList lambda$0(com.volmit.iris.gen.PostBlockChunkGenerator) SignatureNotChanged - private synthetic com.volmit.iris.noise.CNG lambda$1(com.volmit.iris.util.RNG, int) SignatureNotChanged - private static synthetic void lambda$10(com.volmit.iris.gen.ParallelChunkGenerator, java.lang.String, com.volmit.iris.util.IrisLock, com.volmit.iris.util.O, com.volmit.iris.util.O, com.volmit.iris.util.O) SignatureNotChanged - private synthetic com.volmit.iris.noise.CNG lambda$2(com.volmit.iris.util.RNG) SignatureNotChanged + private synthetic com.volmit.iris.util.KList lambda$0(com.volmit.iris.generator.PostBlockChunkGenerator) SignatureNotChanged + private synthetic com.volmit.iris.generator.noise.CNG lambda$1(com.volmit.iris.util.RNG, int) SignatureNotChanged + private static synthetic void lambda$10(com.volmit.iris.generator.ParallelChunkGenerator, java.lang.String, com.volmit.iris.util.IrisLock, com.volmit.iris.util.O, com.volmit.iris.util.O, com.volmit.iris.util.O) SignatureNotChanged + private synthetic com.volmit.iris.generator.noise.CNG lambda$2(com.volmit.iris.util.RNG) SignatureNotChanged private synthetic com.volmit.iris.util.KList lambda$3() SignatureNotChanged - private synthetic com.volmit.iris.noise.CNG lambda$4(com.volmit.iris.util.RNG) SignatureNotChanged + private synthetic com.volmit.iris.generator.noise.CNG lambda$4(com.volmit.iris.util.RNG) SignatureNotChanged private synthetic com.volmit.iris.util.KList lambda$5() SignatureNotChanged private synthetic java.lang.Double lambda$6() SignatureNotChanged private synthetic java.lang.Double lambda$7() SignatureNotChanged private synthetic java.lang.Double lambda$8() SignatureNotChanged - private synthetic com.volmit.iris.util.ChunkPosition lambda$9(com.volmit.iris.gen.ParallelChunkGenerator) SignatureNotChanged + private synthetic com.volmit.iris.util.ChunkPosition lambda$9(com.volmit.iris.generator.ParallelChunkGenerator) SignatureNotChanged public org.bukkit.block.data.BlockData resolve(java.lang.String) SignatureNotChanged public void setLandZoom(double) SignatureNotChanged public void setName(java.lang.String) SignatureNotChanged @@ -9500,7 +9500,7 @@ Class: public com.volmit.iris.object.IrisEffect NameNotChanged private int chance NameNotChanged private double extra NameNotChanged private int interval NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache latch => b + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache latch => b private double maxPitch NameNotChanged private double minPitch NameNotChanged private double particleAltX NameNotChanged @@ -9516,7 +9516,7 @@ Class: public com.volmit.iris.object.IrisEffect NameNotChanged private int potionStrength NameNotChanged private int potionTicksMax NameNotChanged private int potionTicksMin NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache pt => a + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache pt => a private boolean randomAltX NameNotChanged private boolean randomAltY NameNotChanged private boolean randomAltZ NameNotChanged @@ -9527,14 +9527,14 @@ Class: public com.volmit.iris.object.IrisEffect NameNotChanged static void () SignatureNotChanged public void () SignatureNotChanged private static java.lang.Throwable a(java.lang.Throwable) SignatureNotChanged - public void apply(org.bukkit.entity.Player, com.volmit.iris.gen.IrisChunkGenerator) SignatureNotChanged + public void apply(org.bukkit.entity.Player, com.volmit.iris.generator.IrisChunkGenerator) SignatureNotChanged protected boolean canEqual(java.lang.Object) SignatureNotChanged public boolean canTick() SignatureNotChanged public boolean equals(java.lang.Object) SignatureNotChanged public int getChance() SignatureNotChanged public double getExtra() SignatureNotChanged public int getInterval() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getLatch() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getLatch() SignatureNotChanged public double getMaxPitch() SignatureNotChanged public double getMinPitch() SignatureNotChanged public double getParticleAltX() SignatureNotChanged @@ -9550,7 +9550,7 @@ Class: public com.volmit.iris.object.IrisEffect NameNotChanged public int getPotionStrength() SignatureNotChanged public int getPotionTicksMax() SignatureNotChanged public int getPotionTicksMin() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getPt() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getPt() SignatureNotChanged public org.bukkit.potion.PotionEffectType getRealType() SignatureNotChanged public org.bukkit.Sound getSound() SignatureNotChanged public int getSoundDistance() SignatureNotChanged @@ -9716,7 +9716,7 @@ Class: public com.volmit.iris.object.IrisGenerator NameNotChanged private double cellFractureHeight NameNotChanged private double cellFractureShuffle NameNotChanged private double cellFractureZoom NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache cellGen => d + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache cellGen => d private double cellPercentSize NameNotChanged private com.volmit.iris.object.IrisNoiseGenerator cliffHeightGenerator NameNotChanged private double cliffHeightMax NameNotChanged @@ -9738,8 +9738,8 @@ Class: public com.volmit.iris.object.IrisGenerator NameNotChanged public double getCellFractureHeight() SignatureNotChanged public double getCellFractureShuffle() SignatureNotChanged public double getCellFractureZoom() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getCellGen() SignatureNotChanged - public com.volmit.iris.noise.CellGenerator getCellGenerator(long) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getCellGen() SignatureNotChanged + public com.volmit.iris.generator.noise.CellGenerator getCellGenerator(long) SignatureNotChanged public double getCellPercentSize() SignatureNotChanged public double getCliffHeight(double, double, double) SignatureNotChanged public com.volmit.iris.object.IrisNoiseGenerator getCliffHeightGenerator() SignatureNotChanged @@ -9757,7 +9757,7 @@ Class: public com.volmit.iris.object.IrisGenerator NameNotChanged private boolean hasCellCracks() => a() public boolean hasCliffs() SignatureNotChanged public int hashCode() SignatureNotChanged - private static synthetic com.volmit.iris.noise.CellGenerator lambda$getCellGenerator$0(long) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CellGenerator lambda$getCellGenerator$0(long) SignatureNotChanged public java.lang.String toString() SignatureNotChanged LineNumbersOf: com.volmit.iris.object.IrisGenerator 23 => 37 @@ -9824,7 +9824,7 @@ Class: public com.volmit.iris.object.IrisGenerator NameNotChanged Class: public com.volmit.iris.object.IrisGeneratorStyle NameNotChanged Source: "IrisGeneratorStyle.java" FieldsOf: com.volmit.iris.object.IrisGeneratorStyle - private final transient com.volmit.iris.gen.atomics.AtomicCache cng => a + private final transient com.volmit.iris.generator.legacy.atomics.AtomicCache cng => a private double exponent NameNotChanged private com.volmit.iris.object.IrisGeneratorStyle fracture NameNotChanged private double multiplier NameNotChanged @@ -9835,16 +9835,16 @@ Class: public com.volmit.iris.object.IrisGeneratorStyle NameNotChanged public void () SignatureNotChanged public void (com.volmit.iris.object.NoiseStyle) SignatureNotChanged protected boolean canEqual(java.lang.Object) SignatureNotChanged - public com.volmit.iris.noise.CNG create(com.volmit.iris.util.RNG) SignatureNotChanged + public com.volmit.iris.generator.noise.CNG create(com.volmit.iris.util.RNG) SignatureNotChanged public boolean equals(java.lang.Object) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getCng() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getCng() SignatureNotChanged public double getExponent() SignatureNotChanged public com.volmit.iris.object.IrisGeneratorStyle getFracture() SignatureNotChanged public double getMultiplier() SignatureNotChanged public com.volmit.iris.object.NoiseStyle getStyle() SignatureNotChanged public double getZoom() SignatureNotChanged public int hashCode() SignatureNotChanged - private synthetic com.volmit.iris.noise.CNG lambda$create$0(com.volmit.iris.util.RNG) SignatureNotChanged + private synthetic com.volmit.iris.generator.noise.CNG lambda$create$0(com.volmit.iris.util.RNG) SignatureNotChanged public java.lang.String toString() SignatureNotChanged LineNumbersOf: com.volmit.iris.object.IrisGeneratorStyle 15 => 3, 20, 29 and 30 @@ -9901,7 +9901,7 @@ Class: public com.volmit.iris.object.IrisLoot NameNotChanged Source: "IrisLoot.java" FieldsOf: com.volmit.iris.object.IrisLoot private com.volmit.iris.util.KList attributes NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache chance => a + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache chance => a private java.lang.Integer customModel NameNotChanged private java.lang.String displayName NameNotChanged private com.volmit.iris.util.KList enchantments NameNotChanged @@ -9923,7 +9923,7 @@ Class: public com.volmit.iris.object.IrisLoot NameNotChanged public org.bukkit.inventory.ItemStack get(boolean, com.volmit.iris.object.IrisLootTable, com.volmit.iris.util.RNG, int, int, int) SignatureNotChanged public org.bukkit.inventory.ItemStack get(boolean, com.volmit.iris.util.RNG) SignatureNotChanged public com.volmit.iris.util.KList getAttributes() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getChance() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getChance() SignatureNotChanged public java.lang.Integer getCustomModel() SignatureNotChanged public java.lang.String getDisplayName() SignatureNotChanged public com.volmit.iris.util.KList getEnchantments() SignatureNotChanged @@ -9939,7 +9939,7 @@ Class: public com.volmit.iris.object.IrisLoot NameNotChanged public int hashCode() SignatureNotChanged public boolean isUnbreakable() SignatureNotChanged private static synthetic void lambda$get$0(com.volmit.iris.util.KList, java.lang.String) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$get$1(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$get$1(com.volmit.iris.util.RNG) SignatureNotChanged private static synthetic void lambda$get$2(com.volmit.iris.util.KList, java.lang.String) SignatureNotChanged public java.lang.String toString() SignatureNotChanged LineNumbersOf: com.volmit.iris.object.IrisLoot @@ -10058,19 +10058,19 @@ Class: public com.volmit.iris.object.IrisLootReference NameNotChanged private com.volmit.iris.object.LootMode mode NameNotChanged private double multiplier NameNotChanged private com.volmit.iris.util.KList tables NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache tt => a + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache tt => a MethodsOf: com.volmit.iris.object.IrisLootReference static void () SignatureNotChanged public void () SignatureNotChanged protected boolean canEqual(java.lang.Object) SignatureNotChanged public boolean equals(java.lang.Object) SignatureNotChanged - public com.volmit.iris.util.KList getLootTables(com.volmit.iris.gen.DimensionChunkGenerator) SignatureNotChanged + public com.volmit.iris.util.KList getLootTables(com.volmit.iris.generator.DimensionChunkGenerator) SignatureNotChanged public com.volmit.iris.object.LootMode getMode() SignatureNotChanged public double getMultiplier() SignatureNotChanged public com.volmit.iris.util.KList getTables() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getTt() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getTt() SignatureNotChanged public int hashCode() SignatureNotChanged - private synthetic com.volmit.iris.util.KList lambda$getLootTables$0(com.volmit.iris.gen.DimensionChunkGenerator) SignatureNotChanged + private synthetic com.volmit.iris.util.KList lambda$getLootTables$0(com.volmit.iris.generator.DimensionChunkGenerator) SignatureNotChanged public java.lang.String toString() SignatureNotChanged LineNumbersOf: com.volmit.iris.object.IrisLootReference 15 => 1, 5, 8 and 19 @@ -10137,9 +10137,9 @@ Class: public com.volmit.iris.object.IrisLootTable NameNotChanged Class: public com.volmit.iris.object.IrisMaterialPalette NameNotChanged Source: "IrisMaterialPalette.java" FieldsOf: com.volmit.iris.object.IrisMaterialPalette - private transient com.volmit.iris.gen.atomics.AtomicCache blockData => c - private transient com.volmit.iris.gen.atomics.AtomicCache heightGenerator => a - private transient com.volmit.iris.gen.atomics.AtomicCache layerGenerator => b + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache blockData => c + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache heightGenerator => a + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache layerGenerator => b private com.volmit.iris.util.KList palette NameNotChanged private com.volmit.iris.object.IrisGeneratorStyle style NameNotChanged private double zoom NameNotChanged @@ -10150,15 +10150,15 @@ Class: public com.volmit.iris.object.IrisMaterialPalette NameNotChanged public boolean equals(java.lang.Object) SignatureNotChanged public org.bukkit.block.data.BlockData get(com.volmit.iris.util.RNG, double, double, double) SignatureNotChanged public com.volmit.iris.util.KList getBlockData() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getHeightGenerator() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getLayerGenerator() SignatureNotChanged - public com.volmit.iris.noise.CNG getLayerGenerator(com.volmit.iris.util.RNG) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getHeightGenerator() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getLayerGenerator() SignatureNotChanged + public com.volmit.iris.generator.noise.CNG getLayerGenerator(com.volmit.iris.util.RNG) SignatureNotChanged public com.volmit.iris.util.KList getPalette() SignatureNotChanged public com.volmit.iris.object.IrisGeneratorStyle getStyle() SignatureNotChanged public double getZoom() SignatureNotChanged public int hashCode() SignatureNotChanged private synthetic com.volmit.iris.util.KList lambda$getBlockData$1() SignatureNotChanged - private synthetic com.volmit.iris.noise.CNG lambda$getLayerGenerator$0(com.volmit.iris.util.RNG) SignatureNotChanged + private synthetic com.volmit.iris.generator.noise.CNG lambda$getLayerGenerator$0(com.volmit.iris.util.RNG) SignatureNotChanged public java.lang.String toString() SignatureNotChanged LineNumbersOf: com.volmit.iris.object.IrisMaterialPalette 19 => 1, 2, 4, 6 and 34 @@ -10195,7 +10195,7 @@ Class: public com.volmit.iris.object.IrisNoiseGenerator NameNotChanged private boolean enabled NameNotChanged private double exponent NameNotChanged private com.volmit.iris.util.KList fracture NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache generator => a + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache generator => a private boolean negative NameNotChanged private int octaves NameNotChanged private double offsetX NameNotChanged @@ -10215,8 +10215,8 @@ Class: public com.volmit.iris.object.IrisNoiseGenerator NameNotChanged public boolean equals(java.lang.Object) SignatureNotChanged public double getExponent() SignatureNotChanged public com.volmit.iris.util.KList getFracture() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getGenerator() SignatureNotChanged - protected com.volmit.iris.noise.CNG getGenerator(long) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getGenerator() SignatureNotChanged + protected com.volmit.iris.generator.noise.CNG getGenerator(long) SignatureNotChanged public double getNoise(long, double, double) SignatureNotChanged public int getOctaves() SignatureNotChanged public double getOffsetX() SignatureNotChanged @@ -10232,7 +10232,7 @@ Class: public com.volmit.iris.object.IrisNoiseGenerator NameNotChanged public boolean isNegative() SignatureNotChanged public boolean isParametric() SignatureNotChanged public boolean isSinCentered() SignatureNotChanged - private synthetic com.volmit.iris.noise.CNG lambda$getGenerator$0(long) SignatureNotChanged + private synthetic com.volmit.iris.generator.noise.CNG lambda$getGenerator$0(long) SignatureNotChanged public void setOctaves(int) SignatureNotChanged public void setOpacity(double) SignatureNotChanged public void setSeed(long) SignatureNotChanged @@ -10627,7 +10627,7 @@ Class: public com.volmit.iris.object.IrisObjectPlacement NameNotChanged public int getOverStilt() SignatureNotChanged public com.volmit.iris.util.KList getPlace() SignatureNotChanged public com.volmit.iris.object.IrisObjectRotation getRotation() SignatureNotChanged - public com.volmit.iris.object.IrisObject getSchematic(com.volmit.iris.gen.ContextualChunkGenerator, com.volmit.iris.util.RNG) SignatureNotChanged + public com.volmit.iris.object.IrisObject getSchematic(com.volmit.iris.generator.ContextualChunkGenerator, com.volmit.iris.util.RNG) SignatureNotChanged public double getSnow() SignatureNotChanged public com.volmit.iris.object.IrisObjectTranslate getTranslate() SignatureNotChanged public int getTriesForChunk(com.volmit.iris.util.RNG) SignatureNotChanged @@ -10708,26 +10708,26 @@ Class: public com.volmit.iris.object.IrisObjectReplace NameNotChanged FieldsOf: com.volmit.iris.object.IrisObjectReplace private boolean exact NameNotChanged private com.volmit.iris.util.KList find NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache findData => a + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache findData => a private com.volmit.iris.util.KList replace NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache replaceData => c - private transient com.volmit.iris.gen.atomics.AtomicCache replaceGen => b + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache replaceData => c + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache replaceGen => b MethodsOf: com.volmit.iris.object.IrisObjectReplace static void () SignatureNotChanged public void () SignatureNotChanged protected boolean canEqual(java.lang.Object) SignatureNotChanged public boolean equals(java.lang.Object) SignatureNotChanged public com.volmit.iris.util.KList getFind() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getFindData() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getFindData() SignatureNotChanged public com.volmit.iris.util.KList getReplace() SignatureNotChanged public org.bukkit.block.data.BlockData getReplace(com.volmit.iris.util.RNG, double, double, double) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getReplaceData() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getReplaceGen() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getReplaceData() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getReplaceGen() SignatureNotChanged public int hashCode() SignatureNotChanged public boolean isExact() SignatureNotChanged private synthetic com.volmit.iris.util.KList lambda$getFind$0() SignatureNotChanged private synthetic com.volmit.iris.util.KList lambda$getReplace$1() SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$getReplace$2(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$getReplace$2(com.volmit.iris.util.RNG) SignatureNotChanged public java.lang.String toString() SignatureNotChanged LineNumbersOf: com.volmit.iris.object.IrisObjectReplace 18 => 8, 13, 16 and 17 @@ -10975,8 +10975,8 @@ Class: public com.volmit.iris.object.IrisRegion NameNotChanged private static synthetic int[] $SWITCH_TABLE$com$volmit$iris$object$InferredType => l private double biomeImplosionRatio NameNotChanged private com.volmit.iris.util.KList blockDrops NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache cacheRidge => i - private transient com.volmit.iris.gen.atomics.AtomicCache cacheSpot => h + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache cacheRidge => i + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache cacheSpot => h private double caveBiomeZoom NameNotChanged private com.volmit.iris.util.KList caveBiomes NameNotChanged private com.volmit.iris.util.KList deposits => f @@ -10986,16 +10986,16 @@ Class: public com.volmit.iris.object.IrisRegion NameNotChanged private com.volmit.iris.object.IrisLootReference loot NameNotChanged private java.lang.String name NameNotChanged private int rarity NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache realCaveBiomes => j - private transient com.volmit.iris.gen.atomics.AtomicCache realLandBiomes => e - private transient com.volmit.iris.gen.atomics.AtomicCache realSeaBiomes => d - private transient com.volmit.iris.gen.atomics.AtomicCache realShoreBiomes => k + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache realCaveBiomes => j + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache realLandBiomes => e + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache realSeaBiomes => d + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache realShoreBiomes => k private com.volmit.iris.util.KList ridgeBiomes NameNotChanged private double seaBiomeZoom NameNotChanged private com.volmit.iris.util.KList seaBiomes NameNotChanged private double shoreBiomeZoom NameNotChanged private com.volmit.iris.util.KList shoreBiomes NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache shoreHeightGenerator => g + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache shoreHeightGenerator => g private double shoreHeightMax NameNotChanged private double shoreHeightMin NameNotChanged private double shoreHeightZoom NameNotChanged @@ -11010,13 +11010,13 @@ Class: public com.volmit.iris.object.IrisRegion NameNotChanged private static java.lang.NoSuchFieldError a(java.lang.NoSuchFieldError) SignatureNotChanged protected boolean canEqual(java.lang.Object) SignatureNotChanged public boolean equals(java.lang.Object) SignatureNotChanged - public com.volmit.iris.util.KList getAllBiomes(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged + public com.volmit.iris.util.KList getAllBiomes(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged public double getBiomeImplosionRatio() SignatureNotChanged public double getBiomeZoom(com.volmit.iris.object.InferredType) SignatureNotChanged - public com.volmit.iris.util.KList getBiomes(com.volmit.iris.gen.ContextualChunkGenerator, com.volmit.iris.object.InferredType) SignatureNotChanged + public com.volmit.iris.util.KList getBiomes(com.volmit.iris.generator.ContextualChunkGenerator, com.volmit.iris.object.InferredType) SignatureNotChanged public com.volmit.iris.util.KList getBlockDrops() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getCacheRidge() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getCacheSpot() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getCacheRidge() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getCacheSpot() SignatureNotChanged public double getCaveBiomeZoom() SignatureNotChanged public com.volmit.iris.util.KList getCaveBiomes() SignatureNotChanged public com.volmit.iris.util.KList getDeposits() SignatureNotChanged @@ -11026,14 +11026,14 @@ Class: public com.volmit.iris.object.IrisRegion NameNotChanged public com.volmit.iris.object.IrisLootReference getLoot() SignatureNotChanged public java.lang.String getName() SignatureNotChanged public int getRarity() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getRealCaveBiomes() SignatureNotChanged - public com.volmit.iris.util.KList getRealCaveBiomes(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getRealLandBiomes() SignatureNotChanged - public com.volmit.iris.util.KList getRealLandBiomes(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getRealSeaBiomes() SignatureNotChanged - public com.volmit.iris.util.KList getRealSeaBiomes(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getRealShoreBiomes() SignatureNotChanged - public com.volmit.iris.util.KList getRealShoreBiomes(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getRealCaveBiomes() SignatureNotChanged + public com.volmit.iris.util.KList getRealCaveBiomes(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getRealLandBiomes() SignatureNotChanged + public com.volmit.iris.util.KList getRealLandBiomes(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getRealSeaBiomes() SignatureNotChanged + public com.volmit.iris.util.KList getRealSeaBiomes(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getRealShoreBiomes() SignatureNotChanged + public com.volmit.iris.util.KList getRealShoreBiomes(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged public com.volmit.iris.util.KList getRidgeBiomeKeys() SignatureNotChanged public com.volmit.iris.util.KList getRidgeBiomes() SignatureNotChanged public double getSeaBiomeZoom() SignatureNotChanged @@ -11041,7 +11041,7 @@ Class: public com.volmit.iris.object.IrisRegion NameNotChanged public double getShoreBiomeZoom() SignatureNotChanged public com.volmit.iris.util.KList getShoreBiomes() SignatureNotChanged public double getShoreHeight(double, double) SignatureNotChanged - public com.volmit.iris.noise.CNG getShoreHeightGenerator() SignatureNotChanged + public com.volmit.iris.generator.noise.CNG getShoreHeightGenerator() SignatureNotChanged public double getShoreHeightMax() SignatureNotChanged public double getShoreHeightMin() SignatureNotChanged public double getShoreHeightZoom() SignatureNotChanged @@ -11053,15 +11053,15 @@ Class: public com.volmit.iris.object.IrisRegion NameNotChanged public int hashCode() SignatureNotChanged private synthetic com.volmit.iris.util.KList lambda$0() SignatureNotChanged private static synthetic void lambda$1(com.volmit.iris.util.KList, com.volmit.iris.object.IrisRegionRidge) SignatureNotChanged - private synthetic com.volmit.iris.util.KList lambda$10(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged + private synthetic com.volmit.iris.util.KList lambda$10(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged private synthetic com.volmit.iris.util.KList lambda$2() SignatureNotChanged private static synthetic void lambda$3(com.volmit.iris.util.KList, com.volmit.iris.object.IrisRegionSpot) SignatureNotChanged - private synthetic com.volmit.iris.noise.CNG lambda$4() SignatureNotChanged + private synthetic com.volmit.iris.generator.noise.CNG lambda$4() SignatureNotChanged private static synthetic void lambda$5(com.volmit.iris.util.KSet, com.volmit.iris.object.IrisRegionSpot) SignatureNotChanged private static synthetic void lambda$6(com.volmit.iris.util.KSet, com.volmit.iris.object.IrisRegionRidge) SignatureNotChanged - private synthetic com.volmit.iris.util.KList lambda$7(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged - private synthetic com.volmit.iris.util.KList lambda$8(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged - private synthetic com.volmit.iris.util.KList lambda$9(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged + private synthetic com.volmit.iris.util.KList lambda$7(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged + private synthetic com.volmit.iris.util.KList lambda$8(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged + private synthetic com.volmit.iris.util.KList lambda$9(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged public void setName(java.lang.String) SignatureNotChanged public java.lang.String toString() SignatureNotChanged LineNumbersOf: com.volmit.iris.object.IrisRegion @@ -11173,10 +11173,10 @@ Class: public com.volmit.iris.object.IrisRegionRidge NameNotChanged private double chanceScale NameNotChanged private double chanceShuffle NameNotChanged private double noiseMultiplier NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache ridge => b + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache ridge => b private double scale NameNotChanged private double shuffle NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache spot => a + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache spot => a private double thickness NameNotChanged private com.volmit.iris.object.InferredType type NameNotChanged MethodsOf: com.volmit.iris.object.IrisRegionRidge @@ -11191,18 +11191,18 @@ Class: public com.volmit.iris.object.IrisRegionRidge NameNotChanged public double getChanceScale() SignatureNotChanged public double getChanceShuffle() SignatureNotChanged public double getNoiseMultiplier() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getRidge() SignatureNotChanged - public com.volmit.iris.noise.CellGenerator getRidgeGenerator(com.volmit.iris.util.RNG) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getRidge() SignatureNotChanged + public com.volmit.iris.generator.noise.CellGenerator getRidgeGenerator(com.volmit.iris.util.RNG) SignatureNotChanged public double getScale() SignatureNotChanged public double getShuffle() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getSpot() SignatureNotChanged - public com.volmit.iris.noise.CellGenerator getSpotGenerator(com.volmit.iris.util.RNG) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getSpot() SignatureNotChanged + public com.volmit.iris.generator.noise.CellGenerator getSpotGenerator(com.volmit.iris.util.RNG) SignatureNotChanged public double getThickness() SignatureNotChanged public com.volmit.iris.object.InferredType getType() SignatureNotChanged public int hashCode() SignatureNotChanged public boolean isRidge(com.volmit.iris.util.RNG, double, double) SignatureNotChanged - private synthetic com.volmit.iris.noise.CellGenerator lambda$getRidgeGenerator$1(com.volmit.iris.util.RNG) SignatureNotChanged - private synthetic com.volmit.iris.noise.CellGenerator lambda$getSpotGenerator$0(com.volmit.iris.util.RNG) SignatureNotChanged + private synthetic com.volmit.iris.generator.noise.CellGenerator lambda$getRidgeGenerator$1(com.volmit.iris.util.RNG) SignatureNotChanged + private synthetic com.volmit.iris.generator.noise.CellGenerator lambda$getSpotGenerator$0(com.volmit.iris.util.RNG) SignatureNotChanged public java.lang.String toString() SignatureNotChanged LineNumbersOf: com.volmit.iris.object.IrisRegionRidge 16 => 2, 17, 19 and 21 @@ -11258,7 +11258,7 @@ Class: public com.volmit.iris.object.IrisRegionSpot NameNotChanged private double rarity NameNotChanged private double scale NameNotChanged private double shuffle NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache spot => a + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache spot => a private com.volmit.iris.object.InferredType type NameNotChanged MethodsOf: com.volmit.iris.object.IrisRegionSpot static void () SignatureNotChanged @@ -11272,12 +11272,12 @@ Class: public com.volmit.iris.object.IrisRegionSpot NameNotChanged public double getRarity() SignatureNotChanged public double getScale() SignatureNotChanged public double getShuffle() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getSpot() SignatureNotChanged - public com.volmit.iris.noise.CellGenerator getSpotGenerator(com.volmit.iris.util.RNG) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getSpot() SignatureNotChanged + public com.volmit.iris.generator.noise.CellGenerator getSpotGenerator(com.volmit.iris.util.RNG) SignatureNotChanged public com.volmit.iris.object.InferredType getType() SignatureNotChanged public int hashCode() SignatureNotChanged public boolean isSpot(com.volmit.iris.util.RNG, double, double) SignatureNotChanged - private synthetic com.volmit.iris.noise.CellGenerator lambda$getSpotGenerator$0(com.volmit.iris.util.RNG) SignatureNotChanged + private synthetic com.volmit.iris.generator.noise.CellGenerator lambda$getSpotGenerator$0(com.volmit.iris.util.RNG) SignatureNotChanged public java.lang.String toString() SignatureNotChanged LineNumbersOf: com.volmit.iris.object.IrisRegionSpot 15 => 5, 9, 15 and 24 @@ -11376,7 +11376,7 @@ Class: public com.volmit.iris.object.IrisStructure NameNotChanged private com.volmit.iris.util.KList tiles NameNotChanged private boolean underwater NameNotChanged private double wallChance NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache wallGenerator => d + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache wallGenerator => d private com.volmit.iris.object.IrisGeneratorStyle wallStyle NameNotChanged MethodsOf: com.volmit.iris.object.IrisStructure static void () SignatureNotChanged @@ -11393,15 +11393,15 @@ Class: public com.volmit.iris.object.IrisStructure NameNotChanged public com.volmit.iris.object.TileResult getTile(com.volmit.iris.util.RNG, double, double, double) SignatureNotChanged public com.volmit.iris.util.KList getTiles() SignatureNotChanged public double getWallChance() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getWallGenerator() SignatureNotChanged - public com.volmit.iris.noise.CNG getWallGenerator(com.volmit.iris.util.RNG) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getWallGenerator() SignatureNotChanged + public com.volmit.iris.generator.noise.CNG getWallGenerator(com.volmit.iris.util.RNG) SignatureNotChanged public com.volmit.iris.object.IrisGeneratorStyle getWallStyle() SignatureNotChanged public int hashCode() SignatureNotChanged public boolean isBore() SignatureNotChanged public boolean isMergeEdges() SignatureNotChanged public boolean isUnderwater() SignatureNotChanged public boolean isWall(com.volmit.iris.util.RNG, double, double, double, com.volmit.iris.object.StructureTileFace) SignatureNotChanged - private synthetic com.volmit.iris.noise.CNG lambda$getWallGenerator$0(com.volmit.iris.util.RNG) SignatureNotChanged + private synthetic com.volmit.iris.generator.noise.CNG lambda$getWallGenerator$0(com.volmit.iris.util.RNG) SignatureNotChanged public void rotate(com.volmit.iris.util.KList) SignatureNotChanged public void setBore(boolean) SignatureNotChanged public void setGridHeight(int) SignatureNotChanged @@ -11481,13 +11481,13 @@ Class: public com.volmit.iris.object.IrisStructure NameNotChanged Class: public com.volmit.iris.object.IrisStructurePlacement NameNotChanged Source: "IrisStructurePlacement.java" FieldsOf: com.volmit.iris.object.IrisStructurePlacement - private transient com.volmit.iris.gen.atomics.AtomicCache chanceCell => a - private transient com.volmit.iris.gen.atomics.AtomicCache config => b + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache chanceCell => a + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache config => b private int height NameNotChanged private int rarity NameNotChanged private double ratio NameNotChanged private double shuffle NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache structure => c + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache structure => c private java.lang.String tileset NameNotChanged private double zoom NameNotChanged MethodsOf: com.volmit.iris.object.IrisStructurePlacement @@ -11496,28 +11496,28 @@ Class: public com.volmit.iris.object.IrisStructurePlacement NameNotChanged private static java.lang.Throwable a(java.lang.Throwable) SignatureNotChanged protected boolean canEqual(java.lang.Object) SignatureNotChanged public boolean equals(java.lang.Object) SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getChanceCell() SignatureNotChanged - public com.volmit.iris.noise.CellGenerator getChanceGenerator(com.volmit.iris.util.RNG) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getChanceCell() SignatureNotChanged + public com.volmit.iris.generator.noise.CellGenerator getChanceGenerator(com.volmit.iris.util.RNG) SignatureNotChanged private com.volmit.iris.object.IrisObjectPlacement getConfig() => a() public int getHeight() SignatureNotChanged public int getRarity() SignatureNotChanged public double getRatio() SignatureNotChanged public double getShuffle() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getStructure() SignatureNotChanged - public com.volmit.iris.object.IrisStructure getStructure(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getStructure() SignatureNotChanged + public com.volmit.iris.object.IrisStructure getStructure(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged public java.lang.String getTileset() SignatureNotChanged public double getZoom() SignatureNotChanged - public int gridHeight(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged - public int gridSize(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged + public int gridHeight(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged + public int gridSize(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged public boolean hasStructure(com.volmit.iris.util.RNG, double, double, double) SignatureNotChanged public int hashCode() SignatureNotChanged - private synthetic com.volmit.iris.noise.CellGenerator lambda$getChanceGenerator$3(com.volmit.iris.util.RNG) SignatureNotChanged + private synthetic com.volmit.iris.generator.noise.CellGenerator lambda$getChanceGenerator$3(com.volmit.iris.util.RNG) SignatureNotChanged private static synthetic com.volmit.iris.object.IrisObjectPlacement lambda$getConfig$1() SignatureNotChanged - private synthetic com.volmit.iris.object.IrisStructure lambda$getStructure$2(com.volmit.iris.gen.ContextualChunkGenerator) SignatureNotChanged - private static synthetic void lambda$placeLayer$0(com.volmit.iris.gen.ParallaxChunkGenerator, com.volmit.iris.object.TileResult, com.volmit.iris.util.BlockPosition) SignatureNotChanged - public com.volmit.iris.object.IrisObject load(com.volmit.iris.gen.ContextualChunkGenerator, java.lang.String) SignatureNotChanged - public void place(com.volmit.iris.gen.ParallaxChunkGenerator, com.volmit.iris.util.RNG, int, int) SignatureNotChanged - public void placeLayer(com.volmit.iris.gen.ParallaxChunkGenerator, com.volmit.iris.util.RNG, com.volmit.iris.util.RNG, int, int, int, int, int) SignatureNotChanged + private synthetic com.volmit.iris.object.IrisStructure lambda$getStructure$2(com.volmit.iris.generator.ContextualChunkGenerator) SignatureNotChanged + private static synthetic void lambda$placeLayer$0(com.volmit.iris.generator.ParallaxChunkGenerator, com.volmit.iris.object.TileResult, com.volmit.iris.util.BlockPosition) SignatureNotChanged + public com.volmit.iris.object.IrisObject load(com.volmit.iris.generator.ContextualChunkGenerator, java.lang.String) SignatureNotChanged + public void place(com.volmit.iris.generator.ParallaxChunkGenerator, com.volmit.iris.util.RNG, int, int) SignatureNotChanged + public void placeLayer(com.volmit.iris.generator.ParallaxChunkGenerator, com.volmit.iris.util.RNG, com.volmit.iris.util.RNG, int, int, int, int, int) SignatureNotChanged public java.lang.String toString() SignatureNotChanged LineNumbersOf: com.volmit.iris.object.IrisStructurePlacement 21 => 5, 17, 76 and 78 @@ -11603,8 +11603,8 @@ Class: public com.volmit.iris.object.IrisStructureTile NameNotChanged private com.volmit.iris.object.StructureTileCondition floor NameNotChanged private transient com.volmit.iris.util.KMap forceObjects => a private com.volmit.iris.object.IrisLootReference loot NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache maxFaces => b - private transient com.volmit.iris.gen.atomics.AtomicCache minFaces => c + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache maxFaces => b + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache minFaces => c private com.volmit.iris.object.StructureTileCondition north NameNotChanged private com.volmit.iris.util.KList objects NameNotChanged private com.volmit.iris.object.ObjectPlaceMode placeMode NameNotChanged @@ -11712,7 +11712,7 @@ Class: public com.volmit.iris.object.IrisTextPlacement NameNotChanged FieldsOf: com.volmit.iris.object.IrisTextPlacement private double chance NameNotChanged private com.volmit.iris.object.IrisObjectLimit clamp NameNotChanged - private com.volmit.iris.gen.atomics.AtomicCache config => a + private com.volmit.iris.generator.legacy.atomics.AtomicCache config => a private int density NameNotChanged private com.volmit.iris.object.ObjectPlaceMode mode NameNotChanged private boolean onwater NameNotChanged @@ -11740,7 +11740,7 @@ Class: public com.volmit.iris.object.IrisTextPlacement NameNotChanged public boolean isWaterloggable() SignatureNotChanged private synthetic com.volmit.iris.object.IrisObjectPlacement lambda$0() SignatureNotChanged public int maxDimension() SignatureNotChanged - public void place(com.volmit.iris.gen.ParallaxChunkGenerator, com.volmit.iris.util.RNG, int, int) SignatureNotChanged + public void place(com.volmit.iris.generator.ParallaxChunkGenerator, com.volmit.iris.util.RNG, int, int) SignatureNotChanged public java.lang.String toString() SignatureNotChanged LineNumbersOf: com.volmit.iris.object.IrisTextPlacement 17 => 1, 2, 9, 11, 13, 20, 26, 27, 32, 33, 43, 47, 48 and 53 @@ -11789,12 +11789,12 @@ Class: public com.volmit.iris.object.IrisTextRenderer NameNotChanged FieldsOf: com.volmit.iris.object.IrisTextRenderer private com.volmit.iris.object.IrisMaterialPalette blockPalette NameNotChanged private java.lang.String font NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache fontData => c - private transient com.volmit.iris.gen.atomics.AtomicCache fontMetrics => a + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache fontData => c + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache fontMetrics => a private com.volmit.iris.object.FontStyle fontStyle NameNotChanged - private transient com.volmit.iris.gen.atomics.AtomicCache fontStyleData => e - private transient com.volmit.iris.gen.atomics.AtomicCache maxLength => b - private transient com.volmit.iris.gen.atomics.AtomicCache objects => d + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache fontStyleData => e + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache maxLength => b + private transient com.volmit.iris.generator.legacy.atomics.AtomicCache objects => d private int size NameNotChanged private com.volmit.iris.object.IrisGeneratorStyle surfaceField NameNotChanged private com.volmit.iris.util.KList text NameNotChanged @@ -11808,21 +11808,21 @@ Class: public com.volmit.iris.object.IrisTextRenderer NameNotChanged public java.awt.Font getFontData() SignatureNotChanged public java.awt.FontMetrics getFontMetrics() SignatureNotChanged public com.volmit.iris.object.FontStyle getFontStyle() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getFontStyleData() SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getFontStyleData() SignatureNotChanged public double getLength(java.lang.String) SignatureNotChanged public double getMaxLength() SignatureNotChanged - public com.volmit.iris.gen.atomics.AtomicCache getObjects() SignatureNotChanged - public com.volmit.iris.util.KList getObjects(com.volmit.iris.gen.ParallaxChunkGenerator, com.volmit.iris.util.RNG) SignatureNotChanged + public com.volmit.iris.generator.legacy.atomics.AtomicCache getObjects() SignatureNotChanged + public com.volmit.iris.util.KList getObjects(com.volmit.iris.generator.ParallaxChunkGenerator, com.volmit.iris.util.RNG) SignatureNotChanged public int getSize() SignatureNotChanged public com.volmit.iris.object.IrisGeneratorStyle getSurfaceField() SignatureNotChanged public com.volmit.iris.util.KList getText() SignatureNotChanged public int hashCode() SignatureNotChanged - private synthetic com.volmit.iris.util.KList lambda$0(com.volmit.iris.gen.ParallaxChunkGenerator, com.volmit.iris.util.RNG) SignatureNotChanged + private synthetic com.volmit.iris.util.KList lambda$0(com.volmit.iris.generator.ParallaxChunkGenerator, com.volmit.iris.util.RNG) SignatureNotChanged private synthetic java.lang.Double lambda$1() SignatureNotChanged private synthetic java.awt.Font lambda$2() SignatureNotChanged private synthetic java.lang.Integer lambda$3() SignatureNotChanged private synthetic java.awt.FontMetrics lambda$4() SignatureNotChanged - public void place(com.volmit.iris.gen.ParallaxChunkGenerator, com.volmit.iris.util.RNG, com.volmit.iris.object.IrisObjectPlacement, int, int) SignatureNotChanged + public void place(com.volmit.iris.generator.ParallaxChunkGenerator, com.volmit.iris.util.RNG, com.volmit.iris.object.IrisObjectPlacement, int, int) SignatureNotChanged public java.lang.String toString() SignatureNotChanged LineNumbersOf: com.volmit.iris.object.IrisTextRenderer 22 => 3, 6, 8, 13, 18, 20, 30, 35, 45, 47, 50 and 52 @@ -11983,108 +11983,108 @@ Class: public final enum com.volmit.iris.object.NoiseStyle NameNotChanged public static final enum com.volmit.iris.object.NoiseStyle VIGOCTAVE_FRACTAL_FBM_SIMPLEX NameNotChanged public static final enum com.volmit.iris.object.NoiseStyle VIGOCTAVE_FRACTAL_RM_SIMPLEX NameNotChanged public static final enum com.volmit.iris.object.NoiseStyle VIGOCTAVE_SIMPLEX NameNotChanged - private com.volmit.iris.noise.CNGFactory f => b + private com.volmit.iris.generator.noise.CNGFactory f => b MethodsOf: com.volmit.iris.object.NoiseStyle static void () SignatureNotChanged - private void (java.lang.String, int, com.volmit.iris.noise.CNGFactory) SignatureNotChanged - public com.volmit.iris.noise.CNG create(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$0(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$1(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$10(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$11(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$12(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$13(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$14(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$15(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$16(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$17(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$18(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$19(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$2(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$20(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$21(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$22(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$23(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$24(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$25(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$26(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$27(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$28(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$29(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$3(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$30(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$31(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$32(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$33(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$34(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$35(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$36(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$37(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$38(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$39(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$4(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$40(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$41(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$42(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$43(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$44(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$45(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$46(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$47(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$48(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$49(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$5(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$50(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$51(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$52(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$53(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$54(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$55(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$56(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$57(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$58(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$59(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$6(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$60(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$61(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$62(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$63(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$64(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$65(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$66(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$67(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$68(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$69(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$7(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$70(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$71(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$72(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$73(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$74(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$75(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$76(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$77(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$78(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$79(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$8(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$80(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$81(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$82(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$83(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$84(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$85(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$86(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$87(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$88(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$89(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$9(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$90(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$91(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$92(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$93(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$94(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$95(com.volmit.iris.util.RNG) SignatureNotChanged - private static synthetic com.volmit.iris.noise.CNG lambda$static$96(com.volmit.iris.util.RNG) SignatureNotChanged + private void (java.lang.String, int, com.volmit.iris.generator.noise.CNGFactory) SignatureNotChanged + public com.volmit.iris.generator.noise.CNG create(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$0(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$1(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$10(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$11(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$12(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$13(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$14(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$15(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$16(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$17(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$18(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$19(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$2(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$20(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$21(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$22(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$23(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$24(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$25(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$26(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$27(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$28(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$29(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$3(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$30(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$31(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$32(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$33(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$34(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$35(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$36(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$37(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$38(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$39(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$4(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$40(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$41(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$42(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$43(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$44(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$45(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$46(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$47(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$48(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$49(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$5(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$50(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$51(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$52(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$53(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$54(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$55(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$56(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$57(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$58(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$59(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$6(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$60(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$61(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$62(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$63(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$64(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$65(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$66(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$67(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$68(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$69(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$7(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$70(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$71(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$72(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$73(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$74(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$75(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$76(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$77(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$78(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$79(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$8(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$80(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$81(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$82(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$83(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$84(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$85(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$86(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$87(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$88(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$89(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$9(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$90(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$91(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$92(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$93(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$94(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$95(com.volmit.iris.util.RNG) SignatureNotChanged + private static synthetic com.volmit.iris.generator.noise.CNG lambda$static$96(com.volmit.iris.util.RNG) SignatureNotChanged public com.volmit.iris.object.IrisGeneratorStyle style() SignatureNotChanged public static com.volmit.iris.object.NoiseStyle valueOf(java.lang.String) SignatureNotChanged public static com.volmit.iris.object.NoiseStyle[] values() SignatureNotChanged @@ -14225,10 +14225,10 @@ Class: public com.volmit.iris.util.GBiset NameNotChanged Class: public abstract com.volmit.iris.util.GenLayer NameNotChanged Source: "GenLayer.java" FieldsOf: com.volmit.iris.util.GenLayer - protected final com.volmit.iris.gen.DimensionChunkGenerator iris NameNotChanged + protected final com.volmit.iris.generator.DimensionChunkGenerator iris NameNotChanged protected final com.volmit.iris.util.RNG rng NameNotChanged MethodsOf: com.volmit.iris.util.GenLayer - public void (com.volmit.iris.gen.DimensionChunkGenerator, com.volmit.iris.util.RNG) SignatureNotChanged + public void (com.volmit.iris.generator.DimensionChunkGenerator, com.volmit.iris.util.RNG) SignatureNotChanged LineNumbersOf: com.volmit.iris.util.GenLayer 11 => 3 12 => 4 @@ -14560,7 +14560,7 @@ Class: public final com.volmit.iris.util.IntTag NameNotChanged Class: public com.volmit.iris.util.IrisInterpolation NameNotChanged Source: "IrisInterpolation.java" FieldsOf: com.volmit.iris.util.IrisInterpolation - public static com.volmit.iris.noise.CNG cng NameNotChanged + public static com.volmit.iris.generator.noise.CNG cng NameNotChanged MethodsOf: com.volmit.iris.util.IrisInterpolation static void () SignatureNotChanged public static double bezier(double) SignatureNotChanged @@ -14835,16 +14835,16 @@ Class: public com.volmit.iris.util.IrisLock NameNotChanged Class: public abstract com.volmit.iris.util.IrisPostBlockFilter NameNotChanged Source: "IrisPostBlockFilter.java" FieldsOf: com.volmit.iris.util.IrisPostBlockFilter - public com.volmit.iris.gen.PostBlockChunkGenerator gen NameNotChanged + public com.volmit.iris.generator.PostBlockChunkGenerator gen NameNotChanged private java.lang.String key => b private int phase => a private com.volmit.iris.util.KList queue => c MethodsOf: com.volmit.iris.util.IrisPostBlockFilter static void () SignatureNotChanged - public void (com.volmit.iris.gen.PostBlockChunkGenerator, int) SignatureNotChanged + public void (com.volmit.iris.generator.PostBlockChunkGenerator, int) SignatureNotChanged protected boolean canEqual(java.lang.Object) SignatureNotChanged public boolean equals(java.lang.Object) SignatureNotChanged - public com.volmit.iris.gen.PostBlockChunkGenerator getGen() SignatureNotChanged + public com.volmit.iris.generator.PostBlockChunkGenerator getGen() SignatureNotChanged public java.lang.String getKey() SignatureNotChanged public int getPhase() SignatureNotChanged public org.bukkit.block.data.BlockData getPostBlock(int, int, int, int, int, org.bukkit.generator.ChunkGenerator$ChunkData) SignatureNotChanged @@ -17456,7 +17456,7 @@ Class: public com.volmit.iris.util.StructureTemplate NameNotChanged private com.volmit.iris.util.ChronoLatch u => n private com.volmit.iris.util.KMap updates => u private boolean use3d => q - private com.volmit.iris.noise.CNG variants => l + private com.volmit.iris.generator.noise.CNG variants => l private int w => s private org.bukkit.entity.Player worker => e private org.bukkit.World world => g @@ -17492,7 +17492,7 @@ Class: public com.volmit.iris.util.StructureTemplate NameNotChanged public com.volmit.iris.util.ChronoLatch getU() SignatureNotChanged public com.volmit.iris.util.KMap getUpdates() SignatureNotChanged public int getVariant(com.volmit.iris.util.Cuboid, com.volmit.iris.object.IrisStructureTile) SignatureNotChanged - public com.volmit.iris.noise.CNG getVariants() SignatureNotChanged + public com.volmit.iris.generator.noise.CNG getVariants() SignatureNotChanged public int getW() SignatureNotChanged public org.bukkit.entity.Player getWorker() SignatureNotChanged public org.bukkit.World getWorld() SignatureNotChanged @@ -20096,13 +20096,13 @@ AutoReflectionClass: com.volmit.iris.util.a TraceBackClass: com.volmit.iris.util.VolmitPlugin Data: 33452 a3452 b3452 z ForwardClass: com.volmit.iris.Iris Package: com.volmit.iris Data: 12115 a2114 b2115 c2116 N ForwardClass: com.volmit.iris.activation.IrisActivation2 Package: com.volmit.iris.activation Data: 24327 a4327 b4327 c4328 E -ForwardClass: com.volmit.iris.command.PermissionIris Package: com.volmit.iris.command Data: 53961 a3961 b3961 r -ForwardClass: com.volmit.iris.gen.ContextualChunkGenerator Package: com.volmit.iris.gen Data: M4571 a4571 b4571 w -ForwardClass: com.volmit.iris.gen.atomics.AtomicCache Package: com.volmit.iris.gen.atomics Data: 23941 a3940 b3940 c3941 Q -ForwardClass: com.volmit.iris.gen.layer.GenLayerUpdate Package: com.volmit.iris.gen.layer Data: 14058 a4058 b4058 c4059 B -ForwardClass: com.volmit.iris.gen.post.PostWallPatcher Package: com.volmit.iris.gen.post Data: 54102 a4102 b4102 s -ForwardClass: com.volmit.iris.gui.IrisVision Package: com.volmit.iris.gui Data: 33118 a3118 b3118 f -ForwardClass: com.volmit.iris.noise.FastNoise Package: com.volmit.iris.noise Data: 53204 a3204 b3204 N +ForwardClass: com.volmit.iris.manager.command.PermissionIris Package: com.volmit.iris.manager.command Data: 53961 a3961 b3961 r +ForwardClass: com.volmit.iris.generator.ContextualChunkGenerator Package: com.volmit.iris.generator Data: M4571 a4571 b4571 w +ForwardClass: com.volmit.iris.generator.legacy.atomics.AtomicCache Package: com.volmit.iris.generator.legacy.atomics Data: 23941 a3940 b3940 c3941 Q +ForwardClass: com.volmit.iris.generator.legacy.layer.GenLayerUpdate Package: com.volmit.iris.generator.legacy.layer Data: 14058 a4058 b4058 c4059 B +ForwardClass: com.volmit.iris.generator.legacy.post.PostWallPatcher Package: com.volmit.iris.generator.legacy.post Data: 54102 a4102 b4102 s +ForwardClass: com.volmit.iris.manager.gui.IrisVision Package: com.volmit.iris.manager.gui Data: 33118 a3118 b3118 f +ForwardClass: com.volmit.iris.generator.noise.FastNoise Package: com.volmit.iris.generator.noise Data: 53204 a3204 b3204 N ForwardClass: com.volmit.iris.object.IrisRegistrant Package: com.volmit.iris.object Data: 13851 a3851 b3851 c3852 E ForwardClass: com.volmit.iris.util.KList Package: com.volmit.iris.util Data: 42687 a2687 b2687 R ForwardClass: org.slf4j.LoggerFactory Package: org.slf4j Data: 32382 a2382 b2382 h @@ -20122,112 +20122,112 @@ MemberClass: com.volmit.iris.StructureManager Data: 3243 MemberClass: com.volmit.iris.WandManager Data: 2660 MemberClass: com.volmit.iris.activation.IrisActivation1 Data: 4187 K MemberClass: com.volmit.iris.activation.IrisActivation2 Data: 4188 v -MemberClass: com.volmit.iris.command.CommandIris Data: 3461 -MemberClass: com.volmit.iris.command.CommandIrisCreate Data: 4057 -MemberClass: com.volmit.iris.command.CommandIrisEditBiome Data: 4343 -MemberClass: com.volmit.iris.command.CommandIrisGoto Data: 3870 -MemberClass: com.volmit.iris.command.CommandIrisHotload Data: 4176 -MemberClass: com.volmit.iris.command.CommandIrisLoot Data: 3875 -MemberClass: com.volmit.iris.command.CommandIrisMap Data: 3747 -MemberClass: com.volmit.iris.command.CommandIrisMetrics Data: 4188 -MemberClass: com.volmit.iris.command.CommandIrisObject Data: 4060 -MemberClass: com.volmit.iris.command.CommandIrisObjectContract Data: 4890 -MemberClass: com.volmit.iris.command.CommandIrisObjectExpand Data: 4668 -MemberClass: com.volmit.iris.command.CommandIrisObjectP1 Data: 4189 -MemberClass: com.volmit.iris.command.CommandIrisObjectP2 Data: 4190 -MemberClass: com.volmit.iris.command.CommandIrisObjectPaste Data: 4569 -MemberClass: com.volmit.iris.command.CommandIrisObjectSave Data: 4459 -MemberClass: com.volmit.iris.command.CommandIrisObjectShift Data: 4570 -MemberClass: com.volmit.iris.command.CommandIrisObjectWand Data: 4454 -MemberClass: com.volmit.iris.command.CommandIrisObjectXAY Data: 4302 -MemberClass: com.volmit.iris.command.CommandIrisObjectXPY Data: 4317 -MemberClass: com.volmit.iris.command.CommandIrisPregen Data: 4070 -MemberClass: com.volmit.iris.command.CommandIrisStructure Data: 4438 -MemberClass: com.volmit.iris.command.CommandIrisStructureClose Data: 4940 -MemberClass: com.volmit.iris.command.CommandIrisStructureCreate Data: 5034 -MemberClass: com.volmit.iris.command.CommandIrisStructureExpand Data: 5046 -MemberClass: com.volmit.iris.command.CommandIrisStructureMore Data: 4841 -MemberClass: com.volmit.iris.command.CommandIrisStructureOpen Data: 4840 -MemberClass: com.volmit.iris.command.CommandIrisStructureSave Data: 4837 -MemberClass: com.volmit.iris.command.CommandIrisStructureVariants Data: 5278 -MemberClass: com.volmit.iris.command.CommandIrisStudio Data: 4093 -MemberClass: com.volmit.iris.command.CommandIrisStudioClose Data: 4595 -MemberClass: com.volmit.iris.command.CommandIrisStudioCreate Data: 4689 -MemberClass: com.volmit.iris.command.CommandIrisStudioList Data: 4505 r -MemberClass: com.volmit.iris.command.CommandIrisStudioOpen Data: 4495 -MemberClass: com.volmit.iris.command.CommandIrisStudioPackage Data: 4777 -MemberClass: com.volmit.iris.command.CommandIrisStudioUpdate Data: 4704 -MemberClass: com.volmit.iris.command.CommandIrisStudioVerify Data: 4722 A -MemberClass: com.volmit.iris.command.CommandIrisTC Data: 3612 -MemberClass: com.volmit.iris.command.CommandIrisWhat Data: 3865 -MemberClass: com.volmit.iris.command.CommandIrisWhatBlock Data: 4356 -MemberClass: com.volmit.iris.command.CommandIrisWhatHand Data: 4244 -MemberClass: com.volmit.iris.command.PermissionIris Data: 3823 -MemberClass: com.volmit.iris.command.PermissionIrisStudio Data: 4455 -MemberClass: com.volmit.iris.gen.ContextualChunkGenerator Data: 4434 X -MemberClass: com.volmit.iris.gen.DimensionChunkGenerator Data: 4305 -MemberClass: com.volmit.iris.gen.IrisChunkGenerator Data: 3778 -MemberClass: com.volmit.iris.gen.ParallaxChunkGenerator Data: 4192 -MemberClass: com.volmit.iris.gen.ParallelChunkGenerator Data: 4184 -MemberClass: com.volmit.iris.gen.PostBlockChunkGenerator Data: 4284 -MemberClass: com.volmit.iris.gen.TerrainChunkGenerator Data: 4096 d -MemberClass: com.volmit.iris.gen.atomics.AtomicCache Data: 3804 -MemberClass: com.volmit.iris.gen.atomics.AtomicMulticache Data: 4359 -MemberClass: com.volmit.iris.gen.atomics.AtomicRegionData Data: 4326 -MemberClass: com.volmit.iris.gen.atomics.AtomicSliver Data: 3965 y -MemberClass: com.volmit.iris.gen.atomics.AtomicSliverMap Data: 4251 V -MemberClass: com.volmit.iris.gen.atomics.AtomicWorldData Data: 4234 -MemberClass: com.volmit.iris.gen.atomics.MasterLock Data: 3744 -MemberClass: com.volmit.iris.gen.layer.BiomeDataProvider Data: 4234 -MemberClass: com.volmit.iris.gen.layer.GenLayerBiome Data: 3804 A -MemberClass: com.volmit.iris.gen.layer.GenLayerCarve Data: 3809 -MemberClass: com.volmit.iris.gen.layer.GenLayerCave Data: 3695 -MemberClass: com.volmit.iris.gen.layer.GenLayerText Data: 3733 -MemberClass: com.volmit.iris.gen.layer.GenLayerUpdate Data: 3923 t -MemberClass: com.volmit.iris.gen.post.Post Data: 2857 -MemberClass: com.volmit.iris.gen.post.PostFloatingNibDeleter Data: 4667 -MemberClass: com.volmit.iris.gen.post.PostNibSmoother Data: 3987 h -MemberClass: com.volmit.iris.gen.post.PostPotholeFiller Data: 4194 A -MemberClass: com.volmit.iris.gen.post.PostSlabber Data: 3556 -MemberClass: com.volmit.iris.gen.post.PostWallPatcher Data: 3968 -MemberClass: com.volmit.iris.gen.post.PostWaterlogger Data: 4012 -MemberClass: com.volmit.iris.gui.IrisRenderer Data: 3178 -MemberClass: com.volmit.iris.gui.IrisVision Data: 2987 Qt -MemberClass: com.volmit.iris.gui.IrisVision$1 Data: 3123 -MemberClass: com.volmit.iris.gui.IrisVision$2 Data: 3121 -MemberClass: com.volmit.iris.gui.IrisVision$3 Data: 3122 -MemberClass: com.volmit.iris.gui.IrisVision$4 Data: 3120 -MemberClass: com.volmit.iris.gui.Renderer Data: 2771 -MemberClass: com.volmit.iris.noise.CNG Data: 2382 K -MemberClass: com.volmit.iris.noise.CNGFactory Data: 3110 -MemberClass: com.volmit.iris.noise.CellGenerator Data: 3485 a -MemberClass: com.volmit.iris.noise.CellHeightNoise Data: 3661 -MemberClass: com.volmit.iris.noise.CellularNoise Data: 3496 -MemberClass: com.volmit.iris.noise.CubicNoise Data: 3162 -MemberClass: com.volmit.iris.noise.FastNoise Data: 3074 -MemberClass: com.volmit.iris.noise.FastNoise$1 Data: 3207 -MemberClass: com.volmit.iris.noise.FastNoise$CellularDistanceFunction Data: 5579 -MemberClass: com.volmit.iris.noise.FastNoise$CellularReturnType Data: 4988 -MemberClass: com.volmit.iris.noise.FastNoise$Float2 Data: 3209 -MemberClass: com.volmit.iris.noise.FastNoise$Float3 Data: 3208 -MemberClass: com.volmit.iris.noise.FastNoise$FractalType Data: 4229 -MemberClass: com.volmit.iris.noise.FastNoise$Interp Data: 3736 -MemberClass: com.volmit.iris.noise.FastNoise$NoiseType Data: 4038 -MemberClass: com.volmit.iris.noise.FlatNoise Data: 3067 -MemberClass: com.volmit.iris.noise.FractalBillowPerlinNoise Data: 4612 -MemberClass: com.volmit.iris.noise.FractalBillowSimplexNoise Data: 4732 -MemberClass: com.volmit.iris.noise.FractalCubicNoise Data: 3863 -MemberClass: com.volmit.iris.noise.FractalFBMSimplexNoise Data: 4328 -MemberClass: com.volmit.iris.noise.FractalRigidMultiSimplexNoise Data: 5133 -MemberClass: com.volmit.iris.noise.GlobNoise Data: 3064 -MemberClass: com.volmit.iris.noise.NoiseFactory Data: 3404 -MemberClass: com.volmit.iris.noise.NoiseGenerator Data: 3611 -MemberClass: com.volmit.iris.noise.NoiseType Data: 3094 -MemberClass: com.volmit.iris.noise.OctaveNoise Data: 3286 -MemberClass: com.volmit.iris.noise.PerlinNoise Data: 3294 -MemberClass: com.volmit.iris.noise.SimplexNoise Data: 3414 -MemberClass: com.volmit.iris.noise.VascularNoise Data: 3509 -MemberClass: com.volmit.iris.noise.WhiteNoise Data: 3189 +MemberClass: com.volmit.iris.manager.command.CommandIris Data: 3461 +MemberClass: com.volmit.iris.manager.command.CommandIrisCreate Data: 4057 +MemberClass: com.volmit.iris.manager.command.CommandIrisEditBiome Data: 4343 +MemberClass: com.volmit.iris.manager.command.CommandIrisGoto Data: 3870 +MemberClass: com.volmit.iris.manager.command.CommandIrisHotload Data: 4176 +MemberClass: com.volmit.iris.manager.command.CommandIrisLoot Data: 3875 +MemberClass: com.volmit.iris.manager.command.CommandIrisMap Data: 3747 +MemberClass: com.volmit.iris.manager.command.CommandIrisMetrics Data: 4188 +MemberClass: com.volmit.iris.manager.command.CommandIrisObject Data: 4060 +MemberClass: com.volmit.iris.manager.command.CommandIrisObjectContract Data: 4890 +MemberClass: com.volmit.iris.manager.command.CommandIrisObjectExpand Data: 4668 +MemberClass: com.volmit.iris.manager.command.CommandIrisObjectP1 Data: 4189 +MemberClass: com.volmit.iris.manager.command.CommandIrisObjectP2 Data: 4190 +MemberClass: com.volmit.iris.manager.command.CommandIrisObjectPaste Data: 4569 +MemberClass: com.volmit.iris.manager.command.CommandIrisObjectSave Data: 4459 +MemberClass: com.volmit.iris.manager.command.CommandIrisObjectShift Data: 4570 +MemberClass: com.volmit.iris.manager.command.CommandIrisObjectWand Data: 4454 +MemberClass: com.volmit.iris.manager.command.CommandIrisObjectXAY Data: 4302 +MemberClass: com.volmit.iris.manager.command.CommandIrisObjectXPY Data: 4317 +MemberClass: com.volmit.iris.manager.command.CommandIrisPregen Data: 4070 +MemberClass: com.volmit.iris.manager.command.CommandIrisStructure Data: 4438 +MemberClass: com.volmit.iris.manager.command.CommandIrisStructureClose Data: 4940 +MemberClass: com.volmit.iris.manager.command.CommandIrisStructureCreate Data: 5034 +MemberClass: com.volmit.iris.manager.command.CommandIrisStructureExpand Data: 5046 +MemberClass: com.volmit.iris.manager.command.CommandIrisStructureMore Data: 4841 +MemberClass: com.volmit.iris.manager.command.CommandIrisStructureOpen Data: 4840 +MemberClass: com.volmit.iris.manager.command.CommandIrisStructureSave Data: 4837 +MemberClass: com.volmit.iris.manager.command.CommandIrisStructureVariants Data: 5278 +MemberClass: com.volmit.iris.manager.command.CommandIrisStudio Data: 4093 +MemberClass: com.volmit.iris.manager.command.CommandIrisStudioClose Data: 4595 +MemberClass: com.volmit.iris.manager.command.CommandIrisStudioCreate Data: 4689 +MemberClass: com.volmit.iris.manager.command.CommandIrisStudioList Data: 4505 r +MemberClass: com.volmit.iris.manager.command.CommandIrisStudioOpen Data: 4495 +MemberClass: com.volmit.iris.manager.command.CommandIrisStudioPackage Data: 4777 +MemberClass: com.volmit.iris.manager.command.CommandIrisStudioUpdate Data: 4704 +MemberClass: com.volmit.iris.manager.command.CommandIrisStudioVerify Data: 4722 A +MemberClass: com.volmit.iris.manager.command.CommandIrisTC Data: 3612 +MemberClass: com.volmit.iris.manager.command.CommandIrisWhat Data: 3865 +MemberClass: com.volmit.iris.manager.command.CommandIrisWhatBlock Data: 4356 +MemberClass: com.volmit.iris.manager.command.CommandIrisWhatHand Data: 4244 +MemberClass: com.volmit.iris.manager.command.PermissionIris Data: 3823 +MemberClass: com.volmit.iris.manager.command.PermissionIrisStudio Data: 4455 +MemberClass: com.volmit.iris.generator.ContextualChunkGenerator Data: 4434 X +MemberClass: com.volmit.iris.generator.DimensionChunkGenerator Data: 4305 +MemberClass: com.volmit.iris.generator.IrisChunkGenerator Data: 3778 +MemberClass: com.volmit.iris.generator.ParallaxChunkGenerator Data: 4192 +MemberClass: com.volmit.iris.generator.ParallelChunkGenerator Data: 4184 +MemberClass: com.volmit.iris.generator.PostBlockChunkGenerator Data: 4284 +MemberClass: com.volmit.iris.generator.TerrainChunkGenerator Data: 4096 d +MemberClass: com.volmit.iris.generator.legacy.atomics.AtomicCache Data: 3804 +MemberClass: com.volmit.iris.generator.legacy.atomics.AtomicMulticache Data: 4359 +MemberClass: com.volmit.iris.generator.legacy.atomics.AtomicRegionData Data: 4326 +MemberClass: com.volmit.iris.generator.legacy.atomics.AtomicSliver Data: 3965 y +MemberClass: com.volmit.iris.generator.legacy.atomics.AtomicSliverMap Data: 4251 V +MemberClass: com.volmit.iris.generator.legacy.atomics.AtomicWorldData Data: 4234 +MemberClass: com.volmit.iris.generator.legacy.atomics.MasterLock Data: 3744 +MemberClass: com.volmit.iris.generator.legacy.layer.BiomeDataProvider Data: 4234 +MemberClass: com.volmit.iris.generator.legacy.layer.GenLayerBiome Data: 3804 A +MemberClass: com.volmit.iris.generator.legacy.layer.GenLayerCarve Data: 3809 +MemberClass: com.volmit.iris.generator.legacy.layer.GenLayerCave Data: 3695 +MemberClass: com.volmit.iris.generator.legacy.layer.GenLayerText Data: 3733 +MemberClass: com.volmit.iris.generator.legacy.layer.GenLayerUpdate Data: 3923 t +MemberClass: com.volmit.iris.generator.legacy.post.Post Data: 2857 +MemberClass: com.volmit.iris.generator.legacy.post.PostFloatingNibDeleter Data: 4667 +MemberClass: com.volmit.iris.generator.legacy.post.PostNibSmoother Data: 3987 h +MemberClass: com.volmit.iris.generator.legacy.post.PostPotholeFiller Data: 4194 A +MemberClass: com.volmit.iris.generator.legacy.post.PostSlabber Data: 3556 +MemberClass: com.volmit.iris.generator.legacy.post.PostWallPatcher Data: 3968 +MemberClass: com.volmit.iris.generator.legacy.post.PostWaterlogger Data: 4012 +MemberClass: com.volmit.iris.manager.gui.IrisRenderer Data: 3178 +MemberClass: com.volmit.iris.manager.gui.IrisVision Data: 2987 Qt +MemberClass: com.volmit.iris.manager.gui.IrisVision$1 Data: 3123 +MemberClass: com.volmit.iris.manager.gui.IrisVision$2 Data: 3121 +MemberClass: com.volmit.iris.manager.gui.IrisVision$3 Data: 3122 +MemberClass: com.volmit.iris.manager.gui.IrisVision$4 Data: 3120 +MemberClass: com.volmit.iris.manager.gui.Renderer Data: 2771 +MemberClass: com.volmit.iris.generator.noise.CNG Data: 2382 K +MemberClass: com.volmit.iris.generator.noise.CNGFactory Data: 3110 +MemberClass: com.volmit.iris.generator.noise.CellGenerator Data: 3485 a +MemberClass: com.volmit.iris.generator.noise.CellHeightNoise Data: 3661 +MemberClass: com.volmit.iris.generator.noise.CellularNoise Data: 3496 +MemberClass: com.volmit.iris.generator.noise.CubicNoise Data: 3162 +MemberClass: com.volmit.iris.generator.noise.FastNoise Data: 3074 +MemberClass: com.volmit.iris.generator.noise.FastNoise$1 Data: 3207 +MemberClass: com.volmit.iris.generator.noise.FastNoise$CellularDistanceFunction Data: 5579 +MemberClass: com.volmit.iris.generator.noise.FastNoise$CellularReturnType Data: 4988 +MemberClass: com.volmit.iris.generator.noise.FastNoise$Float2 Data: 3209 +MemberClass: com.volmit.iris.generator.noise.FastNoise$Float3 Data: 3208 +MemberClass: com.volmit.iris.generator.noise.FastNoise$FractalType Data: 4229 +MemberClass: com.volmit.iris.generator.noise.FastNoise$Interp Data: 3736 +MemberClass: com.volmit.iris.generator.noise.FastNoise$NoiseType Data: 4038 +MemberClass: com.volmit.iris.generator.noise.FlatNoise Data: 3067 +MemberClass: com.volmit.iris.generator.noise.FractalBillowPerlinNoise Data: 4612 +MemberClass: com.volmit.iris.generator.noise.FractalBillowSimplexNoise Data: 4732 +MemberClass: com.volmit.iris.generator.noise.FractalCubicNoise Data: 3863 +MemberClass: com.volmit.iris.generator.noise.FractalFBMSimplexNoise Data: 4328 +MemberClass: com.volmit.iris.generator.noise.FractalRigidMultiSimplexNoise Data: 5133 +MemberClass: com.volmit.iris.generator.noise.GlobNoise Data: 3064 +MemberClass: com.volmit.iris.generator.noise.NoiseFactory Data: 3404 +MemberClass: com.volmit.iris.generator.noise.NoiseGenerator Data: 3611 +MemberClass: com.volmit.iris.generator.noise.NoiseType Data: 3094 +MemberClass: com.volmit.iris.generator.noise.OctaveNoise Data: 3286 +MemberClass: com.volmit.iris.generator.noise.PerlinNoise Data: 3294 +MemberClass: com.volmit.iris.generator.noise.SimplexNoise Data: 3414 +MemberClass: com.volmit.iris.generator.noise.VascularNoise Data: 3509 +MemberClass: com.volmit.iris.generator.noise.WhiteNoise Data: 3189 MemberClass: com.volmit.iris.object.DecorationPart Data: 3695 MemberClass: com.volmit.iris.object.Envelope Data: 3086 MemberClass: com.volmit.iris.object.FontStyle Data: 3192 diff --git a/lint/renaming-log.xml b/lint/renaming-log.xml index 7cdad3b7b..7ecd4cbf9 100644 --- a/lint/renaming-log.xml +++ b/lint/renaming-log.xml @@ -73,7 +73,7 @@ - + @@ -275,7 +275,7 @@ - + @@ -580,14 +580,14 @@ - + - + @@ -672,7 +672,7 @@ - + @@ -697,7 +697,7 @@ - + @@ -776,12 +776,12 @@ - + - + @@ -798,7 +798,7 @@ - + @@ -893,7 +893,7 @@ - + @@ -940,7 +940,7 @@ - + @@ -957,10 +957,10 @@ - + - + @@ -1291,7 +1291,7 @@ - + @@ -1438,7 +1438,7 @@ - + @@ -1833,7 +1833,7 @@ - + @@ -1843,14 +1843,14 @@ - + - + @@ -2005,7 +2005,7 @@ - + @@ -2172,7 +2172,7 @@ - + @@ -2476,7 +2476,7 @@ - + @@ -2493,7 +2493,7 @@ - + @@ -2529,7 +2529,7 @@ - + @@ -2561,7 +2561,7 @@ - + @@ -2668,7 +2668,7 @@ - + @@ -2685,7 +2685,7 @@ - + @@ -2797,7 +2797,7 @@ - + @@ -2827,16 +2827,16 @@ - + - + - + @@ -2928,7 +2928,7 @@ - + @@ -3128,7 +3128,7 @@ - + @@ -3273,7 +3273,7 @@ - + @@ -3435,7 +3435,7 @@ - + @@ -3502,7 +3502,7 @@ - + @@ -3624,7 +3624,7 @@ - + @@ -4052,7 +4052,7 @@ - + @@ -4113,7 +4113,7 @@ - + @@ -4334,7 +4334,7 @@ - + @@ -4534,7 +4534,7 @@ - + @@ -4707,13 +4707,13 @@ - + - + @@ -4943,11 +4943,11 @@ - + - + @@ -4983,7 +4983,7 @@ - + @@ -6064,7 +6064,7 @@ - + @@ -6437,7 +6437,7 @@ - + @@ -6842,7 +6842,7 @@ - + @@ -7593,7 +7593,7 @@ - + @@ -7614,7 +7614,7 @@ - + @@ -7646,7 +7646,7 @@ - + @@ -7933,7 +7933,7 @@ - + @@ -7980,7 +7980,7 @@ - + @@ -8501,7 +8501,7 @@ - + @@ -8532,7 +8532,7 @@ - + @@ -8699,7 +8699,7 @@ - + @@ -8859,7 +8859,7 @@ - + @@ -9128,7 +9128,7 @@ - + @@ -9462,7 +9462,7 @@ - + @@ -9515,7 +9515,7 @@ - + @@ -9540,7 +9540,7 @@ - + @@ -9580,7 +9580,7 @@ - + @@ -9669,7 +9669,7 @@ - + @@ -9722,7 +9722,7 @@ - + @@ -9851,7 +9851,7 @@ - + @@ -9866,7 +9866,7 @@ - + @@ -10004,7 +10004,7 @@ - + @@ -10090,7 +10090,7 @@ - + @@ -10123,7 +10123,7 @@ - + @@ -10243,7 +10243,7 @@ - + @@ -10401,7 +10401,7 @@ - + @@ -10651,7 +10651,7 @@ - + @@ -10773,7 +10773,7 @@ - + @@ -11003,7 +11003,7 @@ - + @@ -11070,7 +11070,7 @@ - + @@ -11103,7 +11103,7 @@ - + @@ -11280,7 +11280,7 @@ - + @@ -11338,7 +11338,7 @@ - + @@ -11591,7 +11591,7 @@ - + @@ -11602,7 +11602,7 @@ - + @@ -11792,7 +11792,7 @@ - + @@ -11873,7 +11873,7 @@ - + @@ -12060,7 +12060,7 @@ - + @@ -12176,14 +12176,14 @@ - + - + @@ -12193,7 +12193,7 @@ - + @@ -12446,7 +12446,7 @@ - + @@ -12817,7 +12817,7 @@ - + @@ -12834,7 +12834,7 @@ - + @@ -12851,7 +12851,7 @@ - + @@ -13083,7 +13083,7 @@ - + @@ -13103,7 +13103,7 @@ - + @@ -13328,7 +13328,7 @@ - + @@ -13369,7 +13369,7 @@ - + @@ -13630,7 +13630,7 @@ - + @@ -13662,7 +13662,7 @@ - + @@ -13782,7 +13782,7 @@ - + @@ -13829,7 +13829,7 @@ - + @@ -13864,7 +13864,7 @@ - + @@ -13899,7 +13899,7 @@ - + @@ -13907,7 +13907,7 @@ - + @@ -13948,7 +13948,7 @@ - + @@ -14123,7 +14123,7 @@ - + @@ -14207,7 +14207,7 @@ - + @@ -14276,7 +14276,7 @@ - + @@ -14284,7 +14284,7 @@ - + @@ -14304,7 +14304,7 @@ - + @@ -14454,7 +14454,7 @@ - + @@ -14551,7 +14551,7 @@ - + @@ -14610,7 +14610,7 @@ - + @@ -14804,7 +14804,7 @@ - + @@ -14969,11 +14969,11 @@ - + - + @@ -15031,7 +15031,7 @@ - + @@ -15194,7 +15194,7 @@ - + @@ -15301,7 +15301,7 @@ - + @@ -15385,7 +15385,7 @@ - + @@ -15437,7 +15437,7 @@ - + @@ -15473,14 +15473,14 @@ - + - + @@ -15521,7 +15521,7 @@ - + diff --git a/lint/script.zkm b/lint/script.zkm index 7e9e0ef86..2f9ff0e40 100644 --- a/lint/script.zkm +++ b/lint/script.zkm @@ -26,7 +26,7 @@ open "C:\Users\cyberpwn\Documents\development\workspace\Iris\lint\in.jar" trimExclude *.Iris and * extends com.volmit.iris.util.MortarCommand and *.* @com.volmit.iris.util.Command * and - @com.volmit.iris.gen.post.Post *.* and + @com.volmit.iris.generator.legacy.post.Post *.* and @org.bukkit.event.EventHandler *.* and *.* @org.bukkit.event.EventHandler * and *.* @org.bukkit.event.EventHandler *(*) and @@ -57,8 +57,8 @@ exclude @com.volmit.iris.util.DontObfuscate *.* and *.* extends com.volmit.iris.util.IrisPostBlockFilter *(*) and *.PostBlockChunkGenerator * and *.PostBlockChunkGenerator *(*) and - com.volmit.iris.gen.post.^* and - com.volmit.iris.gen.post.; + com.volmit.iris.generator.legacy.post.^* and + com.volmit.iris.generator.legacy.post.; obfuscate changeLogFileIn="" changeLogFileOut="ChangeLog.txt" diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index bbe550eb9..898035993 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -1,17 +1,17 @@ package com.volmit.iris; -import com.volmit.iris.command.CommandIris; -import com.volmit.iris.command.PermissionIris; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.nms.INMS; -import com.volmit.iris.gen.provisions.ProvisionBukkit; -import com.volmit.iris.gen.scaffold.IrisGenConfiguration; -import com.volmit.iris.gen.scaffold.IrisWorlds; -import com.volmit.iris.gen.scaffold.TerrainTarget; -import com.volmit.iris.link.BKLink; -import com.volmit.iris.link.CitizensLink; -import com.volmit.iris.link.MultiverseCoreLink; -import com.volmit.iris.link.MythicMobsLink; +import com.volmit.iris.manager.command.CommandIris; +import com.volmit.iris.manager.command.PermissionIris; +import com.volmit.iris.generator.legacy.IrisTerrainProvider; +import com.volmit.iris.generator.legacy.nms.INMS; +import com.volmit.iris.generator.legacy.provisions.ProvisionBukkit; +import com.volmit.iris.generator.legacy.scaffold.IrisGenConfiguration; +import com.volmit.iris.scaffold.IrisWorlds; +import com.volmit.iris.generator.legacy.scaffold.TerrainTarget; +import com.volmit.iris.manager.link.BKLink; +import com.volmit.iris.manager.link.CitizensLink; +import com.volmit.iris.manager.link.MultiverseCoreLink; +import com.volmit.iris.manager.link.MythicMobsLink; import com.volmit.iris.manager.*; import com.volmit.iris.object.IrisCompat; import com.volmit.iris.util.*; @@ -241,7 +241,7 @@ public class Iris extends VolmitPlugin { if(IrisWorlds.isIrisWorld(i)) { - IrisWorlds.getProvider(i).close(); + IrisWorlds.access(i).close(); } } diff --git a/src/main/java/com/volmit/iris/gen/nms/v16_2/NMSBinding16_2.java b/src/main/java/com/volmit/iris/gen/nms/v16_2/NMSBinding16_2.java deleted file mode 100644 index 1c75644fa..000000000 --- a/src/main/java/com/volmit/iris/gen/nms/v16_2/NMSBinding16_2.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.volmit.iris.gen.nms.v16_2; - -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.gen.nms.INMSBinding; -import com.volmit.iris.gen.nms.INMSCreator; - -public class NMSBinding16_2 implements INMSBinding -{ - private final AtomicCache creator = new AtomicCache<>(); - - @Override - public INMSCreator getCreator() - { - return creator.aquire(NMSCreator16_2::new); - } -} diff --git a/src/main/java/com/volmit/iris/gen/nms/v16_2/NMSChunkGenerator16_2_SPIGOT.java b/src/main/java/com/volmit/iris/gen/nms/v16_2/NMSChunkGenerator16_2_SPIGOT.java deleted file mode 100644 index 8daec8d87..000000000 --- a/src/main/java/com/volmit/iris/gen/nms/v16_2/NMSChunkGenerator16_2_SPIGOT.java +++ /dev/null @@ -1,732 +0,0 @@ -package com.volmit.iris.gen.nms.v16_2; - -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.function.Supplier; - -import org.bukkit.Material; -import org.bukkit.block.Biome; -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.objects.ObjectArrayList; -import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.objects.ObjectList; -import org.bukkit.craftbukkit.v1_16_R2.block.CraftBlock; -import org.bukkit.craftbukkit.v1_16_R2.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_16_R2.util.CraftMagicNumbers; -import org.bukkit.generator.ChunkGenerator.BiomeGrid; -import org.bukkit.generator.ChunkGenerator.ChunkData; -import org.bukkit.material.MaterialData; - -import com.mojang.serialization.Codec; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.provisions.ProvisionBukkit; -import com.volmit.iris.gen.scaffold.GeneratedChunk; -import com.volmit.iris.gen.scaffold.Provisioned; -import com.volmit.iris.gen.scaffold.ProvisionedHolder; -import com.volmit.iris.gen.scaffold.TerrainProvider; -import com.volmit.iris.util.O; -import com.volmit.iris.util.V; - -import net.minecraft.server.v1_16_R2.BiomeBase; -import net.minecraft.server.v1_16_R2.BiomeManager; -import net.minecraft.server.v1_16_R2.BiomeSettingsMobs; -import net.minecraft.server.v1_16_R2.Block; -import net.minecraft.server.v1_16_R2.BlockColumn; -import net.minecraft.server.v1_16_R2.BlockPosition; -import net.minecraft.server.v1_16_R2.Blocks; -import net.minecraft.server.v1_16_R2.ChunkCoordIntPair; -import net.minecraft.server.v1_16_R2.ChunkGenerator; -import net.minecraft.server.v1_16_R2.ChunkGeneratorAbstract; -import net.minecraft.server.v1_16_R2.CrashReport; -import net.minecraft.server.v1_16_R2.CrashReportSystemDetails; -import net.minecraft.server.v1_16_R2.DefinedStructureManager; -import net.minecraft.server.v1_16_R2.EnumCreatureType; -import net.minecraft.server.v1_16_R2.GeneratorAccess; -import net.minecraft.server.v1_16_R2.GeneratorAccessSeed; -import net.minecraft.server.v1_16_R2.GeneratorSettingBase; -import net.minecraft.server.v1_16_R2.HeightMap; -import net.minecraft.server.v1_16_R2.IBlockAccess; -import net.minecraft.server.v1_16_R2.IBlockData; -import net.minecraft.server.v1_16_R2.IChunkAccess; -import net.minecraft.server.v1_16_R2.IRegistry; -import net.minecraft.server.v1_16_R2.IRegistryCustom; -import net.minecraft.server.v1_16_R2.IStructureAccess; -import net.minecraft.server.v1_16_R2.NoiseSettings; -import net.minecraft.server.v1_16_R2.PacketDebug; -import net.minecraft.server.v1_16_R2.ProtoChunk; -import net.minecraft.server.v1_16_R2.RegionLimitedWorldAccess; -import net.minecraft.server.v1_16_R2.ReportedException; -import net.minecraft.server.v1_16_R2.ResourceKey; -import net.minecraft.server.v1_16_R2.SectionPosition; -import net.minecraft.server.v1_16_R2.SeededRandom; -import net.minecraft.server.v1_16_R2.SpawnerCreature; -import net.minecraft.server.v1_16_R2.StructureBoundingBox; -import net.minecraft.server.v1_16_R2.StructureFeature; -import net.minecraft.server.v1_16_R2.StructureFeatures; -import net.minecraft.server.v1_16_R2.StructureGenerator; -import net.minecraft.server.v1_16_R2.StructureManager; -import net.minecraft.server.v1_16_R2.StructurePiece; -import net.minecraft.server.v1_16_R2.StructureSettingsFeature; -import net.minecraft.server.v1_16_R2.StructureStart; -import net.minecraft.server.v1_16_R2.WorldChunkManager; -import net.minecraft.server.v1_16_R2.WorldGenFeatureDefinedStructureJigsawJunction; -import net.minecraft.server.v1_16_R2.WorldGenFeatureDefinedStructurePoolTemplate; -import net.minecraft.server.v1_16_R2.WorldGenFeaturePillagerOutpostPoolPiece; -import net.minecraft.server.v1_16_R2.WorldGenStage; -import net.minecraft.server.v1_16_R2.WorldServer; - -@SuppressWarnings("deprecation") -public class NMSChunkGenerator16_2_SPIGOT extends ChunkGenerator implements ProvisionedHolder -{ - private static final IBlockData k = Blocks.AIR.getBlockData(); - private final Provisioned provisioned; - private final int maxHeight; - private final int xzSize; - protected final IBlockData f; - protected final IBlockData g; - private final long w; - protected final Supplier h; - private final O ws; - private BlockColumn BC; - - public NMSChunkGenerator16_2_SPIGOT(Provisioned p, O ws, WorldChunkManager worldchunkmanager, long i, Supplier supplier) - { - this(p, ws, worldchunkmanager, worldchunkmanager, i, supplier); - } - - private NMSChunkGenerator16_2_SPIGOT(Provisioned p, O ws, WorldChunkManager worldchunkmanager, WorldChunkManager worldchunkmanager1, long i, Supplier supplier) - { - super(worldchunkmanager, worldchunkmanager1, supplier.get().a(), i); - this.provisioned = p; - this.ws = ws; - this.w = i; - GeneratorSettingBase generatorsettingbase = supplier.get(); - - this.h = supplier; - NoiseSettings noisesettings = generatorsettingbase.b(); - - this.maxHeight = noisesettings.f() * 4; - this.f = generatorsettingbase.c(); - this.g = generatorsettingbase.d(); - this.xzSize = noisesettings.a() / this.maxHeight; - BC = new BlockColumn(new IBlockData[this.xzSize * this.maxHeight]); - } - - public int getSpawnHeight() - { - return getSeaLevel() + 8; - } - - public WorldChunkManager getWorldChunkManager() - { - return this.c; - } - - public int getGenerationDepth() - { - return 256; - } - - public void doCarving(long i, BiomeManager biomemanager, IChunkAccess ichunkaccess, WorldGenStage.Features worldgenstage_features) - { - if(((IrisTerrainProvider) provisioned.getProvider()).getDimension().isVanillaCaves()) - { - super.doCarving(i, biomemanager, ichunkaccess, worldgenstage_features); - } - } - - @Override - protected Codec a() - { - return ChunkGeneratorAbstract.d; - } - - public boolean a(long i, ResourceKey resourcekey) - { - return this.w == i && this.h.get().a(resourcekey); - } - - @Override - public int getBaseHeight(int i, int j, HeightMap.Type heightmap_type) - { - return 63; - } - - @Override - public IBlockAccess a(int x, int z) - { - return BC; - } - - protected IBlockData a(double d0, int i) - { - IBlockData iblockdata; - - if(d0 > 0.0D) - { - iblockdata = this.f; - } - else if(i < this.getSeaLevel()) - { - iblockdata = this.g; - } - else - { - iblockdata = NMSChunkGenerator16_2_SPIGOT.k; - } - - return iblockdata; - } - - @Override - public void buildBase(RegionLimitedWorldAccess regionlimitedworldaccess, IChunkAccess ichunkaccess) - { - - } - - @Override - public void buildNoise(GeneratorAccess generatoraccess, StructureManager structuremanager, IChunkAccess ichunkaccess) - { - ObjectList objectlist = new ObjectArrayList(10); - ObjectList objectlist1 = new ObjectArrayList(32); - ChunkCoordIntPair chunkcoordintpair = ichunkaccess.getPos(); - int i = chunkcoordintpair.x; - int j = chunkcoordintpair.z; - - if(((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures()) - { - int k = i << 4; - int l = j << 4; - Iterator iterator = StructureGenerator.t.iterator(); - - while(iterator.hasNext()) - { - StructureGenerator structuregenerator = (StructureGenerator) iterator.next(); - - structuremanager.a(SectionPosition.a(chunkcoordintpair, 0), structuregenerator).forEach((structurestart) -> - { - Iterator iterator1 = structurestart.d().iterator(); - - while(iterator1.hasNext()) - { - StructurePiece structurepiece = (StructurePiece) iterator1.next(); - - if(structurepiece.a(chunkcoordintpair, 12)) - { - if(structurepiece instanceof WorldGenFeaturePillagerOutpostPoolPiece) - { - WorldGenFeaturePillagerOutpostPoolPiece worldgenfeaturepillageroutpostpoolpiece = (WorldGenFeaturePillagerOutpostPoolPiece) structurepiece; - WorldGenFeatureDefinedStructurePoolTemplate.Matching worldgenfeaturedefinedstructurepooltemplate_matching = worldgenfeaturepillageroutpostpoolpiece.b().e(); - - if(worldgenfeaturedefinedstructurepooltemplate_matching == WorldGenFeatureDefinedStructurePoolTemplate.Matching.RIGID) - { - objectlist.add(worldgenfeaturepillageroutpostpoolpiece); - } - - Iterator iterator2 = worldgenfeaturepillageroutpostpoolpiece.e().iterator(); - - while(iterator2.hasNext()) - { - WorldGenFeatureDefinedStructureJigsawJunction worldgenfeaturedefinedstructurejigsawjunction = (WorldGenFeatureDefinedStructureJigsawJunction) iterator2.next(); - int i1 = worldgenfeaturedefinedstructurejigsawjunction.a(); - int j1 = worldgenfeaturedefinedstructurejigsawjunction.c(); - - if(i1 > k - 12 && j1 > l - 12 && i1 < k + 15 + 12 && j1 < l + 15 + 12) - { - objectlist1.add(worldgenfeaturedefinedstructurejigsawjunction); - } - } - } - else - { - objectlist.add(structurepiece); - } - } - } - }); - } - } - - ProtoChunk protochunk = (ProtoChunk) ichunkaccess; - HeightMap heightmap = protochunk.a(HeightMap.Type.OCEAN_FLOOR_WG); - HeightMap heightmap1 = protochunk.a(HeightMap.Type.WORLD_SURFACE_WG); - GeneratedChunk gc = ((ProvisionBukkit) provisioned).generateNMSChunkData(ws.get().getWorld(), new Random(i + j), i, j, new ChunkData() - { - public int getMaxHeight() - { - return 256; - } - - public void setBlock(int x, int y, int z, Material material) - { - this.setBlock(x, y, z, material.createBlockData()); - } - - public void setBlock(int x, int y, int z, MaterialData material) - { - this.setBlock(x, y, z, CraftMagicNumbers.getBlock((MaterialData) material)); - } - - public void setBlock(int x, int y, int z, BlockData blockData) - { - this.setBlock(x, y, z, ((CraftBlockData) blockData).getState()); - } - - public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, Material material) - { - this.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, material.createBlockData()); - } - - public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, MaterialData material) - { - this.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, CraftMagicNumbers.getBlock((MaterialData) material)); - } - - public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, BlockData blockData) - { - this.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, ((CraftBlockData) blockData).getState()); - } - - public Material getType(int x, int y, int z) - { - return CraftMagicNumbers.getMaterial((Block) this.getTypeId(x, y, z).getBlock()); - } - - public MaterialData getTypeAndData(int x, int y, int z) - { - return CraftMagicNumbers.getMaterial((IBlockData) this.getTypeId(x, y, z)); - } - - public BlockData getBlockData(int x, int y, int z) - { - return CraftBlockData.fromData((IBlockData) this.getTypeId(x, y, z)); - } - - public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, IBlockData type) - { - if(xMin > 15 || yMin >= getMaxHeight() || zMin > 15) - { - return; - } - if(xMin < 0) - { - xMin = 0; - } - if(yMin < 0) - { - yMin = 0; - } - if(zMin < 0) - { - zMin = 0; - } - if(xMax > 16) - { - xMax = 16; - } - if(yMax > getMaxHeight()) - { - yMax = getMaxHeight(); - } - if(zMax > 16) - { - zMax = 16; - } - if(xMin >= xMax || yMin >= yMax || zMin >= zMax) - { - return; - } - int y = yMin; - while(y < yMax) - { - int x = xMin; - while(x < xMax) - { - int z = zMin; - while(z < zMax) - { - protochunk.setType(new BlockPosition(x, y, z), type, false); - ++z; - } - ++x; - } - ++y; - } - } - - public IBlockData getTypeId(int x, int y, int z) - { - if(x != (x & 15) || y < 0 || y >= getMaxHeight() || z != (z & 15)) - { - return Blocks.AIR.getBlockData(); - } - return protochunk.getType(new BlockPosition(x, y, z)); - } - - public byte getData(int x, int y, int z) - { - return CraftMagicNumbers.toLegacyData((IBlockData) this.getTypeId(x, y, z)); - } - - private void setBlock(int x, int y, int z, IBlockData type) - { - if(x != (x & 15) || y < 0 || y >= getMaxHeight() || z != (z & 15)) - { - return; - } - - protochunk.setType(new BlockPosition(x, y, z), type, false); - - if(type.getBlock().isTileEntity()) - { - // if (this.tiles == null) { - // this.tiles = new HashSet(); - // } - // this.tiles.add(new BlockPosition(x, y, z)); - } - } - }, new BiomeGrid() - { - @Override - public void setBiome(int x, int y, int z, Biome bio) - { - protochunk.getBiomeIndex().setBiome(x, y, z, CraftBlock.biomeToBiomeBase(ws.get().r().b(IRegistry.ay), bio)); - } - - @Override - public void setBiome(int x, int z, Biome bio) - { - protochunk.getBiomeIndex().setBiome(x, 0, z, CraftBlock.biomeToBiomeBase(ws.get().r().b(IRegistry.ay), bio)); - } - - @Override - public Biome getBiome(int x, int y, int z) - { - return CraftBlock.biomeBaseToBiome(ws.get().r().b(IRegistry.ay), protochunk.getBiomeIndex().getBiome(x, y, z)); - } - - @Override - public Biome getBiome(int x, int z) - { - return CraftBlock.biomeBaseToBiome(ws.get().r().b(IRegistry.ay), protochunk.getBiomeIndex().getBiome(x, 0, z)); - } - }); - - for(int xx = 0; xx < 16; xx++) - { - for(int zz = 0; zz < 16; zz++) - { - int y = gc.getHeight().getHeight(xx, zz); - if(y < getSeaLevel()) - { - heightmap.a(xx, y, zz, Blocks.STONE.getBlockData()); - } - heightmap1.a(xx, Math.max(y, getSeaLevel()), zz, Blocks.STONE.getBlockData()); - } - } - } - - public void addDecorations(RegionLimitedWorldAccess regionlimitedworldaccess, StructureManager structuremanager) - { - if(((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures()) - { - int i = regionlimitedworldaccess.a(); - int j = regionlimitedworldaccess.b(); - int k = i * 16; - int l = j * 16; - BlockPosition blockposition = new BlockPosition(k, 0, l); - BiomeBase biomebase = this.b.getBiome((i << 2) + 2, 2, (j << 2) + 2); - SeededRandom seededrandom = new SeededRandom(); - long i1 = seededrandom.a(regionlimitedworldaccess.getSeed(), k, l); - try - { - a(biomebase, structuremanager, this, regionlimitedworldaccess, i1, seededrandom, blockposition); - } - catch(Exception exception) - { - - } - } - } - - public void a(BiomeBase bbase, StructureManager var0, ChunkGenerator var1, RegionLimitedWorldAccess var2, long var3, SeededRandom var5, BlockPosition var6) - { - if(!((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures()) - { - return; - } - - int stages = WorldGenStage.Decoration.values().length; - for(int stage = 0; stage < stages; ++stage) - { - WorldGenStage.Decoration st = WorldGenStage.Decoration.values()[stage]; - - if(st.equals(WorldGenStage.Decoration.LAKES)) - { - continue; - } - - if(st.equals(WorldGenStage.Decoration.LOCAL_MODIFICATIONS)) - { - continue; - } - - if(st.equals(WorldGenStage.Decoration.RAW_GENERATION)) - { - continue; - } - - if(st.equals(WorldGenStage.Decoration.TOP_LAYER_MODIFICATION)) - { - continue; - } - - if(st.equals(WorldGenStage.Decoration.UNDERGROUND_DECORATION)) - { - continue; - } - - if(st.equals(WorldGenStage.Decoration.UNDERGROUND_ORES)) - { - continue; - } - - if(st.equals(WorldGenStage.Decoration.VEGETAL_DECORATION)) - { - continue; - } - - StructureGenerator var13; - int var10 = 0; - if(var0.a()) - { - @SuppressWarnings("unchecked") - List> structureGenerators = ((Map>>) new V(bbase).get("g")).getOrDefault(stage, Collections.emptyList()); - Iterator> iterator = structureGenerators.iterator(); - while(iterator.hasNext()) - { - var13 = (StructureGenerator) iterator.next(); - - if(var13.equals(StructureGenerator.VILLAGE)) - { - continue; - } - - if(var13.equals(StructureGenerator.JUNGLE_PYRAMID)) - { - continue; - } - - if(var13.equals(StructureGenerator.OCEAN_RUIN)) - { - continue; - } - - if(var13.equals(StructureGenerator.IGLOO)) - { - continue; - } - - if(var13.equals(StructureGenerator.MINESHAFT)) - { - continue; - } - - if(var13.equals(StructureGenerator.NETHER_FOSSIL)) - { - continue; - } - - if(var13.equals(StructureGenerator.SHIPWRECK)) - { - continue; - } - - if(var13.equals(StructureGenerator.SHIPWRECK)) - { - continue; - } - - if(var13.equals(StructureGenerator.MONUMENT)) - { - continue; - } - - if(var13.equals(StructureGenerator.BASTION_REMNANT)) - { - continue; - } - - var5.b(var3, var10, stage); - int var14 = var6.getX() >> 4; - int var15 = var6.getZ() >> 4; - int var16 = var14 << 4; - int var17 = var15 << 4; - - try - { - var0.a(SectionPosition.a((BlockPosition) var6), var13).forEach(var8 -> var8.a((GeneratorAccessSeed) var2, var0, var1, (Random) var5, new StructureBoundingBox(var16, var17, var16 + 15, var17 + 15), new ChunkCoordIntPair(var14, var15))); - } - - catch(Exception var18) - { - - } - - ++var10; - } - } - } - } - - @Override - public int getSeaLevel() - { - return ((IrisTerrainProvider) provisioned.getProvider()).getFluidHeight(); - } - - @Override - public List getMobsFor(BiomeBase biomebase, StructureManager structuremanager, EnumCreatureType enumcreaturetype, BlockPosition blockposition) - { - if(structuremanager.a(blockposition, true, StructureGenerator.SWAMP_HUT).e()) - { - if(enumcreaturetype == EnumCreatureType.MONSTER) - { - return StructureGenerator.SWAMP_HUT.c(); - } - - if(enumcreaturetype == EnumCreatureType.CREATURE) - { - return StructureGenerator.SWAMP_HUT.j(); - } - } - - if(enumcreaturetype == EnumCreatureType.MONSTER) - { - if(structuremanager.a(blockposition, false, StructureGenerator.PILLAGER_OUTPOST).e()) - { - return StructureGenerator.PILLAGER_OUTPOST.c(); - } - - if(structuremanager.a(blockposition, false, StructureGenerator.MONUMENT).e()) - { - return StructureGenerator.MONUMENT.c(); - } - - if(structuremanager.a(blockposition, true, StructureGenerator.FORTRESS).e()) - { - return StructureGenerator.FORTRESS.c(); - } - } - - return super.getMobsFor(biomebase, structuremanager, enumcreaturetype, blockposition); - } - - @Override - public void addMobs(RegionLimitedWorldAccess regionlimitedworldaccess) - { - int i = regionlimitedworldaccess.a(); - int j = regionlimitedworldaccess.b(); - BiomeBase biomebase = regionlimitedworldaccess.getBiome((new ChunkCoordIntPair(i, j)).l()); - SeededRandom seededrandom = new SeededRandom(); - seededrandom.a(regionlimitedworldaccess.getSeed(), i << 4, j << 4); - SpawnerCreature.a(regionlimitedworldaccess, biomebase, i, j, seededrandom); - } - - public void createStructures(IRegistryCustom iregistrycustom, StructureManager structuremanager, IChunkAccess ichunkaccess, DefinedStructureManager definedstructuremanager, long i) - { - ChunkCoordIntPair chunkcoordintpair = ichunkaccess.getPos(); - BiomeBase biomebase = this.b.getBiome((chunkcoordintpair.x << 2) + 2, 0, (chunkcoordintpair.z << 2) + 2); - this.a(StructureFeatures.k, iregistrycustom, structuremanager, ichunkaccess, definedstructuremanager, i, chunkcoordintpair, biomebase); - for(Supplier> supplier : biomebase.e().a()) - { - StructureFeature structurefeature = (StructureFeature) supplier.get(); - if(StructureFeature.c == StructureGenerator.STRONGHOLD) - { - StructureFeature structureFeature = structurefeature; - synchronized(structureFeature) - { - this.a(structurefeature, iregistrycustom, structuremanager, ichunkaccess, definedstructuremanager, i, chunkcoordintpair, biomebase); - continue; - } - } - this.a(structurefeature, iregistrycustom, structuremanager, ichunkaccess, definedstructuremanager, i, chunkcoordintpair, biomebase); - } - } - - private void a(StructureFeature structurefeature, IRegistryCustom iregistrycustom, StructureManager structuremanager, IChunkAccess ichunkaccess, DefinedStructureManager definedstructuremanager, long i, ChunkCoordIntPair chunkcoordintpair, BiomeBase biomebase) - { - StructureStart structurestart = structuremanager.a(SectionPosition.a((ChunkCoordIntPair) ichunkaccess.getPos(), (int) 0), structurefeature.d, (IStructureAccess) ichunkaccess); - int j = structurestart != null ? structurestart.j() : 0; - StructureSettingsFeature structuresettingsfeature = getSettings().a(structurefeature.d); - if(structuresettingsfeature != null) - { - StructureStart structurestart1 = structurefeature.a(iregistrycustom, this, this.b, definedstructuremanager, i, chunkcoordintpair, biomebase, j, structuresettingsfeature); - structuremanager.a(SectionPosition.a((ChunkCoordIntPair) ichunkaccess.getPos(), (int) 0), structurefeature.d, structurestart1, (IStructureAccess) ichunkaccess); - } - } - - public void storeStructures(GeneratorAccessSeed generatoraccessseed, StructureManager structuremanager, IChunkAccess ichunkaccess) - { - int i = ichunkaccess.getPos().x; - int j = ichunkaccess.getPos().z; - int k = i << 4; - int l = j << 4; - SectionPosition sectionposition = SectionPosition.a((ChunkCoordIntPair) ichunkaccess.getPos(), (int) 0); - int i1 = i - 8; - while(i1 <= i + 8) - { - int j1 = j - 8; - while(j1 <= j + 8) - { - long k1 = ChunkCoordIntPair.pair((int) i1, (int) j1); - for(StructureStart structurestart : generatoraccessseed.getChunkAt(i1, j1).h().values()) - { - try - { - if(structurestart == StructureStart.a || !structurestart.c().a(k, l, k + 15, l + 15)) - continue; - structuremanager.a(sectionposition, structurestart.l(), k1, (IStructureAccess) ichunkaccess); - PacketDebug.a((GeneratorAccessSeed) generatoraccessseed, (StructureStart) structurestart); - } - catch(Exception exception) - { - CrashReport crashreport = CrashReport.a((Throwable) exception, (String) "Generating structure reference"); - CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Structure"); - crashreportsystemdetails.a("Name", () -> structurestart.l().i()); - crashreportsystemdetails.a("Class", () -> structurestart.l().getClass().getCanonicalName()); - throw new ReportedException(crashreport); - } - } - ++j1; - } - ++i1; - } - } - - @Override - public Provisioned getProvisioned() - { - return provisioned; - } - - @Override - public void clearRegeneratedLists() - { - getProvisioned().clearRegeneratedLists(); - } - - @Override - public TerrainProvider getProvider() - { - return getProvisioned().getProvider(); - } - - @Override - public void regenerate(int x, int z) - { - getProvisioned().regenerate(x, z); - } -} diff --git a/src/main/java/com/volmit/iris/gen/nms/v16_2/NMSCreator16_2.java b/src/main/java/com/volmit/iris/gen/nms/v16_2/NMSCreator16_2.java deleted file mode 100644 index cbe9bb4ba..000000000 --- a/src/main/java/com/volmit/iris/gen/nms/v16_2/NMSCreator16_2.java +++ /dev/null @@ -1,302 +0,0 @@ -package com.volmit.iris.gen.nms.v16_2; - -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Objects; -import java.util.Properties; - -import org.apache.commons.lang.Validate; -import org.bukkit.Bukkit; -import org.bukkit.World; -import org.bukkit.WorldCreator; -import org.bukkit.World.Environment; -import org.bukkit.craftbukkit.v1_16_R2.CraftServer; -import org.bukkit.event.Event; -import org.bukkit.event.world.WorldInitEvent; -import org.bukkit.event.world.WorldLoadEvent; - -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import com.mojang.serialization.DynamicOps; -import com.mojang.serialization.Lifecycle; -import com.volmit.iris.gen.nms.INMSCreator; -import com.volmit.iris.gen.scaffold.IrisWorlds; -import com.volmit.iris.gen.scaffold.Provisioned; -import com.volmit.iris.util.O; -import com.volmit.iris.util.V; - -import io.papermc.lib.PaperLib; -import net.minecraft.server.v1_16_R2.BiomeBase; -import net.minecraft.server.v1_16_R2.BiomeManager; -import net.minecraft.server.v1_16_R2.Convertable; -import net.minecraft.server.v1_16_R2.DataConverterRegistry; -import net.minecraft.server.v1_16_R2.DedicatedServer; -import net.minecraft.server.v1_16_R2.DimensionManager; -import net.minecraft.server.v1_16_R2.DynamicOpsNBT; -import net.minecraft.server.v1_16_R2.EnumDifficulty; -import net.minecraft.server.v1_16_R2.EnumGamemode; -import net.minecraft.server.v1_16_R2.GameRules; -import net.minecraft.server.v1_16_R2.GeneratorSettingBase; -import net.minecraft.server.v1_16_R2.GeneratorSettings; -import net.minecraft.server.v1_16_R2.IRegistry; -import net.minecraft.server.v1_16_R2.IRegistryCustom.Dimension; -import net.minecraft.server.v1_16_R2.IWorldDataServer; -import net.minecraft.server.v1_16_R2.MinecraftKey; -import net.minecraft.server.v1_16_R2.MinecraftServer; -import net.minecraft.server.v1_16_R2.MobSpawner; -import net.minecraft.server.v1_16_R2.MobSpawnerCat; -import net.minecraft.server.v1_16_R2.MobSpawnerPatrol; -import net.minecraft.server.v1_16_R2.MobSpawnerPhantom; -import net.minecraft.server.v1_16_R2.MobSpawnerTrader; -import net.minecraft.server.v1_16_R2.NBTBase; -import net.minecraft.server.v1_16_R2.RegistryReadOps; -import net.minecraft.server.v1_16_R2.ResourceKey; -import net.minecraft.server.v1_16_R2.SaveData; -import net.minecraft.server.v1_16_R2.VillageSiege; -import net.minecraft.server.v1_16_R2.WorldChunkManager; -import net.minecraft.server.v1_16_R2.WorldChunkManagerOverworld; -import net.minecraft.server.v1_16_R2.WorldDataServer; -import net.minecraft.server.v1_16_R2.WorldDimension; -import net.minecraft.server.v1_16_R2.WorldServer; -import net.minecraft.server.v1_16_R2.WorldSettings; - -class NMSCreator16_2 implements INMSCreator -{ - @SuppressWarnings({"unchecked", "rawtypes", "resource"}) - public World createWorld(WorldCreator creator, boolean loadSpawn) - { - if(!creator.environment().equals(Environment.NORMAL)) - { - return creator.createWorld(); - } - - Provisioned pro = (Provisioned) creator.generator(); - CraftServer server = ((CraftServer) Bukkit.getServer()); - Map worlds = new V(server).get("worlds"); - DedicatedServer console = new V(server).get("console"); - Preconditions.checkState(!console.worldServer.isEmpty(), (Object) "Cannot create additional worlds on STARTUP"); - Validate.notNull((Object) creator, "Creator may not be null"); - final String name = creator.name(); - org.bukkit.generator.ChunkGenerator generator = creator.generator(); - final File folder = new File(server.getWorldContainer(), name); - final World world = server.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 = server.getGenerator(name); - } - - ResourceKey actualDimension = null; - switch(creator.environment()) - { - case NORMAL: - { - actualDimension = (ResourceKey) WorldDimension.OVERWORLD; - break; - } - case NETHER: - { - actualDimension = (ResourceKey) WorldDimension.THE_NETHER; - break; - } - case THE_END: - { - actualDimension = (ResourceKey) WorldDimension.THE_END; - break; - } - default: - { - throw new IllegalArgumentException("Illegal dimension"); - } - } - Convertable.ConversionSession worldSession; - try - { - worldSession = Convertable.a(server.getWorldContainer().toPath()).c(name, (ResourceKey) actualDimension); - } - catch(IOException ex) - { - throw new RuntimeException(ex); - } - MinecraftServer.convertWorld(worldSession); - final boolean hardcore = creator.hardcore(); - final RegistryReadOps registryreadops = (RegistryReadOps) RegistryReadOps.a((DynamicOps) DynamicOpsNBT.a, console.dataPackResources.h(), getConsoleDimension(console)); - WorldDataServer worlddata = (WorldDataServer) worldSession.a((DynamicOps) registryreadops, console.datapackconfiguration); - if(worlddata == null) - { - final Properties properties = new Properties(); - properties.put("generator-settings", Objects.toString(creator.generatorSettings())); - properties.put("level-seed", Objects.toString(creator.seed())); - properties.put("generate-structures", Objects.toString(creator.generateStructures())); - properties.put("level-type", Objects.toString(creator.type().getName())); - final GeneratorSettings generatorsettings = GeneratorSettings.a(getConsoleDimension(console), properties); - @SuppressWarnings("deprecation") - final WorldSettings worldSettings = new WorldSettings(name, EnumGamemode.getById(server.getDefaultGameMode().getValue()), hardcore, EnumDifficulty.EASY, false, new GameRules(), console.datapackconfiguration); - worlddata = new WorldDataServer(worldSettings, generatorsettings, Lifecycle.stable()); - } - worlddata.checkName(name); - worlddata.a(console.getServerModName(), console.getModded().isPresent()); - if(console.options.has("forceUpgrade")) - { - net.minecraft.server.v1_16_R2.Main.convertWorld(worldSession, DataConverterRegistry.a(), console.options.has("eraseCache"), () -> true, (ImmutableSet) worlddata.getGeneratorSettings().d().d().stream().map(entry -> ResourceKey.a(IRegistry.K, entry.getKey().a())).collect(ImmutableSet.toImmutableSet())); - } - final long j = BiomeManager.a(creator.seed()); - final List list = (List) ImmutableList.of((MobSpawner) new MobSpawnerPhantom(), (MobSpawner) new MobSpawnerPatrol(), (MobSpawner) new MobSpawnerCat(), (MobSpawner) new VillageSiege(), (MobSpawner) new MobSpawnerTrader((IWorldDataServer) worlddata)); - DimensionManager dimensionmanager; - net.minecraft.server.v1_16_R2.ChunkGenerator chunkgenerator; - long ll = creator.seed(); - dimensionmanager = (DimensionManager) getConsoleDimension(console).a().d(DimensionManager.OVERWORLD); - O ws = new O(); - chunkgenerator = PaperLib.isPaper() ? new NMSChunkGenerator16_2_PAPER(pro, ws, (WorldChunkManager) new WorldChunkManagerOverworld(ll, false, false, (IRegistry) getConsoleDimension(console).b(IRegistry.ay)), ll, () -> (GeneratorSettingBase) getConsoleDimension(console).b(IRegistry.ar).d(GeneratorSettingBase.c)) : new NMSChunkGenerator16_2_SPIGOT(pro, ws, (WorldChunkManager) new WorldChunkManagerOverworld(ll, false, false, (IRegistry) getConsoleDimension(console).b(IRegistry.ay)), ll, () -> (GeneratorSettingBase) getConsoleDimension(console).b(IRegistry.ar).d(GeneratorSettingBase.c)); - final ResourceKey worldKey = (ResourceKey) ResourceKey.a(IRegistry.L, new MinecraftKey(name.toLowerCase(Locale.ENGLISH))); - //@builder - final WorldServer internal = new WorldServer((MinecraftServer) console, - console.executorService, worldSession, - (IWorldDataServer) worlddata, - (ResourceKey) worldKey, - dimensionmanager, - server.getServer().worldLoadListenerFactory.create(11), - chunkgenerator, - worlddata.getGeneratorSettings().isDebugWorld(), - j, - (List) ((creator.environment() == World.Environment.NORMAL) ? list : ImmutableList.of()), - true, - creator.environment(), - server.getGenerator(name)); - //@done - IrisWorlds.register(internal.getWorld(), pro); - ws.set(internal); - if(!worlds.containsKey(name.toLowerCase(Locale.ENGLISH))) - { - try - { - internal.close(); - } - - catch(IOException e) - { - e.printStackTrace(); - } - - return null; - } - - console.initWorld(internal, (IWorldDataServer) worlddata, (SaveData) worlddata, worlddata.getGeneratorSettings()); - internal.setSpawnFlags(true, true); - console.worldServer.put(internal.getDimensionKey(), internal); - server.getPluginManager().callEvent((Event) new WorldInitEvent((World) internal.getWorld())); - - if(loadSpawn) - { - server.getServer().loadSpawn(internal.getChunkProvider().playerChunkMap.worldLoadListener, internal); - } - - else - { - MinecraftServer.LOGGER.info("Preparing start region for dimens... Oh wait, We don't do that here anymore."); - } - - server.getPluginManager().callEvent((Event) new WorldLoadEvent((World) internal.getWorld())); - return (World) internal.getWorld(); - } - - private Dimension getConsoleDimension(DedicatedServer console) - { - Dimension dim = null; - - try - { - dim = new V((MinecraftServer) console, true).get("customRegistry"); - - if(dim != null) - { - return dim; - } - } - - catch(Throwable e) - { - - } - - try - { - dim = new V((MinecraftServer) console, true).get("f"); - - if(dim != null) - { - return dim; - } - } - - catch(Throwable e) - { - - } - - for(Field i : MinecraftServer.class.getDeclaredFields()) - { - if(i.getType().equals(dim.getClass())) - { - i.setAccessible(true); - - if(Modifier.isStatic(i.getModifiers())) - { - try - { - return (Dimension) i.get(null); - } - - catch(Throwable e) - { - e.printStackTrace(); - } - } - - else - { - try - { - return (Dimension) i.get((MinecraftServer) console); - } - - catch(Throwable e) - { - e.printStackTrace(); - } - } - } - } - - if(dim == null) - { - try - { - throw new RuntimeException("Cannot find dimension field!"); - } - - catch(Throwable e) - { - e.printStackTrace(); - } - } - - return dim; - } -} diff --git a/src/main/java/com/volmit/iris/gen/nms/v16_3/NMSBinding16_3.java b/src/main/java/com/volmit/iris/gen/nms/v16_3/NMSBinding16_3.java deleted file mode 100644 index 25c5f8736..000000000 --- a/src/main/java/com/volmit/iris/gen/nms/v16_3/NMSBinding16_3.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.volmit.iris.gen.nms.v16_3; - -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.gen.nms.INMSBinding; -import com.volmit.iris.gen.nms.INMSCreator; - -public class NMSBinding16_3 implements INMSBinding -{ - private final AtomicCache creator = new AtomicCache<>(); - - @Override - public INMSCreator getCreator() - { - return creator.aquire(NMSCreator16_3::new); - } -} diff --git a/src/main/java/com/volmit/iris/gen/nms/v16_3/NMSChunkGenerator16_3_PAPER.java b/src/main/java/com/volmit/iris/gen/nms/v16_3/NMSChunkGenerator16_3_PAPER.java deleted file mode 100644 index 1ce3e1aab..000000000 --- a/src/main/java/com/volmit/iris/gen/nms/v16_3/NMSChunkGenerator16_3_PAPER.java +++ /dev/null @@ -1,688 +0,0 @@ -package com.volmit.iris.gen.nms.v16_3; - -import com.mojang.serialization.Codec; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.provisions.ProvisionBukkit; -import com.volmit.iris.gen.scaffold.GeneratedChunk; -import com.volmit.iris.gen.scaffold.Provisioned; -import com.volmit.iris.gen.scaffold.ProvisionedHolder; -import com.volmit.iris.gen.scaffold.TerrainProvider; -import com.volmit.iris.util.O; -import com.volmit.iris.util.V; -import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import it.unimi.dsi.fastutil.objects.ObjectList; -import net.minecraft.server.v1_16_R3.*; -import org.bukkit.Material; -import org.bukkit.block.Biome; -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_16_R3.block.CraftBlock; -import org.bukkit.craftbukkit.v1_16_R3.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_16_R3.util.CraftMagicNumbers; -import org.bukkit.generator.ChunkGenerator.BiomeGrid; -import org.bukkit.generator.ChunkGenerator.ChunkData; -import org.bukkit.material.MaterialData; - -import java.util.*; -import java.util.function.Supplier; - -@SuppressWarnings("deprecation") -public class NMSChunkGenerator16_3_PAPER extends ChunkGenerator implements ProvisionedHolder -{ - private static final IBlockData k = Blocks.AIR.getBlockData(); - private final Provisioned provisioned; - private final int maxHeight; - private final int xzSize; - protected final IBlockData f; - protected final IBlockData g; - private final long w; - protected final Supplier h; - private final O ws; - private BlockColumn BC; - - public NMSChunkGenerator16_3_PAPER(Provisioned p, O ws, WorldChunkManager worldchunkmanager, long i, Supplier supplier) - { - this(p, ws, worldchunkmanager, worldchunkmanager, i, supplier); - } - - private NMSChunkGenerator16_3_PAPER(Provisioned p, O ws, WorldChunkManager worldchunkmanager, WorldChunkManager worldchunkmanager1, long i, Supplier supplier) - { - super(worldchunkmanager, worldchunkmanager1, supplier.get().a(), i); - this.provisioned = p; - this.ws = ws; - this.w = i; - GeneratorSettingBase generatorsettingbase = supplier.get(); - - this.h = supplier; - NoiseSettings noisesettings = generatorsettingbase.b(); - - this.maxHeight = noisesettings.f() * 4; - this.f = generatorsettingbase.c(); - this.g = generatorsettingbase.d(); - this.xzSize = noisesettings.a() / this.maxHeight; - BC = new BlockColumn(new IBlockData[this.xzSize * this.maxHeight]); - } - - public int getSpawnHeight() - { - return getSeaLevel() + 8; - } - - public WorldChunkManager getWorldChunkManager() - { - return this.c; - } - - public int getGenerationDepth() - { - return 256; - } - - public void doCarving(long i, BiomeManager biomemanager, IChunkAccess ichunkaccess, WorldGenStage.Features worldgenstage_features) - { - if(((IrisTerrainProvider) provisioned.getProvider()).getDimension().isVanillaCaves()) - { - super.doCarving(i, biomemanager, ichunkaccess, worldgenstage_features); - } - } - - @Override - protected Codec a() - { - return ChunkGeneratorAbstract.d; - } - - public boolean a(long i, ResourceKey resourcekey) - { - return this.w == i && this.h.get().a(resourcekey); - } - - @Override - public int getBaseHeight(int i, int j, HeightMap.Type heightmap_type) - { - return 63; - } - - @Override - public IBlockAccess a(int x, int z) - { - return BC; - } - - protected IBlockData a(double d0, int i) - { - IBlockData iblockdata; - - if(d0 > 0.0D) - { - iblockdata = this.f; - } - else if(i < this.getSeaLevel()) - { - iblockdata = this.g; - } - else - { - iblockdata = NMSChunkGenerator16_3_PAPER.k; - } - - return iblockdata; - } - - @Override - public void buildBase(RegionLimitedWorldAccess regionlimitedworldaccess, IChunkAccess ichunkaccess) - { - - } - - @Override - public void buildNoise(GeneratorAccess generatoraccess, StructureManager structuremanager, IChunkAccess ichunkaccess) - { - ObjectList objectlist = new ObjectArrayList(10); - ObjectList objectlist1 = new ObjectArrayList(32); - ChunkCoordIntPair chunkcoordintpair = ichunkaccess.getPos(); - int i = chunkcoordintpair.x; - int j = chunkcoordintpair.z; - - if(((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures()) - { - int k = i << 4; - int l = j << 4; - Iterator iterator = StructureGenerator.t.iterator(); - - while(iterator.hasNext()) - { - StructureGenerator structuregenerator = (StructureGenerator) iterator.next(); - - structuremanager.a(SectionPosition.a(chunkcoordintpair, 0), structuregenerator).forEach((structurestart) -> - { - Iterator iterator1 = structurestart.d().iterator(); - - while(iterator1.hasNext()) - { - StructurePiece structurepiece = (StructurePiece) iterator1.next(); - - if(structurepiece.a(chunkcoordintpair, 12)) - { - if(structurepiece instanceof WorldGenFeaturePillagerOutpostPoolPiece) - { - WorldGenFeaturePillagerOutpostPoolPiece worldgenfeaturepillageroutpostpoolpiece = (WorldGenFeaturePillagerOutpostPoolPiece) structurepiece; - WorldGenFeatureDefinedStructurePoolTemplate.Matching worldgenfeaturedefinedstructurepooltemplate_matching = worldgenfeaturepillageroutpostpoolpiece.b().e(); - - if(worldgenfeaturedefinedstructurepooltemplate_matching == WorldGenFeatureDefinedStructurePoolTemplate.Matching.RIGID) - { - objectlist.add(worldgenfeaturepillageroutpostpoolpiece); - } - - Iterator iterator2 = worldgenfeaturepillageroutpostpoolpiece.e().iterator(); - - while(iterator2.hasNext()) - { - WorldGenFeatureDefinedStructureJigsawJunction worldgenfeaturedefinedstructurejigsawjunction = (WorldGenFeatureDefinedStructureJigsawJunction) iterator2.next(); - int i1 = worldgenfeaturedefinedstructurejigsawjunction.a(); - int j1 = worldgenfeaturedefinedstructurejigsawjunction.c(); - - if(i1 > k - 12 && j1 > l - 12 && i1 < k + 15 + 12 && j1 < l + 15 + 12) - { - objectlist1.add(worldgenfeaturedefinedstructurejigsawjunction); - } - } - } - else - { - objectlist.add(structurepiece); - } - } - } - }); - } - } - - ProtoChunk protochunk = (ProtoChunk) ichunkaccess; - HeightMap heightmap = protochunk.a(HeightMap.Type.OCEAN_FLOOR_WG); - HeightMap heightmap1 = protochunk.a(HeightMap.Type.WORLD_SURFACE_WG); - GeneratedChunk gc = ((ProvisionBukkit) provisioned).generateNMSChunkData(ws.get().getWorld(), new Random(i + j), i, j, new ChunkData() - { - public int getMaxHeight() - { - return 256; - } - - public void setBlock(int x, int y, int z, Material material) - { - this.setBlock(x, y, z, material.createBlockData()); - } - - public void setBlock(int x, int y, int z, MaterialData material) - { - this.setBlock(x, y, z, CraftMagicNumbers.getBlock((MaterialData) material)); - } - - public void setBlock(int x, int y, int z, BlockData blockData) - { - this.setBlock(x, y, z, ((CraftBlockData) blockData).getState()); - } - - public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, Material material) - { - this.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, material.createBlockData()); - } - - public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, MaterialData material) - { - this.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, CraftMagicNumbers.getBlock((MaterialData) material)); - } - - public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, BlockData blockData) - { - this.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, ((CraftBlockData) blockData).getState()); - } - - public Material getType(int x, int y, int z) - { - return CraftMagicNumbers.getMaterial((Block) this.getTypeId(x, y, z).getBlock()); - } - - public MaterialData getTypeAndData(int x, int y, int z) - { - return CraftMagicNumbers.getMaterial((IBlockData) this.getTypeId(x, y, z)); - } - - public BlockData getBlockData(int x, int y, int z) - { - return CraftBlockData.fromData((IBlockData) this.getTypeId(x, y, z)); - } - - public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, IBlockData type) - { - if(xMin > 15 || yMin >= getMaxHeight() || zMin > 15) - { - return; - } - if(xMin < 0) - { - xMin = 0; - } - if(yMin < 0) - { - yMin = 0; - } - if(zMin < 0) - { - zMin = 0; - } - if(xMax > 16) - { - xMax = 16; - } - if(yMax > getMaxHeight()) - { - yMax = getMaxHeight(); - } - if(zMax > 16) - { - zMax = 16; - } - if(xMin >= xMax || yMin >= yMax || zMin >= zMax) - { - return; - } - int y = yMin; - while(y < yMax) - { - int x = xMin; - while(x < xMax) - { - int z = zMin; - while(z < zMax) - { - protochunk.setType(new BlockPosition(x, y, z), type, false); - ++z; - } - ++x; - } - ++y; - } - } - - public IBlockData getTypeId(int x, int y, int z) - { - if(x != (x & 15) || y < 0 || y >= getMaxHeight() || z != (z & 15)) - { - return Blocks.AIR.getBlockData(); - } - return protochunk.getType(new BlockPosition(x, y, z)); - } - - public byte getData(int x, int y, int z) - { - return CraftMagicNumbers.toLegacyData((IBlockData) this.getTypeId(x, y, z)); - } - - private void setBlock(int x, int y, int z, IBlockData type) - { - if(x != (x & 15) || y < 0 || y >= getMaxHeight() || z != (z & 15)) - { - return; - } - - protochunk.setType(new BlockPosition(x, y, z), type, false); - - if(type.getBlock().isTileEntity()) - { - // if (this.tiles == null) { - // this.tiles = new HashSet(); - // } - // this.tiles.add(new BlockPosition(x, y, z)); - } - } - }, new BiomeGrid() - { - @Override - public void setBiome(int x, int y, int z, Biome bio) - { - protochunk.getBiomeIndex().setBiome(x, y, z, CraftBlock.biomeToBiomeBase(ws.get().r().b(IRegistry.ay), bio)); - } - - @Override - public void setBiome(int x, int z, Biome bio) - { - protochunk.getBiomeIndex().setBiome(x, 0, z, CraftBlock.biomeToBiomeBase(ws.get().r().b(IRegistry.ay), bio)); - } - - @Override - public Biome getBiome(int x, int y, int z) - { - return CraftBlock.biomeBaseToBiome(ws.get().r().b(IRegistry.ay), protochunk.getBiomeIndex().getBiome(x, y, z)); - } - - @Override - public Biome getBiome(int x, int z) - { - return CraftBlock.biomeBaseToBiome(ws.get().r().b(IRegistry.ay), protochunk.getBiomeIndex().getBiome(x, 0, z)); - } - }); - - for(int xx = 0; xx < 16; xx++) - { - for(int zz = 0; zz < 16; zz++) - { - try - { - int y = gc.getHeight().getHeight(xx, zz); - if(y < getSeaLevel()) - { - heightmap.a(xx, y, zz, Blocks.STONE.getBlockData()); - } - heightmap1.a(xx, Math.max(y, getSeaLevel()), zz, Blocks.STONE.getBlockData()); - } - - catch(Throwable e) - { - - } - } - } - } - - public void addDecorations(RegionLimitedWorldAccess regionlimitedworldaccess, StructureManager structuremanager) - { - if(((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures()) - { - int i = regionlimitedworldaccess.a(); - int j = regionlimitedworldaccess.b(); - int k = i * 16; - int l = j * 16; - BlockPosition blockposition = new BlockPosition(k, 0, l); - BiomeBase biomebase = this.b.getBiome((i << 2) + 2, 2, (j << 2) + 2); - SeededRandom seededrandom = new SeededRandom(); - long i1 = seededrandom.a(regionlimitedworldaccess.getSeed(), k, l); - try - { - a(biomebase, structuremanager, this, regionlimitedworldaccess, i1, seededrandom, blockposition); - } - catch(Exception exception) - { - - } - } - } - - public void a(BiomeBase bbase, StructureManager var0, ChunkGenerator var1, RegionLimitedWorldAccess var2, long var3, SeededRandom var5, BlockPosition var6) - { - if(!((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures()) - { - return; - } - - int stages = WorldGenStage.Decoration.values().length; - for(int stage = 0; stage < stages; ++stage) - { - WorldGenStage.Decoration st = WorldGenStage.Decoration.values()[stage]; - - if(st.equals(WorldGenStage.Decoration.LAKES)) - { - continue; - } - - if(st.equals(WorldGenStage.Decoration.LOCAL_MODIFICATIONS)) - { - continue; - } - - if(st.equals(WorldGenStage.Decoration.RAW_GENERATION)) - { - continue; - } - - if(st.equals(WorldGenStage.Decoration.TOP_LAYER_MODIFICATION)) - { - continue; - } - - if(st.equals(WorldGenStage.Decoration.UNDERGROUND_DECORATION)) - { - continue; - } - - if(st.equals(WorldGenStage.Decoration.UNDERGROUND_ORES)) - { - continue; - } - - if(st.equals(WorldGenStage.Decoration.VEGETAL_DECORATION)) - { - continue; - } - - StructureGenerator var13; - int var10 = 0; - if(var0.a()) - { - @SuppressWarnings("unchecked") - List> structureGenerators = ((Map>>) new V(bbase).get("g")).getOrDefault(stage, Collections.emptyList()); - Iterator> iterator = structureGenerators.iterator(); - while(iterator.hasNext()) - { - var13 = (StructureGenerator) iterator.next(); - - if(var13.equals(StructureGenerator.VILLAGE)) - { - continue; - } - - if(var13.equals(StructureGenerator.JUNGLE_PYRAMID)) - { - continue; - } - - if(var13.equals(StructureGenerator.IGLOO)) - { - continue; - } - - if(var13.equals(StructureGenerator.MINESHAFT)) - { - continue; - } - - if(var13.equals(StructureGenerator.NETHER_FOSSIL)) - { - continue; - } - - if(var13.equals(StructureGenerator.SHIPWRECK)) - { - continue; - } - - if(var13.equals(StructureGenerator.SHIPWRECK)) - { - continue; - } - - if(var13.equals(StructureGenerator.MONUMENT)) - { - continue; - } - - if(var13.equals(StructureGenerator.OCEAN_RUIN)) - { - continue; - } - - if(var13.equals(StructureGenerator.BASTION_REMNANT)) - { - continue; - } - - var5.b(var3, var10, stage); - int var14 = var6.getX() >> 4; - int var15 = var6.getZ() >> 4; - int var16 = var14 << 4; - int var17 = var15 << 4; - - try - { - var0.a(SectionPosition.a((BlockPosition) var6), var13).forEach(var8 -> var8.a((GeneratorAccessSeed) var2, var0, var1, (Random) var5, new StructureBoundingBox(var16, var17, var16 + 15, var17 + 15), new ChunkCoordIntPair(var14, var15))); - } - - catch(Exception var18) - { - - } - - ++var10; - } - } - } - } - - @Override - public int getSeaLevel() - { - return ((IrisTerrainProvider) provisioned.getProvider()).getFluidHeight(); - } - - @Override - public List getMobsFor(BiomeBase biomebase, StructureManager structuremanager, EnumCreatureType enumcreaturetype, BlockPosition blockposition) - { - if(structuremanager.a(blockposition, true, StructureGenerator.SWAMP_HUT).e()) - { - if(enumcreaturetype == EnumCreatureType.MONSTER) - { - return StructureGenerator.SWAMP_HUT.c(); - } - - if(enumcreaturetype == EnumCreatureType.CREATURE) - { - return StructureGenerator.SWAMP_HUT.j(); - } - } - - if(enumcreaturetype == EnumCreatureType.MONSTER) - { - if(structuremanager.a(blockposition, false, StructureGenerator.PILLAGER_OUTPOST).e()) - { - return StructureGenerator.PILLAGER_OUTPOST.c(); - } - - if(structuremanager.a(blockposition, false, StructureGenerator.MONUMENT).e()) - { - return StructureGenerator.MONUMENT.c(); - } - - if(structuremanager.a(blockposition, true, StructureGenerator.FORTRESS).e()) - { - return StructureGenerator.FORTRESS.c(); - } - } - - return super.getMobsFor(biomebase, structuremanager, enumcreaturetype, blockposition); - } - - @Override - public void addMobs(RegionLimitedWorldAccess regionlimitedworldaccess) - { - int i = regionlimitedworldaccess.a(); - int j = regionlimitedworldaccess.b(); - BiomeBase biomebase = regionlimitedworldaccess.getBiome((new ChunkCoordIntPair(i, j)).l()); - SeededRandom seededrandom = new SeededRandom(); - seededrandom.a(regionlimitedworldaccess.getSeed(), i << 4, j << 4); - SpawnerCreature.a(regionlimitedworldaccess, biomebase, i, j, seededrandom); - } - - public void createStructures(IRegistryCustom iregistrycustom, StructureManager structuremanager, IChunkAccess ichunkaccess, DefinedStructureManager definedstructuremanager, long i) - { - ChunkCoordIntPair chunkcoordintpair = ichunkaccess.getPos(); - BiomeBase biomebase = this.b.getBiome((chunkcoordintpair.x << 2) + 2, 0, (chunkcoordintpair.z << 2) + 2); - this.a(StructureFeatures.k, iregistrycustom, structuremanager, ichunkaccess, definedstructuremanager, i, chunkcoordintpair, biomebase); - for(Supplier> supplier : biomebase.e().a()) - { - StructureFeature structurefeature = (StructureFeature) supplier.get(); - if(StructureFeature.c == StructureGenerator.STRONGHOLD) - { - StructureFeature structureFeature = structurefeature; - synchronized(structureFeature) - { - this.a(structurefeature, iregistrycustom, structuremanager, ichunkaccess, definedstructuremanager, i, chunkcoordintpair, biomebase); - continue; - } - } - this.a(structurefeature, iregistrycustom, structuremanager, ichunkaccess, definedstructuremanager, i, chunkcoordintpair, biomebase); - } - } - - private void a(StructureFeature structurefeature, IRegistryCustom iregistrycustom, StructureManager structuremanager, IChunkAccess ichunkaccess, DefinedStructureManager definedstructuremanager, long i, ChunkCoordIntPair chunkcoordintpair, BiomeBase biomebase) - { - StructureStart structurestart = structuremanager.a(SectionPosition.a((ChunkCoordIntPair) ichunkaccess.getPos(), (int) 0), structurefeature.d, (IStructureAccess) ichunkaccess); - int j = structurestart != null ? structurestart.j() : 0; - StructureSettingsFeature structuresettingsfeature = getSettings().a(structurefeature.d); - if(structuresettingsfeature != null) - { - StructureStart structurestart1 = structurefeature.a(iregistrycustom, this, this.b, definedstructuremanager, i, chunkcoordintpair, biomebase, j, structuresettingsfeature); - structuremanager.a(SectionPosition.a((ChunkCoordIntPair) ichunkaccess.getPos(), (int) 0), structurefeature.d, structurestart1, (IStructureAccess) ichunkaccess); - } - } - - public void storeStructures(GeneratorAccessSeed generatoraccessseed, StructureManager structuremanager, IChunkAccess ichunkaccess) - { - int i = ichunkaccess.getPos().x; - int j = ichunkaccess.getPos().z; - int k = i << 4; - int l = j << 4; - SectionPosition sectionposition = SectionPosition.a((ChunkCoordIntPair) ichunkaccess.getPos(), (int) 0); - int i1 = i - 8; - while(i1 <= i + 8) - { - int j1 = j - 8; - while(j1 <= j + 8) - { - long k1 = ChunkCoordIntPair.pair((int) i1, (int) j1); - for(StructureStart structurestart : generatoraccessseed.getChunkAt(i1, j1).h().values()) - { - try - { - if(structurestart == StructureStart.a || !structurestart.c().a(k, l, k + 15, l + 15)) - continue; - structuremanager.a(sectionposition, structurestart.l(), k1, (IStructureAccess) ichunkaccess); - PacketDebug.a((GeneratorAccessSeed) generatoraccessseed, (StructureStart) structurestart); - } - catch(Exception exception) - { - CrashReport crashreport = CrashReport.a((Throwable) exception, (String) "Generating structure reference"); - CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Structure"); - crashreportsystemdetails.a("Name", () -> structurestart.l().i()); - crashreportsystemdetails.a("Class", () -> structurestart.l().getClass().getCanonicalName()); - throw new ReportedException(crashreport); - } - } - ++j1; - } - ++i1; - } - } - - @Override - public Provisioned getProvisioned() - { - return provisioned; - } - - @Override - public void clearRegeneratedLists() - { - getProvisioned().clearRegeneratedLists(); - } - - @Override - public TerrainProvider getProvider() - { - return getProvisioned().getProvider(); - } - - @Override - public void regenerate(int x, int z) - { - getProvisioned().regenerate(x, z); - } -} diff --git a/src/main/java/com/volmit/iris/gen/nms/v16_3/NMSChunkGenerator16_3_SPIGOT.java b/src/main/java/com/volmit/iris/gen/nms/v16_3/NMSChunkGenerator16_3_SPIGOT.java deleted file mode 100644 index 22bd8331f..000000000 --- a/src/main/java/com/volmit/iris/gen/nms/v16_3/NMSChunkGenerator16_3_SPIGOT.java +++ /dev/null @@ -1,680 +0,0 @@ -package com.volmit.iris.gen.nms.v16_3; - -import com.mojang.serialization.Codec; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.provisions.ProvisionBukkit; -import com.volmit.iris.gen.scaffold.GeneratedChunk; -import com.volmit.iris.gen.scaffold.Provisioned; -import com.volmit.iris.gen.scaffold.ProvisionedHolder; -import com.volmit.iris.gen.scaffold.TerrainProvider; -import com.volmit.iris.util.O; -import com.volmit.iris.util.V; -import net.minecraft.server.v1_16_R3.*; -import org.bukkit.Material; -import org.bukkit.block.Biome; -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.objects.ObjectArrayList; -import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.objects.ObjectList; -import org.bukkit.craftbukkit.v1_16_R3.block.CraftBlock; -import org.bukkit.craftbukkit.v1_16_R3.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_16_R3.util.CraftMagicNumbers; -import org.bukkit.generator.ChunkGenerator.BiomeGrid; -import org.bukkit.generator.ChunkGenerator.ChunkData; -import org.bukkit.material.MaterialData; - -import java.util.*; -import java.util.function.Supplier; - -@SuppressWarnings("deprecation") -public class NMSChunkGenerator16_3_SPIGOT extends ChunkGenerator implements ProvisionedHolder -{ - private static final IBlockData k = Blocks.AIR.getBlockData(); - private final Provisioned provisioned; - private final int maxHeight; - private final int xzSize; - protected final IBlockData f; - protected final IBlockData g; - private final long w; - protected final Supplier h; - private final O ws; - private BlockColumn BC; - - public NMSChunkGenerator16_3_SPIGOT(Provisioned p, O ws, WorldChunkManager worldchunkmanager, long i, Supplier supplier) - { - this(p, ws, worldchunkmanager, worldchunkmanager, i, supplier); - } - - private NMSChunkGenerator16_3_SPIGOT(Provisioned p, O ws, WorldChunkManager worldchunkmanager, WorldChunkManager worldchunkmanager1, long i, Supplier supplier) - { - super(worldchunkmanager, worldchunkmanager1, supplier.get().a(), i); - this.provisioned = p; - this.ws = ws; - this.w = i; - GeneratorSettingBase generatorsettingbase = supplier.get(); - - this.h = supplier; - NoiseSettings noisesettings = generatorsettingbase.b(); - - this.maxHeight = noisesettings.f() * 4; - this.f = generatorsettingbase.c(); - this.g = generatorsettingbase.d(); - this.xzSize = noisesettings.a() / this.maxHeight; - BC = new BlockColumn(new IBlockData[this.xzSize * this.maxHeight]); - } - - public int getSpawnHeight() - { - return getSeaLevel() + 8; - } - - public WorldChunkManager getWorldChunkManager() - { - return this.c; - } - - public int getGenerationDepth() - { - return 256; - } - - public void doCarving(long i, BiomeManager biomemanager, IChunkAccess ichunkaccess, WorldGenStage.Features worldgenstage_features) - { - if(((IrisTerrainProvider) provisioned.getProvider()).getDimension().isVanillaCaves()) - { - super.doCarving(i, biomemanager, ichunkaccess, worldgenstage_features); - } - } - - @Override - protected Codec a() - { - return ChunkGeneratorAbstract.d; - } - - public boolean a(long i, ResourceKey resourcekey) - { - return this.w == i && this.h.get().a(resourcekey); - } - - @Override - public int getBaseHeight(int i, int j, HeightMap.Type heightmap_type) - { - return 63; - } - - @Override - public IBlockAccess a(int x, int z) - { - return BC; - } - - protected IBlockData a(double d0, int i) - { - IBlockData iblockdata; - - if(d0 > 0.0D) - { - iblockdata = this.f; - } - else if(i < this.getSeaLevel()) - { - iblockdata = this.g; - } - else - { - iblockdata = NMSChunkGenerator16_3_SPIGOT.k; - } - - return iblockdata; - } - - @Override - public void buildBase(RegionLimitedWorldAccess regionlimitedworldaccess, IChunkAccess ichunkaccess) - { - - } - - @Override - public void buildNoise(GeneratorAccess generatoraccess, StructureManager structuremanager, IChunkAccess ichunkaccess) - { - ObjectList objectlist = new ObjectArrayList(10); - ObjectList objectlist1 = new ObjectArrayList(32); - ChunkCoordIntPair chunkcoordintpair = ichunkaccess.getPos(); - int i = chunkcoordintpair.x; - int j = chunkcoordintpair.z; - - if(((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures()) - { - int k = i << 4; - int l = j << 4; - Iterator iterator = StructureGenerator.t.iterator(); - - while(iterator.hasNext()) - { - StructureGenerator structuregenerator = (StructureGenerator) iterator.next(); - - structuremanager.a(SectionPosition.a(chunkcoordintpair, 0), structuregenerator).forEach((structurestart) -> - { - Iterator iterator1 = structurestart.d().iterator(); - - while(iterator1.hasNext()) - { - StructurePiece structurepiece = (StructurePiece) iterator1.next(); - - if(structurepiece.a(chunkcoordintpair, 12)) - { - if(structurepiece instanceof WorldGenFeaturePillagerOutpostPoolPiece) - { - WorldGenFeaturePillagerOutpostPoolPiece worldgenfeaturepillageroutpostpoolpiece = (WorldGenFeaturePillagerOutpostPoolPiece) structurepiece; - WorldGenFeatureDefinedStructurePoolTemplate.Matching worldgenfeaturedefinedstructurepooltemplate_matching = worldgenfeaturepillageroutpostpoolpiece.b().e(); - - if(worldgenfeaturedefinedstructurepooltemplate_matching == WorldGenFeatureDefinedStructurePoolTemplate.Matching.RIGID) - { - objectlist.add(worldgenfeaturepillageroutpostpoolpiece); - } - - Iterator iterator2 = worldgenfeaturepillageroutpostpoolpiece.e().iterator(); - - while(iterator2.hasNext()) - { - WorldGenFeatureDefinedStructureJigsawJunction worldgenfeaturedefinedstructurejigsawjunction = (WorldGenFeatureDefinedStructureJigsawJunction) iterator2.next(); - int i1 = worldgenfeaturedefinedstructurejigsawjunction.a(); - int j1 = worldgenfeaturedefinedstructurejigsawjunction.c(); - - if(i1 > k - 12 && j1 > l - 12 && i1 < k + 15 + 12 && j1 < l + 15 + 12) - { - objectlist1.add(worldgenfeaturedefinedstructurejigsawjunction); - } - } - } - else - { - objectlist.add(structurepiece); - } - } - } - }); - } - } - - ProtoChunk protochunk = (ProtoChunk) ichunkaccess; - HeightMap heightmap = protochunk.a(HeightMap.Type.OCEAN_FLOOR_WG); - HeightMap heightmap1 = protochunk.a(HeightMap.Type.WORLD_SURFACE_WG); - GeneratedChunk gc = ((ProvisionBukkit) provisioned).generateNMSChunkData(ws.get().getWorld(), new Random(i + j), i, j, new ChunkData() - { - public int getMaxHeight() - { - return 256; - } - - public void setBlock(int x, int y, int z, Material material) - { - this.setBlock(x, y, z, material.createBlockData()); - } - - public void setBlock(int x, int y, int z, MaterialData material) - { - this.setBlock(x, y, z, CraftMagicNumbers.getBlock((MaterialData) material)); - } - - public void setBlock(int x, int y, int z, BlockData blockData) - { - this.setBlock(x, y, z, ((CraftBlockData) blockData).getState()); - } - - public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, Material material) - { - this.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, material.createBlockData()); - } - - public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, MaterialData material) - { - this.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, CraftMagicNumbers.getBlock((MaterialData) material)); - } - - public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, BlockData blockData) - { - this.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, ((CraftBlockData) blockData).getState()); - } - - public Material getType(int x, int y, int z) - { - return CraftMagicNumbers.getMaterial((Block) this.getTypeId(x, y, z).getBlock()); - } - - public MaterialData getTypeAndData(int x, int y, int z) - { - return CraftMagicNumbers.getMaterial((IBlockData) this.getTypeId(x, y, z)); - } - - public BlockData getBlockData(int x, int y, int z) - { - return CraftBlockData.fromData((IBlockData) this.getTypeId(x, y, z)); - } - - public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, IBlockData type) - { - if(xMin > 15 || yMin >= getMaxHeight() || zMin > 15) - { - return; - } - if(xMin < 0) - { - xMin = 0; - } - if(yMin < 0) - { - yMin = 0; - } - if(zMin < 0) - { - zMin = 0; - } - if(xMax > 16) - { - xMax = 16; - } - if(yMax > getMaxHeight()) - { - yMax = getMaxHeight(); - } - if(zMax > 16) - { - zMax = 16; - } - if(xMin >= xMax || yMin >= yMax || zMin >= zMax) - { - return; - } - int y = yMin; - while(y < yMax) - { - int x = xMin; - while(x < xMax) - { - int z = zMin; - while(z < zMax) - { - protochunk.setType(new BlockPosition(x, y, z), type, false); - ++z; - } - ++x; - } - ++y; - } - } - - public IBlockData getTypeId(int x, int y, int z) - { - if(x != (x & 15) || y < 0 || y >= getMaxHeight() || z != (z & 15)) - { - return Blocks.AIR.getBlockData(); - } - return protochunk.getType(new BlockPosition(x, y, z)); - } - - public byte getData(int x, int y, int z) - { - return CraftMagicNumbers.toLegacyData((IBlockData) this.getTypeId(x, y, z)); - } - - private void setBlock(int x, int y, int z, IBlockData type) - { - if(x != (x & 15) || y < 0 || y >= getMaxHeight() || z != (z & 15)) - { - return; - } - - protochunk.setType(new BlockPosition(x, y, z), type, false); - - if(type.getBlock().isTileEntity()) - { - // if (this.tiles == null) { - // this.tiles = new HashSet(); - // } - // this.tiles.add(new BlockPosition(x, y, z)); - } - } - }, new BiomeGrid() - { - @Override - public void setBiome(int x, int y, int z, Biome bio) - { - protochunk.getBiomeIndex().setBiome(x, y, z, CraftBlock.biomeToBiomeBase(ws.get().r().b(IRegistry.ay), bio)); - } - - @Override - public void setBiome(int x, int z, Biome bio) - { - protochunk.getBiomeIndex().setBiome(x, 0, z, CraftBlock.biomeToBiomeBase(ws.get().r().b(IRegistry.ay), bio)); - } - - @Override - public Biome getBiome(int x, int y, int z) - { - return CraftBlock.biomeBaseToBiome(ws.get().r().b(IRegistry.ay), protochunk.getBiomeIndex().getBiome(x, y, z)); - } - - @Override - public Biome getBiome(int x, int z) - { - return CraftBlock.biomeBaseToBiome(ws.get().r().b(IRegistry.ay), protochunk.getBiomeIndex().getBiome(x, 0, z)); - } - }); - - for(int xx = 0; xx < 16; xx++) - { - for(int zz = 0; zz < 16; zz++) - { - int y = gc.getHeight().getHeight(xx, zz); - if(y < getSeaLevel()) - { - heightmap.a(xx, y, zz, Blocks.STONE.getBlockData()); - } - heightmap1.a(xx, Math.max(y, getSeaLevel()), zz, Blocks.STONE.getBlockData()); - } - } - } - - public void addDecorations(RegionLimitedWorldAccess regionlimitedworldaccess, StructureManager structuremanager) - { - if(((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures()) - { - int i = regionlimitedworldaccess.a(); - int j = regionlimitedworldaccess.b(); - int k = i * 16; - int l = j * 16; - BlockPosition blockposition = new BlockPosition(k, 0, l); - BiomeBase biomebase = this.b.getBiome((i << 2) + 2, 2, (j << 2) + 2); - SeededRandom seededrandom = new SeededRandom(); - long i1 = seededrandom.a(regionlimitedworldaccess.getSeed(), k, l); - try - { - a(biomebase, structuremanager, this, regionlimitedworldaccess, i1, seededrandom, blockposition); - } - catch(Exception exception) - { - - } - } - } - - public void a(BiomeBase bbase, StructureManager var0, ChunkGenerator var1, RegionLimitedWorldAccess var2, long var3, SeededRandom var5, BlockPosition var6) - { - if(!((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures()) - { - return; - } - - int stages = WorldGenStage.Decoration.values().length; - for(int stage = 0; stage < stages; ++stage) - { - WorldGenStage.Decoration st = WorldGenStage.Decoration.values()[stage]; - - if(st.equals(WorldGenStage.Decoration.LAKES)) - { - continue; - } - - if(st.equals(WorldGenStage.Decoration.LOCAL_MODIFICATIONS)) - { - continue; - } - - if(st.equals(WorldGenStage.Decoration.RAW_GENERATION)) - { - continue; - } - - if(st.equals(WorldGenStage.Decoration.TOP_LAYER_MODIFICATION)) - { - continue; - } - - if(st.equals(WorldGenStage.Decoration.UNDERGROUND_DECORATION)) - { - continue; - } - - if(st.equals(WorldGenStage.Decoration.UNDERGROUND_ORES)) - { - continue; - } - - if(st.equals(WorldGenStage.Decoration.VEGETAL_DECORATION)) - { - continue; - } - - StructureGenerator var13; - int var10 = 0; - if(var0.a()) - { - @SuppressWarnings("unchecked") - List> structureGenerators = ((Map>>) new V(bbase).get("g")).getOrDefault(stage, Collections.emptyList()); - Iterator> iterator = structureGenerators.iterator(); - while(iterator.hasNext()) - { - var13 = (StructureGenerator) iterator.next(); - - if(var13.equals(StructureGenerator.VILLAGE)) - { - continue; - } - - if(var13.equals(StructureGenerator.JUNGLE_PYRAMID)) - { - continue; - } - - if(var13.equals(StructureGenerator.OCEAN_RUIN)) - { - continue; - } - - if(var13.equals(StructureGenerator.IGLOO)) - { - continue; - } - - if(var13.equals(StructureGenerator.MINESHAFT)) - { - continue; - } - - if(var13.equals(StructureGenerator.NETHER_FOSSIL)) - { - continue; - } - - if(var13.equals(StructureGenerator.SHIPWRECK)) - { - continue; - } - - if(var13.equals(StructureGenerator.SHIPWRECK)) - { - continue; - } - - if(var13.equals(StructureGenerator.MONUMENT)) - { - continue; - } - - if(var13.equals(StructureGenerator.BASTION_REMNANT)) - { - continue; - } - - var5.b(var3, var10, stage); - int var14 = var6.getX() >> 4; - int var15 = var6.getZ() >> 4; - int var16 = var14 << 4; - int var17 = var15 << 4; - - try - { - var0.a(SectionPosition.a((BlockPosition) var6), var13).forEach(var8 -> var8.a((GeneratorAccessSeed) var2, var0, var1, (Random) var5, new StructureBoundingBox(var16, var17, var16 + 15, var17 + 15), new ChunkCoordIntPair(var14, var15))); - } - - catch(Exception var18) - { - - } - - ++var10; - } - } - } - } - - @Override - public int getSeaLevel() - { - return ((IrisTerrainProvider) provisioned.getProvider()).getFluidHeight(); - } - - @Override - public List getMobsFor(BiomeBase biomebase, StructureManager structuremanager, EnumCreatureType enumcreaturetype, BlockPosition blockposition) - { - if(structuremanager.a(blockposition, true, StructureGenerator.SWAMP_HUT).e()) - { - if(enumcreaturetype == EnumCreatureType.MONSTER) - { - return StructureGenerator.SWAMP_HUT.c(); - } - - if(enumcreaturetype == EnumCreatureType.CREATURE) - { - return StructureGenerator.SWAMP_HUT.j(); - } - } - - if(enumcreaturetype == EnumCreatureType.MONSTER) - { - if(structuremanager.a(blockposition, false, StructureGenerator.PILLAGER_OUTPOST).e()) - { - return StructureGenerator.PILLAGER_OUTPOST.c(); - } - - if(structuremanager.a(blockposition, false, StructureGenerator.MONUMENT).e()) - { - return StructureGenerator.MONUMENT.c(); - } - - if(structuremanager.a(blockposition, true, StructureGenerator.FORTRESS).e()) - { - return StructureGenerator.FORTRESS.c(); - } - } - - return super.getMobsFor(biomebase, structuremanager, enumcreaturetype, blockposition); - } - - @Override - public void addMobs(RegionLimitedWorldAccess regionlimitedworldaccess) - { - int i = regionlimitedworldaccess.a(); - int j = regionlimitedworldaccess.b(); - BiomeBase biomebase = regionlimitedworldaccess.getBiome((new ChunkCoordIntPair(i, j)).l()); - SeededRandom seededrandom = new SeededRandom(); - seededrandom.a(regionlimitedworldaccess.getSeed(), i << 4, j << 4); - SpawnerCreature.a(regionlimitedworldaccess, biomebase, i, j, seededrandom); - } - - public void createStructures(IRegistryCustom iregistrycustom, StructureManager structuremanager, IChunkAccess ichunkaccess, DefinedStructureManager definedstructuremanager, long i) - { - ChunkCoordIntPair chunkcoordintpair = ichunkaccess.getPos(); - BiomeBase biomebase = this.b.getBiome((chunkcoordintpair.x << 2) + 2, 0, (chunkcoordintpair.z << 2) + 2); - this.a(StructureFeatures.k, iregistrycustom, structuremanager, ichunkaccess, definedstructuremanager, i, chunkcoordintpair, biomebase); - for(Supplier> supplier : biomebase.e().a()) - { - StructureFeature structurefeature = (StructureFeature) supplier.get(); - if(StructureFeature.c == StructureGenerator.STRONGHOLD) - { - StructureFeature structureFeature = structurefeature; - synchronized(structureFeature) - { - this.a(structurefeature, iregistrycustom, structuremanager, ichunkaccess, definedstructuremanager, i, chunkcoordintpair, biomebase); - continue; - } - } - this.a(structurefeature, iregistrycustom, structuremanager, ichunkaccess, definedstructuremanager, i, chunkcoordintpair, biomebase); - } - } - - private void a(StructureFeature structurefeature, IRegistryCustom iregistrycustom, StructureManager structuremanager, IChunkAccess ichunkaccess, DefinedStructureManager definedstructuremanager, long i, ChunkCoordIntPair chunkcoordintpair, BiomeBase biomebase) - { - StructureStart structurestart = structuremanager.a(SectionPosition.a((ChunkCoordIntPair) ichunkaccess.getPos(), (int) 0), structurefeature.d, (IStructureAccess) ichunkaccess); - int j = structurestart != null ? structurestart.j() : 0; - StructureSettingsFeature structuresettingsfeature = getSettings().a(structurefeature.d); - if(structuresettingsfeature != null) - { - StructureStart structurestart1 = structurefeature.a(iregistrycustom, this, this.b, definedstructuremanager, i, chunkcoordintpair, biomebase, j, structuresettingsfeature); - structuremanager.a(SectionPosition.a((ChunkCoordIntPair) ichunkaccess.getPos(), (int) 0), structurefeature.d, structurestart1, (IStructureAccess) ichunkaccess); - } - } - - public void storeStructures(GeneratorAccessSeed generatoraccessseed, StructureManager structuremanager, IChunkAccess ichunkaccess) - { - int i = ichunkaccess.getPos().x; - int j = ichunkaccess.getPos().z; - int k = i << 4; - int l = j << 4; - SectionPosition sectionposition = SectionPosition.a((ChunkCoordIntPair) ichunkaccess.getPos(), (int) 0); - int i1 = i - 8; - while(i1 <= i + 8) - { - int j1 = j - 8; - while(j1 <= j + 8) - { - long k1 = ChunkCoordIntPair.pair((int) i1, (int) j1); - for(StructureStart structurestart : generatoraccessseed.getChunkAt(i1, j1).h().values()) - { - try - { - if(structurestart == StructureStart.a || !structurestart.c().a(k, l, k + 15, l + 15)) - continue; - structuremanager.a(sectionposition, structurestart.l(), k1, (IStructureAccess) ichunkaccess); - PacketDebug.a((GeneratorAccessSeed) generatoraccessseed, (StructureStart) structurestart); - } - catch(Exception exception) - { - CrashReport crashreport = CrashReport.a((Throwable) exception, (String) "Generating structure reference"); - CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Structure"); - crashreportsystemdetails.a("Name", () -> structurestart.l().i()); - crashreportsystemdetails.a("Class", () -> structurestart.l().getClass().getCanonicalName()); - throw new ReportedException(crashreport); - } - } - ++j1; - } - ++i1; - } - } - - @Override - public Provisioned getProvisioned() - { - return provisioned; - } - - @Override - public void clearRegeneratedLists() - { - getProvisioned().clearRegeneratedLists(); - } - - @Override - public TerrainProvider getProvider() - { - return getProvisioned().getProvider(); - } - - @Override - public void regenerate(int x, int z) - { - getProvisioned().regenerate(x, z); - } -} diff --git a/src/main/java/com/volmit/iris/gen/nms/v1X/NMSBinding1X.java b/src/main/java/com/volmit/iris/gen/nms/v1X/NMSBinding1X.java deleted file mode 100644 index ea68120dd..000000000 --- a/src/main/java/com/volmit/iris/gen/nms/v1X/NMSBinding1X.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.volmit.iris.gen.nms.v1X; - -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.gen.nms.INMSBinding; -import com.volmit.iris.gen.nms.INMSCreator; - -public class NMSBinding1X implements INMSBinding -{ - private final AtomicCache creator = new AtomicCache<>(); - - @Override - public INMSCreator getCreator() - { - return creator.aquire(NMSCreator1X::new); - } -} diff --git a/src/main/java/com/volmit/iris/gen/scaffold/IrisWorlds.java b/src/main/java/com/volmit/iris/gen/scaffold/IrisWorlds.java deleted file mode 100644 index 160aaa8b9..000000000 --- a/src/main/java/com/volmit/iris/gen/scaffold/IrisWorlds.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.volmit.iris.gen.scaffold; - -import org.bukkit.World; - -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.provisions.ProvisionBukkit; -import com.volmit.iris.util.KMap; - -public class IrisWorlds -{ - private static final KMap provisioned = new KMap<>(); - - public static void register(World w, Provisioned p) - { - provisioned.put(w.getUID().toString(), p); - } - - public static boolean isIrisWorld(World world) - { - if(provisioned.containsKey(world.getUID().toString())) - { - return true; - } - - return world.getGenerator() instanceof Provisioned || world.getGenerator() instanceof ProvisionedHolder; - } - - public static IrisTerrainProvider getProvider(World world) - { - if(isIrisWorld(world)) - { - return (IrisTerrainProvider) getProvisioned(world).getProvider(); - } - - return null; - } - - public static ProvisionBukkit getProvisioned(World world) - { - if(isIrisWorld(world)) - { - if(provisioned.containsKey(world.getUID().toString())) - { - return (ProvisionBukkit) provisioned.get(world.getUID().toString()); - } - - if(world.getGenerator() instanceof ProvisionedHolder) - { - return (ProvisionBukkit) ((ProvisionedHolder) world.getGenerator()).getProvisioned(); - } - - return ((ProvisionBukkit) world.getGenerator()); - } - - return null; - } -} diff --git a/src/main/java/com/volmit/iris/v2/generator/IrisComplex.java b/src/main/java/com/volmit/iris/generator/IrisComplex.java similarity index 97% rename from src/main/java/com/volmit/iris/v2/generator/IrisComplex.java rename to src/main/java/com/volmit/iris/generator/IrisComplex.java index fdfb79bb9..04682b2a9 100644 --- a/src/main/java/com/volmit/iris/v2/generator/IrisComplex.java +++ b/src/main/java/com/volmit/iris/generator/IrisComplex.java @@ -1,18 +1,18 @@ -package com.volmit.iris.v2.generator; +package com.volmit.iris.generator; import com.volmit.iris.object.*; import com.volmit.iris.util.*; -import com.volmit.iris.v2.scaffold.data.DataProvider; -import com.volmit.iris.v2.scaffold.engine.Engine; +import com.volmit.iris.scaffold.data.DataProvider; +import com.volmit.iris.scaffold.engine.Engine; import org.bukkit.Material; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; import com.volmit.iris.Iris; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; -import com.volmit.iris.v2.scaffold.stream.interpolation.Interpolated; +import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.interpolation.Interpolated; import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.noise.CNG; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/generator/IrisEngine.java b/src/main/java/com/volmit/iris/generator/IrisEngine.java new file mode 100644 index 000000000..9b39cc322 --- /dev/null +++ b/src/main/java/com/volmit/iris/generator/IrisEngine.java @@ -0,0 +1,119 @@ +package com.volmit.iris.generator; + +import com.volmit.iris.Iris; +import com.volmit.iris.scaffold.engine.*; +import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.parallel.MultiBurst; +import lombok.Getter; +import lombok.Setter; +import org.bukkit.Chunk; +import org.bukkit.World; +import org.bukkit.block.Biome; +import org.bukkit.block.data.BlockData; +import org.bukkit.generator.BlockPopulator; +import org.jetbrains.annotations.NotNull; + +import java.util.Random; + +public class IrisEngine extends BlockPopulator implements Engine +{ + @Getter + private final EngineCompound compound; + + @Getter + private final EngineTarget target; + + @Getter + private final EngineFramework framework; + + @Getter + private final EngineWorldManager worldManager; + + @Setter + @Getter + private volatile int parallelism; + + @Setter + @Getter + private volatile int minHeight; + private boolean failing; + private boolean closed; + + public IrisEngine(EngineTarget target, EngineCompound compound) + { + Iris.info("Initializing Engine: " + target.getWorld().getName() + "/" + target.getDimension().getLoadKey() + " (" + target.getHeight() + " height)"); + this.target = target; + this.framework = new IrisEngineFramework(this); + worldManager = new IrisWorldManager(this); + this.compound = compound; + minHeight = 0; + failing = false; + closed = false; + } + + @Override + public void close() + { + closed = true; + getWorldManager().close(); + getFramework().close(); + } + + @Override + public boolean isClosed() { + return closed; + } + + @Override + public double modifyX(double x) { + return x / getDimension().getTerrainZoom(); + } + + @Override + public double modifyZ(double z) { + return z / getDimension().getTerrainZoom(); + } + + @Override + public void generate(int x, int z, Hunk vblocks, Hunk vbiomes) { + Hunk biomes = vbiomes.synchronize(); + Hunk blocks = vblocks.synchronize().listen((xx,y,zz,t) -> catchBlockUpdates(x+xx,y+getMinHeight(),z+zz, t)); + + MultiBurst.burst.burst( + () -> getFramework().getEngineParallax().generateParallaxArea(x, z), + () -> getFramework().getBiomeActuator().actuate(x, z, biomes), + () -> getFramework().getTerrainActuator().actuate(x, z, blocks) + ); + MultiBurst.burst.burst( + () -> getFramework().getCaveModifier().modify(x, z, blocks), + () -> getFramework().getRavineModifier().modify(x, z, blocks) + ); + MultiBurst.burst.burst( + () -> getFramework().getDecorantActuator().actuate(x, z, blocks), + () -> getFramework().getDepositModifier().modify(x, z, blocks), + () -> getFramework().getPostModifier().modify(x, z, blocks), + () -> getFramework().getEngineParallax().insertParallax(x, z, blocks) + ); + + getFramework().recycle(); + } + + @Override + public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk c) + { + getWorldManager().spawnInitialEntities(c); + updateChunk(c); + } + + @Override + public void fail(String error, Throwable e) { + failing = true; + Iris.error(error); + e.printStackTrace(); + } + + @Override + public boolean hasFailed() { + return failing; + } +} diff --git a/src/main/java/com/volmit/iris/v2/generator/IrisEngineCompound.java b/src/main/java/com/volmit/iris/generator/IrisEngineCompound.java similarity index 89% rename from src/main/java/com/volmit/iris/v2/generator/IrisEngineCompound.java rename to src/main/java/com/volmit/iris/generator/IrisEngineCompound.java index a4e2b582c..414997ce0 100644 --- a/src/main/java/com/volmit/iris/v2/generator/IrisEngineCompound.java +++ b/src/main/java/com/volmit/iris/generator/IrisEngineCompound.java @@ -1,17 +1,17 @@ -package com.volmit.iris.v2.generator; +package com.volmit.iris.generator; import com.volmit.iris.Iris; import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.object.IrisDimension; import com.volmit.iris.object.IrisDimensionIndex; import com.volmit.iris.util.KList; -import com.volmit.iris.v2.scaffold.engine.Engine; -import com.volmit.iris.v2.scaffold.engine.EngineCompound; -import com.volmit.iris.v2.scaffold.engine.EngineData; -import com.volmit.iris.v2.scaffold.engine.EngineTarget; -import com.volmit.iris.v2.scaffold.hunk.Hunk; -import com.volmit.iris.v2.scaffold.parallel.BurstExecutor; -import com.volmit.iris.v2.scaffold.parallel.MultiBurst; +import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.scaffold.engine.EngineCompound; +import com.volmit.iris.scaffold.engine.EngineData; +import com.volmit.iris.scaffold.engine.EngineTarget; +import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.parallel.BurstExecutor; +import com.volmit.iris.scaffold.parallel.MultiBurst; import lombok.Getter; import org.bukkit.World; import org.bukkit.block.Biome; @@ -54,7 +54,7 @@ public class IrisEngineCompound implements EngineCompound { if(rootDimension.getDimensionalComposite().isEmpty()) { burster = null; - engines = new Engine[]{new IrisEngine(new EngineTarget(world, rootDimension, data, 256, maximumThreads))}; + engines = new Engine[]{new IrisEngine(new EngineTarget(world, rootDimension, data, 256, maximumThreads), this)}; } else @@ -80,7 +80,7 @@ public class IrisEngineCompound implements EngineCompound { { IrisDimensionIndex index = rootDimension.getDimensionalComposite().get(i); IrisDimension dimension = data.getDimensionLoader().load(index.getDimension()); - engines[i] = new IrisEngine(new EngineTarget(world, dimension, data.copy().preferFolder(rootDimension.getLoadKey()), (int)Math.floor(256D * (index.getWeight() / totalWeight)), index.isInverted(), threadDist)); + engines[i] = new IrisEngine(new EngineTarget(world, dimension, data.copy().preferFolder(rootDimension.getLoadKey()), (int)Math.floor(256D * (index.getWeight() / totalWeight)), index.isInverted(), threadDist), this); engines[i].setMinHeight(buf); buf += engines[i].getHeight(); } @@ -173,4 +173,9 @@ public class IrisEngineCompound implements EngineCompound { public void saveEngineMetadata() { engineMetadata.save(getEngineMetadataFile()); } + + @Override + public IrisDataManager getData(int height) { + return getEngineForHeight(height).getData(); + } } diff --git a/src/main/java/com/volmit/iris/v2/generator/IrisEngineFramework.java b/src/main/java/com/volmit/iris/generator/IrisEngineFramework.java similarity index 82% rename from src/main/java/com/volmit/iris/v2/generator/IrisEngineFramework.java rename to src/main/java/com/volmit/iris/generator/IrisEngineFramework.java index 234fb1cad..4469d1b68 100644 --- a/src/main/java/com/volmit/iris/v2/generator/IrisEngineFramework.java +++ b/src/main/java/com/volmit/iris/generator/IrisEngineFramework.java @@ -1,11 +1,11 @@ -package com.volmit.iris.v2.generator; +package com.volmit.iris.generator; -import com.volmit.iris.v2.generator.actuator.*; -import com.volmit.iris.v2.generator.modifier.IrisCaveModifier; -import com.volmit.iris.v2.generator.modifier.IrisDepositModifier; -import com.volmit.iris.v2.generator.modifier.IrisPostModifier; -import com.volmit.iris.v2.generator.modifier.IrisRavineModifier; -import com.volmit.iris.v2.scaffold.engine.*; +import com.volmit.iris.generator.actuator.*; +import com.volmit.iris.generator.modifier.IrisCaveModifier; +import com.volmit.iris.generator.modifier.IrisDepositModifier; +import com.volmit.iris.generator.modifier.IrisPostModifier; +import com.volmit.iris.generator.modifier.IrisRavineModifier; +import com.volmit.iris.scaffold.engine.*; import lombok.Getter; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/v2/generator/IrisEngineParallax.java b/src/main/java/com/volmit/iris/generator/IrisEngineParallax.java similarity index 67% rename from src/main/java/com/volmit/iris/v2/generator/IrisEngineParallax.java rename to src/main/java/com/volmit/iris/generator/IrisEngineParallax.java index f7102d0cf..7cbd08d36 100644 --- a/src/main/java/com/volmit/iris/v2/generator/IrisEngineParallax.java +++ b/src/main/java/com/volmit/iris/generator/IrisEngineParallax.java @@ -1,8 +1,8 @@ -package com.volmit.iris.v2.generator; +package com.volmit.iris.generator; -import com.volmit.iris.v2.scaffold.engine.Engine; -import com.volmit.iris.v2.scaffold.engine.EngineParallaxManager; -import com.volmit.iris.v2.scaffold.engine.EngineStructureManager; +import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.scaffold.engine.EngineParallaxManager; +import com.volmit.iris.scaffold.engine.EngineStructureManager; import lombok.Getter; public class IrisEngineParallax implements EngineParallaxManager { diff --git a/src/main/java/com/volmit/iris/generator/IrisEngineStructure.java b/src/main/java/com/volmit/iris/generator/IrisEngineStructure.java new file mode 100644 index 000000000..95844d8bb --- /dev/null +++ b/src/main/java/com/volmit/iris/generator/IrisEngineStructure.java @@ -0,0 +1,10 @@ +package com.volmit.iris.generator; + +import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.scaffold.engine.EngineAssignedStructureManager; + +public class IrisEngineStructure extends EngineAssignedStructureManager { + public IrisEngineStructure(Engine engine) { + super(engine); + } +} diff --git a/src/main/java/com/volmit/iris/v2/generator/IrisWorldManager.java b/src/main/java/com/volmit/iris/generator/IrisWorldManager.java similarity index 82% rename from src/main/java/com/volmit/iris/v2/generator/IrisWorldManager.java rename to src/main/java/com/volmit/iris/generator/IrisWorldManager.java index b2b9ca9c7..c457fe2b6 100644 --- a/src/main/java/com/volmit/iris/v2/generator/IrisWorldManager.java +++ b/src/main/java/com/volmit/iris/generator/IrisWorldManager.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.generator; +package com.volmit.iris.generator; -import com.volmit.iris.v2.scaffold.engine.Engine; -import com.volmit.iris.v2.scaffold.engine.EngineAssignedWorldManager; +import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.scaffold.engine.EngineAssignedWorldManager; import org.bukkit.Chunk; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockPlaceEvent; diff --git a/src/main/java/com/volmit/iris/v2/generator/actuator/IrisBiomeActuator.java b/src/main/java/com/volmit/iris/generator/actuator/IrisBiomeActuator.java similarity index 76% rename from src/main/java/com/volmit/iris/v2/generator/actuator/IrisBiomeActuator.java rename to src/main/java/com/volmit/iris/generator/actuator/IrisBiomeActuator.java index 5296a9fd9..74d5164c6 100644 --- a/src/main/java/com/volmit/iris/v2/generator/actuator/IrisBiomeActuator.java +++ b/src/main/java/com/volmit/iris/generator/actuator/IrisBiomeActuator.java @@ -1,8 +1,8 @@ -package com.volmit.iris.v2.generator.actuator; +package com.volmit.iris.generator.actuator; -import com.volmit.iris.v2.scaffold.engine.Engine; -import com.volmit.iris.v2.scaffold.engine.EngineAssignedActuator; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.scaffold.engine.EngineAssignedActuator; +import com.volmit.iris.scaffold.hunk.Hunk; import org.bukkit.block.Biome; public class IrisBiomeActuator extends EngineAssignedActuator diff --git a/src/main/java/com/volmit/iris/v2/generator/actuator/IrisDecorantActuator.java b/src/main/java/com/volmit/iris/generator/actuator/IrisDecorantActuator.java similarity index 88% rename from src/main/java/com/volmit/iris/v2/generator/actuator/IrisDecorantActuator.java rename to src/main/java/com/volmit/iris/generator/actuator/IrisDecorantActuator.java index b8f183539..7e8066921 100644 --- a/src/main/java/com/volmit/iris/v2/generator/actuator/IrisDecorantActuator.java +++ b/src/main/java/com/volmit/iris/generator/actuator/IrisDecorantActuator.java @@ -1,15 +1,15 @@ -package com.volmit.iris.v2.generator.actuator; +package com.volmit.iris.generator.actuator; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.util.RNG; -import com.volmit.iris.v2.generator.decorator.IrisCeilingDecorator; -import com.volmit.iris.v2.generator.decorator.IrisSeaSurfaceDecorator; -import com.volmit.iris.v2.generator.decorator.IrisShoreLineDecorator; -import com.volmit.iris.v2.generator.decorator.IrisSurfaceDecorator; -import com.volmit.iris.v2.scaffold.engine.Engine; -import com.volmit.iris.v2.scaffold.engine.EngineAssignedActuator; -import com.volmit.iris.v2.scaffold.engine.EngineDecorator; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.generator.decorator.IrisCeilingDecorator; +import com.volmit.iris.generator.decorator.IrisSeaSurfaceDecorator; +import com.volmit.iris.generator.decorator.IrisShoreLineDecorator; +import com.volmit.iris.generator.decorator.IrisSurfaceDecorator; +import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.scaffold.engine.EngineAssignedActuator; +import com.volmit.iris.scaffold.engine.EngineDecorator; +import com.volmit.iris.scaffold.hunk.Hunk; import lombok.Getter; import org.bukkit.Material; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/v2/generator/actuator/IrisTerrainActuator.java b/src/main/java/com/volmit/iris/generator/actuator/IrisTerrainActuator.java similarity index 93% rename from src/main/java/com/volmit/iris/v2/generator/actuator/IrisTerrainActuator.java rename to src/main/java/com/volmit/iris/generator/actuator/IrisTerrainActuator.java index a68b114e2..8f50c8912 100644 --- a/src/main/java/com/volmit/iris/v2/generator/actuator/IrisTerrainActuator.java +++ b/src/main/java/com/volmit/iris/generator/actuator/IrisTerrainActuator.java @@ -1,11 +1,11 @@ -package com.volmit.iris.v2.generator.actuator; +package com.volmit.iris.generator.actuator; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.util.KList; import com.volmit.iris.util.RNG; -import com.volmit.iris.v2.scaffold.engine.Engine; -import com.volmit.iris.v2.scaffold.engine.EngineAssignedActuator; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.scaffold.engine.EngineAssignedActuator; +import com.volmit.iris.scaffold.hunk.Hunk; import lombok.Getter; import org.bukkit.Material; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/v2/generator/decorator/IrisCeilingDecorator.java b/src/main/java/com/volmit/iris/generator/decorator/IrisCeilingDecorator.java similarity index 87% rename from src/main/java/com/volmit/iris/v2/generator/decorator/IrisCeilingDecorator.java rename to src/main/java/com/volmit/iris/generator/decorator/IrisCeilingDecorator.java index 166cf77c4..65e08bcab 100644 --- a/src/main/java/com/volmit/iris/v2/generator/decorator/IrisCeilingDecorator.java +++ b/src/main/java/com/volmit/iris/generator/decorator/IrisCeilingDecorator.java @@ -1,11 +1,11 @@ -package com.volmit.iris.v2.generator.decorator; +package com.volmit.iris.generator.decorator; import com.volmit.iris.object.DecorationPart; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDecorator; -import com.volmit.iris.v2.scaffold.cache.Cache; -import com.volmit.iris.v2.scaffold.engine.Engine; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.cache.Cache; +import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.scaffold.hunk.Hunk; import org.bukkit.block.data.BlockData; public class IrisCeilingDecorator extends IrisEngineDecorator diff --git a/src/main/java/com/volmit/iris/v2/generator/decorator/IrisEngineDecorator.java b/src/main/java/com/volmit/iris/generator/decorator/IrisEngineDecorator.java similarity index 82% rename from src/main/java/com/volmit/iris/v2/generator/decorator/IrisEngineDecorator.java rename to src/main/java/com/volmit/iris/generator/decorator/IrisEngineDecorator.java index a2e81f73f..a375bd5c6 100644 --- a/src/main/java/com/volmit/iris/v2/generator/decorator/IrisEngineDecorator.java +++ b/src/main/java/com/volmit/iris/generator/decorator/IrisEngineDecorator.java @@ -1,12 +1,12 @@ -package com.volmit.iris.v2.generator.decorator; +package com.volmit.iris.generator.decorator; import com.volmit.iris.object.DecorationPart; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDecorator; import com.volmit.iris.util.RNG; -import com.volmit.iris.v2.scaffold.engine.Engine; -import com.volmit.iris.v2.scaffold.engine.EngineAssignedComponent; -import com.volmit.iris.v2.scaffold.engine.EngineDecorator; +import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.scaffold.engine.EngineAssignedComponent; +import com.volmit.iris.scaffold.engine.EngineDecorator; import lombok.Getter; public abstract class IrisEngineDecorator extends EngineAssignedComponent implements EngineDecorator { diff --git a/src/main/java/com/volmit/iris/v2/generator/decorator/IrisSeaSurfaceDecorator.java b/src/main/java/com/volmit/iris/generator/decorator/IrisSeaSurfaceDecorator.java similarity index 89% rename from src/main/java/com/volmit/iris/v2/generator/decorator/IrisSeaSurfaceDecorator.java rename to src/main/java/com/volmit/iris/generator/decorator/IrisSeaSurfaceDecorator.java index e13fe80d9..84519b8c5 100644 --- a/src/main/java/com/volmit/iris/v2/generator/decorator/IrisSeaSurfaceDecorator.java +++ b/src/main/java/com/volmit/iris/generator/decorator/IrisSeaSurfaceDecorator.java @@ -1,11 +1,11 @@ -package com.volmit.iris.v2.generator.decorator; +package com.volmit.iris.generator.decorator; import com.volmit.iris.object.DecorationPart; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDecorator; -import com.volmit.iris.v2.scaffold.cache.Cache; -import com.volmit.iris.v2.scaffold.engine.Engine; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.cache.Cache; +import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.scaffold.hunk.Hunk; import org.bukkit.block.data.BlockData; public class IrisSeaSurfaceDecorator extends IrisEngineDecorator diff --git a/src/main/java/com/volmit/iris/v2/generator/decorator/IrisShoreLineDecorator.java b/src/main/java/com/volmit/iris/generator/decorator/IrisShoreLineDecorator.java similarity index 91% rename from src/main/java/com/volmit/iris/v2/generator/decorator/IrisShoreLineDecorator.java rename to src/main/java/com/volmit/iris/generator/decorator/IrisShoreLineDecorator.java index 03d93aaa1..b3acca707 100644 --- a/src/main/java/com/volmit/iris/v2/generator/decorator/IrisShoreLineDecorator.java +++ b/src/main/java/com/volmit/iris/generator/decorator/IrisShoreLineDecorator.java @@ -1,11 +1,11 @@ -package com.volmit.iris.v2.generator.decorator; +package com.volmit.iris.generator.decorator; import com.volmit.iris.object.DecorationPart; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDecorator; -import com.volmit.iris.v2.scaffold.cache.Cache; -import com.volmit.iris.v2.scaffold.engine.Engine; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.cache.Cache; +import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.scaffold.hunk.Hunk; import org.bukkit.block.data.BlockData; public class IrisShoreLineDecorator extends IrisEngineDecorator diff --git a/src/main/java/com/volmit/iris/v2/generator/decorator/IrisSurfaceDecorator.java b/src/main/java/com/volmit/iris/generator/decorator/IrisSurfaceDecorator.java similarity index 92% rename from src/main/java/com/volmit/iris/v2/generator/decorator/IrisSurfaceDecorator.java rename to src/main/java/com/volmit/iris/generator/decorator/IrisSurfaceDecorator.java index 5078a0be3..2d6b92b1b 100644 --- a/src/main/java/com/volmit/iris/v2/generator/decorator/IrisSurfaceDecorator.java +++ b/src/main/java/com/volmit/iris/generator/decorator/IrisSurfaceDecorator.java @@ -1,12 +1,12 @@ -package com.volmit.iris.v2.generator.decorator; +package com.volmit.iris.generator.decorator; import com.volmit.iris.object.DecorationPart; import com.volmit.iris.object.InferredType; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDecorator; -import com.volmit.iris.v2.scaffold.cache.Cache; -import com.volmit.iris.v2.scaffold.engine.Engine; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.cache.Cache; +import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.scaffold.hunk.Hunk; import org.bukkit.block.data.BlockData; public class IrisSurfaceDecorator extends IrisEngineDecorator diff --git a/src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java b/src/main/java/com/volmit/iris/generator/legacy/ContextualTerrainProvider.java similarity index 93% rename from src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java rename to src/main/java/com/volmit/iris/generator/legacy/ContextualTerrainProvider.java index d9c268d02..31947b978 100644 --- a/src/main/java/com/volmit/iris/gen/ContextualTerrainProvider.java +++ b/src/main/java/com/volmit/iris/generator/legacy/ContextualTerrainProvider.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen; +package com.volmit.iris.generator.legacy; import java.util.Random; @@ -22,18 +22,18 @@ import org.bukkit.event.world.ChunkUnloadEvent; import org.bukkit.event.world.WorldUnloadEvent; import com.volmit.iris.Iris; -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.gen.atomics.AtomicMulticache; -import com.volmit.iris.gen.scaffold.GeneratedChunk; -import com.volmit.iris.gen.scaffold.IrisContext; -import com.volmit.iris.gen.scaffold.IrisMetrics; -import com.volmit.iris.gen.scaffold.Provisioned; -import com.volmit.iris.gen.scaffold.TerrainChunk; -import com.volmit.iris.gen.scaffold.TerrainProvider; -import com.volmit.iris.gen.scaffold.TerrainTarget; -import com.volmit.iris.v2.scaffold.data.DataProvider; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.atomics.AtomicMulticache; +import com.volmit.iris.generator.legacy.scaffold.GeneratedChunk; +import com.volmit.iris.generator.legacy.scaffold.IrisContext; +import com.volmit.iris.generator.legacy.scaffold.IrisMetrics; +import com.volmit.iris.generator.legacy.scaffold.Provisioned; +import com.volmit.iris.generator.legacy.scaffold.TerrainChunk; +import com.volmit.iris.generator.legacy.scaffold.TerrainProvider; +import com.volmit.iris.generator.legacy.scaffold.TerrainTarget; +import com.volmit.iris.scaffold.data.DataProvider; import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDimension; import com.volmit.iris.object.IrisGenerator; diff --git a/src/main/java/com/volmit/iris/gen/DimensionalTerrainProvider.java b/src/main/java/com/volmit/iris/generator/legacy/DimensionalTerrainProvider.java similarity index 97% rename from src/main/java/com/volmit/iris/gen/DimensionalTerrainProvider.java rename to src/main/java/com/volmit/iris/generator/legacy/DimensionalTerrainProvider.java index 7c20034b3..0dae648f8 100644 --- a/src/main/java/com/volmit/iris/gen/DimensionalTerrainProvider.java +++ b/src/main/java/com/volmit/iris/generator/legacy/DimensionalTerrainProvider.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen; +package com.volmit.iris.generator.legacy; import java.io.File; @@ -9,7 +9,7 @@ import org.bukkit.entity.Player; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.gen.scaffold.TerrainTarget; +import com.volmit.iris.generator.legacy.scaffold.TerrainTarget; import com.volmit.iris.object.InferredType; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDimension; diff --git a/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java b/src/main/java/com/volmit/iris/generator/legacy/IrisTerrainProvider.java similarity index 96% rename from src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java rename to src/main/java/com/volmit/iris/generator/legacy/IrisTerrainProvider.java index 62b984aeb..33f8fd9ed 100644 --- a/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java +++ b/src/main/java/com/volmit/iris/generator/legacy/IrisTerrainProvider.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen; +package com.volmit.iris.generator.legacy; import java.awt.Color; import java.io.File; @@ -20,14 +20,14 @@ import org.bukkit.util.BlockVector; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.gen.atomics.AtomicRegionData; -import com.volmit.iris.gen.scaffold.GeneratedChunk; -import com.volmit.iris.gen.scaffold.IrisContext; -import com.volmit.iris.gen.scaffold.IrisGenConfiguration; -import com.volmit.iris.gen.scaffold.TerrainChunk; -import com.volmit.iris.gen.scaffold.TerrainTarget; -import com.volmit.iris.gui.Renderer; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.legacy.atomics.AtomicRegionData; +import com.volmit.iris.generator.legacy.scaffold.GeneratedChunk; +import com.volmit.iris.generator.legacy.scaffold.IrisContext; +import com.volmit.iris.generator.legacy.scaffold.IrisGenConfiguration; +import com.volmit.iris.generator.legacy.scaffold.TerrainChunk; +import com.volmit.iris.generator.legacy.scaffold.TerrainTarget; +import com.volmit.iris.manager.gui.Renderer; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisBlockDrops; import com.volmit.iris.object.IrisDimension; diff --git a/src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java b/src/main/java/com/volmit/iris/generator/legacy/ParallaxTerrainProvider.java similarity index 91% rename from src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java rename to src/main/java/com/volmit/iris/generator/legacy/ParallaxTerrainProvider.java index f9aee63bb..b0e5e9ae3 100644 --- a/src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java +++ b/src/main/java/com/volmit/iris/generator/legacy/ParallaxTerrainProvider.java @@ -1,47 +1,27 @@ -package com.volmit.iris.gen; - -import java.io.IOException; -import java.util.List; +package com.volmit.iris.generator.legacy; +import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; +import com.volmit.iris.generator.legacy.atomics.AtomicSliver; +import com.volmit.iris.generator.legacy.atomics.AtomicSliverMap; +import com.volmit.iris.generator.legacy.atomics.AtomicWorldData; +import com.volmit.iris.generator.legacy.atomics.MasterLock; +import com.volmit.iris.generator.legacy.layer.GenLayerText; +import com.volmit.iris.generator.legacy.layer.GenLayerUpdate; +import com.volmit.iris.generator.legacy.scaffold.TerrainChunk; +import com.volmit.iris.generator.legacy.scaffold.TerrainTarget; +import com.volmit.iris.object.*; +import com.volmit.iris.util.*; +import lombok.Data; +import lombok.EqualsAndHashCode; import org.bukkit.Chunk; import org.bukkit.World; import org.bukkit.block.data.BlockData; import org.bukkit.entity.Player; import org.bukkit.generator.BlockPopulator; -import com.volmit.iris.Iris; -import com.volmit.iris.IrisSettings; -import com.volmit.iris.gen.atomics.AtomicSliver; -import com.volmit.iris.gen.atomics.AtomicSliverMap; -import com.volmit.iris.gen.atomics.AtomicWorldData; -import com.volmit.iris.gen.atomics.MasterLock; -import com.volmit.iris.gen.layer.GenLayerText; -import com.volmit.iris.gen.layer.GenLayerUpdate; -import com.volmit.iris.gen.scaffold.TerrainChunk; -import com.volmit.iris.gen.scaffold.TerrainTarget; -import com.volmit.iris.object.IrisBiome; -import com.volmit.iris.object.IrisBiomeMutation; -import com.volmit.iris.object.IrisObjectPlacement; -import com.volmit.iris.object.IrisRegion; -import com.volmit.iris.object.IrisStructurePlacement; -import com.volmit.iris.object.IrisTextPlacement; -import com.volmit.iris.util.BiomeMap; -import com.volmit.iris.util.CarveResult; -import com.volmit.iris.util.CaveResult; -import com.volmit.iris.util.ChunkPosition; -import com.volmit.iris.util.HeightMap; -import com.volmit.iris.util.IObjectPlacer; -import com.volmit.iris.util.IrisLock; -import com.volmit.iris.util.IrisStructureResult; -import com.volmit.iris.util.J; -import com.volmit.iris.util.KList; -import com.volmit.iris.util.KMap; -import com.volmit.iris.util.PrecisionStopwatch; -import com.volmit.iris.util.RNG; -import com.volmit.iris.util.Spiraler; - -import lombok.Data; -import lombok.EqualsAndHashCode; +import java.io.IOException; +import java.util.List; @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/volmit/iris/gen/ParallelTerrainProvider.java b/src/main/java/com/volmit/iris/generator/legacy/ParallelTerrainProvider.java similarity index 90% rename from src/main/java/com/volmit/iris/gen/ParallelTerrainProvider.java rename to src/main/java/com/volmit/iris/generator/legacy/ParallelTerrainProvider.java index 620dc88cb..7f441fd63 100644 --- a/src/main/java/com/volmit/iris/gen/ParallelTerrainProvider.java +++ b/src/main/java/com/volmit/iris/generator/legacy/ParallelTerrainProvider.java @@ -1,11 +1,11 @@ -package com.volmit.iris.gen; +package com.volmit.iris.generator.legacy; import com.volmit.iris.Iris; -import com.volmit.iris.gen.atomics.AtomicSliver; -import com.volmit.iris.gen.atomics.AtomicSliverMap; -import com.volmit.iris.gen.scaffold.GeneratedChunk; -import com.volmit.iris.gen.scaffold.TerrainChunk; -import com.volmit.iris.gen.scaffold.TerrainTarget; +import com.volmit.iris.generator.legacy.atomics.AtomicSliver; +import com.volmit.iris.generator.legacy.atomics.AtomicSliverMap; +import com.volmit.iris.generator.legacy.scaffold.GeneratedChunk; +import com.volmit.iris.generator.legacy.scaffold.TerrainChunk; +import com.volmit.iris.generator.legacy.scaffold.TerrainTarget; import com.volmit.iris.util.BiomeMap; import com.volmit.iris.util.GroupedExecutor; import com.volmit.iris.util.HeightMap; diff --git a/src/main/java/com/volmit/iris/gen/PostBlockTerrainProvider.java b/src/main/java/com/volmit/iris/generator/legacy/PostBlockTerrainProvider.java similarity index 90% rename from src/main/java/com/volmit/iris/gen/PostBlockTerrainProvider.java rename to src/main/java/com/volmit/iris/generator/legacy/PostBlockTerrainProvider.java index eccbb35f2..517f99f42 100644 --- a/src/main/java/com/volmit/iris/gen/PostBlockTerrainProvider.java +++ b/src/main/java/com/volmit/iris/generator/legacy/PostBlockTerrainProvider.java @@ -1,13 +1,13 @@ -package com.volmit.iris.gen; +package com.volmit.iris.generator.legacy; import org.bukkit.block.data.BlockData; import org.bukkit.generator.ChunkGenerator.ChunkData; import com.volmit.iris.Iris; -import com.volmit.iris.gen.post.PostMasterPatcher; -import com.volmit.iris.gen.scaffold.GeneratedChunk; -import com.volmit.iris.gen.scaffold.TerrainChunk; -import com.volmit.iris.gen.scaffold.TerrainTarget; +import com.volmit.iris.generator.legacy.post.PostMasterPatcher; +import com.volmit.iris.generator.legacy.scaffold.GeneratedChunk; +import com.volmit.iris.generator.legacy.scaffold.TerrainChunk; +import com.volmit.iris.generator.legacy.scaffold.TerrainTarget; import com.volmit.iris.util.CaveResult; import com.volmit.iris.util.IPostBlockAccess; import com.volmit.iris.util.IrisLock; diff --git a/src/main/java/com/volmit/iris/gen/TopographicTerrainProvider.java b/src/main/java/com/volmit/iris/generator/legacy/TopographicTerrainProvider.java similarity index 97% rename from src/main/java/com/volmit/iris/gen/TopographicTerrainProvider.java rename to src/main/java/com/volmit/iris/generator/legacy/TopographicTerrainProvider.java index 5f76f3036..6c5c1d748 100644 --- a/src/main/java/com/volmit/iris/gen/TopographicTerrainProvider.java +++ b/src/main/java/com/volmit/iris/generator/legacy/TopographicTerrainProvider.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen; +package com.volmit.iris.generator.legacy; import org.bukkit.Material; import org.bukkit.block.Biome; @@ -6,16 +6,16 @@ import org.bukkit.block.data.Bisected; import org.bukkit.block.data.Bisected.Half; import com.volmit.iris.Iris; -import com.volmit.iris.gen.atomics.AtomicSliver; -import com.volmit.iris.gen.atomics.AtomicSliverMap; -import com.volmit.iris.gen.layer.GenLayerBiome; -import com.volmit.iris.gen.layer.GenLayerCarve; -import com.volmit.iris.gen.layer.GenLayerCave; -import com.volmit.iris.gen.layer.GenLayerRavine; -import com.volmit.iris.gen.scaffold.GeneratedChunk; -import com.volmit.iris.gen.scaffold.TerrainChunk; -import com.volmit.iris.gen.scaffold.TerrainTarget; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.legacy.atomics.AtomicSliver; +import com.volmit.iris.generator.legacy.atomics.AtomicSliverMap; +import com.volmit.iris.generator.legacy.layer.GenLayerBiome; +import com.volmit.iris.generator.legacy.layer.GenLayerCarve; +import com.volmit.iris.generator.legacy.layer.GenLayerCave; +import com.volmit.iris.generator.legacy.layer.GenLayerRavine; +import com.volmit.iris.generator.legacy.scaffold.GeneratedChunk; +import com.volmit.iris.generator.legacy.scaffold.TerrainChunk; +import com.volmit.iris.generator.legacy.scaffold.TerrainTarget; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.object.DecorationPart; import com.volmit.iris.object.InferredType; import com.volmit.iris.object.IrisBiome; diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicBiomeMap.java b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicBiomeMap.java similarity index 68% rename from src/main/java/com/volmit/iris/gen/atomics/AtomicBiomeMap.java rename to src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicBiomeMap.java index 78c6c2566..2715bd5f9 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/AtomicBiomeMap.java +++ b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicBiomeMap.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.atomics; +package com.volmit.iris.generator.legacy.atomics; import com.volmit.iris.object.IrisBiome; diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicCache.java b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicCache.java similarity index 97% rename from src/main/java/com/volmit/iris/gen/atomics/AtomicCache.java rename to src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicCache.java index 67898fcfb..344a5d4fd 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/AtomicCache.java +++ b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicCache.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.atomics; +package com.volmit.iris.generator.legacy.atomics; import java.util.function.Supplier; diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicDoubleMap.java b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicDoubleMap.java similarity index 89% rename from src/main/java/com/volmit/iris/gen/atomics/AtomicDoubleMap.java rename to src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicDoubleMap.java index b9575b245..f29ecdc99 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/AtomicDoubleMap.java +++ b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicDoubleMap.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.atomics; +package com.volmit.iris.generator.legacy.atomics; import com.google.common.util.concurrent.AtomicDoubleArray; diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicIntMap.java b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicIntMap.java similarity index 87% rename from src/main/java/com/volmit/iris/gen/atomics/AtomicIntMap.java rename to src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicIntMap.java index 52fdc4d85..639ec0cb9 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/AtomicIntMap.java +++ b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicIntMap.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.atomics; +package com.volmit.iris.generator.legacy.atomics; import java.util.concurrent.atomic.AtomicIntegerArray; diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicMulticache.java b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicMulticache.java similarity index 96% rename from src/main/java/com/volmit/iris/gen/atomics/AtomicMulticache.java rename to src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicMulticache.java index 90bf27ffe..fc2b1a4fa 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/AtomicMulticache.java +++ b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicMulticache.java @@ -1,9 +1,9 @@ -package com.volmit.iris.gen.atomics; +package com.volmit.iris.generator.legacy.atomics; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import com.volmit.iris.IrisSettings; -import com.volmit.iris.gen.IrisTerrainProvider; +import com.volmit.iris.generator.legacy.IrisTerrainProvider; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisRegion; import com.volmit.iris.util.ChunkPosition; diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicObjectMap.java b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicObjectMap.java similarity index 87% rename from src/main/java/com/volmit/iris/gen/atomics/AtomicObjectMap.java rename to src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicObjectMap.java index f62da1a6a..0112df041 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/AtomicObjectMap.java +++ b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicObjectMap.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.atomics; +package com.volmit.iris.generator.legacy.atomics; import java.util.concurrent.atomic.AtomicReferenceArray; diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicRegionData.java b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicRegionData.java similarity index 96% rename from src/main/java/com/volmit/iris/gen/atomics/AtomicRegionData.java rename to src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicRegionData.java index 9e8e9c346..62029a01c 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/AtomicRegionData.java +++ b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicRegionData.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.atomics; +package com.volmit.iris.generator.legacy.atomics; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -9,7 +9,7 @@ import java.util.zip.GZIPInputStream; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.gen.scaffold.TerrainTarget; +import com.volmit.iris.generator.legacy.scaffold.TerrainTarget; import com.volmit.iris.util.ByteArrayTag; import com.volmit.iris.util.CompoundTag; import com.volmit.iris.util.CustomOutputStream; diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicRegionMap.java b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicRegionMap.java similarity index 69% rename from src/main/java/com/volmit/iris/gen/atomics/AtomicRegionMap.java rename to src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicRegionMap.java index 669836046..742cf0092 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/AtomicRegionMap.java +++ b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicRegionMap.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.atomics; +package com.volmit.iris.generator.legacy.atomics; import com.volmit.iris.object.IrisRegion; diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicSliver.java b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicSliver.java similarity index 99% rename from src/main/java/com/volmit/iris/gen/atomics/AtomicSliver.java rename to src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicSliver.java index 830093cb5..858ae2f3b 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/AtomicSliver.java +++ b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicSliver.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.atomics; +package com.volmit.iris.generator.legacy.atomics; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicSliverMap.java b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicSliverMap.java similarity index 97% rename from src/main/java/com/volmit/iris/gen/atomics/AtomicSliverMap.java rename to src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicSliverMap.java index 8f0032c46..36731f65c 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/AtomicSliverMap.java +++ b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicSliverMap.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.atomics; +package com.volmit.iris.generator.legacy.atomics; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -9,7 +9,7 @@ import java.io.OutputStream; import org.bukkit.generator.ChunkGenerator.BiomeGrid; import org.bukkit.generator.ChunkGenerator.ChunkData; -import com.volmit.iris.gen.DimensionalTerrainProvider; +import com.volmit.iris.generator.legacy.DimensionalTerrainProvider; import com.volmit.iris.object.IrisStructure; import com.volmit.iris.object.IrisStructureTile; import com.volmit.iris.util.HeightMap; diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicWorldData.java b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicWorldData.java similarity index 98% rename from src/main/java/com/volmit/iris/gen/atomics/AtomicWorldData.java rename to src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicWorldData.java index f344f2c1d..76bc40855 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/AtomicWorldData.java +++ b/src/main/java/com/volmit/iris/generator/legacy/atomics/AtomicWorldData.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.atomics; +package com.volmit.iris.generator.legacy.atomics; import java.io.File; import java.io.FileInputStream; @@ -6,7 +6,7 @@ import java.io.FileOutputStream; import java.io.IOException; import com.volmit.iris.Iris; -import com.volmit.iris.gen.scaffold.TerrainTarget; +import com.volmit.iris.generator.legacy.scaffold.TerrainTarget; import com.volmit.iris.util.ChunkPosition; import com.volmit.iris.util.IrisLock; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/gen/atomics/MasterLock.java b/src/main/java/com/volmit/iris/generator/legacy/atomics/MasterLock.java similarity index 94% rename from src/main/java/com/volmit/iris/gen/atomics/MasterLock.java rename to src/main/java/com/volmit/iris/generator/legacy/atomics/MasterLock.java index a5b2134b7..23328969a 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/MasterLock.java +++ b/src/main/java/com/volmit/iris/generator/legacy/atomics/MasterLock.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.atomics; +package com.volmit.iris.generator.legacy.atomics; import com.volmit.iris.util.IrisLock; import com.volmit.iris.util.KMap; diff --git a/src/main/java/com/volmit/iris/gen/layer/BiomeDataProvider.java b/src/main/java/com/volmit/iris/generator/legacy/layer/BiomeDataProvider.java similarity index 91% rename from src/main/java/com/volmit/iris/gen/layer/BiomeDataProvider.java rename to src/main/java/com/volmit/iris/generator/legacy/layer/BiomeDataProvider.java index cf4f48933..60c7fd807 100644 --- a/src/main/java/com/volmit/iris/gen/layer/BiomeDataProvider.java +++ b/src/main/java/com/volmit/iris/generator/legacy/layer/BiomeDataProvider.java @@ -1,8 +1,8 @@ -package com.volmit.iris.gen.layer; +package com.volmit.iris.generator.legacy.layer; import com.volmit.iris.Iris; -import com.volmit.iris.gen.ContextualTerrainProvider; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.legacy.ContextualTerrainProvider; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.object.InferredType; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisGeneratorStyle; diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerBiome.java b/src/main/java/com/volmit/iris/generator/legacy/layer/GenLayerBiome.java similarity index 97% rename from src/main/java/com/volmit/iris/gen/layer/GenLayerBiome.java rename to src/main/java/com/volmit/iris/generator/legacy/layer/GenLayerBiome.java index 537311a6f..318ccc788 100644 --- a/src/main/java/com/volmit/iris/gen/layer/GenLayerBiome.java +++ b/src/main/java/com/volmit/iris/generator/legacy/layer/GenLayerBiome.java @@ -1,10 +1,10 @@ -package com.volmit.iris.gen.layer; +package com.volmit.iris.generator.legacy.layer; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.gen.DimensionalTerrainProvider; -import com.volmit.iris.gen.TopographicTerrainProvider; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.legacy.DimensionalTerrainProvider; +import com.volmit.iris.generator.legacy.TopographicTerrainProvider; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.object.InferredType; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisRegion; diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerCarve.java b/src/main/java/com/volmit/iris/generator/legacy/layer/GenLayerCarve.java similarity index 95% rename from src/main/java/com/volmit/iris/gen/layer/GenLayerCarve.java rename to src/main/java/com/volmit/iris/generator/legacy/layer/GenLayerCarve.java index 5311d5412..5b29bbf4e 100644 --- a/src/main/java/com/volmit/iris/gen/layer/GenLayerCarve.java +++ b/src/main/java/com/volmit/iris/generator/legacy/layer/GenLayerCarve.java @@ -1,6 +1,6 @@ -package com.volmit.iris.gen.layer; +package com.volmit.iris.generator.legacy.layer; -import com.volmit.iris.gen.TopographicTerrainProvider; +import com.volmit.iris.generator.legacy.TopographicTerrainProvider; import com.volmit.iris.object.IrisCarveLayer; import com.volmit.iris.util.CarveResult; import com.volmit.iris.util.GenLayer; diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java b/src/main/java/com/volmit/iris/generator/legacy/layer/GenLayerCave.java similarity index 91% rename from src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java rename to src/main/java/com/volmit/iris/generator/legacy/layer/GenLayerCave.java index a9da3b0dc..ba96f875d 100644 --- a/src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java +++ b/src/main/java/com/volmit/iris/generator/legacy/layer/GenLayerCave.java @@ -1,16 +1,16 @@ -package com.volmit.iris.gen.layer; +package com.volmit.iris.generator.legacy.layer; import java.util.function.Function; import com.volmit.iris.util.*; import org.bukkit.Material; -import com.volmit.iris.gen.TopographicTerrainProvider; -import com.volmit.iris.gen.atomics.AtomicSliver; -import com.volmit.iris.noise.FastNoiseDouble; -import com.volmit.iris.noise.FastNoiseDouble.CellularDistanceFunction; -import com.volmit.iris.noise.FastNoiseDouble.CellularReturnType; -import com.volmit.iris.noise.FastNoiseDouble.NoiseType; +import com.volmit.iris.generator.legacy.TopographicTerrainProvider; +import com.volmit.iris.generator.legacy.atomics.AtomicSliver; +import com.volmit.iris.generator.noise.FastNoiseDouble; +import com.volmit.iris.generator.noise.FastNoiseDouble.CellularDistanceFunction; +import com.volmit.iris.generator.noise.FastNoiseDouble.CellularReturnType; +import com.volmit.iris.generator.noise.FastNoiseDouble.NoiseType; import com.volmit.iris.object.IrisCaveLayer; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerRavine.java b/src/main/java/com/volmit/iris/generator/legacy/layer/GenLayerRavine.java similarity index 96% rename from src/main/java/com/volmit/iris/gen/layer/GenLayerRavine.java rename to src/main/java/com/volmit/iris/generator/legacy/layer/GenLayerRavine.java index 1b08ca1c2..8447e9b26 100644 --- a/src/main/java/com/volmit/iris/gen/layer/GenLayerRavine.java +++ b/src/main/java/com/volmit/iris/generator/legacy/layer/GenLayerRavine.java @@ -1,11 +1,11 @@ -package com.volmit.iris.gen.layer; +package com.volmit.iris.generator.legacy.layer; import org.bukkit.Material; -import com.volmit.iris.gen.TopographicTerrainProvider; -import com.volmit.iris.gen.atomics.AtomicSliverMap; -import com.volmit.iris.gen.scaffold.TerrainChunk; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.legacy.TopographicTerrainProvider; +import com.volmit.iris.generator.legacy.atomics.AtomicSliverMap; +import com.volmit.iris.generator.legacy.scaffold.TerrainChunk; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.object.NoiseStyle; import com.volmit.iris.util.B; import com.volmit.iris.util.BiomeMap; diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerText.java b/src/main/java/com/volmit/iris/generator/legacy/layer/GenLayerText.java similarity index 92% rename from src/main/java/com/volmit/iris/gen/layer/GenLayerText.java rename to src/main/java/com/volmit/iris/generator/legacy/layer/GenLayerText.java index 63511e276..0f5aa8afe 100644 --- a/src/main/java/com/volmit/iris/gen/layer/GenLayerText.java +++ b/src/main/java/com/volmit/iris/generator/legacy/layer/GenLayerText.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.layer; +package com.volmit.iris.generator.legacy.layer; import java.awt.Font; import java.awt.Graphics; @@ -6,8 +6,8 @@ import java.awt.Graphics2D; import java.awt.image.BufferedImage; import com.volmit.iris.Iris; -import com.volmit.iris.gen.TopographicTerrainProvider; -import com.volmit.iris.gen.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.TopographicTerrainProvider; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; import com.volmit.iris.object.IrisMaterialPalette; import com.volmit.iris.object.IrisObject; import com.volmit.iris.util.B; diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerUpdate.java b/src/main/java/com/volmit/iris/generator/legacy/layer/GenLayerUpdate.java similarity index 96% rename from src/main/java/com/volmit/iris/gen/layer/GenLayerUpdate.java rename to src/main/java/com/volmit/iris/generator/legacy/layer/GenLayerUpdate.java index 9b0220899..562eb17e6 100644 --- a/src/main/java/com/volmit/iris/gen/layer/GenLayerUpdate.java +++ b/src/main/java/com/volmit/iris/generator/legacy/layer/GenLayerUpdate.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.layer; +package com.volmit.iris.generator.legacy.layer; import java.util.Arrays; import java.util.Random; @@ -14,10 +14,10 @@ import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; import com.volmit.iris.IrisSettings; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.ParallaxTerrainProvider; -import com.volmit.iris.gen.atomics.AtomicSliverMap; -import com.volmit.iris.gen.scaffold.ChunkWrapper; +import com.volmit.iris.generator.legacy.IrisTerrainProvider; +import com.volmit.iris.generator.legacy.ParallaxTerrainProvider; +import com.volmit.iris.generator.legacy.atomics.AtomicSliverMap; +import com.volmit.iris.generator.legacy.scaffold.ChunkWrapper; import com.volmit.iris.object.InventorySlotType; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDepositGenerator; diff --git a/src/main/java/com/volmit/iris/gen/nms/INMS.java b/src/main/java/com/volmit/iris/generator/legacy/nms/INMS.java similarity index 84% rename from src/main/java/com/volmit/iris/gen/nms/INMS.java rename to src/main/java/com/volmit/iris/generator/legacy/nms/INMS.java index a10f3d9f1..eddbe6cbf 100644 --- a/src/main/java/com/volmit/iris/gen/nms/INMS.java +++ b/src/main/java/com/volmit/iris/generator/legacy/nms/INMS.java @@ -1,10 +1,9 @@ -package com.volmit.iris.gen.nms; +package com.volmit.iris.generator.legacy.nms; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.gen.nms.v16_2.NMSBinding16_2; -import com.volmit.iris.gen.nms.v16_3.NMSBinding16_3; -import com.volmit.iris.gen.nms.v1X.NMSBinding1X; +import com.volmit.iris.generator.legacy.nms.v16_2.NMSBinding16_2; +import com.volmit.iris.generator.legacy.nms.v1X.NMSBinding1X; import com.volmit.iris.util.KMap; import org.bukkit.Bukkit; @@ -12,8 +11,7 @@ public class INMS { //@builder private static final KMap> bindings = new KMap>() - .qput("v1_16_R2", NMSBinding16_2.class) - .qput("v1_16_R3", NMSBinding16_3.class); + .qput("v1_16_R2", NMSBinding16_2.class); //@done private static final INMSBinding binding = bind(); diff --git a/src/main/java/com/volmit/iris/gen/nms/INMSBinding.java b/src/main/java/com/volmit/iris/generator/legacy/nms/INMSBinding.java similarity index 88% rename from src/main/java/com/volmit/iris/gen/nms/INMSBinding.java rename to src/main/java/com/volmit/iris/generator/legacy/nms/INMSBinding.java index 861b13431..007605041 100644 --- a/src/main/java/com/volmit/iris/gen/nms/INMSBinding.java +++ b/src/main/java/com/volmit/iris/generator/legacy/nms/INMSBinding.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.nms; +package com.volmit.iris.generator.legacy.nms; import org.bukkit.World; import org.bukkit.WorldCreator; diff --git a/src/main/java/com/volmit/iris/gen/nms/INMSCreator.java b/src/main/java/com/volmit/iris/generator/legacy/nms/INMSCreator.java similarity index 84% rename from src/main/java/com/volmit/iris/gen/nms/INMSCreator.java rename to src/main/java/com/volmit/iris/generator/legacy/nms/INMSCreator.java index 02abc85b9..755d3f942 100644 --- a/src/main/java/com/volmit/iris/gen/nms/INMSCreator.java +++ b/src/main/java/com/volmit/iris/generator/legacy/nms/INMSCreator.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.nms; +package com.volmit.iris.generator.legacy.nms; import org.bukkit.World; import org.bukkit.WorldCreator; diff --git a/src/main/java/com/volmit/iris/generator/legacy/nms/v16_2/NMSBinding16_2.java b/src/main/java/com/volmit/iris/generator/legacy/nms/v16_2/NMSBinding16_2.java new file mode 100644 index 000000000..bb20b6b78 --- /dev/null +++ b/src/main/java/com/volmit/iris/generator/legacy/nms/v16_2/NMSBinding16_2.java @@ -0,0 +1,16 @@ +package com.volmit.iris.generator.legacy.nms.v16_2; + +import com.volmit.iris.generator.legacy.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.nms.INMSBinding; +import com.volmit.iris.generator.legacy.nms.INMSCreator; + +public class NMSBinding16_2 implements INMSBinding +{ + private final AtomicCache creator = new AtomicCache<>(); + + @Override + public INMSCreator getCreator() + { + return creator.aquire(NMSCreator16_2::new); + } +} diff --git a/src/main/java/com/volmit/iris/gen/nms/v16_2/NMSChunkGenerator16_2_BACKUP.java b/src/main/java/com/volmit/iris/generator/legacy/nms/v16_2/NMSChunkGenerator16_2_BACKUP.java similarity index 99% rename from src/main/java/com/volmit/iris/gen/nms/v16_2/NMSChunkGenerator16_2_BACKUP.java rename to src/main/java/com/volmit/iris/generator/legacy/nms/v16_2/NMSChunkGenerator16_2_BACKUP.java index 72de474dd..192c2799d 100644 --- a/src/main/java/com/volmit/iris/gen/nms/v16_2/NMSChunkGenerator16_2_BACKUP.java +++ b/src/main/java/com/volmit/iris/generator/legacy/nms/v16_2/NMSChunkGenerator16_2_BACKUP.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.nms.v16_2; +package com.volmit.iris.generator.legacy.nms.v16_2; import java.util.Iterator; import java.util.List; diff --git a/src/main/java/com/volmit/iris/gen/nms/v16_2/NMSChunkGenerator16_2_PAPER.java b/src/main/java/com/volmit/iris/generator/legacy/nms/v16_2/NMSChunkGenerator16_2_PAPER.java similarity index 80% rename from src/main/java/com/volmit/iris/gen/nms/v16_2/NMSChunkGenerator16_2_PAPER.java rename to src/main/java/com/volmit/iris/generator/legacy/nms/v16_2/NMSChunkGenerator16_2_PAPER.java index b135bd760..45a21eaac 100644 --- a/src/main/java/com/volmit/iris/gen/nms/v16_2/NMSChunkGenerator16_2_PAPER.java +++ b/src/main/java/com/volmit/iris/generator/legacy/nms/v16_2/NMSChunkGenerator16_2_PAPER.java @@ -1,12 +1,14 @@ -package com.volmit.iris.gen.nms.v16_2; - -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.function.Supplier; +package com.volmit.iris.generator.legacy.nms.v16_2; +import com.mojang.serialization.Codec; +import com.volmit.iris.generator.legacy.provisions.ProvisionBukkit; +import com.volmit.iris.generator.legacy.scaffold.GeneratedChunk; +import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.util.O; +import com.volmit.iris.util.V; +import it.unimi.dsi.fastutil.objects.ObjectArrayList; +import it.unimi.dsi.fastutil.objects.ObjectList; +import net.minecraft.server.v1_16_R2.*; import org.bukkit.Material; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; @@ -17,71 +19,14 @@ import org.bukkit.generator.ChunkGenerator.BiomeGrid; import org.bukkit.generator.ChunkGenerator.ChunkData; import org.bukkit.material.MaterialData; -import com.mojang.serialization.Codec; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.provisions.ProvisionBukkit; -import com.volmit.iris.gen.scaffold.GeneratedChunk; -import com.volmit.iris.gen.scaffold.Provisioned; -import com.volmit.iris.gen.scaffold.ProvisionedHolder; -import com.volmit.iris.gen.scaffold.TerrainProvider; -import com.volmit.iris.util.O; -import com.volmit.iris.util.V; - -import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import it.unimi.dsi.fastutil.objects.ObjectList; -import net.minecraft.server.v1_16_R2.BiomeBase; -import net.minecraft.server.v1_16_R2.BiomeManager; -import net.minecraft.server.v1_16_R2.BiomeSettingsMobs; -import net.minecraft.server.v1_16_R2.Block; -import net.minecraft.server.v1_16_R2.BlockColumn; -import net.minecraft.server.v1_16_R2.BlockPosition; -import net.minecraft.server.v1_16_R2.Blocks; -import net.minecraft.server.v1_16_R2.ChunkCoordIntPair; -import net.minecraft.server.v1_16_R2.ChunkGenerator; -import net.minecraft.server.v1_16_R2.ChunkGeneratorAbstract; -import net.minecraft.server.v1_16_R2.CrashReport; -import net.minecraft.server.v1_16_R2.CrashReportSystemDetails; -import net.minecraft.server.v1_16_R2.DefinedStructureManager; -import net.minecraft.server.v1_16_R2.EnumCreatureType; -import net.minecraft.server.v1_16_R2.GeneratorAccess; -import net.minecraft.server.v1_16_R2.GeneratorAccessSeed; -import net.minecraft.server.v1_16_R2.GeneratorSettingBase; -import net.minecraft.server.v1_16_R2.HeightMap; -import net.minecraft.server.v1_16_R2.IBlockAccess; -import net.minecraft.server.v1_16_R2.IBlockData; -import net.minecraft.server.v1_16_R2.IChunkAccess; -import net.minecraft.server.v1_16_R2.IRegistry; -import net.minecraft.server.v1_16_R2.IRegistryCustom; -import net.minecraft.server.v1_16_R2.IStructureAccess; -import net.minecraft.server.v1_16_R2.NoiseSettings; -import net.minecraft.server.v1_16_R2.PacketDebug; -import net.minecraft.server.v1_16_R2.ProtoChunk; -import net.minecraft.server.v1_16_R2.RegionLimitedWorldAccess; -import net.minecraft.server.v1_16_R2.ReportedException; -import net.minecraft.server.v1_16_R2.ResourceKey; -import net.minecraft.server.v1_16_R2.SectionPosition; -import net.minecraft.server.v1_16_R2.SeededRandom; -import net.minecraft.server.v1_16_R2.SpawnerCreature; -import net.minecraft.server.v1_16_R2.StructureBoundingBox; -import net.minecraft.server.v1_16_R2.StructureFeature; -import net.minecraft.server.v1_16_R2.StructureFeatures; -import net.minecraft.server.v1_16_R2.StructureGenerator; -import net.minecraft.server.v1_16_R2.StructureManager; -import net.minecraft.server.v1_16_R2.StructurePiece; -import net.minecraft.server.v1_16_R2.StructureSettingsFeature; -import net.minecraft.server.v1_16_R2.StructureStart; -import net.minecraft.server.v1_16_R2.WorldChunkManager; -import net.minecraft.server.v1_16_R2.WorldGenFeatureDefinedStructureJigsawJunction; -import net.minecraft.server.v1_16_R2.WorldGenFeatureDefinedStructurePoolTemplate; -import net.minecraft.server.v1_16_R2.WorldGenFeaturePillagerOutpostPoolPiece; -import net.minecraft.server.v1_16_R2.WorldGenStage; -import net.minecraft.server.v1_16_R2.WorldServer; +import java.util.*; +import java.util.function.Supplier; @SuppressWarnings("deprecation") -public class NMSChunkGenerator16_2_PAPER extends ChunkGenerator implements ProvisionedHolder +public class NMSChunkGenerator16_2_PAPER extends ChunkGenerator { private static final IBlockData k = Blocks.AIR.getBlockData(); - private final Provisioned provisioned; + private final IrisAccess provisioned; private final int maxHeight; private final int xzSize; protected final IBlockData f; @@ -91,12 +36,12 @@ public class NMSChunkGenerator16_2_PAPER extends ChunkGenerator implements Provi private final O ws; private BlockColumn BC; - public NMSChunkGenerator16_2_PAPER(Provisioned p, O ws, WorldChunkManager worldchunkmanager, long i, Supplier supplier) + public NMSChunkGenerator16_2_PAPER(IrisAccess p, O ws, WorldChunkManager worldchunkmanager, long i, Supplier supplier) { this(p, ws, worldchunkmanager, worldchunkmanager, i, supplier); } - private NMSChunkGenerator16_2_PAPER(Provisioned p, O ws, WorldChunkManager worldchunkmanager, WorldChunkManager worldchunkmanager1, long i, Supplier supplier) + private NMSChunkGenerator16_2_PAPER(IrisAccess p, O ws, WorldChunkManager worldchunkmanager, WorldChunkManager worldchunkmanager1, long i, Supplier supplier) { super(worldchunkmanager, worldchunkmanager1, supplier.get().a(), i); this.provisioned = p; @@ -131,7 +76,7 @@ public class NMSChunkGenerator16_2_PAPER extends ChunkGenerator implements Provi public void doCarving(long i, BiomeManager biomemanager, IChunkAccess ichunkaccess, WorldGenStage.Features worldgenstage_features) { - if(((IrisTerrainProvider) provisioned.getProvider()).getDimension().isVanillaCaves()) + if(provisioned.getCompound().getRootDimension().isVanillaCaves()) { super.doCarving(i, biomemanager, ichunkaccess, worldgenstage_features); } @@ -195,7 +140,7 @@ public class NMSChunkGenerator16_2_PAPER extends ChunkGenerator implements Provi int i = chunkcoordintpair.x; int j = chunkcoordintpair.z; - if(((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures()) + if(provisioned.getCompound().getRootDimension().isVanillaStructures()) { int k = i << 4; int l = j << 4; @@ -438,7 +383,7 @@ public class NMSChunkGenerator16_2_PAPER extends ChunkGenerator implements Provi public void addDecorations(RegionLimitedWorldAccess regionlimitedworldaccess, StructureManager structuremanager) { - if(((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures()) + if(provisioned.getCompound().getRootDimension().isVanillaStructures()) { int i = regionlimitedworldaccess.a(); int j = regionlimitedworldaccess.b(); @@ -461,7 +406,7 @@ public class NMSChunkGenerator16_2_PAPER extends ChunkGenerator implements Provi public void a(BiomeBase bbase, StructureManager var0, ChunkGenerator var1, RegionLimitedWorldAccess var2, long var3, SeededRandom var5, BlockPosition var6) { - if(!((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures()) + if(!provisioned.getCompound().getRootDimension().isVanillaStructures()) { return; } @@ -592,7 +537,7 @@ public class NMSChunkGenerator16_2_PAPER extends ChunkGenerator implements Provi @Override public int getSeaLevel() { - return ((IrisTerrainProvider) provisioned.getProvider()).getFluidHeight(); + return provisioned.getCompound().getRootDimension().getFluidHeight(); } @Override @@ -713,28 +658,4 @@ public class NMSChunkGenerator16_2_PAPER extends ChunkGenerator implements Provi ++i1; } } - - @Override - public Provisioned getProvisioned() - { - return provisioned; - } - - @Override - public void clearRegeneratedLists() - { - getProvisioned().clearRegeneratedLists(); - } - - @Override - public TerrainProvider getProvider() - { - return getProvisioned().getProvider(); - } - - @Override - public void regenerate(int x, int z) - { - getProvisioned().regenerate(x, z); - } } diff --git a/src/main/java/com/volmit/iris/gen/nms/v16_3/NMSCreator16_3.java b/src/main/java/com/volmit/iris/generator/legacy/nms/v16_2/NMSCreator16_2.java similarity index 83% rename from src/main/java/com/volmit/iris/gen/nms/v16_3/NMSCreator16_3.java rename to src/main/java/com/volmit/iris/generator/legacy/nms/v16_2/NMSCreator16_2.java index d91b86205..df59f65d6 100644 --- a/src/main/java/com/volmit/iris/gen/nms/v16_3/NMSCreator16_3.java +++ b/src/main/java/com/volmit/iris/generator/legacy/nms/v16_2/NMSCreator16_2.java @@ -1,24 +1,23 @@ -package com.volmit.iris.gen.nms.v16_3; +package com.volmit.iris.generator.legacy.nms.v16_2; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.mojang.serialization.DynamicOps; import com.mojang.serialization.Lifecycle; -import com.volmit.iris.gen.nms.INMSCreator; -import com.volmit.iris.gen.scaffold.IrisWorlds; -import com.volmit.iris.gen.scaffold.Provisioned; +import com.volmit.iris.generator.legacy.nms.INMSCreator; +import com.volmit.iris.scaffold.IrisWorlds; +import com.volmit.iris.scaffold.engine.IrisAccess; import com.volmit.iris.util.O; import com.volmit.iris.util.V; -import io.papermc.lib.PaperLib; -import net.minecraft.server.v1_16_R3.*; -import net.minecraft.server.v1_16_R3.IRegistryCustom.Dimension; +import net.minecraft.server.v1_16_R2.*; +import net.minecraft.server.v1_16_R2.IRegistryCustom.Dimension; import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.World.Environment; import org.bukkit.WorldCreator; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; +import org.bukkit.craftbukkit.v1_16_R2.CraftServer; import org.bukkit.event.Event; import org.bukkit.event.world.WorldInitEvent; import org.bukkit.event.world.WorldLoadEvent; @@ -29,7 +28,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.*; -class NMSCreator16_3 implements INMSCreator +class NMSCreator16_2 implements INMSCreator { @SuppressWarnings({"unchecked", "rawtypes", "resource"}) public World createWorld(WorldCreator creator, boolean loadSpawn) @@ -39,7 +38,7 @@ class NMSCreator16_3 implements INMSCreator return creator.createWorld(); } - Provisioned pro = (Provisioned) creator.generator(); + IrisAccess pro = (IrisAccess) creator.generator(); CraftServer server = ((CraftServer) Bukkit.getServer()); Map worlds = new V(server).get("worlds"); DedicatedServer console = new V(server).get("console"); @@ -117,22 +116,17 @@ class NMSCreator16_3 implements INMSCreator worlddata.a(console.getServerModName(), console.getModded().isPresent()); if(console.options.has("forceUpgrade")) { - net.minecraft.server.v1_16_R3.Main.convertWorld(worldSession, DataConverterRegistry.a(), console.options.has("eraseCache"), () -> true, (ImmutableSet) worlddata.getGeneratorSettings().d().d().stream().map(entry -> ResourceKey.a(IRegistry.K, entry.getKey().a())).collect(ImmutableSet.toImmutableSet())); + net.minecraft.server.v1_16_R2.Main.convertWorld(worldSession, DataConverterRegistry.a(), console.options.has("eraseCache"), () -> true, (ImmutableSet) worlddata.getGeneratorSettings().d().d().stream().map(entry -> ResourceKey.a(IRegistry.K, entry.getKey().a())).collect(ImmutableSet.toImmutableSet())); } final long j = BiomeManager.a(creator.seed()); final List list = (List) ImmutableList.of((MobSpawner) new MobSpawnerPhantom(), (MobSpawner) new MobSpawnerPatrol(), (MobSpawner) new MobSpawnerCat(), (MobSpawner) new VillageSiege(), (MobSpawner) new MobSpawnerTrader((IWorldDataServer) worlddata)); DimensionManager dimensionmanager; - net.minecraft.server.v1_16_R3.ChunkGenerator chunkgenerator; + net.minecraft.server.v1_16_R2.ChunkGenerator chunkgenerator; long ll = creator.seed(); dimensionmanager = (DimensionManager) getConsoleDimension(console).a().d(DimensionManager.OVERWORLD); O ws = new O(); - chunkgenerator = PaperLib.isPaper() ? new NMSChunkGenerator16_3_PAPER(pro, ws, (WorldChunkManager) new WorldChunkManagerOverworld(ll, false, false, (IRegistry) getConsoleDimension(console).b(IRegistry.ay)), ll, - - () -> (GeneratorSettingBase) - getConsoleDimension(console) - .b(IRegistry.ar) - .d(GeneratorSettingBase.c)) : new NMSChunkGenerator16_3_SPIGOT(pro, ws, (WorldChunkManager) new WorldChunkManagerOverworld(ll, false, false, (IRegistry) getConsoleDimension(console).b(IRegistry.ay)), ll, () -> (GeneratorSettingBase) getConsoleDimension(console).b(IRegistry.ar).d(GeneratorSettingBase.c)); - final ResourceKey worldKey = (ResourceKey) ResourceKey.a(IRegistry.L, new MinecraftKey(name.toLowerCase(Locale.ENGLISH))); + chunkgenerator = new NMSChunkGenerator16_2_PAPER(pro, ws, (WorldChunkManager) new WorldChunkManagerOverworld(ll, false, false, (IRegistry) getConsoleDimension(console).b(IRegistry.ay)), ll, () -> (GeneratorSettingBase) getConsoleDimension(console).b(IRegistry.ar).d(GeneratorSettingBase.c)); + final ResourceKey worldKey = (ResourceKey) ResourceKey.a(IRegistry.L, new MinecraftKey(name.toLowerCase(Locale.ENGLISH))); //@builder final WorldServer internal = new WorldServer((MinecraftServer) console, console.executorService, worldSession, @@ -143,7 +137,7 @@ class NMSCreator16_3 implements INMSCreator chunkgenerator, worlddata.getGeneratorSettings().isDebugWorld(), j, - (List) ((creator.environment() == Environment.NORMAL) ? list : ImmutableList.of()), + (List) ((creator.environment() == World.Environment.NORMAL) ? list : ImmutableList.of()), true, creator.environment(), server.getGenerator(name)); diff --git a/src/main/java/com/volmit/iris/generator/legacy/nms/v1X/NMSBinding1X.java b/src/main/java/com/volmit/iris/generator/legacy/nms/v1X/NMSBinding1X.java new file mode 100644 index 000000000..df42ffe9b --- /dev/null +++ b/src/main/java/com/volmit/iris/generator/legacy/nms/v1X/NMSBinding1X.java @@ -0,0 +1,16 @@ +package com.volmit.iris.generator.legacy.nms.v1X; + +import com.volmit.iris.generator.legacy.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.nms.INMSBinding; +import com.volmit.iris.generator.legacy.nms.INMSCreator; + +public class NMSBinding1X implements INMSBinding +{ + private final AtomicCache creator = new AtomicCache<>(); + + @Override + public INMSCreator getCreator() + { + return creator.aquire(NMSCreator1X::new); + } +} diff --git a/src/main/java/com/volmit/iris/gen/nms/v1X/NMSCreator1X.java b/src/main/java/com/volmit/iris/generator/legacy/nms/v1X/NMSCreator1X.java similarity index 66% rename from src/main/java/com/volmit/iris/gen/nms/v1X/NMSCreator1X.java rename to src/main/java/com/volmit/iris/generator/legacy/nms/v1X/NMSCreator1X.java index 987b0dcd2..c0ec35d93 100644 --- a/src/main/java/com/volmit/iris/gen/nms/v1X/NMSCreator1X.java +++ b/src/main/java/com/volmit/iris/generator/legacy/nms/v1X/NMSCreator1X.java @@ -1,9 +1,9 @@ -package com.volmit.iris.gen.nms.v1X; +package com.volmit.iris.generator.legacy.nms.v1X; import org.bukkit.World; import org.bukkit.WorldCreator; -import com.volmit.iris.gen.nms.INMSCreator; +import com.volmit.iris.generator.legacy.nms.INMSCreator; class NMSCreator1X implements INMSCreator { diff --git a/src/main/java/com/volmit/iris/gen/post/PostMasterPatcher.java b/src/main/java/com/volmit/iris/generator/legacy/post/PostMasterPatcher.java similarity index 99% rename from src/main/java/com/volmit/iris/gen/post/PostMasterPatcher.java rename to src/main/java/com/volmit/iris/generator/legacy/post/PostMasterPatcher.java index 8f542fb3e..1f3ab6659 100644 --- a/src/main/java/com/volmit/iris/gen/post/PostMasterPatcher.java +++ b/src/main/java/com/volmit/iris/generator/legacy/post/PostMasterPatcher.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.post; +package com.volmit.iris.generator.legacy.post; import org.bukkit.Material; import org.bukkit.block.data.BlockData; @@ -7,7 +7,7 @@ import org.bukkit.block.data.type.Slab; import org.bukkit.block.data.type.Slab.Type; import org.bukkit.generator.ChunkGenerator.ChunkData; -import com.volmit.iris.gen.PostBlockTerrainProvider; +import com.volmit.iris.generator.legacy.PostBlockTerrainProvider; import com.volmit.iris.object.InferredType; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.util.B; diff --git a/src/main/java/com/volmit/iris/gen/provisions/ProvisionBukkit.java b/src/main/java/com/volmit/iris/generator/legacy/provisions/ProvisionBukkit.java similarity index 93% rename from src/main/java/com/volmit/iris/gen/provisions/ProvisionBukkit.java rename to src/main/java/com/volmit/iris/generator/legacy/provisions/ProvisionBukkit.java index bd8c4c919..5c647deab 100644 --- a/src/main/java/com/volmit/iris/gen/provisions/ProvisionBukkit.java +++ b/src/main/java/com/volmit/iris/generator/legacy/provisions/ProvisionBukkit.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.provisions; +package com.volmit.iris.generator.legacy.provisions; import java.util.List; import java.util.Random; @@ -15,12 +15,12 @@ import org.bukkit.generator.BlockPopulator; import org.bukkit.generator.ChunkGenerator; import com.volmit.iris.Iris; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.scaffold.GeneratedChunk; -import com.volmit.iris.gen.scaffold.HeightedFakeWorld; -import com.volmit.iris.gen.scaffold.Provisioned; -import com.volmit.iris.gen.scaffold.TerrainChunk; -import com.volmit.iris.gen.scaffold.TerrainProvider; +import com.volmit.iris.generator.legacy.IrisTerrainProvider; +import com.volmit.iris.generator.legacy.scaffold.GeneratedChunk; +import com.volmit.iris.generator.legacy.scaffold.HeightedFakeWorld; +import com.volmit.iris.generator.legacy.scaffold.Provisioned; +import com.volmit.iris.generator.legacy.scaffold.TerrainChunk; +import com.volmit.iris.generator.legacy.scaffold.TerrainProvider; import com.volmit.iris.util.ChunkPosition; import com.volmit.iris.util.KList; import com.volmit.iris.util.KMap; diff --git a/src/main/java/com/volmit/iris/gen/scaffold/ChunkWrapper.java b/src/main/java/com/volmit/iris/generator/legacy/scaffold/ChunkWrapper.java similarity index 97% rename from src/main/java/com/volmit/iris/gen/scaffold/ChunkWrapper.java rename to src/main/java/com/volmit/iris/generator/legacy/scaffold/ChunkWrapper.java index 1158bab6a..7a2d47c60 100644 --- a/src/main/java/com/volmit/iris/gen/scaffold/ChunkWrapper.java +++ b/src/main/java/com/volmit/iris/generator/legacy/scaffold/ChunkWrapper.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.scaffold; +package com.volmit.iris.generator.legacy.scaffold; import org.bukkit.Chunk; import org.bukkit.Material; diff --git a/src/main/java/com/volmit/iris/gen/scaffold/GeneratedChunk.java b/src/main/java/com/volmit/iris/generator/legacy/scaffold/GeneratedChunk.java similarity index 73% rename from src/main/java/com/volmit/iris/gen/scaffold/GeneratedChunk.java rename to src/main/java/com/volmit/iris/generator/legacy/scaffold/GeneratedChunk.java index 70e03d35b..b967dd6f8 100644 --- a/src/main/java/com/volmit/iris/gen/scaffold/GeneratedChunk.java +++ b/src/main/java/com/volmit/iris/generator/legacy/scaffold/GeneratedChunk.java @@ -1,6 +1,6 @@ -package com.volmit.iris.gen.scaffold; +package com.volmit.iris.generator.legacy.scaffold; -import com.volmit.iris.gen.atomics.AtomicSliverMap; +import com.volmit.iris.generator.legacy.atomics.AtomicSliverMap; import com.volmit.iris.util.BiomeMap; import com.volmit.iris.util.HeightMap; diff --git a/src/main/java/com/volmit/iris/gen/scaffold/HeightedFakeWorld.java b/src/main/java/com/volmit/iris/generator/legacy/scaffold/HeightedFakeWorld.java similarity index 99% rename from src/main/java/com/volmit/iris/gen/scaffold/HeightedFakeWorld.java rename to src/main/java/com/volmit/iris/generator/legacy/scaffold/HeightedFakeWorld.java index a5a640512..e2cc5f60f 100644 --- a/src/main/java/com/volmit/iris/gen/scaffold/HeightedFakeWorld.java +++ b/src/main/java/com/volmit/iris/generator/legacy/scaffold/HeightedFakeWorld.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.scaffold; +package com.volmit.iris.generator.legacy.scaffold; import java.io.File; import java.util.Collection; diff --git a/src/main/java/com/volmit/iris/gen/scaffold/IrisBiomeStorage.java b/src/main/java/com/volmit/iris/generator/legacy/scaffold/IrisBiomeStorage.java similarity index 97% rename from src/main/java/com/volmit/iris/gen/scaffold/IrisBiomeStorage.java rename to src/main/java/com/volmit/iris/generator/legacy/scaffold/IrisBiomeStorage.java index 1fd66fed0..81d82190f 100644 --- a/src/main/java/com/volmit/iris/gen/scaffold/IrisBiomeStorage.java +++ b/src/main/java/com/volmit/iris/generator/legacy/scaffold/IrisBiomeStorage.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.scaffold; +package com.volmit.iris.generator.legacy.scaffold; import org.bukkit.block.Biome; import org.bukkit.generator.ChunkGenerator.BiomeGrid; diff --git a/src/main/java/com/volmit/iris/gen/scaffold/IrisContext.java b/src/main/java/com/volmit/iris/generator/legacy/scaffold/IrisContext.java similarity index 93% rename from src/main/java/com/volmit/iris/gen/scaffold/IrisContext.java rename to src/main/java/com/volmit/iris/generator/legacy/scaffold/IrisContext.java index 7e4ce81b1..162ca0286 100644 --- a/src/main/java/com/volmit/iris/gen/scaffold/IrisContext.java +++ b/src/main/java/com/volmit/iris/generator/legacy/scaffold/IrisContext.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.scaffold; +package com.volmit.iris.generator.legacy.scaffold; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDimension; diff --git a/src/main/java/com/volmit/iris/gen/scaffold/IrisGenConfiguration.java b/src/main/java/com/volmit/iris/generator/legacy/scaffold/IrisGenConfiguration.java similarity index 74% rename from src/main/java/com/volmit/iris/gen/scaffold/IrisGenConfiguration.java rename to src/main/java/com/volmit/iris/generator/legacy/scaffold/IrisGenConfiguration.java index bca11f3c1..5d0e13ab2 100644 --- a/src/main/java/com/volmit/iris/gen/scaffold/IrisGenConfiguration.java +++ b/src/main/java/com/volmit/iris/generator/legacy/scaffold/IrisGenConfiguration.java @@ -1,6 +1,6 @@ -package com.volmit.iris.gen.scaffold; +package com.volmit.iris.generator.legacy.scaffold; -import com.volmit.iris.gen.IrisTerrainProvider; +import com.volmit.iris.generator.legacy.IrisTerrainProvider; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/gen/scaffold/IrisMetrics.java b/src/main/java/com/volmit/iris/generator/legacy/scaffold/IrisMetrics.java similarity index 95% rename from src/main/java/com/volmit/iris/gen/scaffold/IrisMetrics.java rename to src/main/java/com/volmit/iris/generator/legacy/scaffold/IrisMetrics.java index a70fab84a..8ed012ab5 100644 --- a/src/main/java/com/volmit/iris/gen/scaffold/IrisMetrics.java +++ b/src/main/java/com/volmit/iris/generator/legacy/scaffold/IrisMetrics.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.scaffold; +package com.volmit.iris.generator.legacy.scaffold; import com.volmit.iris.Iris; import com.volmit.iris.util.RollingSequence; diff --git a/src/main/java/com/volmit/iris/gen/scaffold/LinkedTerrainChunk.java b/src/main/java/com/volmit/iris/generator/legacy/scaffold/LinkedTerrainChunk.java similarity index 98% rename from src/main/java/com/volmit/iris/gen/scaffold/LinkedTerrainChunk.java rename to src/main/java/com/volmit/iris/generator/legacy/scaffold/LinkedTerrainChunk.java index 50658e2ec..036cc2104 100644 --- a/src/main/java/com/volmit/iris/gen/scaffold/LinkedTerrainChunk.java +++ b/src/main/java/com/volmit/iris/generator/legacy/scaffold/LinkedTerrainChunk.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.scaffold; +package com.volmit.iris.generator.legacy.scaffold; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/com/volmit/iris/gen/scaffold/Provisioned.java b/src/main/java/com/volmit/iris/generator/legacy/scaffold/Provisioned.java similarity index 74% rename from src/main/java/com/volmit/iris/gen/scaffold/Provisioned.java rename to src/main/java/com/volmit/iris/generator/legacy/scaffold/Provisioned.java index 250737a1e..3bac2c768 100644 --- a/src/main/java/com/volmit/iris/gen/scaffold/Provisioned.java +++ b/src/main/java/com/volmit/iris/generator/legacy/scaffold/Provisioned.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.scaffold; +package com.volmit.iris.generator.legacy.scaffold; public interface Provisioned { diff --git a/src/main/java/com/volmit/iris/gen/scaffold/ProvisionedHolder.java b/src/main/java/com/volmit/iris/generator/legacy/scaffold/ProvisionedHolder.java similarity index 65% rename from src/main/java/com/volmit/iris/gen/scaffold/ProvisionedHolder.java rename to src/main/java/com/volmit/iris/generator/legacy/scaffold/ProvisionedHolder.java index a1fb62c1c..8cec52f0a 100644 --- a/src/main/java/com/volmit/iris/gen/scaffold/ProvisionedHolder.java +++ b/src/main/java/com/volmit/iris/generator/legacy/scaffold/ProvisionedHolder.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.scaffold; +package com.volmit.iris.generator.legacy.scaffold; public interface ProvisionedHolder extends Provisioned { diff --git a/src/main/java/com/volmit/iris/gen/scaffold/TerrainChunk.java b/src/main/java/com/volmit/iris/generator/legacy/scaffold/TerrainChunk.java similarity index 98% rename from src/main/java/com/volmit/iris/gen/scaffold/TerrainChunk.java rename to src/main/java/com/volmit/iris/generator/legacy/scaffold/TerrainChunk.java index d8fe1b974..768ae58f4 100644 --- a/src/main/java/com/volmit/iris/gen/scaffold/TerrainChunk.java +++ b/src/main/java/com/volmit/iris/generator/legacy/scaffold/TerrainChunk.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.scaffold; +package com.volmit.iris.generator.legacy.scaffold; import org.bukkit.World; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/gen/scaffold/TerrainProvider.java b/src/main/java/com/volmit/iris/generator/legacy/scaffold/TerrainProvider.java similarity index 93% rename from src/main/java/com/volmit/iris/gen/scaffold/TerrainProvider.java rename to src/main/java/com/volmit/iris/generator/legacy/scaffold/TerrainProvider.java index d53e48a30..4e1c0968a 100644 --- a/src/main/java/com/volmit/iris/gen/scaffold/TerrainProvider.java +++ b/src/main/java/com/volmit/iris/generator/legacy/scaffold/TerrainProvider.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.scaffold; +package com.volmit.iris.generator.legacy.scaffold; import java.util.List; import java.util.Random; diff --git a/src/main/java/com/volmit/iris/gen/scaffold/TerrainTarget.java b/src/main/java/com/volmit/iris/generator/legacy/scaffold/TerrainTarget.java similarity index 97% rename from src/main/java/com/volmit/iris/gen/scaffold/TerrainTarget.java rename to src/main/java/com/volmit/iris/generator/legacy/scaffold/TerrainTarget.java index 06e54cae2..06acf37a8 100644 --- a/src/main/java/com/volmit/iris/gen/scaffold/TerrainTarget.java +++ b/src/main/java/com/volmit/iris/generator/legacy/scaffold/TerrainTarget.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gen.scaffold; +package com.volmit.iris.generator.legacy.scaffold; import java.io.File; import java.util.List; diff --git a/src/main/java/com/volmit/iris/v2/generator/modifier/IrisCaveModifier.java b/src/main/java/com/volmit/iris/generator/modifier/IrisCaveModifier.java similarity index 97% rename from src/main/java/com/volmit/iris/v2/generator/modifier/IrisCaveModifier.java rename to src/main/java/com/volmit/iris/generator/modifier/IrisCaveModifier.java index 079007358..afe5be588 100644 --- a/src/main/java/com/volmit/iris/v2/generator/modifier/IrisCaveModifier.java +++ b/src/main/java/com/volmit/iris/generator/modifier/IrisCaveModifier.java @@ -1,15 +1,15 @@ -package com.volmit.iris.v2.generator.modifier; +package com.volmit.iris.generator.modifier; -import com.volmit.iris.noise.FastNoiseDouble; +import com.volmit.iris.generator.noise.FastNoiseDouble; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisCaveLayer; import com.volmit.iris.util.B; import com.volmit.iris.util.CaveResult; import com.volmit.iris.util.KList; import com.volmit.iris.util.RNG; -import com.volmit.iris.v2.scaffold.engine.Engine; -import com.volmit.iris.v2.scaffold.engine.EngineAssignedModifier; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.scaffold.engine.EngineAssignedModifier; +import com.volmit.iris.scaffold.hunk.Hunk; import org.bukkit.Material; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/v2/generator/modifier/IrisDepositModifier.java b/src/main/java/com/volmit/iris/generator/modifier/IrisDepositModifier.java similarity index 95% rename from src/main/java/com/volmit/iris/v2/generator/modifier/IrisDepositModifier.java rename to src/main/java/com/volmit/iris/generator/modifier/IrisDepositModifier.java index 4ae82d34c..f514c0925 100644 --- a/src/main/java/com/volmit/iris/v2/generator/modifier/IrisDepositModifier.java +++ b/src/main/java/com/volmit/iris/generator/modifier/IrisDepositModifier.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.generator.modifier; +package com.volmit.iris.generator.modifier; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDepositGenerator; @@ -6,9 +6,9 @@ import com.volmit.iris.object.IrisObject; import com.volmit.iris.object.IrisRegion; import com.volmit.iris.util.HeightMap; import com.volmit.iris.util.RNG; -import com.volmit.iris.v2.scaffold.engine.Engine; -import com.volmit.iris.v2.scaffold.engine.EngineAssignedModifier; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.scaffold.engine.EngineAssignedModifier; +import com.volmit.iris.scaffold.hunk.Hunk; import org.bukkit.block.data.BlockData; import org.bukkit.util.BlockVector; diff --git a/src/main/java/com/volmit/iris/v2/generator/modifier/IrisPostModifier.java b/src/main/java/com/volmit/iris/generator/modifier/IrisPostModifier.java similarity index 99% rename from src/main/java/com/volmit/iris/v2/generator/modifier/IrisPostModifier.java rename to src/main/java/com/volmit/iris/generator/modifier/IrisPostModifier.java index ecd867708..b9041a984 100644 --- a/src/main/java/com/volmit/iris/v2/generator/modifier/IrisPostModifier.java +++ b/src/main/java/com/volmit/iris/generator/modifier/IrisPostModifier.java @@ -1,12 +1,12 @@ -package com.volmit.iris.v2.generator.modifier; +package com.volmit.iris.generator.modifier; import com.volmit.iris.object.*; import com.volmit.iris.util.B; import com.volmit.iris.util.CaveResult; import com.volmit.iris.util.RNG; -import com.volmit.iris.v2.scaffold.engine.Engine; -import com.volmit.iris.v2.scaffold.engine.EngineAssignedModifier; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.scaffold.engine.EngineAssignedModifier; +import com.volmit.iris.scaffold.hunk.Hunk; import org.bukkit.Material; import org.bukkit.block.data.BlockData; import org.bukkit.block.data.Levelled; diff --git a/src/main/java/com/volmit/iris/v2/generator/modifier/IrisRavineModifier.java b/src/main/java/com/volmit/iris/generator/modifier/IrisRavineModifier.java similarity index 97% rename from src/main/java/com/volmit/iris/v2/generator/modifier/IrisRavineModifier.java rename to src/main/java/com/volmit/iris/generator/modifier/IrisRavineModifier.java index 9127a7cc9..e8b69662d 100644 --- a/src/main/java/com/volmit/iris/v2/generator/modifier/IrisRavineModifier.java +++ b/src/main/java/com/volmit/iris/generator/modifier/IrisRavineModifier.java @@ -1,11 +1,11 @@ -package com.volmit.iris.v2.generator.modifier; +package com.volmit.iris.generator.modifier; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.object.NoiseStyle; import com.volmit.iris.util.*; -import com.volmit.iris.v2.scaffold.engine.Engine; -import com.volmit.iris.v2.scaffold.engine.EngineAssignedModifier; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.scaffold.engine.EngineAssignedModifier; +import com.volmit.iris.scaffold.hunk.Hunk; import org.bukkit.Material; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/noise/CNG.java b/src/main/java/com/volmit/iris/generator/noise/CNG.java similarity index 97% rename from src/main/java/com/volmit/iris/noise/CNG.java rename to src/main/java/com/volmit/iris/generator/noise/CNG.java index 80caca1d0..578147a5d 100644 --- a/src/main/java/com/volmit/iris/noise/CNG.java +++ b/src/main/java/com/volmit/iris/generator/noise/CNG.java @@ -1,11 +1,11 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; import java.util.List; import com.volmit.iris.Iris; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; -import com.volmit.iris.v2.scaffold.stream.sources.CNGStream; -import com.volmit.iris.v2.scaffold.stream.arithmetic.FittedStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.sources.CNGStream; +import com.volmit.iris.scaffold.stream.arithmetic.FittedStream; import com.volmit.iris.util.IRare; import com.volmit.iris.util.IrisInterpolation; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/noise/CNGFactory.java b/src/main/java/com/volmit/iris/generator/noise/CNGFactory.java similarity index 73% rename from src/main/java/com/volmit/iris/noise/CNGFactory.java rename to src/main/java/com/volmit/iris/generator/noise/CNGFactory.java index 2b2a2b033..ce9aef9e8 100644 --- a/src/main/java/com/volmit/iris/noise/CNGFactory.java +++ b/src/main/java/com/volmit/iris/generator/noise/CNGFactory.java @@ -1,4 +1,4 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/noise/CellGenerator.java b/src/main/java/com/volmit/iris/generator/noise/CellGenerator.java similarity index 98% rename from src/main/java/com/volmit/iris/noise/CellGenerator.java rename to src/main/java/com/volmit/iris/generator/noise/CellGenerator.java index d7044e994..0beba98b6 100644 --- a/src/main/java/com/volmit/iris/noise/CellGenerator.java +++ b/src/main/java/com/volmit/iris/generator/noise/CellGenerator.java @@ -1,4 +1,4 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/noise/CellHeightNoise.java b/src/main/java/com/volmit/iris/generator/noise/CellHeightNoise.java similarity index 95% rename from src/main/java/com/volmit/iris/noise/CellHeightNoise.java rename to src/main/java/com/volmit/iris/generator/noise/CellHeightNoise.java index 60ed71c4d..fc94ae512 100644 --- a/src/main/java/com/volmit/iris/noise/CellHeightNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/CellHeightNoise.java @@ -1,4 +1,4 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; import com.volmit.iris.util.M; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/noise/CellularNoise.java b/src/main/java/com/volmit/iris/generator/noise/CellularNoise.java similarity index 94% rename from src/main/java/com/volmit/iris/noise/CellularNoise.java rename to src/main/java/com/volmit/iris/generator/noise/CellularNoise.java index 937595111..2d447f879 100644 --- a/src/main/java/com/volmit/iris/noise/CellularNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/CellularNoise.java @@ -1,4 +1,4 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/noise/CubicNoise.java b/src/main/java/com/volmit/iris/generator/noise/CubicNoise.java similarity index 93% rename from src/main/java/com/volmit/iris/noise/CubicNoise.java rename to src/main/java/com/volmit/iris/generator/noise/CubicNoise.java index 5187edf43..57e55339f 100644 --- a/src/main/java/com/volmit/iris/noise/CubicNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/CubicNoise.java @@ -1,4 +1,4 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/noise/FastNoise.java b/src/main/java/com/volmit/iris/generator/noise/FastNoise.java similarity index 99% rename from src/main/java/com/volmit/iris/noise/FastNoise.java rename to src/main/java/com/volmit/iris/generator/noise/FastNoise.java index 354b3cc98..4dc06e187 100644 --- a/src/main/java/com/volmit/iris/noise/FastNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/FastNoise.java @@ -26,7 +26,7 @@ // off every 'zix'.) // -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; import com.volmit.iris.util.Vector2f; import com.volmit.iris.util.Vector3f; diff --git a/src/main/java/com/volmit/iris/noise/FastNoiseDouble.java b/src/main/java/com/volmit/iris/generator/noise/FastNoiseDouble.java similarity index 99% rename from src/main/java/com/volmit/iris/noise/FastNoiseDouble.java rename to src/main/java/com/volmit/iris/generator/noise/FastNoiseDouble.java index 27820f510..2c849716d 100644 --- a/src/main/java/com/volmit/iris/noise/FastNoiseDouble.java +++ b/src/main/java/com/volmit/iris/generator/noise/FastNoiseDouble.java @@ -25,7 +25,7 @@ // The developer's email is jorzixdan.me2@gzixmail.com (for great email, take // off every 'zix'.) // -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; import com.volmit.iris.util.Vector2f; import com.volmit.iris.util.Vector3f; diff --git a/src/main/java/com/volmit/iris/noise/FlatNoise.java b/src/main/java/com/volmit/iris/generator/noise/FlatNoise.java similarity index 88% rename from src/main/java/com/volmit/iris/noise/FlatNoise.java rename to src/main/java/com/volmit/iris/generator/noise/FlatNoise.java index ce0a57815..baa7030e9 100644 --- a/src/main/java/com/volmit/iris/noise/FlatNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/FlatNoise.java @@ -1,4 +1,4 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; public class FlatNoise implements NoiseGenerator { diff --git a/src/main/java/com/volmit/iris/noise/FractalBillowPerlinNoise.java b/src/main/java/com/volmit/iris/generator/noise/FractalBillowPerlinNoise.java similarity index 87% rename from src/main/java/com/volmit/iris/noise/FractalBillowPerlinNoise.java rename to src/main/java/com/volmit/iris/generator/noise/FractalBillowPerlinNoise.java index f92c8f5fa..90b638398 100644 --- a/src/main/java/com/volmit/iris/noise/FractalBillowPerlinNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/FractalBillowPerlinNoise.java @@ -1,6 +1,6 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; -import com.volmit.iris.noise.FastNoiseDouble.FractalType; +import com.volmit.iris.generator.noise.FastNoiseDouble.FractalType; import com.volmit.iris.util.RNG; public class FractalBillowPerlinNoise implements NoiseGenerator, OctaveNoise diff --git a/src/main/java/com/volmit/iris/noise/FractalBillowSimplexNoise.java b/src/main/java/com/volmit/iris/generator/noise/FractalBillowSimplexNoise.java similarity index 87% rename from src/main/java/com/volmit/iris/noise/FractalBillowSimplexNoise.java rename to src/main/java/com/volmit/iris/generator/noise/FractalBillowSimplexNoise.java index f72faadc0..1be8dbc53 100644 --- a/src/main/java/com/volmit/iris/noise/FractalBillowSimplexNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/FractalBillowSimplexNoise.java @@ -1,6 +1,6 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; -import com.volmit.iris.noise.FastNoiseDouble.FractalType; +import com.volmit.iris.generator.noise.FastNoiseDouble.FractalType; import com.volmit.iris.util.RNG; public class FractalBillowSimplexNoise implements NoiseGenerator, OctaveNoise diff --git a/src/main/java/com/volmit/iris/noise/FractalCubicNoise.java b/src/main/java/com/volmit/iris/generator/noise/FractalCubicNoise.java similarity index 85% rename from src/main/java/com/volmit/iris/noise/FractalCubicNoise.java rename to src/main/java/com/volmit/iris/generator/noise/FractalCubicNoise.java index a81bc3206..750d98b02 100644 --- a/src/main/java/com/volmit/iris/noise/FractalCubicNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/FractalCubicNoise.java @@ -1,6 +1,6 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; -import com.volmit.iris.noise.FastNoiseDouble.FractalType; +import com.volmit.iris.generator.noise.FastNoiseDouble.FractalType; import com.volmit.iris.util.RNG; public class FractalCubicNoise implements NoiseGenerator diff --git a/src/main/java/com/volmit/iris/noise/FractalFBMSimplexNoise.java b/src/main/java/com/volmit/iris/generator/noise/FractalFBMSimplexNoise.java similarity index 87% rename from src/main/java/com/volmit/iris/noise/FractalFBMSimplexNoise.java rename to src/main/java/com/volmit/iris/generator/noise/FractalFBMSimplexNoise.java index 61a7f6e14..9f1b0a2a9 100644 --- a/src/main/java/com/volmit/iris/noise/FractalFBMSimplexNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/FractalFBMSimplexNoise.java @@ -1,6 +1,6 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; -import com.volmit.iris.noise.FastNoiseDouble.FractalType; +import com.volmit.iris.generator.noise.FastNoiseDouble.FractalType; import com.volmit.iris.util.RNG; public class FractalFBMSimplexNoise implements NoiseGenerator, OctaveNoise diff --git a/src/main/java/com/volmit/iris/noise/FractalRigidMultiSimplexNoise.java b/src/main/java/com/volmit/iris/generator/noise/FractalRigidMultiSimplexNoise.java similarity index 87% rename from src/main/java/com/volmit/iris/noise/FractalRigidMultiSimplexNoise.java rename to src/main/java/com/volmit/iris/generator/noise/FractalRigidMultiSimplexNoise.java index d32fafb95..d2c197ac1 100644 --- a/src/main/java/com/volmit/iris/noise/FractalRigidMultiSimplexNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/FractalRigidMultiSimplexNoise.java @@ -1,6 +1,6 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; -import com.volmit.iris.noise.FastNoiseDouble.FractalType; +import com.volmit.iris.generator.noise.FastNoiseDouble.FractalType; import com.volmit.iris.util.RNG; public class FractalRigidMultiSimplexNoise implements NoiseGenerator, OctaveNoise diff --git a/src/main/java/com/volmit/iris/noise/GlobNoise.java b/src/main/java/com/volmit/iris/generator/noise/GlobNoise.java similarity index 94% rename from src/main/java/com/volmit/iris/noise/GlobNoise.java rename to src/main/java/com/volmit/iris/generator/noise/GlobNoise.java index 5e660813a..c339db713 100644 --- a/src/main/java/com/volmit/iris/noise/GlobNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/GlobNoise.java @@ -1,4 +1,4 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/noise/NoiseFactory.java b/src/main/java/com/volmit/iris/generator/noise/NoiseFactory.java similarity index 69% rename from src/main/java/com/volmit/iris/noise/NoiseFactory.java rename to src/main/java/com/volmit/iris/generator/noise/NoiseFactory.java index 0d7cb57b2..7fbf98eeb 100644 --- a/src/main/java/com/volmit/iris/noise/NoiseFactory.java +++ b/src/main/java/com/volmit/iris/generator/noise/NoiseFactory.java @@ -1,4 +1,4 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; @FunctionalInterface public interface NoiseFactory diff --git a/src/main/java/com/volmit/iris/noise/NoiseGenerator.java b/src/main/java/com/volmit/iris/generator/noise/NoiseGenerator.java similarity index 80% rename from src/main/java/com/volmit/iris/noise/NoiseGenerator.java rename to src/main/java/com/volmit/iris/generator/noise/NoiseGenerator.java index 33870fd49..b377bb514 100644 --- a/src/main/java/com/volmit/iris/noise/NoiseGenerator.java +++ b/src/main/java/com/volmit/iris/generator/noise/NoiseGenerator.java @@ -1,4 +1,4 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; public interface NoiseGenerator { diff --git a/src/main/java/com/volmit/iris/noise/NoiseType.java b/src/main/java/com/volmit/iris/generator/noise/NoiseType.java similarity index 95% rename from src/main/java/com/volmit/iris/noise/NoiseType.java rename to src/main/java/com/volmit/iris/generator/noise/NoiseType.java index c789e799a..1596ee953 100644 --- a/src/main/java/com/volmit/iris/noise/NoiseType.java +++ b/src/main/java/com/volmit/iris/generator/noise/NoiseType.java @@ -1,4 +1,4 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; public enum NoiseType { WHITE(seed -> new WhiteNoise(seed)), diff --git a/src/main/java/com/volmit/iris/noise/OctaveNoise.java b/src/main/java/com/volmit/iris/generator/noise/OctaveNoise.java similarity index 62% rename from src/main/java/com/volmit/iris/noise/OctaveNoise.java rename to src/main/java/com/volmit/iris/generator/noise/OctaveNoise.java index c0ca0b931..5d213c91a 100644 --- a/src/main/java/com/volmit/iris/noise/OctaveNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/OctaveNoise.java @@ -1,4 +1,4 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; public interface OctaveNoise { diff --git a/src/main/java/com/volmit/iris/noise/PerlinNoise.java b/src/main/java/com/volmit/iris/generator/noise/PerlinNoise.java similarity index 97% rename from src/main/java/com/volmit/iris/noise/PerlinNoise.java rename to src/main/java/com/volmit/iris/generator/noise/PerlinNoise.java index 3469a20e9..9b68f0c7e 100644 --- a/src/main/java/com/volmit/iris/noise/PerlinNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/PerlinNoise.java @@ -1,4 +1,4 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/noise/RarityCellGenerator.java b/src/main/java/com/volmit/iris/generator/noise/RarityCellGenerator.java similarity index 96% rename from src/main/java/com/volmit/iris/noise/RarityCellGenerator.java rename to src/main/java/com/volmit/iris/generator/noise/RarityCellGenerator.java index 7c53d361c..8afa6458e 100644 --- a/src/main/java/com/volmit/iris/noise/RarityCellGenerator.java +++ b/src/main/java/com/volmit/iris/generator/noise/RarityCellGenerator.java @@ -1,4 +1,4 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; import com.volmit.iris.util.IRare; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/noise/SimplexNoise.java b/src/main/java/com/volmit/iris/generator/noise/SimplexNoise.java similarity index 97% rename from src/main/java/com/volmit/iris/noise/SimplexNoise.java rename to src/main/java/com/volmit/iris/generator/noise/SimplexNoise.java index 1412f49c9..bbff624da 100644 --- a/src/main/java/com/volmit/iris/noise/SimplexNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/SimplexNoise.java @@ -1,4 +1,4 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/noise/VascularNoise.java b/src/main/java/com/volmit/iris/generator/noise/VascularNoise.java similarity index 95% rename from src/main/java/com/volmit/iris/noise/VascularNoise.java rename to src/main/java/com/volmit/iris/generator/noise/VascularNoise.java index 0efc4bc6f..8bff7cd79 100644 --- a/src/main/java/com/volmit/iris/noise/VascularNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/VascularNoise.java @@ -1,4 +1,4 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; import com.volmit.iris.util.M; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/noise/WhiteNoise.java b/src/main/java/com/volmit/iris/generator/noise/WhiteNoise.java similarity index 93% rename from src/main/java/com/volmit/iris/noise/WhiteNoise.java rename to src/main/java/com/volmit/iris/generator/noise/WhiteNoise.java index d49c3b558..bca45a97a 100644 --- a/src/main/java/com/volmit/iris/noise/WhiteNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/WhiteNoise.java @@ -1,4 +1,4 @@ -package com.volmit.iris.noise; +package com.volmit.iris.generator.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/manager/EditManager.java b/src/main/java/com/volmit/iris/manager/EditManager.java index 490dc8348..c0879d642 100644 --- a/src/main/java/com/volmit/iris/manager/EditManager.java +++ b/src/main/java/com/volmit/iris/manager/EditManager.java @@ -10,9 +10,9 @@ import org.bukkit.event.world.WorldUnloadEvent; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.edit.BlockEditor; -import com.volmit.iris.edit.BukkitBlockEditor; -import com.volmit.iris.edit.WEBlockEditor; +import com.volmit.iris.manager.edit.BlockEditor; +import com.volmit.iris.manager.edit.BukkitBlockEditor; +import com.volmit.iris.manager.edit.WEBlockEditor; import com.volmit.iris.util.KMap; import com.volmit.iris.util.M; diff --git a/src/main/java/com/volmit/iris/manager/IrisBoardManager.java b/src/main/java/com/volmit/iris/manager/IrisBoardManager.java index 063233d35..fbe53ce06 100644 --- a/src/main/java/com/volmit/iris/manager/IrisBoardManager.java +++ b/src/main/java/com/volmit/iris/manager/IrisBoardManager.java @@ -1,30 +1,17 @@ package com.volmit.iris.manager; -import java.util.List; - +import com.volmit.iris.Iris; +import com.volmit.iris.scaffold.IrisWorlds; +import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.util.*; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerChangedWorldEvent; -import com.volmit.iris.Iris; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.scaffold.IrisWorlds; -import com.volmit.iris.noise.CNG; -import com.volmit.iris.object.IrisBiome; -import com.volmit.iris.util.BoardManager; -import com.volmit.iris.util.BoardProvider; -import com.volmit.iris.util.BoardSettings; -import com.volmit.iris.util.C; -import com.volmit.iris.util.ChronoLatch; -import com.volmit.iris.util.DontObfuscate; -import com.volmit.iris.util.Form; -import com.volmit.iris.util.IrisStructureResult; -import com.volmit.iris.util.J; -import com.volmit.iris.util.KList; -import com.volmit.iris.util.RollingSequence; -import com.volmit.iris.util.ScoreDirection; +import java.util.List; public class IrisBoardManager implements BoardProvider, Listener { @@ -56,7 +43,7 @@ public class IrisBoardManager implements BoardProvider, Listener @DontObfuscate private boolean isIrisWorld(World w) { - return IrisWorlds.isIrisWorld(w) && IrisWorlds.getProvider(w).isDev(); + return IrisWorlds.isIrisWorld(w) && IrisWorlds.access(w).isStudio(); } public void updatePlayer(Player p) @@ -90,45 +77,58 @@ public class IrisBoardManager implements BoardProvider, Listener return v; } - IrisTerrainProvider g = IrisWorlds.getProvider(player.getWorld()); + IrisAccess g = IrisWorlds.access(player.getWorld()); if(cl.flip()) { - mem = Form.memSize(g.guessMemoryUsage(), 2); + // TODO MEMORY + mem = Form.memSize(0, 2); } int x = player.getLocation().getBlockX(); int y = player.getLocation().getBlockY(); int z = player.getLocation().getBlockZ(); - IrisBiome b = g.sampleTrueBiome(x, y, z); - IrisStructureResult st = g.getStructure(x, y, z); - tp.put(g.getMetrics().getSpeed()); + + Engine engine = g.getCompound().getEngine(y); + + int parallaxChunks=0; + int parallaxRegions=0; + long memoryGuess=0; + int loadedObjects=0; + + for(int i = 0; i < g.getCompound().getSize(); i++) + { + parallaxRegions += g.getCompound().getEngine(i).getParallax().getRegionCount(); + parallaxChunks += g.getCompound().getEngine(i).getParallax().getChunkCount(); + loadedObjects+= g.getCompound().getData().getObjectLoader().getSize(); + memoryGuess += g.getCompound().getData().getObjectLoader().getTotalStorage() * 225; + memoryGuess+= parallaxChunks += 3500; + memoryGuess += parallaxRegions += 1700000; + } + + tp.put(0); // TODO: CHUNK SPEED + v.add("&7&m------------------"); - v.add(C.GREEN + "Speed" + C.GRAY + ": " + C.BOLD + "" + C.GRAY + Form.f(g.getMetrics().getPerSecond().getAverage(), 0) + "/s " + Form.duration(g.getMetrics().getTotal().getAverage(), 1) + ""); - v.add(C.GREEN + "Generators" + C.GRAY + ": " + Form.f(CNG.creates)); - v.add(C.GREEN + "Noise" + C.GRAY + ": " + Form.f((int) hits.getAverage())); - v.add(C.GREEN + "Parallax" + C.GRAY + ": " + Form.f((int) g.getParallaxMap().getLoadedChunks().size())); - v.add(C.GREEN + "Objects" + C.GRAY + ": " + Form.f(g.getData().getObjectLoader().count())); - v.add(C.GREEN + "Memory" + C.GRAY + ": " + mem); + v.add(C.GREEN + "PLX Regions" + C.GRAY + ": " + Form.f(parallaxRegions)); + v.add(C.GREEN + "PLX Chunks" + C.GRAY + ": " + Form.f(parallaxChunks)); + v.add(C.GREEN + "CHE Objects" + C.GRAY + ": " + Form.f(loadedObjects)); + v.add(C.GREEN + "Memory Use" + C.GRAY + ": " + Form.memSize(memoryGuess, 0)); + + if(engine != null) + { + v.add("&7&m------------------"); + v.add(C.AQUA + "Engine" + C.GRAY + ": " + engine.getName() + " (" + engine.getMinHeight() + " - " + engine.getMaxHeight() + ")"); + v.add(C.AQUA + "Region" + C.GRAY + ": " + engine.getRegion(x, z).getName()); + v.add(C.AQUA + "Biome" + C.GRAY + ": " + engine.getBiome(x, y, z).getName()); + v.add(C.AQUA + "Height" + C.GRAY + ": " + Math.round(engine.getHeight(x, z))); + } if(Iris.jobCount() > 0) { - v.add(C.GREEN + "Tasks" + C.GRAY + ": " + Iris.jobCount()); + v.add("&7&m------------------"); + v.add(C.LIGHT_PURPLE + "Tasks" + C.GRAY + ": " + Iris.jobCount()); } - v.add("&7&m------------------"); - v.add(C.GREEN + "Heightmap" + C.GRAY + ": " + (int) g.getTerrainHeight(x, z)); - - if(b != null) - { - v.add(C.GREEN + "Biome" + C.GRAY + ": " + b.getName()); - } - - if(st != null) - { - v.add(C.GREEN + "Structure" + C.GRAY + ": " + st.getStructure().getName()); - v.add(C.GREEN + "Tile" + C.GRAY + ": " + st.getTile().toString()); - } v.add("&7&m------------------"); diff --git a/src/main/java/com/volmit/iris/manager/IrisHotloadManager.java b/src/main/java/com/volmit/iris/manager/IrisHotloadManager.java index 5f16ac5a1..6cdd07dc1 100644 --- a/src/main/java/com/volmit/iris/manager/IrisHotloadManager.java +++ b/src/main/java/com/volmit/iris/manager/IrisHotloadManager.java @@ -7,7 +7,7 @@ import org.bukkit.entity.Player; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.gen.scaffold.IrisContext; +import com.volmit.iris.generator.legacy.scaffold.IrisContext; import com.volmit.iris.util.ChronoLatch; import com.volmit.iris.util.FolderWatcher; import com.volmit.iris.util.J; diff --git a/src/main/java/com/volmit/iris/manager/IrisProject.java b/src/main/java/com/volmit/iris/manager/IrisProject.java index d72a26fde..a73659306 100644 --- a/src/main/java/com/volmit/iris/manager/IrisProject.java +++ b/src/main/java/com/volmit/iris/manager/IrisProject.java @@ -1,59 +1,31 @@ package com.volmit.iris.manager; -import java.awt.Desktop; -import java.io.File; -import java.io.IOException; -import java.util.UUID; - -import org.bukkit.Bukkit; -import org.bukkit.GameMode; -import org.bukkit.World; -import org.bukkit.WorldCreator; -import org.bukkit.WorldType; -import org.zeroturnaround.zip.ZipUtil; - import com.google.gson.Gson; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.nms.INMS; -import com.volmit.iris.gen.provisions.ProvisionBukkit; -import com.volmit.iris.gen.scaffold.IrisGenConfiguration; -import com.volmit.iris.gen.scaffold.TerrainTarget; -import com.volmit.iris.object.IrisBiome; -import com.volmit.iris.object.IrisBiomeMutation; -import com.volmit.iris.object.IrisBlockData; -import com.volmit.iris.object.IrisDimension; -import com.volmit.iris.object.IrisEntity; -import com.volmit.iris.object.IrisGenerator; -import com.volmit.iris.object.IrisLootTable; -import com.volmit.iris.object.IrisObjectPlacement; -import com.volmit.iris.object.IrisRegion; -import com.volmit.iris.object.IrisStructure; -import com.volmit.iris.object.IrisStructureTile; -import com.volmit.iris.util.C; -import com.volmit.iris.util.ChronoLatch; -import com.volmit.iris.util.Form; -import com.volmit.iris.util.IO; -import com.volmit.iris.util.J; -import com.volmit.iris.util.JSONArray; -import com.volmit.iris.util.JSONObject; -import com.volmit.iris.util.KList; -import com.volmit.iris.util.KMap; -import com.volmit.iris.util.KSet; -import com.volmit.iris.util.M; -import com.volmit.iris.util.MortarSender; -import com.volmit.iris.util.O; -import com.volmit.iris.util.PrecisionStopwatch; - +import com.volmit.iris.generator.legacy.nms.INMS; +import com.volmit.iris.object.*; +import com.volmit.iris.scaffold.IrisWorldCreator; +import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.util.*; import lombok.Data; +import org.bukkit.Bukkit; +import org.bukkit.GameMode; +import org.bukkit.World; +import org.bukkit.WorldCreator; +import org.zeroturnaround.zip.ZipUtil; + +import java.awt.*; +import java.io.File; +import java.io.IOException; +import java.util.UUID; @Data public class IrisProject { private File path; private String name; - private IrisTerrainProvider activeProvider; + private IrisAccess activeProvider; public IrisProject(File path) { @@ -128,22 +100,13 @@ public class IrisProject Iris.globaldata.dump(); String wfp = "iris/" + UUID.randomUUID(); - //@builder - ProvisionBukkit gen = Iris.instance - .createProvisionBukkit(IrisGenConfiguration.builder() - .threads(Iris.getThreadCount()) - .dimension(getName()) - .target(TerrainTarget.builder() - .environment(d.getEnvironment()) - .folder(new File(wfp)) - .name(wfp) - .seed(1337) - .build()) - .build()); - //@done - IrisTerrainProvider gx = (IrisTerrainProvider) gen.getProvider(); - gx.setDev(true); + WorldCreator c = new IrisWorldCreator().dimension(getName()) + .seed(1337) + .name(wfp) + .studioMode() + .create(); + IrisAccess gx = ((IrisAccess)c.generator()); sender.sendMessage("Generating with " + Iris.getThreadCount() + " threads per chunk"); O done = new O(); done.set(false); @@ -154,14 +117,14 @@ public class IrisProject double last = 0; int req = 740; double lpc = 0; - boolean c = false; + boolean fc = false; while(!done.get()) { boolean derp = false; double v = (double) gx.getGenerated() / (double) req; - c = lpc != v; + fc = lpc != v; lpc = v; if(last > v || v > 1) @@ -175,7 +138,7 @@ public class IrisProject last = v; } - if(c) + if(fc) { sender.sendMessage(C.WHITE + "Generating " + Form.pc(v) + (derp ? (C.GRAY + " (Waiting on Server...)") : (C.GRAY + " (" + (req - gx.getGenerated()) + " Left)"))); } @@ -191,14 +154,7 @@ public class IrisProject }); //@builder - World world = INMS.get().createWorld(new WorldCreator(wfp) - .seed(1337) - .generator(gen) - .generateStructures(d.isVanillaStructures()) - .type(WorldType.NORMAL) - .environment(d.getEnvironment()), false); - //@done - gx.getTarget().setRealWorld(world); + World world = INMS.get().createWorld(c, false); Iris.linkMultiverseCore.removeFromConfig(world); done.set(true); @@ -225,9 +181,9 @@ public class IrisProject public void close() { activeProvider.close(); - File folder = activeProvider.getTarget().getFolder(); - Iris.linkMultiverseCore.removeFromConfig(activeProvider.getTarget().getName()); - Bukkit.unloadWorld(activeProvider.getTarget().getName(), false); + File folder = activeProvider.getTarget().getWorld().getWorldFolder(); + Iris.linkMultiverseCore.removeFromConfig(activeProvider.getTarget().getWorld().getName()); + Bukkit.unloadWorld(activeProvider.getTarget().getWorld().getName(), false); flush(); J.attemptAsync(() -> IO.delete(folder)); activeProvider = null; diff --git a/src/main/java/com/volmit/iris/manager/StructureManager.java b/src/main/java/com/volmit/iris/manager/StructureManager.java index b4949d6be..16cd3a8b1 100644 --- a/src/main/java/com/volmit/iris/manager/StructureManager.java +++ b/src/main/java/com/volmit/iris/manager/StructureManager.java @@ -2,7 +2,7 @@ package com.volmit.iris.manager; import org.bukkit.entity.Player; -import com.volmit.iris.structure.StructureTemplate; +import com.volmit.iris.manager.structure.StructureTemplate; import com.volmit.iris.util.KList; public class StructureManager diff --git a/src/main/java/com/volmit/iris/manager/WandManager.java b/src/main/java/com/volmit/iris/manager/WandManager.java index 413ad7e95..9f7a67038 100644 --- a/src/main/java/com/volmit/iris/manager/WandManager.java +++ b/src/main/java/com/volmit/iris/manager/WandManager.java @@ -3,6 +3,7 @@ package com.volmit.iris.manager; import java.awt.Color; import java.util.Iterator; +import com.volmit.iris.manager.edit.DustRevealer; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/main/java/com/volmit/iris/command/CommandIris.java b/src/main/java/com/volmit/iris/manager/command/CommandIris.java similarity index 63% rename from src/main/java/com/volmit/iris/command/CommandIris.java rename to src/main/java/com/volmit/iris/manager/command/CommandIris.java index 2a32e32dc..3d4e4cbf9 100644 --- a/src/main/java/com/volmit/iris/command/CommandIris.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIris.java @@ -1,14 +1,10 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; -import com.volmit.iris.IrisSettings; -import com.volmit.iris.inject.SIGNAL; import com.volmit.iris.util.Command; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; -import com.volmit.iris.v2.TestGen; -import com.volmit.iris.v2.scaffold.engine.Hotloadable; public class CommandIris extends MortarCommand { @@ -66,26 +62,6 @@ public class CommandIris extends MortarCommand @Override public boolean handle(MortarSender sender, String[] args) { - if(args.length == 1 && args[0].equalsIgnoreCase("tick!")) - { - SIGNAL.NO_ENTITY_TICKING = !SIGNAL.NO_ENTITY_TICKING; - sender.sendMessage("TICKING: " + SIGNAL.NO_ENTITY_TICKING); - return true; - } - - if(args.length == 2 && args[0].equalsIgnoreCase("test!") && IrisSettings.get().allowExperimentalV2Generator) - { - TestGen.gen(sender.player(), args[1]); - return true; - } - - if(args.length == 1 && args[0].equalsIgnoreCase("hl!") && IrisSettings.get().allowExperimentalV2Generator) - { - ((Hotloadable)sender.player().getWorld().getGenerator()).hotload(); - sender.sendMessage("Done!"); - return true; - } - sender.sendMessage("Iris v" + Iris.instance.getDescription().getVersion() + " by Volmit Software"); printHelp(sender); return true; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisCTC.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisCTC.java similarity index 88% rename from src/main/java/com/volmit/iris/command/CommandIrisCTC.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisCTC.java index f1ca405e1..82e0c5e80 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisCTC.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisCTC.java @@ -1,14 +1,13 @@ -package com.volmit.iris.command; - -import com.volmit.iris.util.KList; -import org.bukkit.World; -import org.bukkit.entity.Player; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.scaffold.IrisWorlds; +import com.volmit.iris.scaffold.IrisWorlds; +import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; +import org.bukkit.World; +import org.bukkit.entity.Player; public class CommandIrisCTC extends MortarCommand { @@ -41,7 +40,7 @@ public class CommandIrisCTC extends MortarCommand sender.sendMessage("You must be in an iris world."); return true; } - IrisTerrainProvider g = IrisWorlds.getProvider(world); + IrisAccess g = IrisWorlds.access(world); if(args.length == 0){ sender.sendMessage("Current threads: " + g.getThreadCount()); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisCapture.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisCapture.java similarity index 87% rename from src/main/java/com/volmit/iris/command/CommandIrisCapture.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisCapture.java index 3e33a6f82..e06f5b36b 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisCapture.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisCapture.java @@ -1,4 +1,16 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; + +import com.volmit.iris.Iris; +import com.volmit.iris.object.IrisBiome; +import com.volmit.iris.object.IrisObject; +import com.volmit.iris.object.IrisObjectPlacement; +import com.volmit.iris.scaffold.IrisWorlds; +import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.util.*; +import io.papermc.lib.PaperLib; +import org.bukkit.*; +import org.bukkit.entity.Player; +import org.bukkit.util.BlockVector; import java.io.File; import java.io.FileNotFoundException; @@ -10,31 +22,6 @@ import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.Date; -import org.bukkit.Bukkit; -import org.bukkit.Chunk; -import org.bukkit.FluidCollisionMode; -import org.bukkit.Location; -import org.bukkit.World; -import org.bukkit.entity.Player; -import org.bukkit.util.BlockVector; - -import com.volmit.iris.Iris; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.scaffold.IrisWorlds; -import com.volmit.iris.object.IrisBiome; -import com.volmit.iris.object.IrisObject; -import com.volmit.iris.object.IrisObjectPlacement; -import com.volmit.iris.util.Form; -import com.volmit.iris.util.KList; -import com.volmit.iris.util.KMap; -import com.volmit.iris.util.KSet; -import com.volmit.iris.util.M; -import com.volmit.iris.util.MortarCommand; -import com.volmit.iris.util.MortarSender; -import com.volmit.iris.util.Spiraler; - -import io.papermc.lib.PaperLib; - public class CommandIrisCapture extends MortarCommand { public CommandIrisCapture() @@ -64,7 +51,7 @@ public class CommandIrisCapture extends MortarCommand return true; } - IrisTerrainProvider g = IrisWorlds.getProvider(world); + IrisAccess g = IrisWorlds.access(world); KList chunks = new KList<>(); int bx = p.getLocation().getChunk().getX(); int bz = p.getLocation().getChunk().getZ(); @@ -155,8 +142,8 @@ public class CommandIrisCapture extends MortarCommand continue; } - IrisBiome bb = g.sampleTrueBiome((i.getX() * 16) + j, (i.getZ() * 16) + k); - IrisBiome bxf = g.sampleTrueBiome((i.getX() * 16) + j, 3, (i.getZ() * 16) + k); + IrisBiome bb = g.getBiome((i.getX() * 16) + j, (i.getZ() * 16) + k); + IrisBiome bxf = g.getCaveBiome((i.getX() * 16) + j, (i.getZ() * 16) + k); biomes.addIfMissing(bb.getName() + " [" + Form.capitalize(bb.getInferredType().name().toLowerCase()) + "] " + " (" + bb.getLoadFile().getName() + ")"); caveBiomes.addIfMissing(bxf.getName() + " (" + bxf.getLoadFile().getName() + ")"); exportObjects(bb, pw, g, objects); @@ -231,7 +218,7 @@ public class CommandIrisCapture extends MortarCommand return true; } - private void exportObjects(IrisBiome bb, PrintWriter pw, IrisTerrainProvider g, KMap>> objects) + private void exportObjects(IrisBiome bb, PrintWriter pw, IrisAccess g, KMap>> objects) { String n1 = bb.getName() + " [" + Form.capitalize(bb.getInferredType().name().toLowerCase()) + "] " + " (" + bb.getLoadFile().getName() + ")"; int m = 0; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisCreate.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisCreate.java similarity index 76% rename from src/main/java/com/volmit/iris/command/CommandIrisCreate.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisCreate.java index 60af38174..254c8d666 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisCreate.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisCreate.java @@ -1,20 +1,16 @@ -package com.volmit.iris.command; - -import java.io.File; +package com.volmit.iris.manager.command; +import com.volmit.iris.Iris; +import com.volmit.iris.generator.legacy.nms.INMS; +import com.volmit.iris.object.IrisDimension; +import com.volmit.iris.scaffold.IrisWorldCreator; +import com.volmit.iris.scaffold.engine.IrisAccess; import com.volmit.iris.util.*; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.WorldCreator; -import org.bukkit.WorldType; -import com.volmit.iris.Iris; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.nms.INMS; -import com.volmit.iris.gen.provisions.ProvisionBukkit; -import com.volmit.iris.gen.scaffold.IrisGenConfiguration; -import com.volmit.iris.gen.scaffold.TerrainTarget; -import com.volmit.iris.object.IrisDimension; +import java.io.File; public class CommandIrisCreate extends MortarCommand { @@ -64,21 +60,8 @@ public class CommandIrisCreate extends MortarCommand IrisDimension dim = Iris.proj.installIntoWorld(sender, type, folder); - //@builder - ProvisionBukkit gen = Iris.instance.createProvisionBukkit( - IrisGenConfiguration.builder() - .threads(Iris.getThreadCount()) - .dimension(dim.getLoadKey()) - .target(TerrainTarget - .builder() - .environment(dim.getEnvironment()) - .folder(folder) - .name(worldName) - .seed(seed) - .build() - ).build()); - //@done - + WorldCreator wc = new IrisWorldCreator().dimension(dim).name(worldName) + .productionMode().seed(seed).create(); sender.sendMessage("Generating with " + Iris.getThreadCount() + " threads per chunk"); O done = new O(); done.set(false); @@ -90,7 +73,7 @@ public class CommandIrisCreate extends MortarCommand while(!done.get()) { boolean derp = false; - double v = (double) ((IrisTerrainProvider) gen.getProvider()).getGenerated() / (double) req; + double v = (double) ((IrisAccess) wc.generator()).getGenerated() / (double) req; if(last > v || v > 1) { @@ -108,8 +91,6 @@ public class CommandIrisCreate extends MortarCommand } }); - WorldCreator wc = new WorldCreator(worldName).seed(seed).generator(gen).type(WorldType.NORMAL).environment(dim.getEnvironment()); - World world = INMS.get().createWorld(wc, false); done.set(true); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisDownload.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisDownload.java similarity index 95% rename from src/main/java/com/volmit/iris/command/CommandIrisDownload.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisDownload.java index 1fe2838b6..d23cf284f 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisDownload.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisDownload.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; import com.volmit.iris.util.*; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisLMM.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisLMM.java similarity index 94% rename from src/main/java/com/volmit/iris/command/CommandIrisLMM.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisLMM.java index 4342e03b8..e7c481016 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisLMM.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisLMM.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisMetrics.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisMetrics.java similarity index 84% rename from src/main/java/com/volmit/iris/command/CommandIrisMetrics.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisMetrics.java index 808c017a6..f9a164207 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisMetrics.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisMetrics.java @@ -1,14 +1,13 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; +import com.volmit.iris.Iris; +import com.volmit.iris.generator.legacy.scaffold.IrisMetrics; +import com.volmit.iris.scaffold.IrisWorlds; +import com.volmit.iris.scaffold.engine.IrisAccess; import com.volmit.iris.util.*; import org.bukkit.World; import org.bukkit.entity.Player; -import com.volmit.iris.Iris; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.scaffold.IrisMetrics; -import com.volmit.iris.gen.scaffold.IrisWorlds; - public class CommandIrisMetrics extends MortarCommand { public CommandIrisMetrics() @@ -37,9 +36,9 @@ public class CommandIrisMetrics extends MortarCommand return true; } - IrisTerrainProvider g = IrisWorlds.getProvider(world); - IrisMetrics m = g.getMetrics(); - sender.sendMessage("Thread Count: " + C.BOLD + "" + C.WHITE + g.getThreads()); + IrisAccess g = IrisWorlds.access(world); + IrisMetrics m = new IrisMetrics(20); // TODO: BROKEN + sender.sendMessage("Thread Count: " + C.BOLD + "" + C.WHITE + g.getThreadCount()); sender.sendMessage("Total : " + C.BOLD + "" + C.WHITE + Form.duration(m.getTotal().getAverage(), 2)); sender.sendMessage(" Terrain : " + C.BOLD + "" + C.WHITE + Form.duration(m.getTerrain().getAverage(), 2)); sender.sendMessage(" Deposits : " + C.BOLD + "" + C.WHITE + Form.duration(m.getDeposits().getAverage(), 2)); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObject.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisObject.java similarity index 97% rename from src/main/java/com/volmit/iris/command/CommandIrisObject.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisObject.java index eb08e7636..5d1f387cb 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObject.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisObject.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectContract.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectContract.java similarity index 97% rename from src/main/java/com/volmit/iris/command/CommandIrisObjectContract.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisObjectContract.java index ee544b8b1..dcc80bbc1 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectContract.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectContract.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.util.*; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectDust.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectDust.java similarity index 96% rename from src/main/java/com/volmit/iris/command/CommandIrisObjectDust.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisObjectDust.java index d2d0184cf..acb04ac31 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectDust.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectDust.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectExpand.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectExpand.java similarity index 97% rename from src/main/java/com/volmit/iris/command/CommandIrisObjectExpand.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisObjectExpand.java index 188c46f1b..fb8101df6 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectExpand.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectExpand.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.util.*; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectP1.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectP1.java similarity index 97% rename from src/main/java/com/volmit/iris/command/CommandIrisObjectP1.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisObjectP1.java index ff915d4d7..69ff8bf49 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectP1.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectP1.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import java.util.Set; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectP2.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectP2.java similarity index 97% rename from src/main/java/com/volmit/iris/command/CommandIrisObjectP2.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisObjectP2.java index 12165fca4..e6af8a14b 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectP2.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectP2.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import java.util.Set; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectPaste.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectPaste.java similarity index 98% rename from src/main/java/com/volmit/iris/command/CommandIrisObjectPaste.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisObjectPaste.java index b11f61a50..ac432e2bf 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectPaste.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectPaste.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import java.io.File; import java.util.Set; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectSave.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectSave.java similarity index 98% rename from src/main/java/com/volmit/iris/command/CommandIrisObjectSave.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisObjectSave.java index 7195e3841..d45b0dc1e 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectSave.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectSave.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import java.io.File; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectShift.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectShift.java similarity index 97% rename from src/main/java/com/volmit/iris/command/CommandIrisObjectShift.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisObjectShift.java index 6c61a19d6..08a56230f 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectShift.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectShift.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.util.*; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectWand.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectWand.java similarity index 96% rename from src/main/java/com/volmit/iris/command/CommandIrisObjectWand.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisObjectWand.java index 509f21dd6..01ca0e6f2 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectWand.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectWand.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.util.KList; import org.bukkit.Sound; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectXAY.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectXAY.java similarity index 98% rename from src/main/java/com/volmit/iris/command/CommandIrisObjectXAY.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisObjectXAY.java index 58f584f28..215b29994 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectXAY.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectXAY.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.util.KList; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisObjectXPY.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectXPY.java similarity index 98% rename from src/main/java/com/volmit/iris/command/CommandIrisObjectXPY.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisObjectXPY.java index 5e851ee99..0da7e2628 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisObjectXPY.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisObjectXPY.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.util.KList; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisPregen.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisPregen.java similarity index 98% rename from src/main/java/com/volmit/iris/command/CommandIrisPregen.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisPregen.java index 8e31fd4b2..87fc03346 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisPregen.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisPregen.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.util.KList; import org.bukkit.World; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisRegen.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisRegen.java similarity index 76% rename from src/main/java/com/volmit/iris/command/CommandIrisRegen.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisRegen.java index 6c2d5f8be..b5363c937 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisRegen.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisRegen.java @@ -1,11 +1,11 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.util.KList; import org.bukkit.World; import org.bukkit.entity.Player; import com.volmit.iris.Iris; -import com.volmit.iris.gen.scaffold.IrisWorlds; +import com.volmit.iris.scaffold.IrisWorlds; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; import com.volmit.iris.util.Spiraler; @@ -40,17 +40,17 @@ public class CommandIrisRegen extends MortarCommand return true; } - if(IrisWorlds.getProvider(world).isFailing()) + if(IrisWorlds.access(world).isFailing()) { sender.sendMessage("This world is in a failed state! Cannot Regenerate!"); return true; } - IrisWorlds.getProvisioned(world).clearRegeneratedLists(); + //TODO: IrisWorlds.access(world).clearRegeneratedLists(); if(args.length == 0) { sender.sendMessage("Regenerating your chunk"); - IrisWorlds.getProvisioned(world).regenerate(p.getLocation().getChunk().getX(), p.getLocation().getChunk().getZ()); + IrisWorlds.access(world).regenerate(p.getLocation().getChunk().getX(), p.getLocation().getChunk().getZ()); return true; } @@ -58,7 +58,7 @@ public class CommandIrisRegen extends MortarCommand { int m = Integer.valueOf(args[0]); sender.sendMessage("Regenerating " + (m * m) + " Chunks Surrounding you"); - new Spiraler(m, m, (a, b) -> IrisWorlds.getProvisioned(world).regenerate(a + p.getLocation().getChunk().getX(), b + p.getLocation().getChunk().getZ())).drain(); + new Spiraler(m, m, (a, b) -> IrisWorlds.access(world).regenerate(a + p.getLocation().getChunk().getX(), b + p.getLocation().getChunk().getZ())).drain(); } catch(Throwable e) { diff --git a/src/main/java/com/volmit/iris/command/CommandIrisReload.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisReload.java similarity index 95% rename from src/main/java/com/volmit/iris/command/CommandIrisReload.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisReload.java index 438a9f15e..c657e922c 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisReload.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisReload.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStructure.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStructure.java similarity index 97% rename from src/main/java/com/volmit/iris/command/CommandIrisStructure.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStructure.java index 9bc0ef18b..21843960b 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStructure.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStructure.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStructureClose.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStructureClose.java similarity index 92% rename from src/main/java/com/volmit/iris/command/CommandIrisStructureClose.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStructureClose.java index c27500016..ff67ac11c 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStructureClose.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStructureClose.java @@ -1,11 +1,11 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.util.KList; import org.bukkit.entity.Player; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.structure.StructureTemplate; +import com.volmit.iris.manager.structure.StructureTemplate; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStructureCreate.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStructureCreate.java similarity index 96% rename from src/main/java/com/volmit/iris/command/CommandIrisStructureCreate.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStructureCreate.java index 54c7afc1d..ef4f77e72 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStructureCreate.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStructureCreate.java @@ -1,11 +1,11 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.util.KList; import org.bukkit.entity.Player; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.structure.StructureTemplate; +import com.volmit.iris.manager.structure.StructureTemplate; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStructureExpand.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStructureExpand.java similarity index 92% rename from src/main/java/com/volmit/iris/command/CommandIrisStructureExpand.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStructureExpand.java index 60dbf8450..89abd541b 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStructureExpand.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStructureExpand.java @@ -1,11 +1,11 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.util.KList; import org.bukkit.entity.Player; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.structure.StructureTemplate; +import com.volmit.iris.manager.structure.StructureTemplate; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStructureMove.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStructureMove.java similarity index 92% rename from src/main/java/com/volmit/iris/command/CommandIrisStructureMove.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStructureMove.java index ba151dd67..4db392ca5 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStructureMove.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStructureMove.java @@ -1,11 +1,11 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.util.KList; import org.bukkit.entity.Player; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.structure.StructureTemplate; +import com.volmit.iris.manager.structure.StructureTemplate; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStructureOpen.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStructureOpen.java similarity index 94% rename from src/main/java/com/volmit/iris/command/CommandIrisStructureOpen.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStructureOpen.java index bdf44be20..fd55a1a8a 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStructureOpen.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStructureOpen.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.util.KList; import org.bukkit.entity.Player; @@ -6,7 +6,7 @@ import org.bukkit.entity.Player; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; import com.volmit.iris.object.IrisStructure; -import com.volmit.iris.structure.StructureTemplate; +import com.volmit.iris.manager.structure.StructureTemplate; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStructureSave.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStructureSave.java similarity index 92% rename from src/main/java/com/volmit/iris/command/CommandIrisStructureSave.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStructureSave.java index 32d981124..89bc53ff6 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStructureSave.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStructureSave.java @@ -1,11 +1,11 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.util.KList; import org.bukkit.entity.Player; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.structure.StructureTemplate; +import com.volmit.iris.manager.structure.StructureTemplate; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStructureVariants.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStructureVariants.java similarity index 96% rename from src/main/java/com/volmit/iris/command/CommandIrisStructureVariants.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStructureVariants.java index 25548fb96..5cbaa10a5 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStructureVariants.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStructureVariants.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.util.KList; import org.bukkit.entity.Player; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudio.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudio.java similarity index 97% rename from src/main/java/com/volmit/iris/command/CommandIrisStudio.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStudio.java index 7fbcbe546..b6b557783 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudio.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudio.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioClose.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioClose.java similarity index 88% rename from src/main/java/com/volmit/iris/command/CommandIrisStudioClose.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStudioClose.java index 87c077a96..ffc5f33a2 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioClose.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioClose.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.util.KList; import org.bukkit.Bukkit; @@ -46,7 +46,7 @@ public class CommandIrisStudioClose extends MortarCommand for(World i : Bukkit.getWorlds()) { - if(i.getWorldFolder().getAbsolutePath().equals(Iris.proj.getActiveProject().getActiveProvider().getTarget().getFolder().getAbsolutePath())) + if(i.getWorldFolder().getAbsolutePath().equals(Iris.proj.getActiveProject().getActiveProvider().getTarget().getWorld().getWorldFolder().getAbsolutePath())) { continue; } @@ -57,7 +57,7 @@ public class CommandIrisStudioClose extends MortarCommand if(f == null) { - for(Player i : Iris.proj.getActiveProject().getActiveProvider().getTarget().getPlayers()) + for(Player i : Iris.proj.getActiveProject().getActiveProvider().getTarget().getWorld().getPlayers()) { i.kickPlayer("Project Closing, No other world to put you in. Rejoin Please!"); } @@ -65,7 +65,7 @@ public class CommandIrisStudioClose extends MortarCommand else { - for(Player i : Iris.proj.getActiveProject().getActiveProvider().getTarget().getPlayers()) + for(Player i : Iris.proj.getActiveProject().getActiveProvider().getTarget().getWorld().getPlayers()) { i.teleport(f.getSpawnLocation()); } diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioConvert.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioConvert.java similarity index 95% rename from src/main/java/com/volmit/iris/command/CommandIrisStudioConvert.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStudioConvert.java index a71db2eb3..8b6338e60 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioConvert.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioConvert.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioCreate.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioCreate.java similarity index 97% rename from src/main/java/com/volmit/iris/command/CommandIrisStudioCreate.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStudioCreate.java index 9fb507c1a..ddc822e82 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioCreate.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioCreate.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioEditBiome.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioEditBiome.java similarity index 83% rename from src/main/java/com/volmit/iris/command/CommandIrisStudioEditBiome.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStudioEditBiome.java index 1fd42b28b..2084ad663 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioEditBiome.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioEditBiome.java @@ -1,15 +1,14 @@ -package com.volmit.iris.command; - -import java.awt.Desktop; -import java.io.File; - -import com.volmit.iris.util.KList; -import org.bukkit.entity.Player; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; +import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; +import org.bukkit.entity.Player; + +import java.awt.*; +import java.io.File; public class CommandIrisStudioEditBiome extends MortarCommand { @@ -41,7 +40,7 @@ public class CommandIrisStudioEditBiome extends MortarCommand try { - File f = Iris.proj.getActiveProject().getActiveProvider().sampleTrueBiome(p.getLocation().getBlockX(), p.getLocation().getBlockY(), p.getLocation().getBlockZ()).getLoadFile(); + File f = Iris.proj.getActiveProject().getActiveProvider().getBiome(p.getLocation().getBlockX(), p.getLocation().getBlockY(), p.getLocation().getBlockZ()).getLoadFile(); Desktop.getDesktop().open(f); } diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioExplorer.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioExplorer.java similarity index 93% rename from src/main/java/com/volmit/iris/command/CommandIrisStudioExplorer.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStudioExplorer.java index d9e8a18eb..f4b0d4dfb 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioExplorer.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioExplorer.java @@ -1,8 +1,8 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.gui.NoiseExplorer; +import com.volmit.iris.manager.gui.NoiseExplorer; import com.volmit.iris.util.Command; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioExplorerGenerator.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioExplorerGenerator.java similarity index 86% rename from src/main/java/com/volmit/iris/command/CommandIrisStudioExplorerGenerator.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStudioExplorerGenerator.java index 169b99640..52a9aa82c 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioExplorerGenerator.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioExplorerGenerator.java @@ -1,12 +1,13 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.gui.NoiseExplorer; +import com.volmit.iris.manager.gui.NoiseExplorer; import com.volmit.iris.object.IrisGenerator; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; +import com.volmit.iris.util.RNG; public class CommandIrisStudioExplorerGenerator extends MortarCommand { @@ -59,7 +60,7 @@ public class CommandIrisStudioExplorerGenerator extends MortarCommand { NoiseExplorer.launch((x, z) -> { - return b.getHeight(x, z, Iris.proj.getActiveProject().getActiveProvider().getMasterRandom().nextParallelRNG(3245).lmax()); + return b.getHeight(x, z, new RNG(Iris.proj.getActiveProject().getActiveProvider().getTarget().getWorld().getSeed()).nextParallelRNG(3245).lmax()); }, "Gen: " + b.getLoadKey()); sender.sendMessage("Opening Noise Explorer for gen " + b.getLoadKey()); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioGoto.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioGoto.java similarity index 81% rename from src/main/java/com/volmit/iris/command/CommandIrisStudioGoto.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStudioGoto.java index 62e1ace8f..362810998 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioGoto.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioGoto.java @@ -1,17 +1,16 @@ -package com.volmit.iris.command; - -import com.volmit.iris.util.KList; -import org.bukkit.Location; -import org.bukkit.World; -import org.bukkit.entity.Player; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.scaffold.IrisWorlds; import com.volmit.iris.object.IrisBiome; +import com.volmit.iris.scaffold.IrisWorlds; +import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; import com.volmit.iris.util.RNG; +import org.bukkit.Location; +import org.bukkit.World; +import org.bukkit.entity.Player; public class CommandIrisStudioGoto extends MortarCommand { @@ -27,7 +26,7 @@ public class CommandIrisStudioGoto extends MortarCommand public void addTabOptions(MortarSender sender, String[] args, KList list) { if(args.length == 0 && sender.isPlayer() && IrisWorlds.isIrisWorld(sender.player().getWorld())) { - list.add(IrisWorlds.getProvider(sender.player().getWorld()).getData().getBiomeLoader().getPreferredKeys()); + list.add(IrisWorlds.access(sender.player().getWorld()).getData().getBiomeLoader().getPreferredKeys()); } } @@ -53,7 +52,7 @@ public class CommandIrisStudioGoto extends MortarCommand return true; } - IrisTerrainProvider g = IrisWorlds.getProvider(world); + IrisAccess g = IrisWorlds.access(world); int tries = 10000; boolean cave = false; IrisBiome biome2 = null; @@ -66,7 +65,7 @@ public class CommandIrisStudioGoto extends MortarCommand else { - biome2 = g.loadBiome(args[1]); + biome2 = g.getData().getBiomeLoader().load(args[1]); if(biome2 == null) { @@ -84,7 +83,7 @@ public class CommandIrisStudioGoto extends MortarCommand } } - IrisBiome biome = args[0].equals("this") ? g.sampleTrueBiome(p.getLocation().getBlockX(), p.getLocation().getBlockZ()) : g.loadBiome(args[0]); + IrisBiome biome = args[0].equals("this") ? g.getBiome(p.getLocation().getBlockX(), p.getLocation().getBlockZ()) : g.getData().getBiomeLoader().load(args[0]); if(biome == null) { @@ -98,7 +97,7 @@ public class CommandIrisStudioGoto extends MortarCommand int xx = (int) (RNG.r.i(-29999970, 29999970)); int zz = (int) (RNG.r.i(-29999970, 29999970)); - if((cave ? g.sampleCaveBiome(xx, zz) : g.sampleTrueBiome(xx, zz)).getLoadKey().equals(biome.getLoadKey())) + if((cave ? g.getCaveBiome(xx, zz) : g.getBiome(xx, zz)).getLoadKey().equals(biome.getLoadKey())) { if(biome2 != null) { @@ -107,7 +106,7 @@ public class CommandIrisStudioGoto extends MortarCommand int ax = xx + RNG.r.i(-64, 32); int az = zz + RNG.r.i(-64, 32); - if((cave ? g.sampleCaveBiome(ax, az) : g.sampleTrueBiome(ax, az)).getLoadKey().equals(biome2.getLoadKey())) + if((cave ? g.getBiome(ax, az) : g.getBiome(ax, az)).getLoadKey().equals(biome2.getLoadKey())) { tries--; p.teleport(new Location(world, xx, world.getHighestBlockYAt(xx, zz), zz)); diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioHotload.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioHotload.java similarity index 85% rename from src/main/java/com/volmit/iris/command/CommandIrisStudioHotload.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStudioHotload.java index 09ea1f9ef..b22071040 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioHotload.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioHotload.java @@ -1,15 +1,13 @@ -package com.volmit.iris.command; - -import com.volmit.iris.util.KList; -import org.bukkit.World; -import org.bukkit.entity.Player; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.scaffold.IrisWorlds; +import com.volmit.iris.scaffold.IrisWorlds; +import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; +import org.bukkit.World; +import org.bukkit.entity.Player; public class CommandIrisStudioHotload extends MortarCommand { @@ -45,8 +43,7 @@ public class CommandIrisStudioHotload extends MortarCommand return true; } - IrisTerrainProvider g = IrisWorlds.getProvider(world); - g.onHotload(); + IrisWorlds.access(world).hotload(); sender.sendMessage("Hotloaded!"); return true; } diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioList.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioList.java similarity index 97% rename from src/main/java/com/volmit/iris/command/CommandIrisStudioList.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStudioList.java index c0add32e1..59ad5533c 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioList.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioList.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import java.io.File; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioLoot.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioLoot.java similarity index 61% rename from src/main/java/com/volmit/iris/command/CommandIrisStudioLoot.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStudioLoot.java index 6282dd290..e51e5c3b7 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioLoot.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioLoot.java @@ -1,22 +1,17 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; +import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; +import com.volmit.iris.object.InventorySlotType; +import com.volmit.iris.object.IrisLootTable; +import com.volmit.iris.scaffold.IrisWorlds; +import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.util.*; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; -import com.volmit.iris.Iris; -import com.volmit.iris.IrisSettings; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.scaffold.IrisWorlds; -import com.volmit.iris.object.InventorySlotType; -import com.volmit.iris.object.IrisLootTable; -import com.volmit.iris.util.KList; -import com.volmit.iris.util.MortarCommand; -import com.volmit.iris.util.MortarSender; -import com.volmit.iris.util.O; -import com.volmit.iris.util.RNG; - public class CommandIrisStudioLoot extends MortarCommand { public CommandIrisStudioLoot() @@ -44,7 +39,7 @@ public class CommandIrisStudioLoot extends MortarCommand if(sender.isPlayer()) { Player p = sender.player(); - IrisTerrainProvider prov = IrisWorlds.getProvider(sender.player().getWorld()); + IrisAccess prov = IrisWorlds.access(sender.player().getWorld()); if(prov == null) { @@ -52,28 +47,12 @@ public class CommandIrisStudioLoot extends MortarCommand return true; } - try - { - if(Iris.proj.getActiveProject().getActiveProvider().getGlUpdate() == null) - { - sender.sendMessage("You can only use /iris loot in a studio world of iris."); - return true; - } - } - - catch(Throwable e) - { - sender.sendMessage("You can only use /iris loot in a studio world of iris."); - return true; - } - - prov.initGLUpdate(); - KList tables = prov.getGlUpdate().getLootTables(RNG.r, p.getLocation().getBlock()); + KList tables = prov.getCompound().getEngine(p.getLocation().getBlockY()).getLootTables(RNG.r, p.getLocation().getBlock()); Inventory inv = Bukkit.createInventory(null, 27 * 2); try { - Iris.proj.getActiveProject().getActiveProvider().getGlUpdate().addItems(true, inv, RNG.r, tables, InventorySlotType.STORAGE, p.getLocation().getBlockX(), p.getLocation().getBlockY(), p.getLocation().getBlockZ(), 1); + Iris.proj.getActiveProject().getActiveProvider().getCompound().getEngine(p.getLocation().getBlockY()).addItems(true, inv, RNG.r, tables, InventorySlotType.STORAGE, p.getLocation().getBlockX(), p.getLocation().getBlockY(), p.getLocation().getBlockZ(), 1); } catch(Throwable e) @@ -123,7 +102,7 @@ public class CommandIrisStudioLoot extends MortarCommand inv.clear(); } - Iris.proj.getActiveProject().getActiveProvider().getGlUpdate().addItems(true, inv, new RNG(RNG.r.imax()), tables, InventorySlotType.STORAGE, p.getLocation().getBlockX(), p.getLocation().getBlockY(), p.getLocation().getBlockZ(), 1); + Iris.proj.getActiveProject().getActiveProvider().getCompound().getEngine(p.getLocation().getBlockY()).addItems(true, inv, new RNG(RNG.r.imax()), tables, InventorySlotType.STORAGE, p.getLocation().getBlockX(), p.getLocation().getBlockY(), p.getLocation().getBlockZ(), 1); }, 0, fast ? 5 : 35)); return true; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioMap.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioMap.java similarity index 79% rename from src/main/java/com/volmit/iris/command/CommandIrisStudioMap.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStudioMap.java index 69072bdd3..51d855ecf 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioMap.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioMap.java @@ -1,9 +1,8 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gui.IrisVision; +import com.volmit.iris.scaffold.engine.IrisAccess; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; @@ -38,9 +37,9 @@ public class CommandIrisStudioMap extends MortarCommand return true; } - IrisTerrainProvider g = Iris.proj.getActiveProject().getActiveProvider(); - IrisVision.launch(g); - sender.sendMessage("Opening Map!"); + IrisAccess g = Iris.proj.getActiveProject().getActiveProvider(); + // IrisVision.launch(g); + sender.sendMessage("NYI: Opening Map!"); return true; } diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioOpen.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioOpen.java similarity index 96% rename from src/main/java/com/volmit/iris/command/CommandIrisStudioOpen.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStudioOpen.java index 4b4fbda41..ffd08d0e6 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioOpen.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioOpen.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioPackage.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioPackage.java similarity index 96% rename from src/main/java/com/volmit/iris/command/CommandIrisStudioPackage.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStudioPackage.java index 923bd26a7..977e0c4b8 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioPackage.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioPackage.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioSummon.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioSummon.java similarity index 87% rename from src/main/java/com/volmit/iris/command/CommandIrisStudioSummon.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStudioSummon.java index d30425e97..cee587390 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioSummon.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioSummon.java @@ -1,13 +1,14 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; +import com.volmit.iris.scaffold.engine.IrisAccess; import com.volmit.iris.util.KList; import org.bukkit.World; import org.bukkit.entity.Player; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.scaffold.IrisWorlds; +import com.volmit.iris.generator.legacy.IrisTerrainProvider; +import com.volmit.iris.scaffold.IrisWorlds; import com.volmit.iris.object.IrisEntity; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; @@ -46,7 +47,7 @@ public class CommandIrisStudioSummon extends MortarCommand return true; } - IrisTerrainProvider g = IrisWorlds.getProvider(world); + IrisAccess g = IrisWorlds.access(world); if(args.length == 0) { for(String i : g.getData().getEntityLoader().getPossibleKeys()) diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioTP.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioTP.java similarity index 92% rename from src/main/java/com/volmit/iris/command/CommandIrisStudioTP.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStudioTP.java index a6f05f099..fd3c0db4e 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioTP.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioTP.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; @@ -39,7 +39,7 @@ public class CommandIrisStudioTP extends MortarCommand try { sender.sendMessage("Teleporting you to the active studio world."); - sender.player().teleport(Iris.proj.getActiveProject().getActiveProvider().getTarget().getRealWorld().getSpawnLocation()); + sender.player().teleport(Iris.proj.getActiveProject().getActiveProvider().getTarget().getWorld().getSpawnLocation()); } catch(Throwable e) diff --git a/src/main/java/com/volmit/iris/command/CommandIrisStudioUpdate.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioUpdate.java similarity index 96% rename from src/main/java/com/volmit/iris/command/CommandIrisStudioUpdate.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisStudioUpdate.java index c5d532601..38fe63300 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisStudioUpdate.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisStudioUpdate.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisUpdateProject.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisUpdateProject.java similarity index 94% rename from src/main/java/com/volmit/iris/command/CommandIrisUpdateProject.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisUpdateProject.java index 106cb3609..463cb99f5 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisUpdateProject.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisUpdateProject.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; import com.volmit.iris.util.*; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisUpdateWorld.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisUpdateWorld.java similarity index 96% rename from src/main/java/com/volmit/iris/command/CommandIrisUpdateWorld.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisUpdateWorld.java index 8204c3125..f484368b2 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisUpdateWorld.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisUpdateWorld.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import java.io.File; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisWhat.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisWhat.java similarity index 95% rename from src/main/java/com/volmit/iris/command/CommandIrisWhat.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisWhat.java index b3ac55060..3ec752393 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisWhat.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisWhat.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; import com.volmit.iris.util.Command; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisWhatBiome.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisWhatBiome.java similarity index 79% rename from src/main/java/com/volmit/iris/command/CommandIrisWhatBiome.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisWhatBiome.java index c813b0bb6..105ca0575 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisWhatBiome.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisWhatBiome.java @@ -1,15 +1,14 @@ -package com.volmit.iris.command; - -import com.volmit.iris.util.KList; -import org.bukkit.World; -import org.bukkit.entity.Player; +package com.volmit.iris.manager.command; import com.volmit.iris.Iris; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.scaffold.IrisWorlds; import com.volmit.iris.object.IrisBiome; +import com.volmit.iris.scaffold.IrisWorlds; +import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; +import org.bukkit.World; +import org.bukkit.entity.Player; public class CommandIrisWhatBiome extends MortarCommand { @@ -38,8 +37,8 @@ public class CommandIrisWhatBiome extends MortarCommand try { - IrisTerrainProvider g = IrisWorlds.getProvider(w); - IrisBiome b = g.sampleTrueBiome(p.getLocation().getBlockX(), p.getLocation().getBlockY(), p.getLocation().getBlockZ()); + IrisAccess g = IrisWorlds.access(w); + IrisBiome b = g.getBiome(p.getLocation().getBlockX(), p.getLocation().getBlockY(), p.getLocation().getBlockZ()); sender.sendMessage("IBiome: " + b.getLoadKey() + " (" + b.getDerivative().name() + ")"); } diff --git a/src/main/java/com/volmit/iris/command/CommandIrisWhatBlock.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisWhatBlock.java similarity index 97% rename from src/main/java/com/volmit/iris/command/CommandIrisWhatBlock.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisWhatBlock.java index 9fa301029..67eab2494 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisWhatBlock.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisWhatBlock.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.util.*; import org.bukkit.FluidCollisionMode; diff --git a/src/main/java/com/volmit/iris/command/CommandIrisWhatHand.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisWhatHand.java similarity index 97% rename from src/main/java/com/volmit/iris/command/CommandIrisWhatHand.java rename to src/main/java/com/volmit/iris/manager/command/CommandIrisWhatHand.java index 8de9fd902..c5fe3ed8c 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisWhatHand.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisWhatHand.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.util.KList; import org.bukkit.Material; diff --git a/src/main/java/com/volmit/iris/command/PermissionIris.java b/src/main/java/com/volmit/iris/manager/command/PermissionIris.java similarity index 91% rename from src/main/java/com/volmit/iris/command/PermissionIris.java rename to src/main/java/com/volmit/iris/manager/command/PermissionIris.java index fd7701481..94c7571c9 100644 --- a/src/main/java/com/volmit/iris/command/PermissionIris.java +++ b/src/main/java/com/volmit/iris/manager/command/PermissionIris.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.util.MortarPermission; import com.volmit.iris.util.Permission; diff --git a/src/main/java/com/volmit/iris/command/PermissionIrisStudio.java b/src/main/java/com/volmit/iris/manager/command/PermissionIrisStudio.java similarity index 90% rename from src/main/java/com/volmit/iris/command/PermissionIrisStudio.java rename to src/main/java/com/volmit/iris/manager/command/PermissionIrisStudio.java index 03a9df808..ecc0d912e 100644 --- a/src/main/java/com/volmit/iris/command/PermissionIrisStudio.java +++ b/src/main/java/com/volmit/iris/manager/command/PermissionIrisStudio.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command; +package com.volmit.iris.manager.command; import com.volmit.iris.util.MortarPermission; diff --git a/src/main/java/com/volmit/iris/edit/BlockEditor.java b/src/main/java/com/volmit/iris/manager/edit/BlockEditor.java similarity index 92% rename from src/main/java/com/volmit/iris/edit/BlockEditor.java rename to src/main/java/com/volmit/iris/manager/edit/BlockEditor.java index acdbbe708..29a208321 100644 --- a/src/main/java/com/volmit/iris/edit/BlockEditor.java +++ b/src/main/java/com/volmit/iris/manager/edit/BlockEditor.java @@ -1,4 +1,4 @@ -package com.volmit.iris.edit; +package com.volmit.iris.manager.edit; import java.io.Closeable; diff --git a/src/main/java/com/volmit/iris/manager/BlockSignal.java b/src/main/java/com/volmit/iris/manager/edit/BlockSignal.java similarity index 93% rename from src/main/java/com/volmit/iris/manager/BlockSignal.java rename to src/main/java/com/volmit/iris/manager/edit/BlockSignal.java index aee0235c1..e5e5b0aaa 100644 --- a/src/main/java/com/volmit/iris/manager/BlockSignal.java +++ b/src/main/java/com/volmit/iris/manager/edit/BlockSignal.java @@ -1,7 +1,7 @@ -package com.volmit.iris.manager; +package com.volmit.iris.manager.edit; import com.volmit.iris.util.J; -import com.volmit.iris.v2.scaffold.parallel.MultiBurst; +import com.volmit.iris.scaffold.parallel.MultiBurst; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/edit/BukkitBlockEditor.java b/src/main/java/com/volmit/iris/manager/edit/BukkitBlockEditor.java similarity index 96% rename from src/main/java/com/volmit/iris/edit/BukkitBlockEditor.java rename to src/main/java/com/volmit/iris/manager/edit/BukkitBlockEditor.java index 20f07e71f..6f1e04a3c 100644 --- a/src/main/java/com/volmit/iris/edit/BukkitBlockEditor.java +++ b/src/main/java/com/volmit/iris/manager/edit/BukkitBlockEditor.java @@ -1,4 +1,4 @@ -package com.volmit.iris.edit; +package com.volmit.iris.manager.edit; import org.bukkit.World; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/manager/DustRevealer.java b/src/main/java/com/volmit/iris/manager/edit/DustRevealer.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/DustRevealer.java rename to src/main/java/com/volmit/iris/manager/edit/DustRevealer.java index 20c6236d1..4a49444cb 100644 --- a/src/main/java/com/volmit/iris/manager/DustRevealer.java +++ b/src/main/java/com/volmit/iris/manager/edit/DustRevealer.java @@ -1,11 +1,11 @@ -package com.volmit.iris.manager; +package com.volmit.iris.manager.edit; import com.volmit.iris.util.BlockPosition; import com.volmit.iris.util.J; import com.volmit.iris.util.KList; import com.volmit.iris.util.RNG; -import com.volmit.iris.v2.scaffold.engine.EngineCompositeGenerator; -import com.volmit.iris.v2.scaffold.parallax.ParallaxAccess; +import com.volmit.iris.scaffold.engine.EngineCompositeGenerator; +import com.volmit.iris.scaffold.parallax.ParallaxAccess; import lombok.Data; import org.bukkit.World; import org.bukkit.block.Block; diff --git a/src/main/java/com/volmit/iris/edit/WEBlockEditor.java b/src/main/java/com/volmit/iris/manager/edit/WEBlockEditor.java similarity index 97% rename from src/main/java/com/volmit/iris/edit/WEBlockEditor.java rename to src/main/java/com/volmit/iris/manager/edit/WEBlockEditor.java index 4a7a39464..5c939a47c 100644 --- a/src/main/java/com/volmit/iris/edit/WEBlockEditor.java +++ b/src/main/java/com/volmit/iris/manager/edit/WEBlockEditor.java @@ -1,4 +1,4 @@ -package com.volmit.iris.edit; +package com.volmit.iris.manager.edit; import org.bukkit.World; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/gui/IrisRenderer.java b/src/main/java/com/volmit/iris/manager/gui/IrisRenderer.java similarity index 95% rename from src/main/java/com/volmit/iris/gui/IrisRenderer.java rename to src/main/java/com/volmit/iris/manager/gui/IrisRenderer.java index cb9d30f3b..823a66cc7 100644 --- a/src/main/java/com/volmit/iris/gui/IrisRenderer.java +++ b/src/main/java/com/volmit/iris/manager/gui/IrisRenderer.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gui; +package com.volmit.iris.manager.gui; import java.awt.image.BufferedImage; diff --git a/src/main/java/com/volmit/iris/gui/IrisVision.java b/src/main/java/com/volmit/iris/manager/gui/IrisVision.java similarity index 91% rename from src/main/java/com/volmit/iris/gui/IrisVision.java rename to src/main/java/com/volmit/iris/manager/gui/IrisVision.java index 772c0756e..2c3fca4e6 100644 --- a/src/main/java/com/volmit/iris/gui/IrisVision.java +++ b/src/main/java/com/volmit/iris/manager/gui/IrisVision.java @@ -1,10 +1,12 @@ -package com.volmit.iris.gui; +package com.volmit.iris.manager.gui; -import java.awt.Color; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Image; -import java.awt.Point; +import com.volmit.iris.Iris; +import com.volmit.iris.generator.legacy.IrisTerrainProvider; +import com.volmit.iris.util.*; + +import javax.imageio.ImageIO; +import javax.swing.*; +import java.awt.*; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionListener; import java.awt.event.MouseWheelEvent; @@ -17,20 +19,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; -import javax.imageio.ImageIO; -import javax.swing.JFrame; -import javax.swing.JPanel; - -import com.volmit.iris.Iris; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.util.BlockPosition; -import com.volmit.iris.util.J; -import com.volmit.iris.util.KMap; -import com.volmit.iris.util.KSet; -import com.volmit.iris.util.O; -import com.volmit.iris.util.PrecisionStopwatch; -import com.volmit.iris.util.RollingSequence; - public class IrisVision extends JPanel implements MouseWheelListener { private static final long serialVersionUID = 2094606939770332040L; @@ -214,13 +202,14 @@ public class IrisVision extends JPanel implements MouseWheelListener ozp += Math.abs(ozp - oz) * 0.36; } - if(lid != Iris.proj.getActiveProject().getActiveProvider().getCacheID()) + // TODO: DETECT HOTLOADS + if(false) { working.clear(); workingfast.clear(); positions.clear(); fastpositions.clear(); - lid = Iris.proj.getActiveProject().getActiveProvider().getCacheID(); + //TODO: lid = Iris.proj.getActiveProject().getActiveProvider().getCacheID(); Iris.info("Hotloading Vision"); } diff --git a/src/main/java/com/volmit/iris/gui/NoiseExplorer.java b/src/main/java/com/volmit/iris/manager/gui/NoiseExplorer.java similarity index 99% rename from src/main/java/com/volmit/iris/gui/NoiseExplorer.java rename to src/main/java/com/volmit/iris/manager/gui/NoiseExplorer.java index 7c649fbbd..8da6adac6 100644 --- a/src/main/java/com/volmit/iris/gui/NoiseExplorer.java +++ b/src/main/java/com/volmit/iris/manager/gui/NoiseExplorer.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gui; +package com.volmit.iris.manager.gui; import java.awt.Color; import java.awt.Dimension; @@ -27,7 +27,7 @@ import javax.swing.JPanel; import javax.swing.JViewport; import com.volmit.iris.Iris; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.object.NoiseStyle; import com.volmit.iris.util.Function2; import com.volmit.iris.util.GroupedExecutor; diff --git a/src/main/java/com/volmit/iris/gui/PregenGui.java b/src/main/java/com/volmit/iris/manager/gui/PregenGui.java similarity index 99% rename from src/main/java/com/volmit/iris/gui/PregenGui.java rename to src/main/java/com/volmit/iris/manager/gui/PregenGui.java index 5a2e38f45..5dddc9748 100644 --- a/src/main/java/com/volmit/iris/gui/PregenGui.java +++ b/src/main/java/com/volmit/iris/manager/gui/PregenGui.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gui; +package com.volmit.iris.manager.gui; import java.awt.Color; import java.awt.Font; diff --git a/src/main/java/com/volmit/iris/gui/Renderer.java b/src/main/java/com/volmit/iris/manager/gui/Renderer.java similarity index 75% rename from src/main/java/com/volmit/iris/gui/Renderer.java rename to src/main/java/com/volmit/iris/manager/gui/Renderer.java index 218cd0772..4a89c1f3d 100644 --- a/src/main/java/com/volmit/iris/gui/Renderer.java +++ b/src/main/java/com/volmit/iris/manager/gui/Renderer.java @@ -1,4 +1,4 @@ -package com.volmit.iris.gui; +package com.volmit.iris.manager.gui; import java.awt.Color; diff --git a/src/main/java/com/volmit/iris/link/BKLink.java b/src/main/java/com/volmit/iris/manager/link/BKLink.java similarity index 93% rename from src/main/java/com/volmit/iris/link/BKLink.java rename to src/main/java/com/volmit/iris/manager/link/BKLink.java index bb53a8bff..461577c81 100644 --- a/src/main/java/com/volmit/iris/link/BKLink.java +++ b/src/main/java/com/volmit/iris/manager/link/BKLink.java @@ -1,4 +1,4 @@ -package com.volmit.iris.link; +package com.volmit.iris.manager.link; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/com/volmit/iris/link/CitizensLink.java b/src/main/java/com/volmit/iris/manager/link/CitizensLink.java similarity index 93% rename from src/main/java/com/volmit/iris/link/CitizensLink.java rename to src/main/java/com/volmit/iris/manager/link/CitizensLink.java index db04ca729..5aaf227ec 100644 --- a/src/main/java/com/volmit/iris/link/CitizensLink.java +++ b/src/main/java/com/volmit/iris/manager/link/CitizensLink.java @@ -1,4 +1,4 @@ -package com.volmit.iris.link; +package com.volmit.iris.manager.link; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; diff --git a/src/main/java/com/volmit/iris/link/MultiverseCoreLink.java b/src/main/java/com/volmit/iris/manager/link/MultiverseCoreLink.java similarity index 98% rename from src/main/java/com/volmit/iris/link/MultiverseCoreLink.java rename to src/main/java/com/volmit/iris/manager/link/MultiverseCoreLink.java index 7cc6a5c88..541815809 100644 --- a/src/main/java/com/volmit/iris/link/MultiverseCoreLink.java +++ b/src/main/java/com/volmit/iris/manager/link/MultiverseCoreLink.java @@ -1,4 +1,4 @@ -package com.volmit.iris.link; +package com.volmit.iris.manager.link; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/src/main/java/com/volmit/iris/link/MythicMobsLink.java b/src/main/java/com/volmit/iris/manager/link/MythicMobsLink.java similarity index 96% rename from src/main/java/com/volmit/iris/link/MythicMobsLink.java rename to src/main/java/com/volmit/iris/manager/link/MythicMobsLink.java index 0f26ec1fa..2d5dd9d53 100644 --- a/src/main/java/com/volmit/iris/link/MythicMobsLink.java +++ b/src/main/java/com/volmit/iris/manager/link/MythicMobsLink.java @@ -1,4 +1,4 @@ -package com.volmit.iris.link; +package com.volmit.iris.manager.link; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/structure/StructureTemplate.java b/src/main/java/com/volmit/iris/manager/structure/StructureTemplate.java similarity index 99% rename from src/main/java/com/volmit/iris/structure/StructureTemplate.java rename to src/main/java/com/volmit/iris/manager/structure/StructureTemplate.java index 5944eb8ae..25611ab88 100644 --- a/src/main/java/com/volmit/iris/structure/StructureTemplate.java +++ b/src/main/java/com/volmit/iris/manager/structure/StructureTemplate.java @@ -1,4 +1,4 @@ -package com.volmit.iris.structure; +package com.volmit.iris.manager.structure; import java.io.File; import java.util.Iterator; @@ -31,7 +31,7 @@ import org.bukkit.util.BlockVector; import com.google.gson.Gson; import com.volmit.iris.Iris; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.object.IrisObject; import com.volmit.iris.object.IrisStructure; import com.volmit.iris.object.IrisStructureTile; diff --git a/src/main/java/com/volmit/iris/object/IrisBiome.java b/src/main/java/com/volmit/iris/object/IrisBiome.java index 735d7c8bd..7aa800e84 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiome.java +++ b/src/main/java/com/volmit/iris/object/IrisBiome.java @@ -5,11 +5,11 @@ import java.awt.Color; import org.bukkit.block.Biome; import com.volmit.iris.Iris; -import com.volmit.iris.gen.ContextualTerrainProvider; -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.v2.scaffold.data.DataProvider; +import com.volmit.iris.generator.legacy.ContextualTerrainProvider; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; +import com.volmit.iris.scaffold.data.DataProvider; import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.B; import com.volmit.iris.util.DependsOn; diff --git a/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java b/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java index 3cdc07893..8ae72f4f2 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java +++ b/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java @@ -1,8 +1,8 @@ package com.volmit.iris.object; import com.volmit.iris.Iris; -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.v2.scaffold.data.DataProvider; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; +import com.volmit.iris.scaffold.data.DataProvider; import com.volmit.iris.util.DependsOn; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; diff --git a/src/main/java/com/volmit/iris/object/IrisBiomeMutation.java b/src/main/java/com/volmit/iris/object/IrisBiomeMutation.java index 61c47252a..4510d35b9 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiomeMutation.java +++ b/src/main/java/com/volmit/iris/object/IrisBiomeMutation.java @@ -1,7 +1,6 @@ package com.volmit.iris.object; -import com.volmit.iris.gen.ContextualTerrainProvider; -import com.volmit.iris.gen.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; @@ -13,7 +12,7 @@ import com.volmit.iris.util.RegistryListBiome; import com.volmit.iris.util.RegistryListObject; import com.volmit.iris.util.Required; -import com.volmit.iris.v2.scaffold.data.DataProvider; +import com.volmit.iris.scaffold.data.DataProvider; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java b/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java index 9154f0a94..4b7a8374b 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java +++ b/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java @@ -1,8 +1,8 @@ package com.volmit.iris.object; -import com.volmit.iris.gen.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.DependsOn; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/IrisBlockData.java b/src/main/java/com/volmit/iris/object/IrisBlockData.java index c064184d3..43c132e66 100644 --- a/src/main/java/com/volmit/iris/object/IrisBlockData.java +++ b/src/main/java/com/volmit/iris/object/IrisBlockData.java @@ -1,7 +1,7 @@ package com.volmit.iris.object; import com.volmit.iris.Iris; -import com.volmit.iris.gen.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.util.B; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/IrisBlockDrops.java b/src/main/java/com/volmit/iris/object/IrisBlockDrops.java index 0fc808e40..4524519cc 100644 --- a/src/main/java/com/volmit/iris/object/IrisBlockDrops.java +++ b/src/main/java/com/volmit/iris/object/IrisBlockDrops.java @@ -3,7 +3,7 @@ package com.volmit.iris.object; import org.bukkit.block.data.BlockData; import org.bukkit.inventory.ItemStack; -import com.volmit.iris.gen.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/IrisCarveLayer.java b/src/main/java/com/volmit/iris/object/IrisCarveLayer.java index 161916148..8276fc4d7 100644 --- a/src/main/java/com/volmit/iris/object/IrisCarveLayer.java +++ b/src/main/java/com/volmit/iris/object/IrisCarveLayer.java @@ -1,7 +1,7 @@ package com.volmit.iris.object; -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; import com.volmit.iris.util.IrisInterpolation; diff --git a/src/main/java/com/volmit/iris/object/IrisCaveFluid.java b/src/main/java/com/volmit/iris/object/IrisCaveFluid.java index 259de712d..c1a7eb9ea 100644 --- a/src/main/java/com/volmit/iris/object/IrisCaveFluid.java +++ b/src/main/java/com/volmit/iris/object/IrisCaveFluid.java @@ -1,6 +1,6 @@ package com.volmit.iris.object; -import com.volmit.iris.gen.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.util.B; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/IrisCompatabilityBlockFilter.java b/src/main/java/com/volmit/iris/object/IrisCompatabilityBlockFilter.java index c662fb955..628ae3fd8 100644 --- a/src/main/java/com/volmit/iris/object/IrisCompatabilityBlockFilter.java +++ b/src/main/java/com/volmit/iris/object/IrisCompatabilityBlockFilter.java @@ -1,7 +1,7 @@ package com.volmit.iris.object; import com.volmit.iris.Iris; -import com.volmit.iris.gen.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; import com.volmit.iris.util.B; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; diff --git a/src/main/java/com/volmit/iris/object/IrisCompatabilityItemFilter.java b/src/main/java/com/volmit/iris/object/IrisCompatabilityItemFilter.java index 0a2b4c102..f2bef3233 100644 --- a/src/main/java/com/volmit/iris/object/IrisCompatabilityItemFilter.java +++ b/src/main/java/com/volmit/iris/object/IrisCompatabilityItemFilter.java @@ -3,7 +3,7 @@ package com.volmit.iris.object; import org.bukkit.Material; import com.volmit.iris.Iris; -import com.volmit.iris.gen.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; import com.volmit.iris.util.B; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; diff --git a/src/main/java/com/volmit/iris/object/IrisDecorator.java b/src/main/java/com/volmit/iris/object/IrisDecorator.java index d7819bc8c..e39c753e9 100644 --- a/src/main/java/com/volmit/iris/object/IrisDecorator.java +++ b/src/main/java/com/volmit/iris/object/IrisDecorator.java @@ -1,9 +1,9 @@ package com.volmit.iris.object; import com.volmit.iris.Iris; -import com.volmit.iris.gen.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.DependsOn; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java b/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java index cd03fc272..be31ccf87 100644 --- a/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java +++ b/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java @@ -5,8 +5,8 @@ import org.bukkit.block.data.BlockData; import org.bukkit.generator.ChunkGenerator.ChunkData; import org.bukkit.util.BlockVector; -import com.volmit.iris.gen.TopographicTerrainProvider; -import com.volmit.iris.gen.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.TopographicTerrainProvider; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.B; diff --git a/src/main/java/com/volmit/iris/object/IrisDimension.java b/src/main/java/com/volmit/iris/object/IrisDimension.java index c73a10705..abf0214dd 100644 --- a/src/main/java/com/volmit/iris/object/IrisDimension.java +++ b/src/main/java/com/volmit/iris/object/IrisDimension.java @@ -1,16 +1,15 @@ package com.volmit.iris.object; -import net.royawesome.jlibnoise.Noise; import org.bukkit.Material; import org.bukkit.World.Environment; import org.bukkit.block.data.BlockData; import org.bukkit.util.BlockVector; import com.volmit.iris.Iris; -import com.volmit.iris.gen.ContextualTerrainProvider; -import com.volmit.iris.gen.ParallelTerrainProvider; -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.legacy.ContextualTerrainProvider; +import com.volmit.iris.generator.legacy.ParallelTerrainProvider; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.ChunkPosition; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/IrisEffect.java b/src/main/java/com/volmit/iris/object/IrisEffect.java index da5b84da5..00a491c1b 100644 --- a/src/main/java/com/volmit/iris/object/IrisEffect.java +++ b/src/main/java/com/volmit/iris/object/IrisEffect.java @@ -8,8 +8,8 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import com.volmit.iris.Iris; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.IrisTerrainProvider; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; import com.volmit.iris.util.ChronoLatch; import com.volmit.iris.util.DependsOn; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/IrisEntity.java b/src/main/java/com/volmit/iris/object/IrisEntity.java index 19eeec94c..856f55351 100644 --- a/src/main/java/com/volmit/iris/object/IrisEntity.java +++ b/src/main/java/com/volmit/iris/object/IrisEntity.java @@ -1,17 +1,17 @@ package com.volmit.iris.object; -import java.util.Collection; -import java.util.Random; - +import com.volmit.iris.Iris; +import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.util.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; import org.bukkit.Location; import org.bukkit.NamespacedKey; import org.bukkit.attribute.Attributable; -import org.bukkit.entity.Ageable; -import org.bukkit.entity.Entity; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Mob; -import org.bukkit.entity.Panda; +import org.bukkit.entity.*; import org.bukkit.entity.Panda.Gene; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; @@ -19,22 +19,8 @@ import org.bukkit.loot.LootContext; import org.bukkit.loot.LootTable; import org.bukkit.loot.Lootable; -import com.volmit.iris.Iris; -import com.volmit.iris.gen.ParallaxTerrainProvider; -import com.volmit.iris.util.ArrayType; -import com.volmit.iris.util.C; -import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; -import com.volmit.iris.util.KList; -import com.volmit.iris.util.RNG; -import com.volmit.iris.util.RegistryListMythical; -import com.volmit.iris.util.Required; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; +import java.util.Collection; +import java.util.Random; @Accessors(chain = true) @NoArgsConstructor @@ -149,12 +135,12 @@ public class IrisEntity extends IrisRegistrant @Desc("The this entity is ageable, set it's baby status") private boolean baby = false; - public Entity spawn(ParallaxTerrainProvider gen, Location at) + public Entity spawn(IrisAccess gen, Location at) { return spawn(gen, at, new RNG(at.hashCode())); } - public Entity spawn(ParallaxTerrainProvider gen, Location at, RNG rng) + public Entity spawn(IrisAccess gen, Location at, RNG rng) { Entity e = doSpawn(at); e.setCustomName(getCustomName() != null ? C.translateAlternateColorCodes('&', getCustomName()) : null); @@ -202,7 +188,7 @@ public class IrisEntity extends IrisRegistrant for(String fi : getLoot().getTables()) { IrisLootTable i = gen.getData().getLootLoader().load(fi); - items.addAll(i.getLoot(gen.isDev(), false, rng.nextParallelRNG(345911), InventorySlotType.STORAGE, at.getBlockX(), at.getBlockY(), at.getBlockZ(), 8, 4)); + items.addAll(i.getLoot(gen.isStudio(), false, rng.nextParallelRNG(345911), InventorySlotType.STORAGE, at.getBlockX(), at.getBlockY(), at.getBlockZ(), 8, 4)); } return items; @@ -216,7 +202,7 @@ public class IrisEntity extends IrisRegistrant inventory.addItem(i); } - gen.getGlUpdate().scramble(inventory, rng); + gen.getCompound().getEngine(at.getBlockY()).scramble(inventory, rng); } }); } @@ -237,32 +223,32 @@ public class IrisEntity extends IrisRegistrant if(getHelmet() != null && rng.i(1, getHelmet().getRarity()) == 1) { - l.getEquipment().setHelmet(getHelmet().get(gen.isDev(), rng)); + l.getEquipment().setHelmet(getHelmet().get(gen.isStudio(), rng)); } if(getChestplate() != null && rng.i(1, getChestplate().getRarity()) == 1) { - l.getEquipment().setChestplate(getChestplate().get(gen.isDev(), rng)); + l.getEquipment().setChestplate(getChestplate().get(gen.isStudio(), rng)); } if(getLeggings() != null && rng.i(1, getLeggings().getRarity()) == 1) { - l.getEquipment().setLeggings(getLeggings().get(gen.isDev(), rng)); + l.getEquipment().setLeggings(getLeggings().get(gen.isStudio(), rng)); } if(getBoots() != null && rng.i(1, getBoots().getRarity()) == 1) { - l.getEquipment().setBoots(getBoots().get(gen.isDev(), rng)); + l.getEquipment().setBoots(getBoots().get(gen.isStudio(), rng)); } if(getMainHand() != null && rng.i(1, getMainHand().getRarity()) == 1) { - l.getEquipment().setItemInMainHand(getMainHand().get(gen.isDev(), rng)); + l.getEquipment().setItemInMainHand(getMainHand().get(gen.isStudio(), rng)); } if(getOffHand() != null && rng.i(1, getOffHand().getRarity()) == 1) { - l.getEquipment().setItemInOffHand(getOffHand().get(gen.isDev(), rng)); + l.getEquipment().setItemInOffHand(getOffHand().get(gen.isStudio(), rng)); } } diff --git a/src/main/java/com/volmit/iris/object/IrisEntityInitialSpawn.java b/src/main/java/com/volmit/iris/object/IrisEntityInitialSpawn.java index 2cc77dfd7..d3b674357 100644 --- a/src/main/java/com/volmit/iris/object/IrisEntityInitialSpawn.java +++ b/src/main/java/com/volmit/iris/object/IrisEntityInitialSpawn.java @@ -1,22 +1,15 @@ package com.volmit.iris.object; -import org.bukkit.Chunk; -import org.bukkit.Location; -import org.bukkit.entity.Entity; - -import com.volmit.iris.gen.ParallaxTerrainProvider; -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; -import com.volmit.iris.util.MinNumber; -import com.volmit.iris.util.RNG; -import com.volmit.iris.util.RegistryListEntity; -import com.volmit.iris.util.Required; - +import com.volmit.iris.generator.legacy.atomics.AtomicCache; +import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import org.bukkit.Chunk; +import org.bukkit.Location; +import org.bukkit.entity.Entity; @Accessors(chain = true) @NoArgsConstructor @@ -50,7 +43,7 @@ public class IrisEntityInitialSpawn private final transient AtomicCache rng = new AtomicCache<>(); private final transient AtomicCache ent = new AtomicCache<>(); - public void spawn(ParallaxTerrainProvider gen, Chunk c, RNG rng) + public void spawn(IrisAccess gen, Chunk c, RNG rng) { int spawns = rng.i(1, rarity) == 1 ? rng.i(minSpawns, maxSpawns) : 0; @@ -60,25 +53,25 @@ public class IrisEntityInitialSpawn { int x = (c.getX() * 16) + rng.i(15); int z = (c.getZ() * 16) + rng.i(15); - int h = gen.getCarvedHeight(x, z, false); + int h = gen.getHeight(x, 0, z); spawn100(gen, new Location(c.getWorld(), x, h, z)); } } } - public IrisEntity getRealEntity(ParallaxTerrainProvider g) + public IrisEntity getRealEntity(IrisAccess g) { return ent.aquire(() -> g.getData().getEntityLoader().load(getEntity())); } - public Entity spawn(ParallaxTerrainProvider g, Location at) + public Entity spawn(IrisAccess g, Location at) { if(getRealEntity(g) == null) { return null; } - if(rng.aquire(() -> new RNG(g.getTarget().getSeed() + 4)).i(1, getRarity()) == 1) + if(rng.aquire(() -> new RNG(g.getTarget().getWorld().getSeed() + 4)).i(1, getRarity()) == 1) { return spawn100(g, at); } @@ -86,8 +79,8 @@ public class IrisEntityInitialSpawn return null; } - private Entity spawn100(ParallaxTerrainProvider g, Location at) + private Entity spawn100(IrisAccess g, Location at) { - return getRealEntity(g).spawn(g, at.clone().add(0, 1, 0), rng.aquire(() -> new RNG(g.getTarget().getSeed() + 4))); + return getRealEntity(g).spawn(g, at.clone().add(0, 1, 0), rng.aquire(() -> new RNG(g.getTarget().getWorld().getSeed() + 4))); } } diff --git a/src/main/java/com/volmit/iris/object/IrisEntitySpawnOverride.java b/src/main/java/com/volmit/iris/object/IrisEntitySpawnOverride.java index 30c8ba500..71720b8ab 100644 --- a/src/main/java/com/volmit/iris/object/IrisEntitySpawnOverride.java +++ b/src/main/java/com/volmit/iris/object/IrisEntitySpawnOverride.java @@ -1,23 +1,16 @@ package com.volmit.iris.object; -import org.bukkit.Location; -import org.bukkit.entity.Entity; -import org.bukkit.entity.EntityType; -import org.bukkit.event.entity.EntitySpawnEvent; - -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; -import com.volmit.iris.util.MinNumber; -import com.volmit.iris.util.RNG; -import com.volmit.iris.util.RegistryListEntity; -import com.volmit.iris.util.Required; - +import com.volmit.iris.generator.legacy.atomics.AtomicCache; +import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import org.bukkit.Location; +import org.bukkit.entity.Entity; +import org.bukkit.entity.EntityType; +import org.bukkit.event.entity.EntitySpawnEvent; @Accessors(chain = true) @NoArgsConstructor @@ -54,7 +47,7 @@ public class IrisEntitySpawnOverride private final transient AtomicCache ent = new AtomicCache<>(); - public Entity on(IrisTerrainProvider g, Location at, EntityType t, EntitySpawnEvent ee) + public Entity on(IrisAccess g, Location at, EntityType t, EntitySpawnEvent ee) { if(!trigger.equals(EntityType.UNKNOWN)) { @@ -75,23 +68,23 @@ public class IrisEntitySpawnOverride return e; } - public IrisEntity getRealEntity(IrisTerrainProvider g) - { - return ent.aquire(() -> g.getData().getEntityLoader().load(getEntity())); - } - - public Entity spawn(IrisTerrainProvider g, Location at) + public Entity spawn(IrisAccess g, Location at) { if(getRealEntity(g) == null) { return null; } - if(rng.aquire(() -> new RNG(g.getTarget().getSeed() + 4)).i(1, getRarity()) == 1) + if(rng.aquire(() -> new RNG(g.getTarget().getWorld().getSeed() + 4)).i(1, getRarity()) == 1) { - return getRealEntity(g).spawn(g, at, rng.aquire(() -> new RNG(g.getTarget().getSeed() + 4))); + return getRealEntity(g).spawn(g, at, rng.aquire(() -> new RNG(g.getTarget().getWorld().getSeed() + 4))); } return null; } + + public IrisEntity getRealEntity(IrisAccess g) + { + return ent.aquire(() -> g.getData().getEntityLoader().load(getEntity())); + } } diff --git a/src/main/java/com/volmit/iris/object/IrisGenerator.java b/src/main/java/com/volmit/iris/object/IrisGenerator.java index 5913d966b..f5218d8a1 100644 --- a/src/main/java/com/volmit/iris/object/IrisGenerator.java +++ b/src/main/java/com/volmit/iris/object/IrisGenerator.java @@ -3,8 +3,8 @@ package com.volmit.iris.object; import java.util.List; import com.volmit.iris.Iris; -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.noise.CellGenerator; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; +import com.volmit.iris.generator.noise.CellGenerator; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; diff --git a/src/main/java/com/volmit/iris/object/IrisGeneratorStyle.java b/src/main/java/com/volmit/iris/object/IrisGeneratorStyle.java index b50b74827..68ea9414c 100644 --- a/src/main/java/com/volmit/iris/object/IrisGeneratorStyle.java +++ b/src/main/java/com/volmit/iris/object/IrisGeneratorStyle.java @@ -1,7 +1,7 @@ package com.volmit.iris.object; -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; import com.volmit.iris.util.MaxNumber; diff --git a/src/main/java/com/volmit/iris/object/IrisLoot.java b/src/main/java/com/volmit/iris/object/IrisLoot.java index 6928152f7..8b0dfcf08 100644 --- a/src/main/java/com/volmit/iris/object/IrisLoot.java +++ b/src/main/java/com/volmit/iris/object/IrisLoot.java @@ -12,8 +12,8 @@ import org.bukkit.inventory.meta.LeatherArmorMeta; import org.bukkit.material.Colorable; import com.volmit.iris.Iris; -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.B; import com.volmit.iris.util.C; diff --git a/src/main/java/com/volmit/iris/object/IrisLootReference.java b/src/main/java/com/volmit/iris/object/IrisLootReference.java index f1ebeef52..280dbd96a 100644 --- a/src/main/java/com/volmit/iris/object/IrisLootReference.java +++ b/src/main/java/com/volmit/iris/object/IrisLootReference.java @@ -1,7 +1,6 @@ package com.volmit.iris.object; -import com.volmit.iris.gen.DimensionalTerrainProvider; -import com.volmit.iris.gen.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; @@ -9,7 +8,7 @@ import com.volmit.iris.util.KList; import com.volmit.iris.util.MinNumber; import com.volmit.iris.util.RegistryListLoot; -import com.volmit.iris.v2.scaffold.data.DataProvider; +import com.volmit.iris.scaffold.data.DataProvider; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/object/IrisMaterialPalette.java b/src/main/java/com/volmit/iris/object/IrisMaterialPalette.java index 8ecd3a7ab..f682b258b 100644 --- a/src/main/java/com/volmit/iris/object/IrisMaterialPalette.java +++ b/src/main/java/com/volmit/iris/object/IrisMaterialPalette.java @@ -1,8 +1,8 @@ package com.volmit.iris.object; -import com.volmit.iris.gen.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; diff --git a/src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java b/src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java index 07d11e1c0..9459996de 100644 --- a/src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java +++ b/src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java @@ -1,7 +1,7 @@ package com.volmit.iris.object; -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; diff --git a/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java b/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java index 60d9efbd2..cacea8c8f 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java @@ -1,8 +1,8 @@ package com.volmit.iris.object; import com.volmit.iris.Iris; -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; @@ -12,7 +12,7 @@ import com.volmit.iris.util.MinNumber; import com.volmit.iris.util.RNG; import com.volmit.iris.util.RegistryListObject; import com.volmit.iris.util.Required; -import com.volmit.iris.v2.scaffold.data.DataProvider; +import com.volmit.iris.scaffold.data.DataProvider; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisObjectReplace.java b/src/main/java/com/volmit/iris/object/IrisObjectReplace.java index 7f45c3b3e..2aaf1601c 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectReplace.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectReplace.java @@ -1,8 +1,8 @@ package com.volmit.iris.object; -import com.volmit.iris.gen.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; diff --git a/src/main/java/com/volmit/iris/object/IrisPotionEffect.java b/src/main/java/com/volmit/iris/object/IrisPotionEffect.java index 379b92267..97381920f 100644 --- a/src/main/java/com/volmit/iris/object/IrisPotionEffect.java +++ b/src/main/java/com/volmit/iris/object/IrisPotionEffect.java @@ -5,7 +5,7 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import com.volmit.iris.Iris; -import com.volmit.iris.gen.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; import com.volmit.iris.util.MaxNumber; diff --git a/src/main/java/com/volmit/iris/object/IrisRegion.java b/src/main/java/com/volmit/iris/object/IrisRegion.java index 51df78e9f..e505c84d1 100644 --- a/src/main/java/com/volmit/iris/object/IrisRegion.java +++ b/src/main/java/com/volmit/iris/object/IrisRegion.java @@ -1,9 +1,9 @@ package com.volmit.iris.object; import com.volmit.iris.Iris; -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.v2.scaffold.data.DataProvider; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; +import com.volmit.iris.scaffold.data.DataProvider; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; diff --git a/src/main/java/com/volmit/iris/object/IrisRegionRidge.java b/src/main/java/com/volmit/iris/object/IrisRegionRidge.java index 40a318636..bf3cefd9d 100644 --- a/src/main/java/com/volmit/iris/object/IrisRegionRidge.java +++ b/src/main/java/com/volmit/iris/object/IrisRegionRidge.java @@ -1,7 +1,7 @@ package com.volmit.iris.object; -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.noise.CellGenerator; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; +import com.volmit.iris.generator.noise.CellGenerator; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; import com.volmit.iris.util.MaxNumber; diff --git a/src/main/java/com/volmit/iris/object/IrisRegionSpot.java b/src/main/java/com/volmit/iris/object/IrisRegionSpot.java index d77a8492f..98314c431 100644 --- a/src/main/java/com/volmit/iris/object/IrisRegionSpot.java +++ b/src/main/java/com/volmit/iris/object/IrisRegionSpot.java @@ -1,7 +1,7 @@ package com.volmit.iris.object; -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.noise.CellGenerator; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; +import com.volmit.iris.generator.noise.CellGenerator; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; import com.volmit.iris.util.MinNumber; diff --git a/src/main/java/com/volmit/iris/object/IrisStructure.java b/src/main/java/com/volmit/iris/object/IrisStructure.java index 616a35fed..d879d66f9 100644 --- a/src/main/java/com/volmit/iris/object/IrisStructure.java +++ b/src/main/java/com/volmit/iris/object/IrisStructure.java @@ -1,7 +1,7 @@ package com.volmit.iris.object; -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.BlockPosition; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/IrisStructurePlacement.java b/src/main/java/com/volmit/iris/object/IrisStructurePlacement.java index 60cbc053b..7b287a027 100644 --- a/src/main/java/com/volmit/iris/object/IrisStructurePlacement.java +++ b/src/main/java/com/volmit/iris/object/IrisStructurePlacement.java @@ -1,10 +1,9 @@ package com.volmit.iris.object; import com.volmit.iris.Iris; -import com.volmit.iris.gen.ContextualTerrainProvider; -import com.volmit.iris.gen.ParallaxTerrainProvider; -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.noise.CellGenerator; +import com.volmit.iris.generator.legacy.ParallaxTerrainProvider; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; +import com.volmit.iris.generator.noise.CellGenerator; import com.volmit.iris.util.ChunkPosition; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; @@ -15,7 +14,7 @@ import com.volmit.iris.util.RNG; import com.volmit.iris.util.RegistryListStructure; import com.volmit.iris.util.Required; -import com.volmit.iris.v2.scaffold.data.DataProvider; +import com.volmit.iris.scaffold.data.DataProvider; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/object/IrisStructureTile.java b/src/main/java/com/volmit/iris/object/IrisStructureTile.java index 2e67bc9f1..13626aff7 100644 --- a/src/main/java/com/volmit/iris/object/IrisStructureTile.java +++ b/src/main/java/com/volmit/iris/object/IrisStructureTile.java @@ -2,7 +2,7 @@ package com.volmit.iris.object; import java.util.Objects; -import com.volmit.iris.gen.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; diff --git a/src/main/java/com/volmit/iris/object/IrisTextPlacement.java b/src/main/java/com/volmit/iris/object/IrisTextPlacement.java index 4162b5eba..34bf3fcc2 100644 --- a/src/main/java/com/volmit/iris/object/IrisTextPlacement.java +++ b/src/main/java/com/volmit/iris/object/IrisTextPlacement.java @@ -1,7 +1,7 @@ package com.volmit.iris.object; -import com.volmit.iris.gen.ParallaxTerrainProvider; -import com.volmit.iris.gen.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.ParallaxTerrainProvider; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; @@ -11,7 +11,6 @@ import com.volmit.iris.util.MinNumber; import com.volmit.iris.util.RNG; import com.volmit.iris.util.Required; -import com.volmit.iris.v2.scaffold.data.DataProvider; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/object/IrisTextRenderer.java b/src/main/java/com/volmit/iris/object/IrisTextRenderer.java index a72107fa7..cc039a1b8 100644 --- a/src/main/java/com/volmit/iris/object/IrisTextRenderer.java +++ b/src/main/java/com/volmit/iris/object/IrisTextRenderer.java @@ -4,8 +4,8 @@ import java.awt.Canvas; import java.awt.Font; import java.awt.FontMetrics; -import com.volmit.iris.gen.ParallaxTerrainProvider; -import com.volmit.iris.gen.atomics.AtomicCache; +import com.volmit.iris.generator.legacy.ParallaxTerrainProvider; +import com.volmit.iris.generator.legacy.atomics.AtomicCache; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; diff --git a/src/main/java/com/volmit/iris/object/NoiseStyle.java b/src/main/java/com/volmit/iris/object/NoiseStyle.java index 9cb18f326..25ae7b192 100644 --- a/src/main/java/com/volmit/iris/object/NoiseStyle.java +++ b/src/main/java/com/volmit/iris/object/NoiseStyle.java @@ -1,9 +1,9 @@ package com.volmit.iris.object; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; -import com.volmit.iris.noise.CNG; -import com.volmit.iris.noise.CNGFactory; -import com.volmit.iris.noise.NoiseType; +import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.generator.noise.CNG; +import com.volmit.iris.generator.noise.CNGFactory; +import com.volmit.iris.generator.noise.NoiseType; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/scaffold/IrisWorldCreator.java b/src/main/java/com/volmit/iris/scaffold/IrisWorldCreator.java new file mode 100644 index 000000000..fb6406dc2 --- /dev/null +++ b/src/main/java/com/volmit/iris/scaffold/IrisWorldCreator.java @@ -0,0 +1,83 @@ +package com.volmit.iris.scaffold; + +import com.volmit.iris.Iris; +import com.volmit.iris.object.IrisDimension; +import com.volmit.iris.scaffold.engine.EngineCompositeGenerator; +import org.bukkit.World; +import org.bukkit.WorldCreator; +import org.bukkit.generator.ChunkGenerator; + +public class IrisWorldCreator +{ + private String name; + private boolean studio = false; + private String dimensionName = null; + private long seed = 1337; + + public IrisWorldCreator() + { + + } + + public IrisWorldCreator dimension(String loadKey) + { + this.dimensionName = dimensionName; + return this; + } + + public IrisWorldCreator dimension(IrisDimension dim) + { + this.dimensionName = dim.getLoadKey(); + return this; + } + + public IrisWorldCreator name(String name) + { + this.name = name; + return this; + } + + public IrisWorldCreator seed(long seed) + { + this.seed = seed; + return this; + } + + public IrisWorldCreator studioMode() + { + this.studio = true; + return this; + } + + public IrisWorldCreator productionMode() + { + this.studio = false; + return this; + } + + public WorldCreator create() + { + ChunkGenerator g = new EngineCompositeGenerator(dimensionName, !studio); + + return new WorldCreator(name) + .environment(findEnvironment()) + .generateStructures(true) + .generator(g).seed(seed); + } + + private World.Environment findEnvironment() { + if(dimensionName == null) + { + return World.Environment.NORMAL; + } + + IrisDimension dim = Iris.globaldata.getDimensionLoader().load(dimensionName); + + if(dim != null) + { + return dim.getEnvironment(); + } + + return World.Environment.NORMAL; + } +} diff --git a/src/main/java/com/volmit/iris/scaffold/IrisWorlds.java b/src/main/java/com/volmit/iris/scaffold/IrisWorlds.java new file mode 100644 index 000000000..62f51d255 --- /dev/null +++ b/src/main/java/com/volmit/iris/scaffold/IrisWorlds.java @@ -0,0 +1,40 @@ +package com.volmit.iris.scaffold; + +import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.util.KMap; +import org.bukkit.World; + +public class IrisWorlds +{ + private static final KMap provisioned = new KMap<>(); + + public static void register(World w, IrisAccess p) + { + provisioned.put(w.getUID().toString(), p); + } + + public static boolean isIrisWorld(World world) + { + if(provisioned.containsKey(world.getUID().toString())) + { + return true; + } + + return world.getGenerator() instanceof IrisAccess; + } + + public static IrisAccess access(World world) + { + if(isIrisWorld(world)) + { + if(provisioned.containsKey(world.getUID().toString())) + { + return provisioned.get(world.getUID().toString()); + } + + return ((IrisAccess) world.getGenerator()); + } + + return null; + } +} diff --git a/src/main/java/com/volmit/iris/v2/scaffold/cache/Cache.java b/src/main/java/com/volmit/iris/scaffold/cache/Cache.java similarity index 89% rename from src/main/java/com/volmit/iris/v2/scaffold/cache/Cache.java rename to src/main/java/com/volmit/iris/scaffold/cache/Cache.java index a6583a46a..6f39152b0 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/cache/Cache.java +++ b/src/main/java/com/volmit/iris/scaffold/cache/Cache.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.cache; +package com.volmit.iris.scaffold.cache; public interface Cache { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/cache/Multicache.java b/src/main/java/com/volmit/iris/scaffold/cache/Multicache.java similarity index 69% rename from src/main/java/com/volmit/iris/v2/scaffold/cache/Multicache.java rename to src/main/java/com/volmit/iris/scaffold/cache/Multicache.java index 4b1bb8e8e..84a023f70 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/cache/Multicache.java +++ b/src/main/java/com/volmit/iris/scaffold/cache/Multicache.java @@ -1,6 +1,4 @@ -package com.volmit.iris.v2.scaffold.cache; - -import com.volmit.iris.util.V; +package com.volmit.iris.scaffold.cache; public interface Multicache { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/data/DataPalette.java b/src/main/java/com/volmit/iris/scaffold/data/DataPalette.java similarity index 97% rename from src/main/java/com/volmit/iris/v2/scaffold/data/DataPalette.java rename to src/main/java/com/volmit/iris/scaffold/data/DataPalette.java index f10ba307d..29c4cff02 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/data/DataPalette.java +++ b/src/main/java/com/volmit/iris/scaffold/data/DataPalette.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.data; +package com.volmit.iris.scaffold.data; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/data/DataProvider.java b/src/main/java/com/volmit/iris/scaffold/data/DataProvider.java similarity index 73% rename from src/main/java/com/volmit/iris/v2/scaffold/data/DataProvider.java rename to src/main/java/com/volmit/iris/scaffold/data/DataProvider.java index 149244dd3..2254ec831 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/data/DataProvider.java +++ b/src/main/java/com/volmit/iris/scaffold/data/DataProvider.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.data; +package com.volmit.iris.scaffold.data; import com.volmit.iris.manager.IrisDataManager; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/data/IOAdapter.java b/src/main/java/com/volmit/iris/scaffold/data/IOAdapter.java similarity index 81% rename from src/main/java/com/volmit/iris/v2/scaffold/data/IOAdapter.java rename to src/main/java/com/volmit/iris/scaffold/data/IOAdapter.java index a7cf8f069..64c136d90 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/data/IOAdapter.java +++ b/src/main/java/com/volmit/iris/scaffold/data/IOAdapter.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.data; +package com.volmit.iris.scaffold.data; import java.io.*; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/BlockUpdater.java b/src/main/java/com/volmit/iris/scaffold/engine/BlockUpdater.java new file mode 100644 index 000000000..e25bb9b62 --- /dev/null +++ b/src/main/java/com/volmit/iris/scaffold/engine/BlockUpdater.java @@ -0,0 +1,14 @@ +package com.volmit.iris.scaffold.engine; + +import com.volmit.iris.util.RNG; +import org.bukkit.Chunk; +import org.bukkit.block.data.BlockData; + +public interface BlockUpdater { + + public void catchBlockUpdates(int x, int y, int z, BlockData data); + + public void updateChunk(Chunk c); + + public void update(int x, int y, int z, Chunk c, RNG rf); +} diff --git a/src/main/java/com/volmit/iris/v2/generator/IrisEngine.java b/src/main/java/com/volmit/iris/scaffold/engine/Engine.java similarity index 61% rename from src/main/java/com/volmit/iris/v2/generator/IrisEngine.java rename to src/main/java/com/volmit/iris/scaffold/engine/Engine.java index d12bc02f9..2cd1afb87 100644 --- a/src/main/java/com/volmit/iris/v2/generator/IrisEngine.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/Engine.java @@ -1,101 +1,124 @@ -package com.volmit.iris.v2.generator; +package com.volmit.iris.scaffold.engine; import com.volmit.iris.Iris; +import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.object.*; -import com.volmit.iris.util.*; -import com.volmit.iris.v2.scaffold.cache.Cache; -import com.volmit.iris.v2.scaffold.engine.Engine; -import com.volmit.iris.v2.scaffold.engine.EngineFramework; -import com.volmit.iris.v2.scaffold.engine.EngineTarget; -import com.volmit.iris.v2.scaffold.engine.EngineWorldManager; -import com.volmit.iris.v2.scaffold.hunk.Hunk; -import com.volmit.iris.v2.scaffold.parallel.MultiBurst; -import lombok.Getter; -import lombok.Setter; +import com.volmit.iris.scaffold.cache.Cache; +import com.volmit.iris.scaffold.data.DataProvider; +import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.parallax.ParallaxAccess; +import com.volmit.iris.util.B; +import com.volmit.iris.util.KList; +import com.volmit.iris.util.RNG; import org.bukkit.Chunk; import org.bukkit.World; import org.bukkit.block.Biome; import org.bukkit.block.Block; import org.bukkit.block.data.BlockData; -import org.bukkit.generator.BlockPopulator; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; import java.util.Arrays; -import java.util.Random; -public class IrisEngine extends BlockPopulator implements Engine -{ - @Getter - private final EngineTarget target; +public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootProvider, BlockUpdater { + public void close(); - @Getter - private final EngineFramework framework; + public boolean isClosed(); - @Getter - private final EngineWorldManager worldManager; + public EngineWorldManager getWorldManager(); - @Setter - @Getter - private volatile int parallelism; + public void setParallelism(int parallelism); - @Setter - @Getter - private volatile int minHeight; + public int getParallelism(); - public IrisEngine(EngineTarget target) + public EngineTarget getTarget(); + + public EngineFramework getFramework(); + + public void setMinHeight(int min); + + public int getIndex(); + + public int getMinHeight(); + + public double modifyX(double x); + + public double modifyZ(double z); + + public void generate(int x, int z, Hunk blocks, Hunk biomes); + + default void save() { - Iris.info("Initializing Engine: " + target.getWorld().getName() + "/" + target.getDimension().getLoadKey() + " (" + target.getHeight() + " height)"); - this.target = target; - this.framework = new IrisEngineFramework(this); - worldManager = new IrisWorldManager(this); - minHeight = 0; + getParallax().saveAll(); } - @Override - public void close() + default void saveNow() { - getWorldManager().close(); - getFramework().close(); + getParallax().saveAllNOW(); + } + + default String getName() + { + return getDimension().getName(); + } + + public default int getHeight() + { + return getTarget().getHeight(); + } + + public default IrisDataManager getData() + { + return getTarget().getData(); + } + + public default World getWorld() + { + return getTarget().getWorld(); + } + + public default IrisDimension getDimension() + { + return getTarget().getDimension(); + } + + public default ParallaxAccess getParallax() + { + return getTarget().getParallaxWorld(); } @Override - public double modifyX(double x) { - return x / getDimension().getTerrainZoom(); + public default IrisRegion getRegion(int x, int z) { + return getFramework().getComplex().getRegionStream().get(x, z); } @Override - public double modifyZ(double z) { - return z / getDimension().getTerrainZoom(); + public default ParallaxAccess getParallaxAccess() + { + return getParallax(); } @Override - public void generate(int x, int z, Hunk vblocks, Hunk vbiomes) { - Hunk biomes = vbiomes.synchronize(); - Hunk blocks = vblocks.synchronize().listen((xx,y,zz,t) -> catchBlockUpdates(x+xx,y+getMinHeight(),z+zz, t)); - - MultiBurst.burst.burst( - () -> getFramework().getEngineParallax().generateParallaxArea(x, z), - () -> getFramework().getBiomeActuator().actuate(x, z, biomes), - () -> getFramework().getTerrainActuator().actuate(x, z, blocks) - ); - MultiBurst.burst.burst( - () -> getFramework().getCaveModifier().modify(x, z, blocks), - () -> getFramework().getRavineModifier().modify(x, z, blocks) - ); - MultiBurst.burst.burst( - () -> getFramework().getDecorantActuator().actuate(x, z, blocks), - () -> getFramework().getDepositModifier().modify(x, z, blocks), - () -> getFramework().getPostModifier().modify(x, z, blocks), - () -> getFramework().getEngineParallax().insertParallax(x, z, blocks) - ); - - getFramework().recycle(); + public default IrisBiome getCaveBiome(int x, int z) + { + return getFramework().getComplex().getCaveBiomeStream().get(x, z); } - private void catchBlockUpdates(int x, int y, int z, BlockData data) { + @Override + public default IrisBiome getSurfaceBiome(int x, int z) + { + return getFramework().getComplex().getTrueBiomeStream().get(x, z); + } + + @Override + public default int getHeight(int x, int z) + { + return getFramework().getEngineParallax().getHighest(x, z, true); + } + + @Override + public default void catchBlockUpdates(int x, int y, int z, BlockData data) { if(data == null) { return; @@ -108,14 +131,9 @@ public class IrisEngine extends BlockPopulator implements Engine } } - @Override - public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk c) - { - getWorldManager().spawnInitialEntities(c); - updateChunk(c); - } - public void updateChunk(Chunk c) + @Override + public default void updateChunk(Chunk c) { if(getParallax().getMetaR(c.getX(), c.getZ()).isUpdates()) { @@ -130,7 +148,8 @@ public class IrisEngine extends BlockPopulator implements Engine } } - private void update(int x, int y, int z, Chunk c, RNG rf) + @Override + public default void update(int x, int y, int z, Chunk c, RNG rf) { Block block = c.getBlock(x,y,z); BlockData data = block.getBlockData(); @@ -169,9 +188,8 @@ public class IrisEngine extends BlockPopulator implements Engine } } - - - public void scramble(Inventory inventory, RNG rng) + @Override + public default void scramble(Inventory inventory, RNG rng) { org.bukkit.inventory.ItemStack[] items = inventory.getContents(); org.bukkit.inventory.ItemStack[] nitems = new org.bukkit.inventory.ItemStack[inventory.getSize()]; @@ -218,7 +236,8 @@ public class IrisEngine extends BlockPopulator implements Engine inventory.setContents(nitems); } - public void injectTables(KList list, IrisLootReference r) + @Override + public default void injectTables(KList list, IrisLootReference r) { if(r.getMode().equals(LootMode.CLEAR) || r.getMode().equals(LootMode.REPLACE)) { @@ -228,7 +247,8 @@ public class IrisEngine extends BlockPopulator implements Engine list.addAll(r.getLootTables(getFramework().getComplex())); } - public KList getLootTables(RNG rng, Block b) + @Override + public default KList getLootTables(RNG rng, Block b) { int rx = b.getX(); int rz = b.getZ(); @@ -261,7 +281,8 @@ public class IrisEngine extends BlockPopulator implements Engine return tables; } - public void addItems(boolean debug, Inventory inv, RNG rng, KList tables, InventorySlotType slot, int x, int y, int z, int mgf) + @Override + public default void addItems(boolean debug, Inventory inv, RNG rng, KList tables, InventorySlotType slot, int x, int y, int z, int mgf) { KList items = new KList<>(); @@ -280,4 +301,8 @@ public class IrisEngine extends BlockPopulator implements Engine scramble(inv, rng); } + public default int getMaxHeight() + { + return getHeight() + getMinHeight(); + } } diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineActuator.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineActuator.java similarity index 57% rename from src/main/java/com/volmit/iris/v2/scaffold/engine/EngineActuator.java rename to src/main/java/com/volmit/iris/scaffold/engine/EngineActuator.java index defdb642b..a906876a2 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineActuator.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineActuator.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.engine; +package com.volmit.iris.scaffold.engine; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; public interface EngineActuator extends EngineComponent { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedActuator.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedActuator.java similarity index 81% rename from src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedActuator.java rename to src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedActuator.java index 74ff617aa..7021fe70b 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedActuator.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedActuator.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.engine; +package com.volmit.iris.scaffold.engine; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; public abstract class EngineAssignedActuator extends EngineAssignedComponent implements EngineActuator { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedBiModifier.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedBiModifier.java similarity index 82% rename from src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedBiModifier.java rename to src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedBiModifier.java index 4f6621720..1ef322b06 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedBiModifier.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedBiModifier.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.engine; +package com.volmit.iris.scaffold.engine; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; public abstract class EngineAssignedBiModifier extends EngineAssignedComponent implements EngineBiModifier { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedComponent.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedComponent.java similarity index 90% rename from src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedComponent.java rename to src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedComponent.java index 8d20f56a4..5b9db41c0 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedComponent.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedComponent.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.engine; +package com.volmit.iris.scaffold.engine; import com.volmit.iris.util.RollingSequence; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedModifier.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedModifier.java similarity index 81% rename from src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedModifier.java rename to src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedModifier.java index e12233fde..0a51449cb 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedModifier.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedModifier.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.engine; +package com.volmit.iris.scaffold.engine; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; public abstract class EngineAssignedModifier extends EngineAssignedComponent implements EngineModifier { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedStructureManager.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedStructureManager.java similarity index 83% rename from src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedStructureManager.java rename to src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedStructureManager.java index 832d405a9..a2706fb61 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedStructureManager.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedStructureManager.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.engine; +package com.volmit.iris.scaffold.engine; public abstract class EngineAssignedStructureManager extends EngineAssignedComponent implements EngineStructureManager { public EngineAssignedStructureManager(Engine engine) { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedWorldManager.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedWorldManager.java similarity index 97% rename from src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedWorldManager.java rename to src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedWorldManager.java index 12f7b414c..ecfbd4478 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedWorldManager.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedWorldManager.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.engine; +package com.volmit.iris.scaffold.engine; import com.volmit.iris.Iris; import org.bukkit.Bukkit; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineBiModifier.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineBiModifier.java similarity index 59% rename from src/main/java/com/volmit/iris/v2/scaffold/engine/EngineBiModifier.java rename to src/main/java/com/volmit/iris/scaffold/engine/EngineBiModifier.java index c1ea6f4c4..188bde30c 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineBiModifier.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineBiModifier.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.engine; +package com.volmit.iris.scaffold.engine; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; public interface EngineBiModifier extends EngineComponent { public void modify(int x, int z, Hunk a, Hunk b); diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineComponent.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineComponent.java similarity index 89% rename from src/main/java/com/volmit/iris/v2/scaffold/engine/EngineComponent.java rename to src/main/java/com/volmit/iris/scaffold/engine/EngineComponent.java index a1ec0da09..e4d0b44b8 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineComponent.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineComponent.java @@ -1,12 +1,11 @@ -package com.volmit.iris.v2.scaffold.engine; +package com.volmit.iris.scaffold.engine; import com.volmit.iris.Iris; import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.object.IrisDimension; import com.volmit.iris.util.RollingSequence; -import com.volmit.iris.v2.generator.IrisComplex; -import com.volmit.iris.v2.scaffold.parallax.ParallaxAccess; -import org.bukkit.Bukkit; +import com.volmit.iris.generator.IrisComplex; +import com.volmit.iris.scaffold.parallax.ParallaxAccess; import org.bukkit.event.Listener; public interface EngineComponent { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineCompositeGenerator.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java similarity index 73% rename from src/main/java/com/volmit/iris/v2/scaffold/engine/EngineCompositeGenerator.java rename to src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java index f54a7ee97..d0656b3b1 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineCompositeGenerator.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java @@ -1,12 +1,15 @@ -package com.volmit.iris.v2.scaffold.engine; +package com.volmit.iris.scaffold.engine; -import java.io.File; -import java.util.List; -import java.util.Random; -import java.util.concurrent.atomic.AtomicBoolean; - -import com.volmit.iris.gen.scaffold.TerrainChunk; +import com.volmit.iris.Iris; +import com.volmit.iris.generator.IrisEngineCompound; +import com.volmit.iris.generator.legacy.scaffold.TerrainChunk; +import com.volmit.iris.manager.IrisDataManager; +import com.volmit.iris.object.IrisBiome; +import com.volmit.iris.object.IrisDimension; +import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.util.Form; import com.volmit.iris.util.KList; +import com.volmit.iris.util.M; import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.World; @@ -17,20 +20,18 @@ import org.bukkit.generator.ChunkGenerator; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import com.volmit.iris.Iris; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.object.IrisDimension; -import com.volmit.iris.util.Form; -import com.volmit.iris.util.M; -import com.volmit.iris.v2.generator.IrisEngineCompound; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import java.io.File; +import java.util.List; +import java.util.Random; +import java.util.concurrent.atomic.AtomicBoolean; -public class EngineCompositeGenerator extends ChunkGenerator implements Hotloadable { +public class EngineCompositeGenerator extends ChunkGenerator implements IrisAccess { private EngineCompound compound; private final AtomicBoolean initialized; private final String dimensionHint; private final boolean production; private final KList populators; + private int generated = 0; public EngineCompositeGenerator() { this(null, true); @@ -144,6 +145,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements Hotloada long m = M.ms(); compound.generate(x * 16, z * 16, blocks, biomes); System.out.println("Generated " + x + "," + z + " in " + Form.duration(M.ms() - m, 0)); + generated++; } @Override @@ -203,4 +205,87 @@ public class EngineCompositeGenerator extends ChunkGenerator implements Hotloada public EngineCompound getComposite() { return compound; } + + @Override + public IrisBiome getBiome(int x, int z) { + return getBiome(x, 0, z); + } + + @Override + public IrisBiome getCaveBiome(int x, int z) { + return getCaveBiome(x, 0, z); + } + + @Override + public int getGenerated() { + return generated; + } + + @Override + public IrisBiome getBiome(int x, int y, int z) { + // TODO: REMOVE GET ABS BIOME OR THIS ONE + return getEngineAccess(y).getBiome(x, y-getComposite().getEngineForHeight(y).getMinHeight(), z); + } + + @Override + public IrisBiome getCaveBiome(int x, int y, int z) { + return getEngineAccess(y).getCaveBiome(x, z); + } + + @Override + public GeneratorAccess getEngineAccess(int y) { + return getComposite().getEngineForHeight(y); + } + + @Override + public IrisDataManager getData() { + return getComposite().getData(); + } + + @Override + public int getHeight(int x, int y, int z) { + return getEngineAccess(y).getHeight(x, z); + } + + @Override + public IrisBiome getAbsoluteBiome(int x, int y, int z) { + // TODO: REMOVE GET BIOME OR THIS ONE + return getEngineAccess(y).getBiome(x, y-getComposite().getEngineForHeight(y).getMinHeight(), z); + } + + @Override + public int getThreadCount() { + // TODO: NOT CORRECT + return Iris.getThreadCount(); + } + + @Override + public void changeThreadCount(int m) { + // TODO: DO IT + } + + @Override + public void regenerate(int x, int z) { + // TODO: DO IT + } + + @Override + public void close() { + getComposite().close(); + } + + @Override + public boolean isClosed() { + return getComposite().getEngine(0).isClosed(); + } + + @Override + public EngineTarget getTarget() { + return getComposite().getEngine(0).getTarget(); + } + + @Override + public EngineCompound getCompound() { + return getComposite(); + } } \ No newline at end of file diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineCompound.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompound.java similarity index 76% rename from src/main/java/com/volmit/iris/v2/scaffold/engine/EngineCompound.java rename to src/main/java/com/volmit/iris/scaffold/engine/EngineCompound.java index ad0626b29..2b211f15d 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineCompound.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompound.java @@ -1,5 +1,6 @@ -package com.volmit.iris.v2.scaffold.engine; +package com.volmit.iris.scaffold.engine; +import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.object.IrisDimension; import com.volmit.iris.util.KList; import org.bukkit.World; @@ -7,8 +8,8 @@ import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; import org.bukkit.event.Listener; -import com.volmit.iris.v2.scaffold.hunk.Hunk; -import com.volmit.iris.v2.scaffold.parallel.MultiBurst; +import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.parallel.MultiBurst; import org.bukkit.generator.BlockPopulator; public interface EngineCompound extends Listener @@ -71,4 +72,19 @@ public interface EngineCompound extends Listener getEngine(i).saveNow(); } } + + public IrisDataManager getData(int height); + + public default IrisDataManager getData() + { + return getData(0); + } + + public default void close() + { + for(int i = 0; i < getSize(); i++) + { + getEngine(i).close(); + } + } } diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineData.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineData.java similarity index 94% rename from src/main/java/com/volmit/iris/v2/scaffold/engine/EngineData.java rename to src/main/java/com/volmit/iris/scaffold/engine/EngineData.java index 41b9561ba..3d4068a18 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineData.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineData.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.engine; +package com.volmit.iris.scaffold.engine; import com.google.gson.Gson; import com.volmit.iris.util.IO; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineDecorator.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineDecorator.java similarity index 88% rename from src/main/java/com/volmit/iris/v2/scaffold/engine/EngineDecorator.java rename to src/main/java/com/volmit/iris/scaffold/engine/EngineDecorator.java index 860ae4c4c..16182c4e0 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineDecorator.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineDecorator.java @@ -1,8 +1,8 @@ -package com.volmit.iris.v2.scaffold.engine; +package com.volmit.iris.scaffold.engine; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.util.B; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; import org.bukkit.block.data.BlockData; public interface EngineDecorator extends EngineComponent { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineFramework.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineFramework.java similarity index 84% rename from src/main/java/com/volmit/iris/v2/scaffold/engine/EngineFramework.java rename to src/main/java/com/volmit/iris/scaffold/engine/EngineFramework.java index 8edac1261..09abf4bdb 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineFramework.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineFramework.java @@ -1,13 +1,13 @@ -package com.volmit.iris.v2.scaffold.engine; +package com.volmit.iris.scaffold.engine; import com.volmit.iris.util.M; -import com.volmit.iris.v2.scaffold.parallel.MultiBurst; +import com.volmit.iris.scaffold.parallel.MultiBurst; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.v2.generator.IrisComplex; -import com.volmit.iris.v2.scaffold.data.DataProvider; +import com.volmit.iris.generator.IrisComplex; +import com.volmit.iris.scaffold.data.DataProvider; public interface EngineFramework extends DataProvider { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineModifier.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineModifier.java similarity index 56% rename from src/main/java/com/volmit/iris/v2/scaffold/engine/EngineModifier.java rename to src/main/java/com/volmit/iris/scaffold/engine/EngineModifier.java index 4e7265ef7..98fe710e8 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineModifier.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineModifier.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.engine; +package com.volmit.iris.scaffold.engine; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; public interface EngineModifier extends EngineComponent { public void modify(int x, int z, Hunk t); diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineParallaxManager.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java similarity index 95% rename from src/main/java/com/volmit/iris/v2/scaffold/engine/EngineParallaxManager.java rename to src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java index c4c7db479..b2c76235b 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineParallaxManager.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java @@ -1,24 +1,24 @@ -package com.volmit.iris.v2.scaffold.engine; +package com.volmit.iris.scaffold.engine; import java.util.concurrent.atomic.AtomicInteger; import com.volmit.iris.object.*; import com.volmit.iris.util.*; -import com.volmit.iris.v2.generator.actuator.IrisTerrainActuator; -import com.volmit.iris.v2.generator.modifier.IrisCaveModifier; -import com.volmit.iris.v2.scaffold.parallax.ParallaxChunkMeta; +import com.volmit.iris.generator.actuator.IrisTerrainActuator; +import com.volmit.iris.generator.modifier.IrisCaveModifier; +import com.volmit.iris.scaffold.parallax.ParallaxChunkMeta; import org.bukkit.block.data.BlockData; import org.bukkit.util.BlockVector; import com.volmit.iris.Iris; import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.v2.generator.IrisComplex; -import com.volmit.iris.v2.scaffold.cache.Cache; -import com.volmit.iris.v2.scaffold.data.DataProvider; -import com.volmit.iris.v2.scaffold.hunk.Hunk; -import com.volmit.iris.v2.scaffold.parallax.ParallaxAccess; -import com.volmit.iris.v2.scaffold.parallel.BurstExecutor; -import com.volmit.iris.v2.scaffold.parallel.MultiBurst; +import com.volmit.iris.generator.IrisComplex; +import com.volmit.iris.scaffold.cache.Cache; +import com.volmit.iris.scaffold.data.DataProvider; +import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.parallax.ParallaxAccess; +import com.volmit.iris.scaffold.parallel.BurstExecutor; +import com.volmit.iris.scaffold.parallel.MultiBurst; public interface EngineParallaxManager extends DataProvider, IObjectPlacer { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineStructureManager.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineStructureManager.java similarity index 97% rename from src/main/java/com/volmit/iris/v2/scaffold/engine/EngineStructureManager.java rename to src/main/java/com/volmit/iris/scaffold/engine/EngineStructureManager.java index 92d4e5d22..8ce4fc5f3 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineStructureManager.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineStructureManager.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.engine; +package com.volmit.iris.scaffold.engine; import com.volmit.iris.object.IrisObject; import com.volmit.iris.object.IrisRareObject; @@ -7,7 +7,7 @@ import com.volmit.iris.object.TileResult; import com.volmit.iris.util.ChunkPosition; import com.volmit.iris.util.KSet; import com.volmit.iris.util.RNG; -import com.volmit.iris.v2.scaffold.parallax.ParallaxChunkMeta; +import com.volmit.iris.scaffold.parallax.ParallaxChunkMeta; public interface EngineStructureManager extends EngineComponent { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineTarget.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineTarget.java similarity index 87% rename from src/main/java/com/volmit/iris/v2/scaffold/engine/EngineTarget.java rename to src/main/java/com/volmit/iris/scaffold/engine/EngineTarget.java index e8c4a12b3..c36496c14 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineTarget.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineTarget.java @@ -1,9 +1,9 @@ -package com.volmit.iris.v2.scaffold.engine; +package com.volmit.iris.scaffold.engine; -import com.volmit.iris.v2.scaffold.parallax.ParallaxWorld; +import com.volmit.iris.scaffold.parallax.ParallaxWorld; import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.object.IrisDimension; -import com.volmit.iris.v2.scaffold.parallel.MultiBurst; +import com.volmit.iris.scaffold.parallel.MultiBurst; import lombok.Data; import org.bukkit.World; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineWorldManager.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineWorldManager.java similarity index 91% rename from src/main/java/com/volmit/iris/v2/scaffold/engine/EngineWorldManager.java rename to src/main/java/com/volmit/iris/scaffold/engine/EngineWorldManager.java index 0e759230d..c3347bd48 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineWorldManager.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineWorldManager.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.engine; +package com.volmit.iris.scaffold.engine; import org.bukkit.Chunk; import org.bukkit.event.block.BlockBreakEvent; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/Fallible.java b/src/main/java/com/volmit/iris/scaffold/engine/Fallible.java new file mode 100644 index 000000000..157b5e123 --- /dev/null +++ b/src/main/java/com/volmit/iris/scaffold/engine/Fallible.java @@ -0,0 +1,26 @@ +package com.volmit.iris.scaffold.engine; + +public interface Fallible +{ + public default void fail(String error) + { + try + { + throw new RuntimeException(); + } + + catch(Throwable e) + { + fail(error, e); + } + } + + public default void fail(Throwable e) + { + fail("Failed to generate", e); + } + + public void fail(String error, Throwable e); + + public boolean hasFailed(); +} diff --git a/src/main/java/com/volmit/iris/scaffold/engine/GeneratorAccess.java b/src/main/java/com/volmit/iris/scaffold/engine/GeneratorAccess.java new file mode 100644 index 000000000..6afa94009 --- /dev/null +++ b/src/main/java/com/volmit/iris/scaffold/engine/GeneratorAccess.java @@ -0,0 +1,66 @@ +package com.volmit.iris.scaffold.engine; + +import com.volmit.iris.manager.IrisDataManager; +import com.volmit.iris.object.IrisBiome; +import com.volmit.iris.object.IrisObjectPlacement; +import com.volmit.iris.object.IrisRegion; +import com.volmit.iris.scaffold.parallax.ParallaxAccess; + +public interface GeneratorAccess +{ + public IrisRegion getRegion(int x, int z); + + public ParallaxAccess getParallaxAccess(); + + public IrisDataManager getData(); + + public IrisBiome getCaveBiome(int x, int z); + + public IrisBiome getSurfaceBiome(int x, int z); + + public int getHeight(int x, int z); + + public default IrisBiome getBiome(int x, int y, int z) + { + if(y <= getHeight(x, z) - 2) + { + return getCaveBiome(x, z); + } + + return getSurfaceBiome(x, z); + } + public default PlacedObject getObjectPlacement(int x, int y, int z) + { + String objectAt = getParallaxAccess().getObject(x, y, z); + + if(objectAt == null || objectAt.isEmpty()) + { + return null; + } + + String[] v = objectAt.split("\\Q@\\E"); + String object = v[0]; + int id = Integer.parseInt(v[1]); + IrisRegion region = getRegion(x, z); + + for(IrisObjectPlacement i : region.getObjects()) + { + if(i.getPlace().contains(object)) + { + return new PlacedObject(i, getData().getObjectLoader().load(object), id); + } + } + + IrisBiome biome = getBiome(x, y, z); + + for(IrisObjectPlacement i : biome.getObjects()) + { + if(i.getPlace().contains(object)) + { + return new PlacedObject(i, getData().getObjectLoader().load(object), id); + } + } + + return new PlacedObject(null, getData().getObjectLoader().load(object), id); + } +} diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/Hotloadable.java b/src/main/java/com/volmit/iris/scaffold/engine/Hotloadable.java similarity index 58% rename from src/main/java/com/volmit/iris/v2/scaffold/engine/Hotloadable.java rename to src/main/java/com/volmit/iris/scaffold/engine/Hotloadable.java index 307bdce16..13d53a218 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/Hotloadable.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/Hotloadable.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.engine; +package com.volmit.iris.scaffold.engine; public interface Hotloadable { public void hotload(); diff --git a/src/main/java/com/volmit/iris/scaffold/engine/IrisAccess.java b/src/main/java/com/volmit/iris/scaffold/engine/IrisAccess.java new file mode 100644 index 000000000..8bf0d6a96 --- /dev/null +++ b/src/main/java/com/volmit/iris/scaffold/engine/IrisAccess.java @@ -0,0 +1,43 @@ +package com.volmit.iris.scaffold.engine; + +import com.volmit.iris.manager.IrisDataManager; +import com.volmit.iris.object.IrisBiome; + +public interface IrisAccess extends Hotloadable { + + public int getGenerated(); + + public IrisBiome getBiome(int x, int y, int z); + + public IrisBiome getCaveBiome(int x, int y, int z); + + public IrisBiome getBiome(int x, int z); + + public IrisBiome getCaveBiome(int x, int z); + + public GeneratorAccess getEngineAccess(int y); + + public IrisDataManager getData(); + + public int getHeight(int x, int y, int z); + + public IrisBiome getAbsoluteBiome(int x, int y, int z); + + public int getThreadCount(); + + public void changeThreadCount(int m); + + public void regenerate(int x, int z); + + public void close(); + + public boolean isClosed(); + + public EngineTarget getTarget(); + + public EngineCompound getCompound(); + + public boolean isFailing(); + + public boolean isStudio(); +} diff --git a/src/main/java/com/volmit/iris/scaffold/engine/LootProvider.java b/src/main/java/com/volmit/iris/scaffold/engine/LootProvider.java new file mode 100644 index 000000000..80e65d254 --- /dev/null +++ b/src/main/java/com/volmit/iris/scaffold/engine/LootProvider.java @@ -0,0 +1,19 @@ +package com.volmit.iris.scaffold.engine; + +import com.volmit.iris.object.InventorySlotType; +import com.volmit.iris.object.IrisLootReference; +import com.volmit.iris.object.IrisLootTable; +import com.volmit.iris.util.KList; +import com.volmit.iris.util.RNG; +import org.bukkit.block.Block; +import org.bukkit.inventory.Inventory; + +public interface LootProvider { + public void scramble(Inventory inventory, RNG rng); + + public void injectTables(KList list, IrisLootReference r); + + public KList getLootTables(RNG rng, Block b); + + public void addItems(boolean debug, Inventory inv, RNG rng, KList tables, InventorySlotType slot, int x, int y, int z, int mgf); +} diff --git a/src/main/java/com/volmit/iris/scaffold/engine/PlacedObject.java b/src/main/java/com/volmit/iris/scaffold/engine/PlacedObject.java new file mode 100644 index 000000000..03198cc9e --- /dev/null +++ b/src/main/java/com/volmit/iris/scaffold/engine/PlacedObject.java @@ -0,0 +1,18 @@ +package com.volmit.iris.scaffold.engine; + +import com.volmit.iris.object.IrisObject; +import com.volmit.iris.object.IrisObjectPlacement; +import lombok.AllArgsConstructor; +import lombok.Data; + +import javax.annotation.Nullable; + +@Data +@AllArgsConstructor +public class PlacedObject { + @Nullable + private IrisObjectPlacement placement; + @Nullable + private IrisObject object; + private int id; +} diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/Hunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/Hunk.java similarity index 97% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/Hunk.java rename to src/main/java/com/volmit/iris/scaffold/hunk/Hunk.java index 74bf976e4..445fb1377 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/Hunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/Hunk.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.hunk; +package com.volmit.iris.scaffold.hunk; import java.io.File; import java.io.IOException; @@ -7,7 +7,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.volmit.iris.v2.scaffold.hunk.view.*; +import com.volmit.iris.scaffold.hunk.view.*; import org.bukkit.Chunk; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; @@ -23,16 +23,16 @@ import com.volmit.iris.util.Consumer6; import com.volmit.iris.util.Consumer8; import com.volmit.iris.util.Function3; import com.volmit.iris.util.KList; -import com.volmit.iris.v2.scaffold.hunk.io.HunkIOAdapter; -import com.volmit.iris.v2.scaffold.hunk.storage.ArrayHunk; -import com.volmit.iris.v2.scaffold.hunk.storage.AtomicDoubleHunk; -import com.volmit.iris.v2.scaffold.hunk.storage.AtomicHunk; -import com.volmit.iris.v2.scaffold.hunk.storage.AtomicIntegerHunk; -import com.volmit.iris.v2.scaffold.hunk.storage.AtomicLongHunk; -import com.volmit.iris.v2.scaffold.hunk.storage.MappedHunk; -import com.volmit.iris.v2.scaffold.hunk.storage.SynchronizedArrayHunk; -import com.volmit.iris.v2.scaffold.parallel.BurstExecutor; -import com.volmit.iris.v2.scaffold.parallel.MultiBurst; +import com.volmit.iris.scaffold.hunk.io.HunkIOAdapter; +import com.volmit.iris.scaffold.hunk.storage.ArrayHunk; +import com.volmit.iris.scaffold.hunk.storage.AtomicDoubleHunk; +import com.volmit.iris.scaffold.hunk.storage.AtomicHunk; +import com.volmit.iris.scaffold.hunk.storage.AtomicIntegerHunk; +import com.volmit.iris.scaffold.hunk.storage.AtomicLongHunk; +import com.volmit.iris.scaffold.hunk.storage.MappedHunk; +import com.volmit.iris.scaffold.hunk.storage.SynchronizedArrayHunk; +import com.volmit.iris.scaffold.parallel.BurstExecutor; +import com.volmit.iris.scaffold.parallel.MultiBurst; public interface Hunk { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/HunkFace.java b/src/main/java/com/volmit/iris/scaffold/hunk/HunkFace.java similarity index 62% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/HunkFace.java rename to src/main/java/com/volmit/iris/scaffold/hunk/HunkFace.java index 4d187e0a9..253ae27c5 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/HunkFace.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/HunkFace.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.hunk; +package com.volmit.iris.scaffold.hunk; public enum HunkFace { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BasicHunkIOAdapter.java b/src/main/java/com/volmit/iris/scaffold/hunk/io/BasicHunkIOAdapter.java similarity index 95% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BasicHunkIOAdapter.java rename to src/main/java/com/volmit/iris/scaffold/hunk/io/BasicHunkIOAdapter.java index 524903c92..518171c1e 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BasicHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/io/BasicHunkIOAdapter.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.hunk.io; +package com.volmit.iris.scaffold.hunk.io; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; import com.volmit.iris.util.Function3; import java.io.*; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BlockDataHunkIOAdapter.java b/src/main/java/com/volmit/iris/scaffold/hunk/io/BlockDataHunkIOAdapter.java similarity index 92% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BlockDataHunkIOAdapter.java rename to src/main/java/com/volmit/iris/scaffold/hunk/io/BlockDataHunkIOAdapter.java index e37b1ec43..113122f21 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BlockDataHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/io/BlockDataHunkIOAdapter.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.hunk.io; +package com.volmit.iris.scaffold.hunk.io; import com.volmit.iris.util.B; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BooleanHunkIOAdapter.java b/src/main/java/com/volmit/iris/scaffold/hunk/io/BooleanHunkIOAdapter.java similarity index 90% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BooleanHunkIOAdapter.java rename to src/main/java/com/volmit/iris/scaffold/hunk/io/BooleanHunkIOAdapter.java index c823ddcc6..03a467308 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/BooleanHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/io/BooleanHunkIOAdapter.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.hunk.io; +package com.volmit.iris.scaffold.hunk.io; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkIOAdapter.java b/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkIOAdapter.java similarity index 91% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkIOAdapter.java rename to src/main/java/com/volmit/iris/scaffold/hunk/io/HunkIOAdapter.java index e6bd56c5b..d2f7ce281 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkIOAdapter.java @@ -1,8 +1,8 @@ -package com.volmit.iris.v2.scaffold.hunk.io; +package com.volmit.iris.scaffold.hunk.io; import com.volmit.iris.IrisSettings; -import com.volmit.iris.v2.scaffold.data.IOAdapter; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.data.IOAdapter; +import com.volmit.iris.scaffold.hunk.Hunk; import com.volmit.iris.util.ByteArrayTag; import com.volmit.iris.util.CustomOutputStream; import com.volmit.iris.util.Function3; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegion.java b/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkRegion.java similarity index 95% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegion.java rename to src/main/java/com/volmit/iris/scaffold/hunk/io/HunkRegion.java index 9248f42a7..d54eac281 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegion.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkRegion.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.hunk.io; +package com.volmit.iris.scaffold.hunk.io; import java.io.File; import java.io.FileInputStream; @@ -6,7 +6,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.util.Map; -import com.volmit.iris.Iris; import com.volmit.iris.util.CompoundTag; import com.volmit.iris.util.KMap; import com.volmit.iris.util.NBTInputStream; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegionSlice.java b/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkRegionSlice.java similarity index 98% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegionSlice.java rename to src/main/java/com/volmit/iris/scaffold/hunk/io/HunkRegionSlice.java index 97e440ebd..22e606344 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegionSlice.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkRegionSlice.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.hunk.io; +package com.volmit.iris.scaffold.hunk.io; import java.io.IOException; @@ -6,7 +6,7 @@ import com.volmit.iris.util.*; import org.bukkit.block.data.BlockData; import com.volmit.iris.Iris; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; public class HunkRegionSlice { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/PaletteHunkIOAdapter.java b/src/main/java/com/volmit/iris/scaffold/hunk/io/PaletteHunkIOAdapter.java similarity index 94% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/io/PaletteHunkIOAdapter.java rename to src/main/java/com/volmit/iris/scaffold/hunk/io/PaletteHunkIOAdapter.java index 2be678b61..8c4b60263 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/PaletteHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/io/PaletteHunkIOAdapter.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.hunk.io; +package com.volmit.iris.scaffold.hunk.io; -import com.volmit.iris.v2.scaffold.data.DataPalette; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.data.DataPalette; +import com.volmit.iris.scaffold.hunk.Hunk; import com.volmit.iris.util.Function3; import java.io.*; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/StringHunkIOAdapter.java b/src/main/java/com/volmit/iris/scaffold/hunk/io/StringHunkIOAdapter.java similarity index 90% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/io/StringHunkIOAdapter.java rename to src/main/java/com/volmit/iris/scaffold/hunk/io/StringHunkIOAdapter.java index dcf55290a..cb8f6da6b 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/StringHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/io/StringHunkIOAdapter.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.hunk.io; +package com.volmit.iris.scaffold.hunk.io; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/ArrayHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/storage/ArrayHunk.java similarity index 88% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/ArrayHunk.java rename to src/main/java/com/volmit/iris/scaffold/hunk/storage/ArrayHunk.java index 12e8fe993..ad1f7981a 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/ArrayHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/storage/ArrayHunk.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.hunk.storage; +package com.volmit.iris.scaffold.hunk.storage; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; import org.bouncycastle.util.Arrays; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicDoubleHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicDoubleHunk.java similarity index 88% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicDoubleHunk.java rename to src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicDoubleHunk.java index 0e8aee9ab..19eb09ecd 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicDoubleHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicDoubleHunk.java @@ -1,8 +1,8 @@ -package com.volmit.iris.v2.scaffold.hunk.storage; +package com.volmit.iris.scaffold.hunk.storage; import com.google.common.util.concurrent.AtomicDoubleArray; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicHunk.java similarity index 88% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicHunk.java rename to src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicHunk.java index 0b96d509a..08c604b67 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicHunk.java @@ -1,8 +1,8 @@ -package com.volmit.iris.v2.scaffold.hunk.storage; +package com.volmit.iris.scaffold.hunk.storage; import java.util.concurrent.atomic.AtomicReferenceArray; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicIntegerHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicIntegerHunk.java similarity index 88% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicIntegerHunk.java rename to src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicIntegerHunk.java index 20e74027b..348eb3456 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicIntegerHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicIntegerHunk.java @@ -1,8 +1,8 @@ -package com.volmit.iris.v2.scaffold.hunk.storage; +package com.volmit.iris.scaffold.hunk.storage; import java.util.concurrent.atomic.AtomicIntegerArray; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicLongHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicLongHunk.java similarity index 88% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicLongHunk.java rename to src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicLongHunk.java index 2310f29ba..84b540f8b 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/AtomicLongHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicLongHunk.java @@ -1,8 +1,8 @@ -package com.volmit.iris.v2.scaffold.hunk.storage; +package com.volmit.iris.scaffold.hunk.storage; import java.util.concurrent.atomic.AtomicLongArray; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/MappedHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/storage/MappedHunk.java similarity index 90% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/MappedHunk.java rename to src/main/java/com/volmit/iris/scaffold/hunk/storage/MappedHunk.java index ed81f1802..06f8aa2cd 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/MappedHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/storage/MappedHunk.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.hunk.storage; +package com.volmit.iris.scaffold.hunk.storage; import com.volmit.iris.util.Consumer4; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; import com.volmit.iris.util.BlockPosition; import com.volmit.iris.util.KMap; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/StorageHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/storage/StorageHunk.java similarity index 85% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/StorageHunk.java rename to src/main/java/com/volmit/iris/scaffold/hunk/storage/StorageHunk.java index a71fba824..0dd1ea73b 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/StorageHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/storage/StorageHunk.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.hunk.storage; +package com.volmit.iris.scaffold.hunk.storage; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; import lombok.Data; @Data diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/SynchronizedArrayHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/storage/SynchronizedArrayHunk.java similarity index 89% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/SynchronizedArrayHunk.java rename to src/main/java/com/volmit/iris/scaffold/hunk/storage/SynchronizedArrayHunk.java index 7111f695a..dea79763e 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/storage/SynchronizedArrayHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/storage/SynchronizedArrayHunk.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.hunk.storage; +package com.volmit.iris.scaffold.hunk.storage; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; import org.bouncycastle.util.Arrays; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/BiomeGridHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/BiomeGridHunkView.java similarity index 86% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/view/BiomeGridHunkView.java rename to src/main/java/com/volmit/iris/scaffold/hunk/view/BiomeGridHunkView.java index 8c4f04051..365ffe80c 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/BiomeGridHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/BiomeGridHunkView.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.hunk.view; +package com.volmit.iris.scaffold.hunk.view; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; import org.bukkit.block.Biome; import org.bukkit.generator.ChunkGenerator.BiomeGrid; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkBiomeHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkBiomeHunkView.java similarity index 89% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkBiomeHunkView.java rename to src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkBiomeHunkView.java index c4a4dec57..b88690551 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkBiomeHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkBiomeHunkView.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.hunk.view; +package com.volmit.iris.scaffold.hunk.view; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; import org.bukkit.Chunk; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkDataHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkDataHunkView.java similarity index 90% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkDataHunkView.java rename to src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkDataHunkView.java index 56494c42f..1070250ff 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkDataHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkDataHunkView.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.hunk.view; +package com.volmit.iris.scaffold.hunk.view; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; import org.bukkit.block.data.BlockData; import org.bukkit.generator.ChunkGenerator.ChunkData; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkHunkView.java similarity index 89% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkHunkView.java rename to src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkHunkView.java index e564033b1..9fa03fbf1 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ChunkHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkHunkView.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.hunk.view; +package com.volmit.iris.scaffold.hunk.view; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; import org.bukkit.Chunk; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/DriftHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/DriftHunkView.java similarity index 88% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/view/DriftHunkView.java rename to src/main/java/com/volmit/iris/scaffold/hunk/view/DriftHunkView.java index 52b92d03c..b06901798 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/DriftHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/DriftHunkView.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.hunk.view; +package com.volmit.iris.scaffold.hunk.view; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; public class DriftHunkView implements Hunk { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/HunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/HunkView.java similarity index 91% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/view/HunkView.java rename to src/main/java/com/volmit/iris/scaffold/hunk/view/HunkView.java index 7aef6015d..42fc095fa 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/HunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/HunkView.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.hunk.view; +package com.volmit.iris.scaffold.hunk.view; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; public class HunkView implements Hunk { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/InvertedHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/InvertedHunkView.java similarity index 86% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/view/InvertedHunkView.java rename to src/main/java/com/volmit/iris/scaffold/hunk/view/InvertedHunkView.java index ec803ba11..d92ff289d 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/InvertedHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/InvertedHunkView.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.hunk.view; +package com.volmit.iris.scaffold.hunk.view; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; public class InvertedHunkView implements Hunk { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ListeningHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/ListeningHunk.java similarity index 84% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ListeningHunk.java rename to src/main/java/com/volmit/iris/scaffold/hunk/view/ListeningHunk.java index c08eb53db..5b74d6b51 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ListeningHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/ListeningHunk.java @@ -1,9 +1,7 @@ -package com.volmit.iris.v2.scaffold.hunk.view; +package com.volmit.iris.scaffold.hunk.view; -import com.volmit.iris.util.B; import com.volmit.iris.util.Consumer4; -import com.volmit.iris.v2.scaffold.hunk.Hunk; -import org.checkerframework.checker.units.qual.A; +import com.volmit.iris.scaffold.hunk.Hunk; public class ListeningHunk implements Hunk { private final Hunk src; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ReadOnlyHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/ReadOnlyHunk.java similarity index 91% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ReadOnlyHunk.java rename to src/main/java/com/volmit/iris/scaffold/hunk/view/ReadOnlyHunk.java index 9b6c79893..4218877c1 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/ReadOnlyHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/ReadOnlyHunk.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.hunk.view; +package com.volmit.iris.scaffold.hunk.view; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; public class ReadOnlyHunk implements Hunk { private final Hunk src; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedXHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedXHunkView.java similarity index 93% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedXHunkView.java rename to src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedXHunkView.java index cb008dc9d..af801eca0 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedXHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedXHunkView.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.hunk.view; +package com.volmit.iris.scaffold.hunk.view; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; public class RotatedXHunkView implements Hunk { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedYHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedYHunkView.java similarity index 93% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedYHunkView.java rename to src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedYHunkView.java index 20e312ad4..a760096f2 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedYHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedYHunkView.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.hunk.view; +package com.volmit.iris.scaffold.hunk.view; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; public class RotatedYHunkView implements Hunk { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedZHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedZHunkView.java similarity index 93% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedZHunkView.java rename to src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedZHunkView.java index a8c99bb34..5214599c6 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/RotatedZHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedZHunkView.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.hunk.view; +package com.volmit.iris.scaffold.hunk.view; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; public class RotatedZHunkView implements Hunk { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/SynchronizedHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/SynchronizedHunkView.java similarity index 89% rename from src/main/java/com/volmit/iris/v2/scaffold/hunk/view/SynchronizedHunkView.java rename to src/main/java/com/volmit/iris/scaffold/hunk/view/SynchronizedHunkView.java index b891f255e..54461fb43 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/view/SynchronizedHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/SynchronizedHunkView.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.hunk.view; +package com.volmit.iris.scaffold.hunk.view; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; public class SynchronizedHunkView implements Hunk { private final Hunk src; diff --git a/src/main/java/com/volmit/iris/v2/lighting/BlockFaceSetSection.java b/src/main/java/com/volmit/iris/scaffold/lighting/BlockFaceSetSection.java similarity index 92% rename from src/main/java/com/volmit/iris/v2/lighting/BlockFaceSetSection.java rename to src/main/java/com/volmit/iris/scaffold/lighting/BlockFaceSetSection.java index 1558dfa4c..71496a0ad 100644 --- a/src/main/java/com/volmit/iris/v2/lighting/BlockFaceSetSection.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/BlockFaceSetSection.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.lighting; +package com.volmit.iris.scaffold.lighting; import com.bergerkiller.bukkit.common.collections.BlockFaceSet; diff --git a/src/main/java/com/volmit/iris/v2/lighting/FlatRegionInfo.java b/src/main/java/com/volmit/iris/scaffold/lighting/FlatRegionInfo.java similarity index 99% rename from src/main/java/com/volmit/iris/v2/lighting/FlatRegionInfo.java rename to src/main/java/com/volmit/iris/scaffold/lighting/FlatRegionInfo.java index c068fad94..3a7a8fc9f 100644 --- a/src/main/java/com/volmit/iris/v2/lighting/FlatRegionInfo.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/FlatRegionInfo.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.lighting; +package com.volmit.iris.scaffold.lighting; import java.util.Arrays; import java.util.BitSet; diff --git a/src/main/java/com/volmit/iris/v2/lighting/FlatRegionInfoMap.java b/src/main/java/com/volmit/iris/scaffold/lighting/FlatRegionInfoMap.java similarity index 99% rename from src/main/java/com/volmit/iris/v2/lighting/FlatRegionInfoMap.java rename to src/main/java/com/volmit/iris/scaffold/lighting/FlatRegionInfoMap.java index c72188598..c9bd28f7c 100644 --- a/src/main/java/com/volmit/iris/v2/lighting/FlatRegionInfoMap.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/FlatRegionInfoMap.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.lighting; +package com.volmit.iris.scaffold.lighting; import java.util.Collection; import java.util.Set; diff --git a/src/main/java/com/volmit/iris/v2/lighting/LightingAutoClean.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingAutoClean.java similarity index 98% rename from src/main/java/com/volmit/iris/v2/lighting/LightingAutoClean.java rename to src/main/java/com/volmit/iris/scaffold/lighting/LightingAutoClean.java index e3a8920d6..37d610fad 100644 --- a/src/main/java/com/volmit/iris/v2/lighting/LightingAutoClean.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingAutoClean.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.lighting; +package com.volmit.iris.scaffold.lighting; import java.util.HashMap; diff --git a/src/main/java/com/volmit/iris/v2/lighting/LightingCategory.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingCategory.java similarity index 99% rename from src/main/java/com/volmit/iris/v2/lighting/LightingCategory.java rename to src/main/java/com/volmit/iris/scaffold/lighting/LightingCategory.java index aa9603976..7f6cfdfc7 100644 --- a/src/main/java/com/volmit/iris/v2/lighting/LightingCategory.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingCategory.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.lighting; +package com.volmit.iris.scaffold.lighting; import com.bergerkiller.bukkit.common.collections.BlockFaceSet; diff --git a/src/main/java/com/volmit/iris/v2/lighting/LightingChunk.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingChunk.java similarity index 99% rename from src/main/java/com/volmit/iris/v2/lighting/LightingChunk.java rename to src/main/java/com/volmit/iris/scaffold/lighting/LightingChunk.java index 0facf6e34..3d5862bde 100644 --- a/src/main/java/com/volmit/iris/v2/lighting/LightingChunk.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingChunk.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.lighting; +package com.volmit.iris.scaffold.lighting; import com.bergerkiller.bukkit.common.bases.IntVector2; import com.bergerkiller.bukkit.common.chunk.ForcedChunk; @@ -18,7 +18,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.concurrent.CompletableFuture; -import java.util.logging.Level; import java.util.stream.Collectors; import java.util.stream.IntStream; diff --git a/src/main/java/com/volmit/iris/v2/lighting/LightingChunkNeighboring.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingChunkNeighboring.java similarity index 98% rename from src/main/java/com/volmit/iris/v2/lighting/LightingChunkNeighboring.java rename to src/main/java/com/volmit/iris/scaffold/lighting/LightingChunkNeighboring.java index 774eb1b79..8d3e60cea 100644 --- a/src/main/java/com/volmit/iris/v2/lighting/LightingChunkNeighboring.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingChunkNeighboring.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.lighting; +package com.volmit.iris.scaffold.lighting; /** * Keeps track of the 4 x/z neighbors of chunks diff --git a/src/main/java/com/volmit/iris/v2/lighting/LightingCube.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingCube.java similarity index 99% rename from src/main/java/com/volmit/iris/v2/lighting/LightingCube.java rename to src/main/java/com/volmit/iris/scaffold/lighting/LightingCube.java index 51f9a9b2e..d1adff8b8 100644 --- a/src/main/java/com/volmit/iris/v2/lighting/LightingCube.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingCube.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.lighting; +package com.volmit.iris.scaffold.lighting; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/com/volmit/iris/v2/lighting/LightingCubeNeighboring.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingCubeNeighboring.java similarity index 97% rename from src/main/java/com/volmit/iris/v2/lighting/LightingCubeNeighboring.java rename to src/main/java/com/volmit/iris/scaffold/lighting/LightingCubeNeighboring.java index bcae0cfa4..95b3e5400 100644 --- a/src/main/java/com/volmit/iris/v2/lighting/LightingCubeNeighboring.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingCubeNeighboring.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.lighting; +package com.volmit.iris.scaffold.lighting; /** * Keeps track of the 6 x/y/z neighbors of cubes diff --git a/src/main/java/com/volmit/iris/v2/lighting/LightingForcedChunkCache.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingForcedChunkCache.java similarity index 97% rename from src/main/java/com/volmit/iris/v2/lighting/LightingForcedChunkCache.java rename to src/main/java/com/volmit/iris/scaffold/lighting/LightingForcedChunkCache.java index 13cb3da67..b9e0205f4 100644 --- a/src/main/java/com/volmit/iris/v2/lighting/LightingForcedChunkCache.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingForcedChunkCache.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.lighting; +package com.volmit.iris.scaffold.lighting; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/volmit/iris/v2/lighting/LightingService.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingService.java similarity index 98% rename from src/main/java/com/volmit/iris/v2/lighting/LightingService.java rename to src/main/java/com/volmit/iris/scaffold/lighting/LightingService.java index 3b394b396..54bec789e 100644 --- a/src/main/java/com/volmit/iris/v2/lighting/LightingService.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingService.java @@ -1,14 +1,10 @@ -package com.volmit.iris.v2.lighting; +package com.volmit.iris.scaffold.lighting; import com.bergerkiller.bukkit.common.AsyncTask; import com.bergerkiller.bukkit.common.bases.IntVector2; import com.bergerkiller.bukkit.common.bases.IntVector3; -import com.bergerkiller.bukkit.common.config.CompressedDataReader; -import com.bergerkiller.bukkit.common.config.CompressedDataWriter; import com.bergerkiller.bukkit.common.permissions.NoPermissionException; import com.bergerkiller.bukkit.common.utils.MathUtil; -import com.bergerkiller.bukkit.common.utils.ParseUtil; -import com.bergerkiller.bukkit.common.utils.StringUtil; import com.bergerkiller.bukkit.common.utils.WorldUtil; import com.bergerkiller.bukkit.common.wrappers.LongHashSet; import com.bergerkiller.bukkit.common.wrappers.LongHashSet.LongIterator; @@ -17,12 +13,7 @@ import org.bukkit.*; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.IOException; import java.util.*; -import java.util.logging.Level; public class LightingService extends AsyncTask { private static final Set recipientsForDone = new HashSet(); diff --git a/src/main/java/com/volmit/iris/v2/lighting/LightingTask.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingTask.java similarity index 96% rename from src/main/java/com/volmit/iris/v2/lighting/LightingTask.java rename to src/main/java/com/volmit/iris/scaffold/lighting/LightingTask.java index 9da9964c2..5935a60dc 100644 --- a/src/main/java/com/volmit/iris/v2/lighting/LightingTask.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingTask.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.lighting; +package com.volmit.iris.scaffold.lighting; import org.bukkit.World; diff --git a/src/main/java/com/volmit/iris/v2/lighting/LightingTaskBatch.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingTaskBatch.java similarity index 99% rename from src/main/java/com/volmit/iris/v2/lighting/LightingTaskBatch.java rename to src/main/java/com/volmit/iris/scaffold/lighting/LightingTaskBatch.java index cfd38265b..4643a953b 100644 --- a/src/main/java/com/volmit/iris/v2/lighting/LightingTaskBatch.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingTaskBatch.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.lighting; +package com.volmit.iris.scaffold.lighting; import com.bergerkiller.bukkit.common.bases.IntVector2; import com.bergerkiller.bukkit.common.utils.CommonUtil; @@ -12,11 +12,9 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import java.util.logging.Level; import java.util.stream.Stream; import com.volmit.iris.Iris; -import com.volmit.iris.IrisSettings; import org.bukkit.Chunk; import org.bukkit.World; diff --git a/src/main/java/com/volmit/iris/v2/lighting/LightingTaskWorld.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingTaskWorld.java similarity index 99% rename from src/main/java/com/volmit/iris/v2/lighting/LightingTaskWorld.java rename to src/main/java/com/volmit/iris/scaffold/lighting/LightingTaskWorld.java index 78fd6ceff..da242df7e 100644 --- a/src/main/java/com/volmit/iris/v2/lighting/LightingTaskWorld.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingTaskWorld.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.lighting; +package com.volmit.iris.scaffold.lighting; import com.bergerkiller.bukkit.common.utils.CommonUtil; import com.bergerkiller.bukkit.common.wrappers.LongHashSet; diff --git a/src/main/java/com/volmit/iris/v2/lighting/LightingUtil.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingUtil.java similarity index 96% rename from src/main/java/com/volmit/iris/v2/lighting/LightingUtil.java rename to src/main/java/com/volmit/iris/scaffold/lighting/LightingUtil.java index c24762fb3..6d35e943f 100644 --- a/src/main/java/com/volmit/iris/v2/lighting/LightingUtil.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingUtil.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.lighting; +package com.volmit.iris.scaffold.lighting; import com.bergerkiller.bukkit.common.utils.MathUtil; diff --git a/src/main/java/com/volmit/iris/v2/lighting/TimeDurationFormat.java b/src/main/java/com/volmit/iris/scaffold/lighting/TimeDurationFormat.java similarity index 96% rename from src/main/java/com/volmit/iris/v2/lighting/TimeDurationFormat.java rename to src/main/java/com/volmit/iris/scaffold/lighting/TimeDurationFormat.java index b0b391e1e..08c526588 100644 --- a/src/main/java/com/volmit/iris/v2/lighting/TimeDurationFormat.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/TimeDurationFormat.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.lighting; +package com.volmit.iris.scaffold.lighting; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxAccess.java b/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxAccess.java similarity index 96% rename from src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxAccess.java rename to src/main/java/com/volmit/iris/scaffold/parallax/ParallaxAccess.java index 6b8870c03..60c6dbca0 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxAccess.java +++ b/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxAccess.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.parallax; +package com.volmit.iris.scaffold.parallax; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; import org.bukkit.block.data.BlockData; public interface ParallaxAccess diff --git a/src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxChunkMeta.java b/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxChunkMeta.java similarity index 91% rename from src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxChunkMeta.java rename to src/main/java/com/volmit/iris/scaffold/parallax/ParallaxChunkMeta.java index 793beab54..89ce72b9b 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxChunkMeta.java +++ b/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxChunkMeta.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.parallax; +package com.volmit.iris.scaffold.parallax; -import com.volmit.iris.v2.scaffold.hunk.io.HunkIOAdapter; -import com.volmit.iris.v2.scaffold.hunk.io.PaletteHunkIOAdapter; +import com.volmit.iris.scaffold.hunk.io.HunkIOAdapter; +import com.volmit.iris.scaffold.hunk.io.PaletteHunkIOAdapter; import com.volmit.iris.util.CompoundTag; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxRegion.java b/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxRegion.java similarity index 93% rename from src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxRegion.java rename to src/main/java/com/volmit/iris/scaffold/parallax/ParallaxRegion.java index adb142898..2981281a7 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxRegion.java +++ b/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxRegion.java @@ -1,12 +1,12 @@ -package com.volmit.iris.v2.scaffold.parallax; +package com.volmit.iris.scaffold.parallax; import java.io.File; import java.io.IOException; -import com.volmit.iris.v2.scaffold.hunk.Hunk; -import com.volmit.iris.v2.scaffold.hunk.io.HunkIOAdapter; -import com.volmit.iris.v2.scaffold.hunk.io.HunkRegion; -import com.volmit.iris.v2.scaffold.hunk.io.HunkRegionSlice; +import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.io.HunkIOAdapter; +import com.volmit.iris.scaffold.hunk.io.HunkRegion; +import com.volmit.iris.scaffold.hunk.io.HunkRegionSlice; import com.volmit.iris.util.*; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxWorld.java b/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxWorld.java similarity index 97% rename from src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxWorld.java rename to src/main/java/com/volmit/iris/scaffold/parallax/ParallaxWorld.java index 8810def4f..6377d46fd 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxWorld.java +++ b/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxWorld.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.parallax; +package com.volmit.iris.scaffold.parallax; import java.io.File; import java.io.IOException; @@ -6,7 +6,7 @@ import java.io.IOException; import com.volmit.iris.util.*; import org.bukkit.block.data.BlockData; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; public class ParallaxWorld implements ParallaxAccess { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/parallel/BurstExecutor.java b/src/main/java/com/volmit/iris/scaffold/parallel/BurstExecutor.java similarity index 96% rename from src/main/java/com/volmit/iris/v2/scaffold/parallel/BurstExecutor.java rename to src/main/java/com/volmit/iris/scaffold/parallel/BurstExecutor.java index 3023a92b8..768190ced 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/parallel/BurstExecutor.java +++ b/src/main/java/com/volmit/iris/scaffold/parallel/BurstExecutor.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.parallel; +package com.volmit.iris.scaffold.parallel; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/parallel/BurstedHunk.java b/src/main/java/com/volmit/iris/scaffold/parallel/BurstedHunk.java similarity index 59% rename from src/main/java/com/volmit/iris/v2/scaffold/parallel/BurstedHunk.java rename to src/main/java/com/volmit/iris/scaffold/parallel/BurstedHunk.java index d58ea0341..32c83a514 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/parallel/BurstedHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/parallel/BurstedHunk.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.parallel; +package com.volmit.iris.scaffold.parallel; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.hunk.Hunk; public interface BurstedHunk extends Hunk { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/parallel/MultiBurst.java b/src/main/java/com/volmit/iris/scaffold/parallel/MultiBurst.java similarity index 93% rename from src/main/java/com/volmit/iris/v2/scaffold/parallel/MultiBurst.java rename to src/main/java/com/volmit/iris/scaffold/parallel/MultiBurst.java index 6debc3be2..e35d23b5a 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/parallel/MultiBurst.java +++ b/src/main/java/com/volmit/iris/scaffold/parallel/MultiBurst.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.parallel; +package com.volmit.iris.scaffold.parallel; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/ArraySignificance.java b/src/main/java/com/volmit/iris/scaffold/stream/ArraySignificance.java similarity index 95% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/ArraySignificance.java rename to src/main/java/com/volmit/iris/scaffold/stream/ArraySignificance.java index 816331c4b..609d0c067 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/ArraySignificance.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/ArraySignificance.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.stream; +package com.volmit.iris.scaffold.stream; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/BasicLayer.java b/src/main/java/com/volmit/iris/scaffold/stream/BasicLayer.java similarity index 91% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/BasicLayer.java rename to src/main/java/com/volmit/iris/scaffold/stream/BasicLayer.java index ac642b437..587ec9ae5 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/BasicLayer.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/BasicLayer.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.stream; +package com.volmit.iris.scaffold.stream; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/BasicStream.java b/src/main/java/com/volmit/iris/scaffold/stream/BasicStream.java similarity index 94% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/BasicStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/BasicStream.java index 7f171eb8a..78b557fe4 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/BasicStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/BasicStream.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.stream; +package com.volmit.iris.scaffold.stream; public abstract class BasicStream extends BasicLayer implements ProceduralStream { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/ProceduralLayer.java b/src/main/java/com/volmit/iris/scaffold/stream/ProceduralLayer.java similarity index 80% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/ProceduralLayer.java rename to src/main/java/com/volmit/iris/scaffold/stream/ProceduralLayer.java index ab82845c9..6fcd4f1f0 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/ProceduralLayer.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/ProceduralLayer.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.stream; +package com.volmit.iris.scaffold.stream; public interface ProceduralLayer { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/ProceduralStream.java b/src/main/java/com/volmit/iris/scaffold/stream/ProceduralStream.java similarity index 96% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/ProceduralStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/ProceduralStream.java index 5d571fe41..4a6b549b7 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/ProceduralStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/ProceduralStream.java @@ -1,14 +1,14 @@ -package com.volmit.iris.v2.scaffold.stream; +package com.volmit.iris.scaffold.stream; import java.util.List; import java.util.function.Function; -import com.volmit.iris.v2.scaffold.hunk.Hunk; -import com.volmit.iris.v2.scaffold.stream.arithmetic.*; -import com.volmit.iris.v2.scaffold.stream.convert.*; -import com.volmit.iris.v2.scaffold.stream.interpolation.Interpolated; -import com.volmit.iris.v2.scaffold.stream.sources.FunctionStream; -import com.volmit.iris.v2.scaffold.stream.utility.*; +import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.scaffold.stream.arithmetic.*; +import com.volmit.iris.scaffold.stream.convert.*; +import com.volmit.iris.scaffold.stream.interpolation.Interpolated; +import com.volmit.iris.scaffold.stream.sources.FunctionStream; +import com.volmit.iris.scaffold.stream.utility.*; import com.volmit.iris.util.Function2; import com.volmit.iris.util.Function3; import com.volmit.iris.util.Function4; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/Significance.java b/src/main/java/com/volmit/iris/scaffold/stream/Significance.java similarity index 80% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/Significance.java rename to src/main/java/com/volmit/iris/scaffold/stream/Significance.java index a754145da..f91c9f1ee 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/Significance.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/Significance.java @@ -1,4 +1,4 @@ -package com.volmit.iris.v2.scaffold.stream; +package com.volmit.iris.scaffold.stream; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/AddingStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/AddingStream.java similarity index 85% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/AddingStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/arithmetic/AddingStream.java index e0bfb86d9..032b58430 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/AddingStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/AddingStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.arithmetic; +package com.volmit.iris.scaffold.stream.arithmetic; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.util.Function2; import com.volmit.iris.util.Function3; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ClampedStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ClampedStream.java similarity index 82% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ClampedStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ClampedStream.java index 260ecb9f2..694662069 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ClampedStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ClampedStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.arithmetic; +package com.volmit.iris.scaffold.stream.arithmetic; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; public class ClampedStream extends BasicStream implements ProceduralStream { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/CoordinateBitShiftLeftStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/CoordinateBitShiftLeftStream.java similarity index 80% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/CoordinateBitShiftLeftStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/arithmetic/CoordinateBitShiftLeftStream.java index 1f0edae1f..dee0c9325 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/CoordinateBitShiftLeftStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/CoordinateBitShiftLeftStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.arithmetic; +package com.volmit.iris.scaffold.stream.arithmetic; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; public class CoordinateBitShiftLeftStream extends BasicStream implements ProceduralStream { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/CoordinateBitShiftRightStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/CoordinateBitShiftRightStream.java similarity index 80% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/CoordinateBitShiftRightStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/arithmetic/CoordinateBitShiftRightStream.java index da80ebf01..11234970a 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/CoordinateBitShiftRightStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/CoordinateBitShiftRightStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.arithmetic; +package com.volmit.iris.scaffold.stream.arithmetic; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; public class CoordinateBitShiftRightStream extends BasicStream implements ProceduralStream { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/DividingStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/DividingStream.java similarity index 86% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/DividingStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/arithmetic/DividingStream.java index 418ca9786..ca0da2836 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/DividingStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/DividingStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.arithmetic; +package com.volmit.iris.scaffold.stream.arithmetic; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.util.Function2; import com.volmit.iris.util.Function3; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/FittedStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/FittedStream.java similarity index 85% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/FittedStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/arithmetic/FittedStream.java index 9e6c4efc2..67fc89346 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/FittedStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/FittedStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.arithmetic; +package com.volmit.iris.scaffold.stream.arithmetic; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; public class FittedStream extends BasicStream implements ProceduralStream { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MaxingStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MaxingStream.java similarity index 85% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MaxingStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MaxingStream.java index d03ea39fa..1777718bc 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MaxingStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MaxingStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.arithmetic; +package com.volmit.iris.scaffold.stream.arithmetic; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.util.Function2; import com.volmit.iris.util.Function3; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MinningStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MinningStream.java similarity index 86% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MinningStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MinningStream.java index 7e948f38a..594444590 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MinningStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MinningStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.arithmetic; +package com.volmit.iris.scaffold.stream.arithmetic; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.util.Function2; import com.volmit.iris.util.Function3; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ModuloStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ModuloStream.java similarity index 85% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ModuloStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ModuloStream.java index d484ba846..268f1e5a7 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ModuloStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ModuloStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.arithmetic; +package com.volmit.iris.scaffold.stream.arithmetic; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.util.Function2; import com.volmit.iris.util.Function3; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MultiplyingStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MultiplyingStream.java similarity index 86% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MultiplyingStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MultiplyingStream.java index 4a14c54ac..71f4cda0e 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/MultiplyingStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MultiplyingStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.arithmetic; +package com.volmit.iris.scaffold.stream.arithmetic; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.util.Function2; import com.volmit.iris.util.Function3; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/OffsetStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/OffsetStream.java similarity index 80% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/OffsetStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/arithmetic/OffsetStream.java index cabca18cf..532a200f1 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/OffsetStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/OffsetStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.arithmetic; +package com.volmit.iris.scaffold.stream.arithmetic; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; public class OffsetStream extends BasicStream implements ProceduralStream { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/RadialStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/RadialStream.java similarity index 82% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/RadialStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/arithmetic/RadialStream.java index 3c6caa259..c46bb2ad5 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/RadialStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/RadialStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.arithmetic; +package com.volmit.iris.scaffold.stream.arithmetic; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; public class RadialStream extends BasicStream implements ProceduralStream { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/RoundingDoubleStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/RoundingDoubleStream.java similarity index 78% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/RoundingDoubleStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/arithmetic/RoundingDoubleStream.java index d42cc12bf..e3154c529 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/RoundingDoubleStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/RoundingDoubleStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.arithmetic; +package com.volmit.iris.scaffold.stream.arithmetic; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; public class RoundingDoubleStream extends BasicStream { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/SlopeStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/SlopeStream.java similarity index 85% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/SlopeStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/arithmetic/SlopeStream.java index 65dc3010e..81d59f60d 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/SlopeStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/SlopeStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.arithmetic; +package com.volmit.iris.scaffold.stream.arithmetic; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; public class SlopeStream extends BasicStream { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/SubtractingStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/SubtractingStream.java similarity index 86% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/SubtractingStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/arithmetic/SubtractingStream.java index 1e566a6dd..acb639d9e 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/SubtractingStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/SubtractingStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.arithmetic; +package com.volmit.iris.scaffold.stream.arithmetic; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.util.Function2; import com.volmit.iris.util.Function3; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ZoomStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ZoomStream.java similarity index 79% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ZoomStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ZoomStream.java index 893414ad1..350176300 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/arithmetic/ZoomStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ZoomStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.arithmetic; +package com.volmit.iris.scaffold.stream.arithmetic; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; public class ZoomStream extends BasicStream { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/AwareConversionStream2D.java b/src/main/java/com/volmit/iris/scaffold/stream/convert/AwareConversionStream2D.java similarity index 83% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/convert/AwareConversionStream2D.java rename to src/main/java/com/volmit/iris/scaffold/stream/convert/AwareConversionStream2D.java index bdb17e66b..8950d94fa 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/AwareConversionStream2D.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/convert/AwareConversionStream2D.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.convert; +package com.volmit.iris.scaffold.stream.convert; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.util.Function3; public class AwareConversionStream2D extends BasicStream diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/AwareConversionStream3D.java b/src/main/java/com/volmit/iris/scaffold/stream/convert/AwareConversionStream3D.java similarity index 84% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/convert/AwareConversionStream3D.java rename to src/main/java/com/volmit/iris/scaffold/stream/convert/AwareConversionStream3D.java index 4e651c495..5146bc0d0 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/AwareConversionStream3D.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/convert/AwareConversionStream3D.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.convert; +package com.volmit.iris.scaffold.stream.convert; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.util.Function4; public class AwareConversionStream3D extends BasicStream diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/CachedConversionStream.java b/src/main/java/com/volmit/iris/scaffold/stream/convert/CachedConversionStream.java similarity index 86% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/convert/CachedConversionStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/convert/CachedConversionStream.java index 8ed6c8d02..448b016cd 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/CachedConversionStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/convert/CachedConversionStream.java @@ -1,9 +1,9 @@ -package com.volmit.iris.v2.scaffold.stream.convert; +package com.volmit.iris.scaffold.stream.convert; import java.util.function.Function; -import com.volmit.iris.v2.scaffold.stream.BasicLayer; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicLayer; +import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.util.KMap; public class CachedConversionStream extends BasicLayer implements ProceduralStream diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/ConversionStream.java b/src/main/java/com/volmit/iris/scaffold/stream/convert/ConversionStream.java similarity index 84% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/convert/ConversionStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/convert/ConversionStream.java index 82464ffbe..0991971ec 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/ConversionStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/convert/ConversionStream.java @@ -1,9 +1,9 @@ -package com.volmit.iris.v2.scaffold.stream.convert; +package com.volmit.iris.scaffold.stream.convert; import java.util.function.Function; -import com.volmit.iris.v2.scaffold.stream.BasicLayer; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicLayer; +import com.volmit.iris.scaffold.stream.ProceduralStream; public class ConversionStream extends BasicLayer implements ProceduralStream { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/ForceDoubleStream.java b/src/main/java/com/volmit/iris/scaffold/stream/convert/ForceDoubleStream.java similarity index 76% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/convert/ForceDoubleStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/convert/ForceDoubleStream.java index 1c59729e5..b563bb512 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/ForceDoubleStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/convert/ForceDoubleStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.convert; +package com.volmit.iris.scaffold.stream.convert; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; public class ForceDoubleStream extends BasicStream { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/RoundingStream.java b/src/main/java/com/volmit/iris/scaffold/stream/convert/RoundingStream.java similarity index 79% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/convert/RoundingStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/convert/RoundingStream.java index c4ebd1ec3..7ae21f2d6 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/RoundingStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/convert/RoundingStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.convert; +package com.volmit.iris.scaffold.stream.convert; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; public class RoundingStream extends BasicStream { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/SelectionStream.java b/src/main/java/com/volmit/iris/scaffold/stream/convert/SelectionStream.java similarity index 85% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/convert/SelectionStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/convert/SelectionStream.java index 93ccf86ef..f6c83418b 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/SelectionStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/convert/SelectionStream.java @@ -1,9 +1,9 @@ -package com.volmit.iris.v2.scaffold.stream.convert; +package com.volmit.iris.scaffold.stream.convert; import java.util.List; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; public class SelectionStream extends BasicStream { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/SignificanceStream.java b/src/main/java/com/volmit/iris/scaffold/stream/convert/SignificanceStream.java similarity index 82% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/convert/SignificanceStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/convert/SignificanceStream.java index 7387f301f..323009a55 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/SignificanceStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/convert/SignificanceStream.java @@ -1,9 +1,9 @@ -package com.volmit.iris.v2.scaffold.stream.convert; +package com.volmit.iris.scaffold.stream.convert; -import com.volmit.iris.v2.scaffold.stream.ArraySignificance; -import com.volmit.iris.v2.scaffold.stream.Significance; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.ArraySignificance; +import com.volmit.iris.scaffold.stream.Significance; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.util.KList; public class SignificanceStream, T> extends BasicStream diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/To3DStream.java b/src/main/java/com/volmit/iris/scaffold/stream/convert/To3DStream.java similarity index 76% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/convert/To3DStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/convert/To3DStream.java index e51a100e2..a04c1084b 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/convert/To3DStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/convert/To3DStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.convert; +package com.volmit.iris.scaffold.stream.convert; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; public class To3DStream extends BasicStream { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BiHermiteStream.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BiHermiteStream.java similarity index 92% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BiHermiteStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/interpolation/BiHermiteStream.java index 9c5bb9b6d..16bcd8b73 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BiHermiteStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BiHermiteStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.interpolation; +package com.volmit.iris.scaffold.stream.interpolation; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.util.IrisInterpolation; public class BiHermiteStream extends BasicStream implements Interpolator diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BiStarcastStream.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BiStarcastStream.java similarity index 85% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BiStarcastStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/interpolation/BiStarcastStream.java index 6959c6f9a..63e7d5018 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BiStarcastStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BiStarcastStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.interpolation; +package com.volmit.iris.scaffold.stream.interpolation; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; public class BiStarcastStream extends BasicStream implements Interpolator { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BicubicStream.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BicubicStream.java similarity index 91% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BicubicStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/interpolation/BicubicStream.java index a1802e55a..894230f7b 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BicubicStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BicubicStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.interpolation; +package com.volmit.iris.scaffold.stream.interpolation; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.util.IrisInterpolation; public class BicubicStream extends BasicStream implements Interpolator diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BilinearStream.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BilinearStream.java similarity index 88% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BilinearStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/interpolation/BilinearStream.java index b7b4093d4..8eb508c27 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/BilinearStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BilinearStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.interpolation; +package com.volmit.iris.scaffold.stream.interpolation; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.util.IrisInterpolation; public class BilinearStream extends BasicStream implements Interpolator diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/Interpolated.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/Interpolated.java similarity index 88% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/Interpolated.java rename to src/main/java/com/volmit/iris/scaffold/stream/interpolation/Interpolated.java index 6cf20e1b3..947d8aca0 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/Interpolated.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/Interpolated.java @@ -1,11 +1,10 @@ -package com.volmit.iris.v2.scaffold.stream.interpolation; +package com.volmit.iris.scaffold.stream.interpolation; import java.util.function.Function; -import com.volmit.iris.object.IrisCaveLayer; import com.volmit.iris.util.CaveResult; import com.volmit.iris.util.KList; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import org.bukkit.block.data.BlockData; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/InterpolatingStream.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/InterpolatingStream.java similarity index 85% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/InterpolatingStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/interpolation/InterpolatingStream.java index 64207e318..b4562cb71 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/InterpolatingStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/InterpolatingStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.interpolation; +package com.volmit.iris.scaffold.stream.interpolation; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.object.InterpolationMethod; import com.volmit.iris.util.IrisInterpolation; import com.volmit.iris.util.NoiseProvider; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/Interpolator.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/Interpolator.java similarity index 67% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/Interpolator.java rename to src/main/java/com/volmit/iris/scaffold/stream/interpolation/Interpolator.java index bf1837852..06a857a08 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/Interpolator.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/Interpolator.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.stream.interpolation; +package com.volmit.iris.scaffold.stream.interpolation; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; public interface Interpolator { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/InterpolatorFactory.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/InterpolatorFactory.java similarity index 94% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/InterpolatorFactory.java rename to src/main/java/com/volmit/iris/scaffold/stream/interpolation/InterpolatorFactory.java index 9428dcc4c..e79688e11 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/InterpolatorFactory.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/InterpolatorFactory.java @@ -1,6 +1,6 @@ -package com.volmit.iris.v2.scaffold.stream.interpolation; +package com.volmit.iris.scaffold.stream.interpolation; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.object.InterpolationMethod; public class InterpolatorFactory diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TriHermiteStream.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TriHermiteStream.java similarity index 96% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TriHermiteStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/interpolation/TriHermiteStream.java index 9f2e7cd1f..6e69de26a 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TriHermiteStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TriHermiteStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.interpolation; +package com.volmit.iris.scaffold.stream.interpolation; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.util.IrisInterpolation; public class TriHermiteStream extends BasicStream implements Interpolator diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TriStarcastStream.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TriStarcastStream.java similarity index 86% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TriStarcastStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/interpolation/TriStarcastStream.java index 2968dac3e..85ad988cc 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TriStarcastStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TriStarcastStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.interpolation; +package com.volmit.iris.scaffold.stream.interpolation; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; public class TriStarcastStream extends BasicStream implements Interpolator { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TricubicStream.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TricubicStream.java similarity index 96% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TricubicStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/interpolation/TricubicStream.java index 6a4c0c6b9..640b9a051 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TricubicStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TricubicStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.interpolation; +package com.volmit.iris.scaffold.stream.interpolation; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.util.IrisInterpolation; public class TricubicStream extends BasicStream implements Interpolator diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TrilinearStream.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TrilinearStream.java similarity index 91% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TrilinearStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/interpolation/TrilinearStream.java index fd03df2e6..4c5b64a4c 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/interpolation/TrilinearStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TrilinearStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.interpolation; +package com.volmit.iris.scaffold.stream.interpolation; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.util.IrisInterpolation; public class TrilinearStream extends BasicStream implements Interpolator diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/sources/CNGStream.java b/src/main/java/com/volmit/iris/scaffold/stream/sources/CNGStream.java similarity index 83% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/sources/CNGStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/sources/CNGStream.java index 3465ada6c..fcfe000da 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/sources/CNGStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/sources/CNGStream.java @@ -1,8 +1,8 @@ -package com.volmit.iris.v2.scaffold.stream.sources; +package com.volmit.iris.scaffold.stream.sources; -import com.volmit.iris.v2.scaffold.stream.BasicLayer; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.scaffold.stream.BasicLayer; +import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.generator.noise.CNG; public class CNGStream extends BasicLayer implements ProceduralStream { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/sources/FunctionStream.java b/src/main/java/com/volmit/iris/scaffold/stream/sources/FunctionStream.java similarity index 81% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/sources/FunctionStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/sources/FunctionStream.java index d692148cb..26b54a82a 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/sources/FunctionStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/sources/FunctionStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.sources; +package com.volmit.iris.scaffold.stream.sources; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.interpolation.Interpolated; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.interpolation.Interpolated; import com.volmit.iris.util.Function2; import com.volmit.iris.util.Function3; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/utility/CachedStream2D.java b/src/main/java/com/volmit/iris/scaffold/stream/utility/CachedStream2D.java similarity index 70% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/utility/CachedStream2D.java rename to src/main/java/com/volmit/iris/scaffold/stream/utility/CachedStream2D.java index 8204bfce5..e9b8e570c 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/utility/CachedStream2D.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/utility/CachedStream2D.java @@ -1,15 +1,10 @@ -package com.volmit.iris.v2.scaffold.stream.utility; +package com.volmit.iris.scaffold.stream.utility; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; -import com.volmit.iris.v2.scaffold.cache.Cache; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; -import com.volmit.iris.util.ChunkPosition; - -import java.time.Duration; -import java.time.temporal.ChronoUnit; -import java.util.concurrent.TimeUnit; +import com.volmit.iris.scaffold.cache.Cache; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; public class CachedStream2D extends BasicStream implements ProceduralStream { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/utility/NullSafeStream.java b/src/main/java/com/volmit/iris/scaffold/stream/utility/NullSafeStream.java similarity index 69% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/utility/NullSafeStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/utility/NullSafeStream.java index 412962c38..14ab5ba97 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/utility/NullSafeStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/utility/NullSafeStream.java @@ -1,10 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.utility; +package com.volmit.iris.scaffold.stream.utility; -import com.github.benmanes.caffeine.cache.Caffeine; -import com.github.benmanes.caffeine.cache.LoadingCache; -import com.volmit.iris.v2.scaffold.cache.Cache; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; public class NullSafeStream extends BasicStream implements ProceduralStream { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/utility/ProfiledStream.java b/src/main/java/com/volmit/iris/scaffold/stream/utility/ProfiledStream.java similarity index 95% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/utility/ProfiledStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/utility/ProfiledStream.java index 20b6b71b3..7080b29c0 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/utility/ProfiledStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/utility/ProfiledStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.utility; +package com.volmit.iris.scaffold.stream.utility; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.util.Form; import com.volmit.iris.util.KList; import com.volmit.iris.util.PrecisionStopwatch; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/utility/SemaphoreStream.java b/src/main/java/com/volmit/iris/scaffold/stream/utility/SemaphoreStream.java similarity index 81% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/utility/SemaphoreStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/utility/SemaphoreStream.java index ffec33fc7..5ea800960 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/utility/SemaphoreStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/utility/SemaphoreStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.utility; +package com.volmit.iris.scaffold.stream.utility; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; import java.util.concurrent.Semaphore; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/stream/utility/SynchronizedStream.java b/src/main/java/com/volmit/iris/scaffold/stream/utility/SynchronizedStream.java similarity index 78% rename from src/main/java/com/volmit/iris/v2/scaffold/stream/utility/SynchronizedStream.java rename to src/main/java/com/volmit/iris/scaffold/stream/utility/SynchronizedStream.java index 0db6da731..7843bcd7f 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/stream/utility/SynchronizedStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/utility/SynchronizedStream.java @@ -1,7 +1,7 @@ -package com.volmit.iris.v2.scaffold.stream.utility; +package com.volmit.iris.scaffold.stream.utility; -import com.volmit.iris.v2.scaffold.stream.BasicStream; -import com.volmit.iris.v2.scaffold.stream.ProceduralStream; +import com.volmit.iris.scaffold.stream.BasicStream; +import com.volmit.iris.scaffold.stream.ProceduralStream; public class SynchronizedStream extends BasicStream { diff --git a/src/main/java/com/volmit/iris/util/GenLayer.java b/src/main/java/com/volmit/iris/util/GenLayer.java index cffc56f2c..7c79ab156 100644 --- a/src/main/java/com/volmit/iris/util/GenLayer.java +++ b/src/main/java/com/volmit/iris/util/GenLayer.java @@ -1,6 +1,6 @@ package com.volmit.iris.util; -import com.volmit.iris.gen.TopographicTerrainProvider; +import com.volmit.iris.generator.legacy.TopographicTerrainProvider; public abstract class GenLayer { diff --git a/src/main/java/com/volmit/iris/util/IrisInterpolation.java b/src/main/java/com/volmit/iris/util/IrisInterpolation.java index 419e1bfa4..02af41cf5 100644 --- a/src/main/java/com/volmit/iris/util/IrisInterpolation.java +++ b/src/main/java/com/volmit/iris/util/IrisInterpolation.java @@ -1,6 +1,6 @@ package com.volmit.iris.util; -import com.volmit.iris.noise.CNG; +import com.volmit.iris.generator.noise.CNG; import com.volmit.iris.object.InterpolationMethod; import com.volmit.iris.object.NoiseStyle; diff --git a/src/main/java/com/volmit/iris/util/IrisPostBlockFilter.java b/src/main/java/com/volmit/iris/util/IrisPostBlockFilter.java index 9aa830cde..bb3f7d5a5 100644 --- a/src/main/java/com/volmit/iris/util/IrisPostBlockFilter.java +++ b/src/main/java/com/volmit/iris/util/IrisPostBlockFilter.java @@ -7,7 +7,7 @@ import org.bukkit.block.data.Waterlogged; import org.bukkit.block.data.type.Slab; import org.bukkit.generator.ChunkGenerator.ChunkData; -import com.volmit.iris.gen.PostBlockTerrainProvider; +import com.volmit.iris.generator.legacy.PostBlockTerrainProvider; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java b/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java index a8aadec10..2825bc0a1 100644 --- a/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java +++ b/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java @@ -1,10 +1,10 @@ package com.volmit.iris.util; -import java.io.File; - import com.volmit.iris.Iris; import com.volmit.iris.object.IrisObject; +import java.io.File; + public class ObjectResourceLoader extends ResourceLoader { private ChronoLatch useFlip = new ChronoLatch(2863); @@ -15,6 +15,11 @@ public class ObjectResourceLoader extends ResourceLoader super(root, folderName, resourceTypeName, IrisObject.class); } + public int getSize() + { + return loadCache.size(); + } + public int getTotalStorage() { int m = 0; diff --git a/src/main/java/com/volmit/iris/util/ParallaxChunk.java b/src/main/java/com/volmit/iris/util/ParallaxChunk.java index d845e4fab..0f5e9eae9 100644 --- a/src/main/java/com/volmit/iris/util/ParallaxChunk.java +++ b/src/main/java/com/volmit/iris/util/ParallaxChunk.java @@ -9,7 +9,7 @@ import org.bukkit.block.data.BlockData; import org.bukkit.generator.ChunkGenerator.ChunkData; import com.volmit.iris.Iris; -import com.volmit.iris.gen.atomics.AtomicSliver; +import com.volmit.iris.generator.legacy.atomics.AtomicSliver; public class ParallaxChunk implements Writable { diff --git a/src/main/java/com/volmit/iris/util/PregenJob.java b/src/main/java/com/volmit/iris/util/PregenJob.java index 9c5f07198..7e2ed4f59 100644 --- a/src/main/java/com/volmit/iris/util/PregenJob.java +++ b/src/main/java/com/volmit/iris/util/PregenJob.java @@ -1,11 +1,9 @@ package com.volmit.iris.util; -import java.awt.Color; -import java.io.File; -import java.io.IOException; -import java.util.concurrent.Semaphore; -import java.util.concurrent.atomic.AtomicInteger; - +import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; +import com.volmit.iris.manager.gui.PregenGui; +import io.papermc.lib.PaperLib; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.World; @@ -13,13 +11,11 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.world.ChunkUnloadEvent; -import com.volmit.iris.Iris; -import com.volmit.iris.IrisSettings; -import com.volmit.iris.gen.IrisTerrainProvider; -import com.volmit.iris.gen.scaffold.IrisWorlds; -import com.volmit.iris.gui.PregenGui; - -import io.papermc.lib.PaperLib; +import java.awt.*; +import java.io.File; +import java.io.IOException; +import java.util.concurrent.Semaphore; +import java.util.concurrent.atomic.AtomicInteger; public class PregenJob implements Listener { @@ -48,7 +44,6 @@ public class PregenJob implements Listener private Spiraler chunkSpiraler; private boolean first; private static Consumer2 consumer; - private IrisTerrainProvider tp; private double cps = 0; private int lg = 0; private long lt = M.ms(); @@ -84,7 +79,6 @@ public class PregenJob implements Listener this.chunkZ = 0; completed = false; first = true; - tp = IrisWorlds.getProvider(world); chunkSpiraler = new Spiraler(cubeSize, cubeSize, (x, z) -> { @@ -387,7 +381,7 @@ public class PregenJob implements Listener if(consumer != null) { - consumer.accept(new ChunkPosition(chunk.getX(), chunk.getZ()), tp != null ? tp.render(chunk.getX() * 16, chunk.getZ() * 16) : Color.blue); + consumer.accept(new ChunkPosition(chunk.getX(), chunk.getZ()), Color.blue); } }); } @@ -412,7 +406,7 @@ public class PregenJob implements Listener if(consumer != null) { - consumer.accept(new ChunkPosition(chunkX, chunkZ), tp != null ? tp.render(chunkX * 16, chunkZ * 16) : Color.blue); + consumer.accept(new ChunkPosition(chunkX, chunkZ), Color.blue); } } } @@ -486,7 +480,7 @@ public class PregenJob implements Listener { if(e.getWorld().equals(world) && isChunkWithin(e.getChunk().getX(), e.getChunk().getZ()) && consumer != null) { - consumer.accept(new ChunkPosition(e.getChunk().getX(), e.getChunk().getZ()), tp != null ? tp.render(e.getChunk().getX() * 16, e.getChunk().getZ() * 16) : Color.blue.darker()); + consumer.accept(new ChunkPosition(e.getChunk().getX(), e.getChunk().getZ()), Color.blue.darker()); } } diff --git a/src/main/java/com/volmit/iris/util/WorldGenLayer.java b/src/main/java/com/volmit/iris/util/WorldGenLayer.java index 4302f8e34..1a686b3b0 100644 --- a/src/main/java/com/volmit/iris/util/WorldGenLayer.java +++ b/src/main/java/com/volmit/iris/util/WorldGenLayer.java @@ -3,7 +3,7 @@ package com.volmit.iris.util; import org.bukkit.Chunk; import org.bukkit.World; -import com.volmit.iris.gen.TopographicTerrainProvider; +import com.volmit.iris.generator.legacy.TopographicTerrainProvider; public abstract class WorldGenLayer { diff --git a/src/main/java/com/volmit/iris/v2/TestGen.java b/src/main/java/com/volmit/iris/v2/TestGen.java deleted file mode 100644 index facb6e1aa..000000000 --- a/src/main/java/com/volmit/iris/v2/TestGen.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.volmit.iris.v2; - -import java.util.UUID; - -import org.bukkit.Location; -import org.bukkit.WorldCreator; -import org.bukkit.entity.Player; - -import com.volmit.iris.v2.scaffold.engine.EngineCompositeGenerator; - -public class TestGen -{ - public static void gen(Player p, String arg) - { - p.teleport(new Location(new WorldCreator("t/" + UUID.randomUUID().toString()) - .generator(EngineCompositeGenerator.newStudioWorld(arg)).createWorld(), 0, 70, 0)); - } -} diff --git a/src/main/java/com/volmit/iris/v2/generator/IrisEngineStructure.java b/src/main/java/com/volmit/iris/v2/generator/IrisEngineStructure.java deleted file mode 100644 index a973a7755..000000000 --- a/src/main/java/com/volmit/iris/v2/generator/IrisEngineStructure.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.volmit.iris.v2.generator; - -import com.volmit.iris.v2.scaffold.engine.Engine; -import com.volmit.iris.v2.scaffold.engine.EngineAssignedStructureManager; - -public class IrisEngineStructure extends EngineAssignedStructureManager { - public IrisEngineStructure(Engine engine) { - super(engine); - } -} diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/Engine.java b/src/main/java/com/volmit/iris/v2/scaffold/engine/Engine.java deleted file mode 100644 index 87d5d0324..000000000 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/Engine.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.volmit.iris.v2.scaffold.engine; - -import com.volmit.iris.v2.scaffold.data.DataProvider; -import org.bukkit.Chunk; -import org.bukkit.World; -import org.bukkit.block.Biome; -import org.bukkit.block.Block; -import org.bukkit.block.data.BlockData; - -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.object.IrisDimension; -import com.volmit.iris.v2.scaffold.hunk.Hunk; -import com.volmit.iris.v2.scaffold.parallax.ParallaxAccess; - -public interface Engine extends DataProvider -{ - public void close(); - - public EngineWorldManager getWorldManager(); - - public void setParallelism(int parallelism); - - public int getParallelism(); - - public EngineTarget getTarget(); - - public EngineFramework getFramework(); - - public void setMinHeight(int min); - - public int getMinHeight(); - - public double modifyX(double x); - - public double modifyZ(double z); - - default void updateBlock(Block block) - { - //TODO: UPDATE IT - } - - default void updateChunk(Chunk chunk) - { - //TODO: UPDATE IT - } - - default void save() - { - getParallax().saveAll(); - } - - default void saveNow() - { - getParallax().saveAllNOW(); - } - - default String getName() - { - return getDimension().getName(); - } - - public void generate(int x, int z, Hunk blocks, Hunk biomes); - - public default int getHeight() - { - return getTarget().getHeight(); - } - - public default IrisDataManager getData() - { - return getTarget().getData(); - } - - public default World getWorld() - { - return getTarget().getWorld(); - } - - public default IrisDimension getDimension() - { - return getTarget().getDimension(); - } - - public default ParallaxAccess getParallax() - { - return getTarget().getParallaxWorld(); - } -}