diff --git a/build.gradle b/build.gradle index 8ce3492e4..828f530f1 100644 --- a/build.gradle +++ b/build.gradle @@ -10,38 +10,12 @@ def apiVersion = '1.14' def name = 'Iris' def main = 'com.volmit.iris.Iris' +// ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED // ============================================================== registerCustomOutputTask('Cyberpwn', 'C://Users/cyberpwn/Documents/development/server/plugins'); +registerCustomOutputTask('ArcaneArts', 'C://Users/arcane/Documents/development/server/plugins'); // ============================================================== -configurations { - provided -} - -processResources { - filesMatching('**/plugin.yml') { - expand( - 'name': name.toString(), - 'version': version.toString(), - 'main': main.toString(), - 'apiversion': apiVersion.toString() - ) - } -} - -repositories { - mavenCentral() - gradlePluginPortal() - maven { - allowInsecureProtocol true - url "http://archive.arcane.art/repository/arcane/" - } -} - -shadowJar { - -} - def registerCustomOutputTask(name, path) { tasks.register('build' + name, Copy) { group('development') @@ -55,19 +29,43 @@ def registerCustomOutputTask(name, path) { } } +processResources { + filesMatching('**/plugin.yml') { + expand( + 'name': name.toString(), + 'version': version.toString(), + 'main': main.toString(), + 'apiversion': apiVersion.toString() + ) + } +} + +repositories { + maven { + allowInsecureProtocol true + url "http://archive.arcane.art/repository/arcane" + } + mavenLocal() +} dependencies { - compileOnly 'org.projectlombok:lombok:1.18.12' - annotationProcessor 'org.projectlombok:lombok:1.18.12' + compileOnly 'org.projectlombok:lombok:1.18.20' + annotationProcessor 'org.projectlombok:lombok:1.18.20' + + // Shade implementation 'io.timeandspace:smoothie-map:2.0.2' implementation 'com.github.ben-manes.caffeine:caffeine:2.8.5' implementation 'org.zeroturnaround:zt-zip:1.14' + implementation 'org.apache.commons:commons-compress:1.20' implementation 'io.papermc:paperlib:1.0.5' - compileClasspath 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT' - compileClasspath 'org.bukkit.craftbukkit:1.16.3:1.16.3' - compileClasspath 'org.bukkit.craftbukkit:1.16.4:1.16.4' - compileClasspath 'com.bergerkiller.bukkit:BKCommonLib:1.16.4-v2' - compileClasspath 'com.sk89q.worldedit:worldedit-bukkit:7.2.0-SNAPSHOT' - compileClasspath 'io.lumine.xikage:MythicMobs:4.9.1' - compileClasspath 'com.google.code.gson:gson:2.8.5' + + // Provided + implementation 'org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT' + implementation 'org.bukkit.craftbukkit:1.16.3:1.16.3' + implementation 'org.bukkit.craftbukkit:1.16.4:1.16.4' + implementation 'org.bukkit.craftbukkit:1.17:1.17' + implementation 'com.bergerkiller.bukkit:BKCommonLib:1.16.4-v2' + implementation 'com.sk89q.worldedit:worldedit-bukkit:7.2.0-SNAPSHOT' + implementation 'io.lumine.xikage:MythicMobs:4.9.1' + implementation 'com.google.code.gson:gson:2.8.5' } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f80bbf51..69a971507 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/com/volmit/iris/generator/IrisEngineCompound.java b/src/main/java/com/volmit/iris/generator/IrisEngineCompound.java index c880077c8..5a8ff9fa1 100644 --- a/src/main/java/com/volmit/iris/generator/IrisEngineCompound.java +++ b/src/main/java/com/volmit/iris/generator/IrisEngineCompound.java @@ -118,6 +118,7 @@ public class IrisEngineCompound implements EngineCompound { if(rootDimension.getDimensionalComposite().isEmpty()) { burster = null; + // TODO: WARNING HEIGHT engines = new Engine[]{new IrisEngine(new EngineTarget(world, rootDimension, data, 256, maximumThreads), this, 0)}; defaultEngine = engines[0]; } @@ -145,6 +146,7 @@ public class IrisEngineCompound implements EngineCompound { { IrisDimensionIndex index = rootDimension.getDimensionalComposite().get(i); IrisDimension dimension = data.getDimensionLoader().load(index.getDimension()); + // TODO: WARNING HEIGHT engines[i] = new IrisEngine(new EngineTarget(world, dimension, data.copy(), (int)Math.floor(256D * (index.getWeight() / totalWeight)), index.isInverted(), threadDist), this, i); engines[i].setMinHeight(buf); buf += engines[i].getHeight(); diff --git a/src/main/java/com/volmit/iris/generator/modifier/IrisCaveModifier.java b/src/main/java/com/volmit/iris/generator/modifier/IrisCaveModifier.java index 4c46e7741..cf9fb1de1 100644 --- a/src/main/java/com/volmit/iris/generator/modifier/IrisCaveModifier.java +++ b/src/main/java/com/volmit/iris/generator/modifier/IrisCaveModifier.java @@ -135,6 +135,7 @@ public class IrisCaveModifier extends EngineAssignedModifier return; } + // TODO: WARNING HEIGHT int ceiling = -256; int floor = 512; diff --git a/src/main/java/com/volmit/iris/generator/modifier/IrisDepositModifier.java b/src/main/java/com/volmit/iris/generator/modifier/IrisDepositModifier.java index c4562ef74..79dd3da7d 100644 --- a/src/main/java/com/volmit/iris/generator/modifier/IrisDepositModifier.java +++ b/src/main/java/com/volmit/iris/generator/modifier/IrisDepositModifier.java @@ -87,6 +87,7 @@ public class IrisDepositModifier extends EngineAssignedModifier { } int i = Math.max(0, k.getMinHeight()); + // TODO: WARNING HEIGHT int a = Math.min(height, Math.min(256, k.getMaxHeight())); if(i >= a) diff --git a/src/main/java/com/volmit/iris/generator/modifier/IrisRavineModifier.java b/src/main/java/com/volmit/iris/generator/modifier/IrisRavineModifier.java index a25e780a5..1d5e36cb5 100644 --- a/src/main/java/com/volmit/iris/generator/modifier/IrisRavineModifier.java +++ b/src/main/java/com/volmit/iris/generator/modifier/IrisRavineModifier.java @@ -77,6 +77,7 @@ public class IrisRavineModifier extends EngineAssignedModifier { n5 = 1; } float f6 = 1.0f; + // TODO: WARNING HEIGHT for(int i = 0; i < 256; ++i) { if(i == 0 || random.nextInt(getDimension().getRavineRibRarity()) == 0) @@ -153,6 +154,7 @@ public class IrisRavineModifier extends EngineAssignedModifier { { for(int j = n10 + 1; !bl && j >= n9 - 1; --j) { + // TODO: WARNING HEIGHT if(j < 0 || j >= 256) { continue; diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectP1.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectP1.java index 76bbcb287..28b14b512 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectP1.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectP1.java @@ -62,6 +62,7 @@ public class CommandIrisObjectP1 extends MortarCommand if(args.length == 1 && args[0].equals("-l")) { + // TODO: WARNING HEIGHT g[0] = p.getTargetBlock((Set) null, 256).getLocation().clone(); } diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectP2.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectP2.java index 4fe8060d1..dfda2a2fb 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectP2.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectP2.java @@ -62,6 +62,7 @@ public class CommandIrisObjectP2 extends MortarCommand if(args.length == 1 && args[0].equals("-l")) { + // TODO: WARNING HEIGHT g[1] = p.getTargetBlock((Set) null, 256).getLocation().clone(); } diff --git a/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java b/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java index af750502f..35fb81e29 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java +++ b/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java @@ -23,16 +23,16 @@ public class IrisBiomeGeneratorLink @DependsOn({"min", "max"}) @Required - @MinNumber(-256) - @MaxNumber(256) + @MinNumber(-256) // TODO: WARNING HEIGHT + @MaxNumber(256) // TODO: WARNING HEIGHT @DontObfuscate @Desc("The min block value (value + fluidHeight)") private int min = 0; @DependsOn({"min", "max"}) @Required - @MinNumber(-256) - @MaxNumber(256) + @MinNumber(-256) // TODO: WARNING HEIGHT + @MaxNumber(256) // TODO: WARNING HEIGHT @DontObfuscate @Desc("The max block value (value + fluidHeight)") private int max = 0; diff --git a/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java b/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java index 1160fbafa..563d50176 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java +++ b/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java @@ -32,14 +32,14 @@ public class IrisBiomePaletteLayer @DependsOn({"minHeight", "maxHeight"}) @MinNumber(0) - @MaxNumber(256) + @MaxNumber(256) // TODO: WARNING HEIGHT @DontObfuscate @Desc("The min thickness of this layer") private int minHeight = 1; @DependsOn({"minHeight", "maxHeight"}) @MinNumber(1) - @MaxNumber(256) + @MaxNumber(256) // TODO: WARNING HEIGHT @DontObfuscate @Desc("The max thickness of this layer") private int maxHeight = 1; diff --git a/src/main/java/com/volmit/iris/object/IrisDecorator.java b/src/main/java/com/volmit/iris/object/IrisDecorator.java index c65035051..3c929821d 100644 --- a/src/main/java/com/volmit/iris/object/IrisDecorator.java +++ b/src/main/java/com/volmit/iris/object/IrisDecorator.java @@ -42,14 +42,14 @@ public class IrisDecorator @DependsOn({"stackMin", "stackMax"}) @MinNumber(1) - @MaxNumber(256) + @MaxNumber(256) // TODO: WARNING HEIGHT @DontObfuscate @Desc("The minimum repeat stack height (setting to 3 would stack 3 of on top of each other") private int stackMin = 1; @DependsOn({"stackMin", "stackMax"}) @MinNumber(1) - @MaxNumber(256) + @MaxNumber(256) // TODO: WARNING HEIGHT @DontObfuscate @Desc("The maximum repeat stack height") private int stackMax = 1; @@ -74,7 +74,7 @@ public class IrisDecorator @MinNumber(0) @MaxNumber(1) @DontObfuscate - @Desc("The chance for this decorator to decorate at a given X,Y coordinate. This is hit 256 times per chunk (per surface block)") + @Desc("The chance for this decorator to decorate at a given X,Y coordinate. This is hit 256 times per chunk (per surface block)") // TODO: WARNING HEIGHT private double chance = 0.1; @Required diff --git a/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java b/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java index 2c145dd3f..28a692dd9 100644 --- a/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java +++ b/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java @@ -19,14 +19,14 @@ public class IrisDepositGenerator { @Required @MinNumber(0) - @MaxNumber(256) + @MaxNumber(256) // TODO: WARNING HEIGHT @DontObfuscate @Desc("The minimum height this deposit can generate at") private int minHeight = 7; @Required @MinNumber(0) - @MaxNumber(256) + @MaxNumber(256) // TODO: WARNING HEIGHT @DontObfuscate @Desc("The maximum height this deposit can generate at") private int maxHeight = 55; diff --git a/src/main/java/com/volmit/iris/object/IrisFeaturePositional.java b/src/main/java/com/volmit/iris/object/IrisFeaturePositional.java index 228499ee1..f74767126 100644 --- a/src/main/java/com/volmit/iris/object/IrisFeaturePositional.java +++ b/src/main/java/com/volmit/iris/object/IrisFeaturePositional.java @@ -38,7 +38,7 @@ public class IrisFeaturePositional { private IrisFeature feature; private transient AtomicCache provider = new AtomicCache<>(); - private static double BLOCK = 1D / 256D; + private static double BLOCK = 1D / 256D; // TODO: WARNING HEIGHT public static IrisFeaturePositional read(DataInputStream s) throws IOException { diff --git a/src/main/java/com/volmit/iris/object/IrisObjectTranslate.java b/src/main/java/com/volmit/iris/object/IrisObjectTranslate.java index c89b4277f..240c673c0 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectTranslate.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectTranslate.java @@ -21,27 +21,27 @@ import lombok.experimental.Accessors; public class IrisObjectTranslate { - @MinNumber(-128) - @MaxNumber(128) + @MinNumber(-128) // TODO: WARNING HEIGHT + @MaxNumber(128) // TODO: WARNING HEIGHT @DontObfuscate @Desc("The x shift in blocks") private int x = 0; @Required - @MinNumber(-256) - @MaxNumber(256) + @MinNumber(-256) // TODO: WARNING HEIGHT + @MaxNumber(256) // TODO: WARNING HEIGHT @DontObfuscate @Desc("The x shift in blocks") private int y = 0; - @MinNumber(-128) - @MaxNumber(128) + @MinNumber(-128) // TODO: WARNING HEIGHT + @MaxNumber(128) // TODO: WARNING HEIGHT @DontObfuscate @Desc("Adds an additional amount of height randomly (translateY + rand(0 - yRandom))") private int yRandom = 0; - @MinNumber(-128) - @MaxNumber(128) + @MinNumber(-128) // TODO: WARNING HEIGHT + @MaxNumber(128) // TODO: WARNING HEIGHT @DontObfuscate @Desc("The x shift in blocks") private int z = 0; diff --git a/src/main/java/com/volmit/iris/object/IrisRegion.java b/src/main/java/com/volmit/iris/object/IrisRegion.java index 9eac5b1ce..fc7791d8e 100644 --- a/src/main/java/com/volmit/iris/object/IrisRegion.java +++ b/src/main/java/com/volmit/iris/object/IrisRegion.java @@ -51,7 +51,7 @@ public class IrisRegion extends IrisRegistrant implements IRare private KList entityInitialSpawns = new KList<>(); @MinNumber(1) - @MaxNumber(256) + @MaxNumber(256) // TODO: WARNING HEIGHT @DontObfuscate @Desc("The rarity of the region") private int rarity = 1; diff --git a/src/main/java/com/volmit/iris/object/IrisShapedGeneratorStyle.java b/src/main/java/com/volmit/iris/object/IrisShapedGeneratorStyle.java index c9a17af42..6dce49f63 100644 --- a/src/main/java/com/volmit/iris/object/IrisShapedGeneratorStyle.java +++ b/src/main/java/com/volmit/iris/object/IrisShapedGeneratorStyle.java @@ -26,16 +26,16 @@ public class IrisShapedGeneratorStyle private IrisGeneratorStyle generator = new IrisGeneratorStyle(NoiseStyle.IRIS); @Required - @MinNumber(-256) - @MaxNumber(256) + @MinNumber(-256) // TODO: WARNING HEIGHT + @MaxNumber(256) // TODO: WARNING HEIGHT @DontObfuscate @Desc("The min block value") private int min = 0; @Required - @MinNumber(-256) - @MaxNumber(256) + @MinNumber(-256) // TODO: WARNING HEIGHT + @MaxNumber(256) // TODO: WARNING HEIGHT @DontObfuscate @Desc("The max block value") private int max = 0; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java index 21f8854af..fadb5ba32 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java @@ -79,6 +79,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce public void prepareSpawnAsync(long seed, String worldName, World.Environment env, int radius, Consumer progress, Runnable onComplete) { + // TODO: WARNING HEIGHT prepareSpawnAsync(256, seed, worldName, env, radius, progress, onComplete); } @@ -402,6 +403,11 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce writer.setBiome((ox + x), y, oz + z, bio); } + @Override + public int getMinHeight() { + return w.getMinHeight(); + } + @Override public int getMaxHeight() { return w.getMaxHeight(); @@ -674,6 +680,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce @Override public void regenerate(int x, int z) { + clearRegeneratedLists(x, z); int xx = x*16; int zz = z*16; @@ -703,9 +710,14 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce } + @Override + public int getMinHeight() { + return getComposite().getWorld().getMinHeight(); + } + @Override public int getMaxHeight() { - return 256; + return getComposite().getWorld().getMaxHeight(); } @Override diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompound.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompound.java index 6e75cf09a..273a16775 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompound.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompound.java @@ -34,6 +34,7 @@ public interface EngineCompound extends Listener, Hotloadable, DataProvider public default int getHeight() { + // TODO: WARNING HEIGHT return 256; } diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineTarget.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineTarget.java index a1214d0e7..d25b627e0 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineTarget.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineTarget.java @@ -26,6 +26,7 @@ public class EngineTarget this.height = height; this.dimension = dimension; this.data = data; + // TODO: WARNING HEIGHT this.parallaxWorld = new ParallaxWorld(256, new File(world.getWorldFolder(), "iris/" + dimension.getLoadKey() + "/parallax")); this.inverted = inverted; this.burster = new MultiBurst(threads); diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/BiomeGridHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/BiomeGridHunkView.java index 365ffe80c..9ed424402 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/BiomeGridHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/BiomeGridHunkView.java @@ -28,6 +28,7 @@ public class BiomeGridHunkView implements Hunk @Override public int getHeight() { + // TODO: WARNING HEIGHT return 256; } diff --git a/src/main/java/com/volmit/iris/util/B.java b/src/main/java/com/volmit/iris/util/B.java index a6d852f14..25037b64c 100644 --- a/src/main/java/com/volmit/iris/util/B.java +++ b/src/main/java/com/volmit/iris/util/B.java @@ -393,7 +393,7 @@ public class B return false; } - if(onto.equals(Material.GRASS_PATH)) + if(onto.equals(Material.DIRT_PATH)) { if(!mat.isSolid()) { diff --git a/src/main/java/com/volmit/iris/util/IrisBiomeStorage.java b/src/main/java/com/volmit/iris/util/IrisBiomeStorage.java index b119e3c12..5918c2519 100644 --- a/src/main/java/com/volmit/iris/util/IrisBiomeStorage.java +++ b/src/main/java/com/volmit/iris/util/IrisBiomeStorage.java @@ -15,7 +15,7 @@ public class IrisBiomeStorage static { e = (int) Math.round(Math.log(16.0) / Math.log(2.0)) - 2; - f = (int) Math.round(Math.log(256.0) / Math.log(2.0)) - 2; + f = (int) Math.round(Math.log(256.0) / Math.log(2.0)) - 2; // TODO: WARNING HEIGHT a = 1 << IrisBiomeStorage.e + IrisBiomeStorage.e + IrisBiomeStorage.f; b = (1 << IrisBiomeStorage.e) - 1; c = (1 << IrisBiomeStorage.f) - 1; @@ -38,6 +38,7 @@ public class IrisBiomeStorage public void inject(BiomeGrid grid) { + // TODO: WARNING HEIGHT for(int i = 0; i < 256; i++) { for(int j = 0; j < 16; j++) diff --git a/src/main/java/com/volmit/iris/util/LinkedTerrainChunk.java b/src/main/java/com/volmit/iris/util/LinkedTerrainChunk.java index bfc0b6208..1d270088e 100644 --- a/src/main/java/com/volmit/iris/util/LinkedTerrainChunk.java +++ b/src/main/java/com/volmit/iris/util/LinkedTerrainChunk.java @@ -122,6 +122,11 @@ public class LinkedTerrainChunk implements TerrainChunk biome3D.setBiome(x, y, z, bio); } + @Override + public int getMinHeight() { + return rawChunkData.getMinHeight(); + } + @Override public int getMaxHeight() { diff --git a/src/main/java/com/volmit/iris/util/MathHelper.java b/src/main/java/com/volmit/iris/util/MathHelper.java index 65b383e25..4c6f0d7fb 100644 --- a/src/main/java/com/volmit/iris/util/MathHelper.java +++ b/src/main/java/com/volmit/iris/util/MathHelper.java @@ -569,6 +569,7 @@ public class MathHelper { for(int var02 = 0; var02 < 257; ++var02) { + // TODO: WARNING HEIGHT double var1 = (double) var02 / 256.0; double var3 = Math.asin(var1); MathHelper.g[var02] = Math.cos(var3);