diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 9d1799dfd..296c358b9 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -23,7 +23,7 @@ A clear and concise description of what you expected to happen. **Screenshots or Video Recordings** If applicable, add screenshots or video recordings to help explain your problem. -**Server and Plugin Informations** +**Server and Plugin Information** - Installed plugins: - Iris Version: - Server Platform and Version [eg: PaperSpigot 1.16.3 #240]: diff --git a/build.gradle b/build.gradle index ee384e0de..fe7301f28 100644 --- a/build.gradle +++ b/build.gradle @@ -10,11 +10,30 @@ def apiVersion = '1.17' def name = 'Iris' def main = 'com.volmit.iris.Iris' +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + // ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED // ============================================================== registerCustomOutputTask('Cyberpwn', 'C://Users/cyberpwn/Documents/development/server/plugins'); registerCustomOutputTask('Psycho', 'D://Dan/MinecraftDevelopment/server/plugins'); registerCustomOutputTask('ArcaneArts', 'C://Users/arcane/Documents/development/server/plugins'); +registerCustomOutputTask('Coco', 'C:/Users/sjoer/Documents/MCServer/plugins'); // ============================================================== def registerCustomOutputTask(name, path) { diff --git a/gradle.properties b/gradle.properties index 229aa2332..e30439176 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,21 @@ +# +# Iris is a World Generator for Minecraft Bukkit Servers +# Copyright (c) 2021 Arcane Arts (Volmit Software) +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + org.gradle.daemon=true org.gradle.parallel=true org.gradle.jvmargs=-Xmx3072m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fe677279e..9a6266293 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,3 +1,21 @@ +# +# Iris is a World Generator for Minecraft Bukkit Servers +# Copyright (c) 2021 Arcane Arts (Volmit Software) +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip diff --git a/gradlew b/gradlew index 4f906e0c8..782ac18d3 100644 --- a/gradlew +++ b/gradlew @@ -1,19 +1,21 @@ #!/usr/bin/env sh # -# Copyright 2015 the original author or authors. +# Iris is a World Generator for Minecraft Bukkit Servers +# Copyright (c) 2021 Arcane Arts (Volmit Software) # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # -# https://www.apache.org/licenses/LICENSE-2.0 +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . # ############################################################################## diff --git a/settings.gradle b/settings.gradle index d7f73608f..7e3e7191b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,20 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + rootProject.name = 'Iris' diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index 50d036ac7..aaebcdf35 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris; import com.volmit.iris.manager.*; @@ -12,7 +30,6 @@ import com.volmit.iris.nms.INMS; import com.volmit.iris.object.IrisCompat; import com.volmit.iris.object.IrisDimension; import com.volmit.iris.scaffold.IrisWorlds; -import com.volmit.iris.scaffold.data.DataProvider; import com.volmit.iris.scaffold.engine.EngineCompositeGenerator; import com.volmit.iris.util.*; import io.papermc.lib.PaperLib; @@ -24,14 +41,15 @@ import org.bukkit.event.HandlerList; import org.bukkit.event.Listener; import org.bukkit.generator.ChunkGenerator; import org.bukkit.plugin.Plugin; +import org.jetbrains.annotations.NotNull; import java.io.BufferedInputStream; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.net.URL; -import java.util.concurrent.Callable; +@SuppressWarnings("CanBeFinal") public class Iris extends VolmitPlugin implements Listener { public static KList executors = new KList<>(); public static Iris instance; @@ -71,48 +89,42 @@ public class Iris extends VolmitPlugin implements Listener { boolean reboot = false; File packs = new File("plugins/Iris/packs"); File dpacks = null; + File props = new File("server.properties"); - look: for(File i : new File(".").listFiles()) - { - if(i.isDirectory()) - { - for(File j : i.listFiles()) - { - if(j.isDirectory() && j.getName().equals("datapacks")) - { - dpacks = j; - break look; + if (props.exists()) { + try { + KList m = new KList<>(IO.readAll(props).split("\\Q\n\\E")); + + for (String i : m) { + if (i.trim().startsWith("level-name=")) { + dpacks = new File(i.trim().split("\\Q=\\E")[1] + "/datapacks"); + break; } } + } catch (IOException e) { + e.printStackTrace(); } } - if(dpacks == null) - { + if (dpacks == null) { Iris.error("Cannot find the datapacks folder! Please try generating a default world first maybe? Is this a new server?"); return; } - if(packs.exists()) - { - for(File i : packs.listFiles()) - { - if(i.isDirectory()) - { + + if (packs.exists()) { + for (File i : packs.listFiles()) { + if (i.isDirectory()) { Iris.verbose("Checking Pack: " + i.getPath()); IrisDataManager data = new IrisDataManager(i); File dims = new File(i, "dimensions"); - if(dims.exists()) - { - for(File j : dims.listFiles()) - { - if(j.getName().endsWith(".json")) - { + if (dims.exists()) { + for (File j : dims.listFiles()) { + if (j.getName().endsWith(".json")) { IrisDimension dim = data.getDimensionLoader().load(j.getName().split("\\Q.\\E")[0]); Iris.verbose(" Checking Dimension " + dim.getLoadFile().getPath()); - if(dim.installDataPack(() -> data, dpacks)) - { + if (dim.installDataPack(() -> data, dpacks)) { reboot = true; } } @@ -131,7 +143,7 @@ public class Iris extends VolmitPlugin implements Listener { if (tc <= 0) { int p = Runtime.getRuntime().availableProcessors(); - return p > 16 ? 16 : p < 4 ? 4 : p; + return p > 16 ? 16 : Math.max(p, 4); } return tc; @@ -142,7 +154,7 @@ public class Iris extends VolmitPlugin implements Listener { int v = Integer.parseInt(Bukkit.getBukkitVersion().split("\\Q-\\E")[0].split("\\Q.\\E")[1]); return v >= 15; - } catch (Throwable e) { + } catch (Throwable ignored) { } @@ -154,7 +166,7 @@ public class Iris extends VolmitPlugin implements Listener { int v = Integer.parseInt(Bukkit.getBukkitVersion().split("\\Q-\\E")[0].split("\\Q.\\E")[1]); return v >= 14; - } catch (Throwable e) { + } catch (Throwable ignored) { } @@ -166,7 +178,7 @@ public class Iris extends VolmitPlugin implements Listener { int v = Integer.parseInt(Bukkit.getBukkitVersion().split("\\Q-\\E")[0].split("\\Q.\\E")[1]); return v >= 15; - } catch (Throwable e) { + } catch (Throwable ignored) { } @@ -276,19 +288,9 @@ public class Iris extends VolmitPlugin implements Listener { J.s(() -> { Metrics m = new Metrics(Iris.instance, 8757); - m.addCustomChart(new Metrics.SingleLineChart("custom_dimensions", new Callable() { - @Override - public Integer call() throws Exception { - return ProjectManager.countUniqueDimensions(); - } - })); + m.addCustomChart(new Metrics.SingleLineChart("custom_dimensions", ProjectManager::countUniqueDimensions)); - m.addCustomChart(new Metrics.SimplePie("using_custom_dimensions", new Callable() { - @Override - public String call() throws Exception { - return ProjectManager.countUniqueDimensions() > 0 ? "Active Projects" : "No Projects"; - } - })); + m.addCustomChart(new Metrics.SimplePie("using_custom_dimensions", () -> ProjectManager.countUniqueDimensions() > 0 ? "Active Projects" : "No Projects")); }); } } @@ -308,7 +310,7 @@ public class Iris extends VolmitPlugin implements Listener { @Override - public ChunkGenerator getDefaultWorldGenerator(String worldName, String id) { + public ChunkGenerator getDefaultWorldGenerator(@NotNull String worldName, String id) { String dimension = IrisSettings.get().getGenerator().getDefaultWorldType(); if (id != null && !id.isEmpty()) { diff --git a/src/main/java/com/volmit/iris/IrisSettings.java b/src/main/java/com/volmit/iris/IrisSettings.java index 24342c048..020c0ef3e 100644 --- a/src/main/java/com/volmit/iris/IrisSettings.java +++ b/src/main/java/com/volmit/iris/IrisSettings.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris; import com.google.gson.Gson; @@ -7,6 +25,7 @@ import lombok.Data; import java.io.File; import java.io.IOException; +@SuppressWarnings("SynchronizeOnNonFinalField") @Data public class IrisSettings { public static transient IrisSettings settings; @@ -18,13 +37,14 @@ public class IrisSettings { private IrisSettingsGenerator generator = new IrisSettingsGenerator(); private IrisSettingsStudio studio = new IrisSettingsStudio(); - @DontObfuscate + public int configurationVersion = 3; public boolean isStudio() { return getStudio().isStudio(); } + @SuppressWarnings("BooleanMethodIsAlwaysInverted") public boolean isUseServerLaunchedGuis() { return getGui().isUseServerLaunchedGuis(); } @@ -35,77 +55,77 @@ public class IrisSettings { @Data public static class IrisSettingsCache { - @DontObfuscate + public int streamingCacheSize = 8192; } @Data public static class IrisSettingsConcurrency { - @DontObfuscate + public int threadCount = -1; } @Data public static class IrisSettingsParallax { - @DontObfuscate + public int parallaxRegionEvictionMS = 15000; - @DontObfuscate + public int parallaxChunkEvictionMS = 5000; } @Data public static class IrisSettingsGeneral { - @DontObfuscate + public boolean commandSounds = true; - @DontObfuscate + public boolean verbose = false; - @DontObfuscate + public boolean ignoreWorldEdit = false; - @DontObfuscate + public boolean disableNMS = false; - @DontObfuscate + public boolean pluginMetrics = true; - @DontObfuscate + public boolean splashLogoStartup = true; } @Data public static class IrisSettingsGUI { - @DontObfuscate + public boolean useServerLaunchedGuis = true; - @DontObfuscate + public boolean maximumPregenGuiFPS = false; - @DontObfuscate + public boolean localPregenGui = true; } @Data public static class IrisSettingsGenerator { - @DontObfuscate + public String defaultWorldType = "overworld"; - @DontObfuscate + public boolean mcaPregenerator = false; - @DontObfuscate + public boolean systemEffects = true; - @DontObfuscate + public boolean systemEntitySpawnOverrides = true; - @DontObfuscate + public boolean systemEntityInitialSpawns = true; - @DontObfuscate + public int maxBiomeChildDepth = 5; } @@ -113,13 +133,13 @@ public class IrisSettings { @Data public static class IrisSettingsStudio { - @DontObfuscate + public boolean studio = true; - @DontObfuscate + public boolean openVSCode = true; - @DontObfuscate + public boolean disableTimeAndWeather = true; } diff --git a/src/main/java/com/volmit/iris/generator/IrisComplex.java b/src/main/java/com/volmit/iris/generator/IrisComplex.java index 849b4e834..488c485c9 100644 --- a/src/main/java/com/volmit/iris/generator/IrisComplex.java +++ b/src/main/java/com/volmit/iris/generator/IrisComplex.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator; import com.google.common.util.concurrent.AtomicDouble; @@ -315,6 +333,7 @@ public class IrisComplex implements DataProvider { return bx.getGenLinkMax(gen.getLoadKey()); } catch (Throwable e) { + e.printStackTrace(); Iris.warn("Failed to sample hi biome at " + xx + " " + zz + " using the generator " + gen.getLoadKey()); } @@ -328,6 +347,7 @@ public class IrisComplex implements DataProvider { return bx.getGenLinkMin(gen.getLoadKey()); } catch (Throwable e) { + e.printStackTrace(); Iris.warn("Failed to sample lo biome at " + xx + " " + zz + " using the generator " + gen.getLoadKey()); } diff --git a/src/main/java/com/volmit/iris/generator/IrisEngine.java b/src/main/java/com/volmit/iris/generator/IrisEngine.java index d1327fb19..e04b4773d 100644 --- a/src/main/java/com/volmit/iris/generator/IrisEngine.java +++ b/src/main/java/com/volmit/iris/generator/IrisEngine.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/generator/IrisEngineCompound.java b/src/main/java/com/volmit/iris/generator/IrisEngineCompound.java index ebaec7962..9dca2a6d3 100644 --- a/src/main/java/com/volmit/iris/generator/IrisEngineCompound.java +++ b/src/main/java/com/volmit/iris/generator/IrisEngineCompound.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/generator/IrisEngineEffects.java b/src/main/java/com/volmit/iris/generator/IrisEngineEffects.java index 34f9d423f..acb00b242 100644 --- a/src/main/java/com/volmit/iris/generator/IrisEngineEffects.java +++ b/src/main/java/com/volmit/iris/generator/IrisEngineEffects.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator; import com.volmit.iris.scaffold.engine.Engine; diff --git a/src/main/java/com/volmit/iris/generator/IrisEngineFramework.java b/src/main/java/com/volmit/iris/generator/IrisEngineFramework.java index 45abdf0ed..57f7fad68 100644 --- a/src/main/java/com/volmit/iris/generator/IrisEngineFramework.java +++ b/src/main/java/com/volmit/iris/generator/IrisEngineFramework.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/generator/IrisEngineParallax.java b/src/main/java/com/volmit/iris/generator/IrisEngineParallax.java index 71ba8716d..5a534d733 100644 --- a/src/main/java/com/volmit/iris/generator/IrisEngineParallax.java +++ b/src/main/java/com/volmit/iris/generator/IrisEngineParallax.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator; import com.volmit.iris.scaffold.engine.Engine; diff --git a/src/main/java/com/volmit/iris/generator/IrisWorldManager.java b/src/main/java/com/volmit/iris/generator/IrisWorldManager.java index 77a229c97..0e4e2107c 100644 --- a/src/main/java/com/volmit/iris/generator/IrisWorldManager.java +++ b/src/main/java/com/volmit/iris/generator/IrisWorldManager.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator; import com.volmit.iris.IrisSettings; @@ -109,7 +127,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager { }); } }); - } catch (Throwable xe) { + } catch (Throwable ignored) { } } diff --git a/src/main/java/com/volmit/iris/generator/actuator/IrisBiomeActuator.java b/src/main/java/com/volmit/iris/generator/actuator/IrisBiomeActuator.java index 6b1a315c0..7818e1579 100644 --- a/src/main/java/com/volmit/iris/generator/actuator/IrisBiomeActuator.java +++ b/src/main/java/com/volmit/iris/generator/actuator/IrisBiomeActuator.java @@ -1,7 +1,26 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.actuator; import com.volmit.iris.nms.INMS; import com.volmit.iris.object.IrisBiome; +import com.volmit.iris.object.IrisBiomeCustom; import com.volmit.iris.scaffold.engine.Engine; import com.volmit.iris.scaffold.engine.EngineAssignedActuator; import com.volmit.iris.scaffold.hunk.Hunk; @@ -10,62 +29,74 @@ import com.volmit.iris.scaffold.parallel.BurstExecutor; import com.volmit.iris.scaffold.parallel.MultiBurst; import com.volmit.iris.util.PrecisionStopwatch; import com.volmit.iris.util.RNG; +import com.volmit.iris.util.TerrainChunk; import org.bukkit.block.Biome; +import org.bukkit.generator.ChunkGenerator; public class IrisBiomeActuator extends EngineAssignedActuator { + private final RNG rng; + public IrisBiomeActuator(Engine engine) { super(engine, "Biome"); + rng = new RNG(engine.getWorld().getSeed() + 243995); + } + + private boolean injectBiome(Hunk h, int x, int y, int z, Object bb) { + try { + if (h instanceof BiomeGridHunkView hh) { + ChunkGenerator.BiomeGrid g = hh.getChunk(); + if (g instanceof TerrainChunk) { + ((TerrainChunk) g).getBiomeBaseInjector().setBiome(x, y, z, bb); + } else { + hh.forceBiomeBaseInto(x, y, z, bb); + } + return true; + } + } catch (Throwable e) { + e.printStackTrace(); + } + + return false; } @Override public void onActuate(int x, int z, Hunk h) { PrecisionStopwatch p = PrecisionStopwatch.start(); - int zf, hh; - BurstExecutor burst = MultiBurst.burst.burst(h.getWidth() * h.getDepth()); + int zf; for (int xf = 0; xf < h.getWidth(); xf++) { for (zf = 0; zf < h.getDepth(); zf++) { - int xxf = xf; - int zzf = zf; - burst.queue(() -> { - IrisBiome ib = getComplex().getTrueBiomeStream().get(modX(xxf + x), modZ(zzf + z)); + IrisBiome ib = getComplex().getTrueBiomeStream().get(modX(xf + x), modZ(zf + z)); - if(ib.isCustom()) - { - try - { - Object biomeBase = INMS.get().getCustomBiomeBaseFor(getDimension().getLoadKey()+":"+ib.getCustom().getId()); - ((BiomeGridHunkView)h).forceBiomeBaseInto(x, 0, z, biomeBase); + if (ib.isCustom()) { + try { + IrisBiomeCustom custom = ib.getCustomBiome(rng, x, 0, z); + Object biomeBase = INMS.get().getCustomBiomeBaseFor(getDimension().getLoadKey() + ":" + custom.getId()); - for (int i = 0; i < h.getHeight(); i++) { - ((BiomeGridHunkView)h).forceBiomeBaseInto(xxf, i, zzf, biomeBase); - } + if (!injectBiome(h, x, 0, z, biomeBase)) { + throw new RuntimeException("Cant inject biome!"); } - catch(Throwable e) - { - e.printStackTrace(); - Biome v = ib.getSkyBiome(RNG.r, x, 0, z); - for (int i = 0; i < h.getHeight(); i++) { - h.set(xxf, i, zzf, v); - } - } - } - - else - { - Biome v = ib.getSkyBiome(RNG.r, x, 0, z); for (int i = 0; i < h.getHeight(); i++) { - h.set(xxf, i, zzf, v); + injectBiome(h, xf, i, zf, biomeBase); + } + } catch (Throwable e) { + e.printStackTrace(); + Biome v = ib.getSkyBiome(rng, x, 0, z); + for (int i = 0; i < h.getHeight(); i++) { + h.set(xf, i, zf, v); } } - }); + } else { + Biome v = ib.getSkyBiome(rng, x, 0, z); + for (int i = 0; i < h.getHeight(); i++) { + h.set(xf, i, zf, v); + } + } } } - burst.complete(); - getEngine().getMetrics().getBiome().put(p.getMilliseconds()); } } diff --git a/src/main/java/com/volmit/iris/generator/actuator/IrisDecorantActuator.java b/src/main/java/com/volmit/iris/generator/actuator/IrisDecorantActuator.java index 7eb360bfd..7261744ce 100644 --- a/src/main/java/com/volmit/iris/generator/actuator/IrisDecorantActuator.java +++ b/src/main/java/com/volmit/iris/generator/actuator/IrisDecorantActuator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.actuator; import com.volmit.iris.generator.decorator.*; diff --git a/src/main/java/com/volmit/iris/generator/actuator/IrisTerrainActuator.java b/src/main/java/com/volmit/iris/generator/actuator/IrisTerrainActuator.java index edb19256e..883757f24 100644 --- a/src/main/java/com/volmit/iris/generator/actuator/IrisTerrainActuator.java +++ b/src/main/java/com/volmit/iris/generator/actuator/IrisTerrainActuator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.actuator; import com.volmit.iris.object.IrisBiome; diff --git a/src/main/java/com/volmit/iris/generator/decorator/IrisCeilingDecorator.java b/src/main/java/com/volmit/iris/generator/decorator/IrisCeilingDecorator.java index b080bdd82..0bc379273 100644 --- a/src/main/java/com/volmit/iris/generator/decorator/IrisCeilingDecorator.java +++ b/src/main/java/com/volmit/iris/generator/decorator/IrisCeilingDecorator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.decorator; import com.volmit.iris.object.DecorationPart; diff --git a/src/main/java/com/volmit/iris/generator/decorator/IrisEngineDecorator.java b/src/main/java/com/volmit/iris/generator/decorator/IrisEngineDecorator.java index d8dbd0655..2f37fa5ad 100644 --- a/src/main/java/com/volmit/iris/generator/decorator/IrisEngineDecorator.java +++ b/src/main/java/com/volmit/iris/generator/decorator/IrisEngineDecorator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.decorator; import com.volmit.iris.Iris; @@ -23,7 +41,7 @@ public abstract class IrisEngineDecorator extends EngineAssignedComponent implem public IrisEngineDecorator(Engine engine, String name, DecorationPart part) { super(engine, name + " Decorator"); this.part = part; - this.rng = new RNG(getSeed() + 29356788 - (part.ordinal() * 10439677)); + this.rng = new RNG(getSeed() + 29356788 - (part.ordinal() * 10439677L)); } protected IrisDecorator getDecorator(IrisBiome biome, double realX, double realZ) { diff --git a/src/main/java/com/volmit/iris/generator/decorator/IrisSeaFloorDecorator.java b/src/main/java/com/volmit/iris/generator/decorator/IrisSeaFloorDecorator.java index 480b58ac5..214e45204 100644 --- a/src/main/java/com/volmit/iris/generator/decorator/IrisSeaFloorDecorator.java +++ b/src/main/java/com/volmit/iris/generator/decorator/IrisSeaFloorDecorator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.decorator; import com.volmit.iris.object.DecorationPart; diff --git a/src/main/java/com/volmit/iris/generator/decorator/IrisSeaSurfaceDecorator.java b/src/main/java/com/volmit/iris/generator/decorator/IrisSeaSurfaceDecorator.java index 2400a7608..91b346ebb 100644 --- a/src/main/java/com/volmit/iris/generator/decorator/IrisSeaSurfaceDecorator.java +++ b/src/main/java/com/volmit/iris/generator/decorator/IrisSeaSurfaceDecorator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.decorator; import com.volmit.iris.object.DecorationPart; diff --git a/src/main/java/com/volmit/iris/generator/decorator/IrisShoreLineDecorator.java b/src/main/java/com/volmit/iris/generator/decorator/IrisShoreLineDecorator.java index 4476dbac9..af1125dff 100644 --- a/src/main/java/com/volmit/iris/generator/decorator/IrisShoreLineDecorator.java +++ b/src/main/java/com/volmit/iris/generator/decorator/IrisShoreLineDecorator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.decorator; import com.volmit.iris.object.DecorationPart; diff --git a/src/main/java/com/volmit/iris/generator/decorator/IrisSurfaceDecorator.java b/src/main/java/com/volmit/iris/generator/decorator/IrisSurfaceDecorator.java index 97d121227..f6ec108d4 100644 --- a/src/main/java/com/volmit/iris/generator/decorator/IrisSurfaceDecorator.java +++ b/src/main/java/com/volmit/iris/generator/decorator/IrisSurfaceDecorator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.decorator; import com.volmit.iris.object.DecorationPart; @@ -41,7 +59,7 @@ public class IrisSurfaceDecorator extends IrisEngineDecorator { ((Bisected) bd).setHalf(Bisected.Half.TOP); try { data.set(x, height + 2, z, bd); - } catch (Throwable e) { + } catch (Throwable ignored) { } bd = bd.clone(); 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 076cc9af4..676bf86c3 100644 --- a/src/main/java/com/volmit/iris/generator/modifier/IrisCaveModifier.java +++ b/src/main/java/com/volmit/iris/generator/modifier/IrisCaveModifier.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.modifier; import com.volmit.iris.generator.noise.FastNoiseDouble; 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 607a03565..4977bbd4d 100644 --- a/src/main/java/com/volmit/iris/generator/modifier/IrisDepositModifier.java +++ b/src/main/java/com/volmit/iris/generator/modifier/IrisDepositModifier.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.modifier; import com.volmit.iris.object.IrisBiome; diff --git a/src/main/java/com/volmit/iris/generator/modifier/IrisPostModifier.java b/src/main/java/com/volmit/iris/generator/modifier/IrisPostModifier.java index 5674da8c5..a54d7db89 100644 --- a/src/main/java/com/volmit/iris/generator/modifier/IrisPostModifier.java +++ b/src/main/java/com/volmit/iris/generator/modifier/IrisPostModifier.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.modifier; import com.volmit.iris.object.IrisBiome; @@ -42,6 +60,7 @@ public class IrisPostModifier extends EngineAssignedModifier { getEngine().getMetrics().getPost().put(p.getMilliseconds()); } + @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter") private void post(int currentPostX, int currentPostZ, Hunk currentData, int x, int z) { int h = getFramework().getEngineParallax().trueHeight(x, z); @@ -322,9 +341,22 @@ public class IrisPostModifier extends EngineAssignedModifier { } if (!cancel && isAirOrWater(x, c, z, currentPostX, currentPostZ, currentData)) { - Slab slab = (Slab) d.clone(); - slab.setType(Slab.Type.TOP); - setPostBlock(x, c, z, slab, currentPostX, currentPostZ, currentData); + try { + Slab slab = (Slab) d.clone(); + slab.setType(Slab.Type.TOP); + setPostBlock(x, c, z, slab, currentPostX, currentPostZ, currentData); + } catch (Throwable ignored) { + try { + Slab slab = (Slab) d.clone(); + + synchronized (slab) { + slab.setType(Slab.Type.TOP); + setPostBlock(x, c, z, slab, currentPostX, currentPostZ, currentData); + } + } catch (Throwable ignored2) { + + } + } } } } 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 166e3b4d7..9ebe280d3 100644 --- a/src/main/java/com/volmit/iris/generator/modifier/IrisRavineModifier.java +++ b/src/main/java/com/volmit/iris/generator/modifier/IrisRavineModifier.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.modifier; import com.volmit.iris.generator.noise.CNG; @@ -9,6 +27,7 @@ import com.volmit.iris.util.*; import org.bukkit.Material; import org.bukkit.block.data.BlockData; +@SuppressWarnings("ALL") public class IrisRavineModifier extends EngineAssignedModifier { private static final BlockData CAVE_AIR = B.get("CAVE_AIR"); private static final BlockData LAVA = B.get("LAVA"); @@ -52,7 +71,7 @@ public class IrisRavineModifier extends EngineAssignedModifier { private final float[] ravineCache = new float[1024]; - private void doRavine(long seed, int tx, int tz, ChunkPosition pos, double sx, double sy, double sz, float f, float f2, float f3, int n3, int n4, double d4, RNG bbx, Hunk terrain) { + private void doRavine(long seed, int tx, int tz, ChunkPosition pos, double sx, double sy, double sz, float f, float f2, float f3, @SuppressWarnings("SameParameterValue") int n3, @SuppressWarnings("SameParameterValue") int n4, @SuppressWarnings("SameParameterValue") double d4, RNG bbx, Hunk terrain) { int n5; RNG random = new RNG(seed); double x = tx * 16 + 8; @@ -196,7 +215,7 @@ public class IrisRavineModifier extends EngineAssignedModifier { } } - private BlockPosition cSet(BlockPosition bb, double var0, double var2, double var4) { + private BlockPosition cSet(BlockPosition bb, double var0, @SuppressWarnings("SameParameterValue") double var2, double var4) { bb.setX(MathHelper.floor(var0)); bb.setY(MathHelper.floor(var2)); bb.setZ(MathHelper.floor(var4)); diff --git a/src/main/java/com/volmit/iris/generator/noise/CNG.java b/src/main/java/com/volmit/iris/generator/noise/CNG.java index f88c2a108..521b46700 100644 --- a/src/main/java/com/volmit/iris/generator/noise/CNG.java +++ b/src/main/java/com/volmit/iris/generator/noise/CNG.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; import com.volmit.iris.scaffold.stream.ProceduralStream; @@ -48,7 +66,7 @@ public class CNG { } public ProceduralStream stream(double min, double max) { - return new FittedStream(stream(), min, max); + return new FittedStream<>(stream(), min, max); } public static CNG signature(RNG rng) { @@ -286,7 +304,7 @@ public class CNG { try { return v.get(fit(0, v.size() - 1, dim)); - } catch (Throwable e) { + } catch (Throwable ignored) { } diff --git a/src/main/java/com/volmit/iris/generator/noise/CNGFactory.java b/src/main/java/com/volmit/iris/generator/noise/CNGFactory.java index 4f2eca08a..a4394d65a 100644 --- a/src/main/java/com/volmit/iris/generator/noise/CNGFactory.java +++ b/src/main/java/com/volmit/iris/generator/noise/CNGFactory.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/generator/noise/CellGenerator.java b/src/main/java/com/volmit/iris/generator/noise/CellGenerator.java index 2265c551c..3ba9bd7d0 100644 --- a/src/main/java/com/volmit/iris/generator/noise/CellGenerator.java +++ b/src/main/java/com/volmit/iris/generator/noise/CellGenerator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/generator/noise/CellHeightNoise.java b/src/main/java/com/volmit/iris/generator/noise/CellHeightNoise.java index ec7565b21..0ff84cd96 100644 --- a/src/main/java/com/volmit/iris/generator/noise/CellHeightNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/CellHeightNoise.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; import com.volmit.iris.util.M; diff --git a/src/main/java/com/volmit/iris/generator/noise/CellularNoise.java b/src/main/java/com/volmit/iris/generator/noise/CellularNoise.java index ee8fab770..00e4b1020 100644 --- a/src/main/java/com/volmit/iris/generator/noise/CellularNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/CellularNoise.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/generator/noise/CubicNoise.java b/src/main/java/com/volmit/iris/generator/noise/CubicNoise.java index a34b69081..1936c743b 100644 --- a/src/main/java/com/volmit/iris/generator/noise/CubicNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/CubicNoise.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/generator/noise/FastNoise.java b/src/main/java/com/volmit/iris/generator/noise/FastNoise.java index dcffbf8e5..fc445510c 100644 --- a/src/main/java/com/volmit/iris/generator/noise/FastNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/FastNoise.java @@ -1,30 +1,20 @@ -// FastNoise.java -// -// MIT License -// -// Copyright(c) 2017 Jordan Peck -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files(the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions : -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. -// -// The developer's email is jorzixdan.me2@gzixmail.com (for great email, take -// off every 'zix'.) -// +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package com.volmit.iris.generator.noise; diff --git a/src/main/java/com/volmit/iris/generator/noise/FastNoiseDouble.java b/src/main/java/com/volmit/iris/generator/noise/FastNoiseDouble.java index 8ec4ab5d6..932edf732 100644 --- a/src/main/java/com/volmit/iris/generator/noise/FastNoiseDouble.java +++ b/src/main/java/com/volmit/iris/generator/noise/FastNoiseDouble.java @@ -1,30 +1,20 @@ -// FastNoise.java -// -// MIT License -// -// Copyright(c) 2017 Jordan Peck -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files(the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions : -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. -// -// The developer's email is jorzixdan.me2@gzixmail.com (for great email, take -// off every 'zix'.) -// +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package com.volmit.iris.generator.noise; import com.volmit.iris.util.Vector2f; @@ -193,6 +183,7 @@ public class FastNoiseDouble { m_gradientPerturbAmp = gradientPerturbAmp / 0.45; } + @SuppressWarnings("ClassCanBeRecord") private static class Double2 { public final double x, y; @@ -202,6 +193,7 @@ public class FastNoiseDouble { } } + @SuppressWarnings("ClassCanBeRecord") private static class Double3 { public final double x, y, z; @@ -368,21 +360,21 @@ public class FastNoiseDouble { hash &= 31; double a = yd, b = zd, c = wd; // X,Y,Z switch ((int) hash >> 3) { // OR, DEPENDING ON HIGH ORDER 2 BITS: - case 1: + case 1 -> { a = wd; b = xd; c = yd; - break; // W,X,Y - case 2: + } // W,X,Y + case 2 -> { a = zd; b = wd; c = xd; - break; // Z,W,X - case 3: + } // Z,W,X + case 3 -> { a = yd; b = zd; c = wd; - break; // Y,Z,W + } // Y,Z,W } return ((hash & 4) == 0 ? -a : a) + ((hash & 2) == 0 ? -b : b) + ((hash & 1) == 0 ? -c : c); } @@ -396,66 +388,42 @@ public class FastNoiseDouble { case Value: return SingleValue(m_seed, x, y, z); case ValueFractal: - switch (m_fractalType) { - case FBM: - return SingleValueFractalFBM(x, y, z); - case Billow: - return SingleValueFractalBillow(x, y, z); - case RigidMulti: - return SingleValueFractalRigidMulti(x, y, z); - default: - return 0; - } + return switch (m_fractalType) { + case FBM -> SingleValueFractalFBM(x, y, z); + case Billow -> SingleValueFractalBillow(x, y, z); + case RigidMulti -> SingleValueFractalRigidMulti(x, y, z); + }; case Perlin: return SinglePerlin(m_seed, x, y, z); case PerlinFractal: - switch (m_fractalType) { - case FBM: - return SinglePerlinFractalFBM(x, y, z); - case Billow: - return SinglePerlinFractalBillow(x, y, z); - case RigidMulti: - return SinglePerlinFractalRigidMulti(x, y, z); - default: - return 0; - } + return switch (m_fractalType) { + case FBM -> SinglePerlinFractalFBM(x, y, z); + case Billow -> SinglePerlinFractalBillow(x, y, z); + case RigidMulti -> SinglePerlinFractalRigidMulti(x, y, z); + }; case Simplex: return SingleSimplex(m_seed, x, y, z); case SimplexFractal: - switch (m_fractalType) { - case FBM: - return SingleSimplexFractalFBM(x, y, z); - case Billow: - return SingleSimplexFractalBillow(x, y, z); - case RigidMulti: - return SingleSimplexFractalRigidMulti(x, y, z); - default: - return 0; - } + return switch (m_fractalType) { + case FBM -> SingleSimplexFractalFBM(x, y, z); + case Billow -> SingleSimplexFractalBillow(x, y, z); + case RigidMulti -> SingleSimplexFractalRigidMulti(x, y, z); + }; case Cellular: - switch (m_cellularReturnType) { - case CellValue: - case NoiseLookup: - case Distance: - return SingleCellular(x, y, z); - default: - return SingleCellular2Edge(x, y, z); - } + return switch (m_cellularReturnType) { + case CellValue, NoiseLookup, Distance -> SingleCellular(x, y, z); + default -> SingleCellular2Edge(x, y, z); + }; case WhiteNoise: return GetWhiteNoise(x, y, z); case Cubic: return SingleCubic(m_seed, x, y, z); case CubicFractal: - switch (m_fractalType) { - case FBM: - return SingleCubicFractalFBM(x, y, z); - case Billow: - return SingleCubicFractalBillow(x, y, z); - case RigidMulti: - return SingleCubicFractalRigidMulti(x, y, z); - default: - return 0; - } + return switch (m_fractalType) { + case FBM -> SingleCubicFractalFBM(x, y, z); + case Billow -> SingleCubicFractalBillow(x, y, z); + case RigidMulti -> SingleCubicFractalRigidMulti(x, y, z); + }; default: return 0; } @@ -469,66 +437,42 @@ public class FastNoiseDouble { case Value: return SingleValue(m_seed, x, y); case ValueFractal: - switch (m_fractalType) { - case FBM: - return SingleValueFractalFBM(x, y); - case Billow: - return SingleValueFractalBillow(x, y); - case RigidMulti: - return SingleValueFractalRigidMulti(x, y); - default: - return 0; - } + return switch (m_fractalType) { + case FBM -> SingleValueFractalFBM(x, y); + case Billow -> SingleValueFractalBillow(x, y); + case RigidMulti -> SingleValueFractalRigidMulti(x, y); + }; case Perlin: return SinglePerlin(m_seed, x, y); case PerlinFractal: - switch (m_fractalType) { - case FBM: - return SinglePerlinFractalFBM(x, y); - case Billow: - return SinglePerlinFractalBillow(x, y); - case RigidMulti: - return SinglePerlinFractalRigidMulti(x, y); - default: - return 0; - } + return switch (m_fractalType) { + case FBM -> SinglePerlinFractalFBM(x, y); + case Billow -> SinglePerlinFractalBillow(x, y); + case RigidMulti -> SinglePerlinFractalRigidMulti(x, y); + }; case Simplex: return SingleSimplex(m_seed, x, y); case SimplexFractal: - switch (m_fractalType) { - case FBM: - return SingleSimplexFractalFBM(x, y); - case Billow: - return SingleSimplexFractalBillow(x, y); - case RigidMulti: - return SingleSimplexFractalRigidMulti(x, y); - default: - return 0; - } + return switch (m_fractalType) { + case FBM -> SingleSimplexFractalFBM(x, y); + case Billow -> SingleSimplexFractalBillow(x, y); + case RigidMulti -> SingleSimplexFractalRigidMulti(x, y); + }; case Cellular: - switch (m_cellularReturnType) { - case CellValue: - case NoiseLookup: - case Distance: - return SingleCellular(x, y); - default: - return SingleCellular2Edge(x, y); - } + return switch (m_cellularReturnType) { + case CellValue, NoiseLookup, Distance -> SingleCellular(x, y); + default -> SingleCellular2Edge(x, y); + }; case WhiteNoise: return GetWhiteNoise(x, y); case Cubic: return SingleCubic(m_seed, x, y); case CubicFractal: - switch (m_fractalType) { - case FBM: - return SingleCubicFractalFBM(x, y); - case Billow: - return SingleCubicFractalBillow(x, y); - case RigidMulti: - return SingleCubicFractalRigidMulti(x, y); - default: - return 0; - } + return switch (m_fractalType) { + case FBM -> SingleCubicFractalFBM(x, y); + case Billow -> SingleCubicFractalBillow(x, y); + case RigidMulti -> SingleCubicFractalRigidMulti(x, y); + }; default: return 0; } @@ -584,16 +528,11 @@ public class FastNoiseDouble { y *= m_frequency; z *= m_frequency; - switch (m_fractalType) { - case FBM: - return SingleValueFractalFBM(x, y, z); - case Billow: - return SingleValueFractalBillow(x, y, z); - case RigidMulti: - return SingleValueFractalRigidMulti(x, y, z); - default: - return 0; - } + return switch (m_fractalType) { + case FBM -> SingleValueFractalFBM(x, y, z); + case Billow -> SingleValueFractalBillow(x, y, z); + case RigidMulti -> SingleValueFractalRigidMulti(x, y, z); + }; } private double SingleValueFractalFBM(double x, double y, double z) { @@ -659,24 +598,23 @@ public class FastNoiseDouble { long y1 = y0 + 1; long z1 = z0 + 1; - double xs, ys, zs; + double xs=0, ys=0, zs=0; switch (m_longerp) { - default: - case Linear: + case Linear -> { xs = x - x0; ys = y - y0; zs = z - z0; - break; - case Hermite: + } + case Hermite -> { xs = longerpHermiteFunc(x - x0); ys = longerpHermiteFunc(y - y0); zs = longerpHermiteFunc(z - z0); - break; - case Qulongic: + } + case Qulongic -> { xs = longerpQulongicFunc(x - x0); ys = longerpQulongicFunc(y - y0); zs = longerpQulongicFunc(z - z0); - break; + } } double xf00 = lerp(valCoord3D(seed, x0, y0, z0), valCoord3D(seed, x1, y0, z0), xs); @@ -694,16 +632,11 @@ public class FastNoiseDouble { x *= m_frequency; y *= m_frequency; - switch (m_fractalType) { - case FBM: - return SingleValueFractalFBM(x, y); - case Billow: - return SingleValueFractalBillow(x, y); - case RigidMulti: - return SingleValueFractalRigidMulti(x, y); - default: - return 0; - } + return switch (m_fractalType) { + case FBM -> SingleValueFractalFBM(x, y); + case Billow -> SingleValueFractalBillow(x, y); + case RigidMulti -> SingleValueFractalRigidMulti(x, y); + }; } private double SingleValueFractalFBM(double x, double y) { @@ -763,21 +696,20 @@ public class FastNoiseDouble { long x1 = x0 + 1; long y1 = y0 + 1; - double xs, ys; + double xs=0, ys=0; switch (m_longerp) { - default: - case Linear: + case Linear -> { xs = x - x0; ys = y - y0; - break; - case Hermite: + } + case Hermite -> { xs = longerpHermiteFunc(x - x0); ys = longerpHermiteFunc(y - y0); - break; - case Qulongic: + } + case Qulongic -> { xs = longerpQulongicFunc(x - x0); ys = longerpQulongicFunc(y - y0); - break; + } } double xf0 = lerp(valCoord2D(seed, x0, y0), valCoord2D(seed, x1, y0), xs); @@ -792,16 +724,11 @@ public class FastNoiseDouble { y *= m_frequency; z *= m_frequency; - switch (m_fractalType) { - case FBM: - return SinglePerlinFractalFBM(x, y, z); - case Billow: - return SinglePerlinFractalBillow(x, y, z); - case RigidMulti: - return SinglePerlinFractalRigidMulti(x, y, z); - default: - return 0; - } + return switch (m_fractalType) { + case FBM -> SinglePerlinFractalFBM(x, y, z); + case Billow -> SinglePerlinFractalBillow(x, y, z); + case RigidMulti -> SinglePerlinFractalRigidMulti(x, y, z); + }; } private double SinglePerlinFractalFBM(double x, double y, double z) { @@ -867,24 +794,23 @@ public class FastNoiseDouble { long y1 = y0 + 1; long z1 = z0 + 1; - double xs, ys, zs; + double xs=0, ys=0, zs=0; switch (m_longerp) { - default: - case Linear: + case Linear -> { xs = x - x0; ys = y - y0; zs = z - z0; - break; - case Hermite: + } + case Hermite -> { xs = longerpHermiteFunc(x - x0); ys = longerpHermiteFunc(y - y0); zs = longerpHermiteFunc(z - z0); - break; - case Qulongic: + } + case Qulongic -> { xs = longerpQulongicFunc(x - x0); ys = longerpQulongicFunc(y - y0); zs = longerpQulongicFunc(z - z0); - break; + } } double xd0 = x - x0; @@ -909,16 +835,11 @@ public class FastNoiseDouble { x *= m_frequency; y *= m_frequency; - switch (m_fractalType) { - case FBM: - return SinglePerlinFractalFBM(x, y); - case Billow: - return SinglePerlinFractalBillow(x, y); - case RigidMulti: - return SinglePerlinFractalRigidMulti(x, y); - default: - return 0; - } + return switch (m_fractalType) { + case FBM -> SinglePerlinFractalFBM(x, y); + case Billow -> SinglePerlinFractalBillow(x, y); + case RigidMulti -> SinglePerlinFractalRigidMulti(x, y); + }; } private double SinglePerlinFractalFBM(double x, double y) { @@ -1012,16 +933,11 @@ public class FastNoiseDouble { y *= m_frequency; z *= m_frequency; - switch (m_fractalType) { - case FBM: - return SingleSimplexFractalFBM(x, y, z); - case Billow: - return SingleSimplexFractalBillow(x, y, z); - case RigidMulti: - return SingleSimplexFractalRigidMulti(x, y, z); - default: - return 0; - } + return switch (m_fractalType) { + case FBM -> SingleSimplexFractalFBM(x, y, z); + case Billow -> SingleSimplexFractalBillow(x, y, z); + case RigidMulti -> SingleSimplexFractalRigidMulti(x, y, z); + }; } private double SingleSimplexFractalFBM(double x, double y, double z) { @@ -1199,16 +1115,11 @@ public class FastNoiseDouble { x *= m_frequency; y *= m_frequency; - switch (m_fractalType) { - case FBM: - return SingleSimplexFractalFBM(x, y); - case Billow: - return SingleSimplexFractalBillow(x, y); - case RigidMulti: - return SingleSimplexFractalRigidMulti(x, y); - default: - return 0; - } + return switch (m_fractalType) { + case FBM -> SingleSimplexFractalFBM(x, y); + case Billow -> SingleSimplexFractalBillow(x, y); + case RigidMulti -> SingleSimplexFractalRigidMulti(x, y); + }; } private double SingleSimplexFractalFBM(double x, double y) { @@ -1431,16 +1342,11 @@ public class FastNoiseDouble { y *= m_frequency; z *= m_frequency; - switch (m_fractalType) { - case FBM: - return SingleCubicFractalFBM(x, y, z); - case Billow: - return SingleCubicFractalBillow(x, y, z); - case RigidMulti: - return SingleCubicFractalRigidMulti(x, y, z); - default: - return 0; - } + return switch (m_fractalType) { + case FBM -> SingleCubicFractalFBM(x, y, z); + case Billow -> SingleCubicFractalBillow(x, y, z); + case RigidMulti -> SingleCubicFractalRigidMulti(x, y, z); + }; } private double SingleCubicFractalFBM(double x, double y, double z) { @@ -1529,16 +1435,11 @@ public class FastNoiseDouble { x *= m_frequency; y *= m_frequency; - switch (m_fractalType) { - case FBM: - return SingleCubicFractalFBM(x, y); - case Billow: - return SingleCubicFractalBillow(x, y); - case RigidMulti: - return SingleCubicFractalRigidMulti(x, y); - default: - return 0; - } + return switch (m_fractalType) { + case FBM -> SingleCubicFractalFBM(x, y); + case Billow -> SingleCubicFractalBillow(x, y); + case RigidMulti -> SingleCubicFractalRigidMulti(x, y); + }; } private double SingleCubicFractalFBM(double x, double y) { @@ -1624,14 +1525,10 @@ public class FastNoiseDouble { y *= m_frequency; z *= m_frequency; - switch (m_cellularReturnType) { - case CellValue: - case NoiseLookup: - case Distance: - return SingleCellular(x, y, z); - default: - return SingleCellular2Edge(x, y, z); - } + return switch (m_cellularReturnType) { + case CellValue, NoiseLookup, Distance -> SingleCellular(x, y, z); + default -> SingleCellular2Edge(x, y, z); + }; } private double SingleCellular(double x, double y, double z) { @@ -1793,34 +1690,24 @@ public class FastNoiseDouble { break; } - switch (m_cellularReturnType) { - case Distance2: - return distance2 - 1; - case Distance2Add: - return distance2 + distance - 1; - case Distance2Sub: - return distance2 - distance - 1; - case Distance2Mul: - return distance2 * distance - 1; - case Distance2Div: - return distance / distance2 - 1; - default: - return 0; - } + return switch (m_cellularReturnType) { + case Distance2 -> distance2 - 1; + case Distance2Add -> distance2 + distance - 1; + case Distance2Sub -> distance2 - distance - 1; + case Distance2Mul -> distance2 * distance - 1; + case Distance2Div -> distance / distance2 - 1; + default -> 0; + }; } public double GetCellular(double x, double y) { x *= m_frequency; y *= m_frequency; - switch (m_cellularReturnType) { - case CellValue: - case NoiseLookup: - case Distance: - return SingleCellular(x, y); - default: - return SingleCellular2Edge(x, y); - } + return switch (m_cellularReturnType) { + case CellValue, NoiseLookup, Distance -> SingleCellular(x, y); + default -> SingleCellular2Edge(x, y); + }; } private double SingleCellular(double x, double y) { @@ -1959,20 +1846,14 @@ public class FastNoiseDouble { break; } - switch (m_cellularReturnType) { - case Distance2: - return distance2 - 1; - case Distance2Add: - return distance2 + distance - 1; - case Distance2Sub: - return distance2 - distance - 1; - case Distance2Mul: - return distance2 * distance - 1; - case Distance2Div: - return distance / distance2 - 1; - default: - return 0; - } + return switch (m_cellularReturnType) { + case Distance2 -> distance2 - 1; + case Distance2Add -> distance2 + distance - 1; + case Distance2Sub -> distance2 - distance - 1; + case Distance2Mul -> distance2 * distance - 1; + case Distance2Div -> distance / distance2 - 1; + default -> 0; + }; } public void GradientPerturb(Vector3f v3) { @@ -2005,24 +1886,23 @@ public class FastNoiseDouble { long y1 = y0 + 1; long z1 = z0 + 1; - double xs, ys, zs; + double xs=0, ys=0, zs=0; switch (m_longerp) { - default: - case Linear: + case Linear -> { xs = xf - x0; ys = yf - y0; zs = zf - z0; - break; - case Hermite: + } + case Hermite -> { xs = longerpHermiteFunc(xf - x0); ys = longerpHermiteFunc(yf - y0); zs = longerpHermiteFunc(zf - z0); - break; - case Qulongic: + } + case Qulongic -> { xs = longerpQulongicFunc(xf - x0); ys = longerpQulongicFunc(yf - y0); zs = longerpQulongicFunc(zf - z0); - break; + } } Double3 vec0 = CELL_3D[(int) hash3D(seed, x0, y0, z0) & 255]; @@ -2089,21 +1969,20 @@ public class FastNoiseDouble { long x1 = x0 + 1; long y1 = y0 + 1; - double xs, ys; + double xs=0, ys=0; switch (m_longerp) { - default: - case Linear: + case Linear -> { xs = xf - x0; ys = yf - y0; - break; - case Hermite: + } + case Hermite -> { xs = longerpHermiteFunc(xf - x0); ys = longerpHermiteFunc(yf - y0); - break; - case Qulongic: + } + case Qulongic -> { xs = longerpQulongicFunc(xf - x0); ys = longerpQulongicFunc(yf - y0); - break; + } } Double2 vec0 = CELL_2D[(int) hash2D(seed, x0, y0) & 255]; diff --git a/src/main/java/com/volmit/iris/generator/noise/FlatNoise.java b/src/main/java/com/volmit/iris/generator/noise/FlatNoise.java index 897dfd34d..8c2944106 100644 --- a/src/main/java/com/volmit/iris/generator/noise/FlatNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/FlatNoise.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; public class FlatNoise implements NoiseGenerator { diff --git a/src/main/java/com/volmit/iris/generator/noise/FractalBillowPerlinNoise.java b/src/main/java/com/volmit/iris/generator/noise/FractalBillowPerlinNoise.java index f1a19f539..104253f51 100644 --- a/src/main/java/com/volmit/iris/generator/noise/FractalBillowPerlinNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/FractalBillowPerlinNoise.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; import com.volmit.iris.generator.noise.FastNoiseDouble.FractalType; diff --git a/src/main/java/com/volmit/iris/generator/noise/FractalBillowSimplexNoise.java b/src/main/java/com/volmit/iris/generator/noise/FractalBillowSimplexNoise.java index 03207afd5..e5b54553d 100644 --- a/src/main/java/com/volmit/iris/generator/noise/FractalBillowSimplexNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/FractalBillowSimplexNoise.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; import com.volmit.iris.generator.noise.FastNoiseDouble.FractalType; diff --git a/src/main/java/com/volmit/iris/generator/noise/FractalCubicNoise.java b/src/main/java/com/volmit/iris/generator/noise/FractalCubicNoise.java index c87be8070..ed0abff2f 100644 --- a/src/main/java/com/volmit/iris/generator/noise/FractalCubicNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/FractalCubicNoise.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; import com.volmit.iris.generator.noise.FastNoiseDouble.FractalType; diff --git a/src/main/java/com/volmit/iris/generator/noise/FractalFBMSimplexNoise.java b/src/main/java/com/volmit/iris/generator/noise/FractalFBMSimplexNoise.java index 4789e4f8c..b6d6d9e52 100644 --- a/src/main/java/com/volmit/iris/generator/noise/FractalFBMSimplexNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/FractalFBMSimplexNoise.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; import com.volmit.iris.generator.noise.FastNoiseDouble.FractalType; diff --git a/src/main/java/com/volmit/iris/generator/noise/FractalRigidMultiSimplexNoise.java b/src/main/java/com/volmit/iris/generator/noise/FractalRigidMultiSimplexNoise.java index 40ec8d270..df5fed649 100644 --- a/src/main/java/com/volmit/iris/generator/noise/FractalRigidMultiSimplexNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/FractalRigidMultiSimplexNoise.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; import com.volmit.iris.generator.noise.FastNoiseDouble.FractalType; diff --git a/src/main/java/com/volmit/iris/generator/noise/GlobNoise.java b/src/main/java/com/volmit/iris/generator/noise/GlobNoise.java index 938c352a8..d51b33dbe 100644 --- a/src/main/java/com/volmit/iris/generator/noise/GlobNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/GlobNoise.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/generator/noise/NoiseFactory.java b/src/main/java/com/volmit/iris/generator/noise/NoiseFactory.java index bbe56e338..22a50d96d 100644 --- a/src/main/java/com/volmit/iris/generator/noise/NoiseFactory.java +++ b/src/main/java/com/volmit/iris/generator/noise/NoiseFactory.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; @FunctionalInterface diff --git a/src/main/java/com/volmit/iris/generator/noise/NoiseGenerator.java b/src/main/java/com/volmit/iris/generator/noise/NoiseGenerator.java index 9a88c4ac0..2269bb0bb 100644 --- a/src/main/java/com/volmit/iris/generator/noise/NoiseGenerator.java +++ b/src/main/java/com/volmit/iris/generator/noise/NoiseGenerator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; public interface NoiseGenerator { diff --git a/src/main/java/com/volmit/iris/generator/noise/NoiseType.java b/src/main/java/com/volmit/iris/generator/noise/NoiseType.java index a986c1b3e..9ad1c4fdd 100644 --- a/src/main/java/com/volmit/iris/generator/noise/NoiseType.java +++ b/src/main/java/com/volmit/iris/generator/noise/NoiseType.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; public enum NoiseType { diff --git a/src/main/java/com/volmit/iris/generator/noise/OctaveNoise.java b/src/main/java/com/volmit/iris/generator/noise/OctaveNoise.java index aa77f8db4..5af655c76 100644 --- a/src/main/java/com/volmit/iris/generator/noise/OctaveNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/OctaveNoise.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; public interface OctaveNoise { diff --git a/src/main/java/com/volmit/iris/generator/noise/PerlinNoise.java b/src/main/java/com/volmit/iris/generator/noise/PerlinNoise.java index a26baefb7..97fd1f69f 100644 --- a/src/main/java/com/volmit/iris/generator/noise/PerlinNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/PerlinNoise.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/generator/noise/RarityCellGenerator.java b/src/main/java/com/volmit/iris/generator/noise/RarityCellGenerator.java index 32f2f1e35..d4ba1084b 100644 --- a/src/main/java/com/volmit/iris/generator/noise/RarityCellGenerator.java +++ b/src/main/java/com/volmit/iris/generator/noise/RarityCellGenerator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; import com.volmit.iris.util.IRare; diff --git a/src/main/java/com/volmit/iris/generator/noise/SimplexNoise.java b/src/main/java/com/volmit/iris/generator/noise/SimplexNoise.java index 8ee42e2be..e1ee1d1cd 100644 --- a/src/main/java/com/volmit/iris/generator/noise/SimplexNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/SimplexNoise.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/generator/noise/VascularNoise.java b/src/main/java/com/volmit/iris/generator/noise/VascularNoise.java index a78188baa..e069e44d0 100644 --- a/src/main/java/com/volmit/iris/generator/noise/VascularNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/VascularNoise.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; import com.volmit.iris.util.M; diff --git a/src/main/java/com/volmit/iris/generator/noise/WhiteNoise.java b/src/main/java/com/volmit/iris/generator/noise/WhiteNoise.java index 8081501a7..67689f77b 100644 --- a/src/main/java/com/volmit/iris/generator/noise/WhiteNoise.java +++ b/src/main/java/com/volmit/iris/generator/noise/WhiteNoise.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.generator.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/manager/ConversionManager.java b/src/main/java/com/volmit/iris/manager/ConversionManager.java index 95d622e0c..f08c02d19 100644 --- a/src/main/java/com/volmit/iris/manager/ConversionManager.java +++ b/src/main/java/com/volmit/iris/manager/ConversionManager.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager; import com.google.gson.Gson; @@ -28,46 +46,44 @@ public class ConversionManager { converters = new KList<>(); J.s(() -> - { - J.attemptAsync(() -> - { - if (Bukkit.getPluginManager().isPluginEnabled("WorldEdit")) { - converters.add(new Converter() { - @Override - public String getOutExtension() { - return "iob"; - } + J.attemptAsync(() -> + { + if (Bukkit.getPluginManager().isPluginEnabled("WorldEdit")) { + converters.add(new Converter() { + @Override + public String getOutExtension() { + return "iob"; + } - @Override - public String getInExtension() { - return "schem"; - } + @Override + public String getInExtension() { + return "schem"; + } - @Override - public void convert(File in, File out) { - SKConversion.convertSchematic(in, out); - } - }); + @Override + public void convert(File in, File out) { + SKConversion.convertSchematic(in, out); + } + }); - converters.add(new Converter() { - @Override - public String getOutExtension() { - return "iob"; - } + converters.add(new Converter() { + @Override + public String getOutExtension() { + return "iob"; + } - @Override - public String getInExtension() { - return "schematic"; - } + @Override + public String getInExtension() { + return "schematic"; + } - @Override - public void convert(File in, File out) { - SKConversion.convertSchematic(in, out); - } - }); - } - }); - }, 5); + @Override + public void convert(File in, File out) { + SKConversion.convertSchematic(in, out); + } + }); + } + }), 5); } private String toPoolName(String poolReference) { @@ -118,22 +134,22 @@ public class ConversionManager { if (compound.containsKey("blocks") && compound.containsKey("palette") && compound.containsKey("size")) { String id = in.toURI().relativize(folder.toURI()).getPath() + file.getName().split("\\Q.\\E")[0]; - ListTag size = (ListTag) compound.getListTag("size"); + @SuppressWarnings("unchecked") ListTag size = (ListTag) compound.getListTag("size"); int w = size.get(0).asInt(); int h = size.get(1).asInt(); int d = size.get(2).asInt(); KList palette = new KList<>(); - ListTag paletteList = (ListTag) compound.getListTag("palette"); + @SuppressWarnings("unchecked") ListTag paletteList = (ListTag) compound.getListTag("palette"); for (int i = 0; i < paletteList.size(); i++) { CompoundTag cp = paletteList.get(i); palette.add(DirectWorldWriter.getBlockData(cp)); } IrisJigsawPiece piece = new IrisJigsawPiece(); IrisObject object = new IrisObject(w, h, d); - ListTag blockList = (ListTag) compound.getListTag("blocks"); + @SuppressWarnings("unchecked") ListTag blockList = (ListTag) compound.getListTag("blocks"); for (int i = 0; i < blockList.size(); i++) { CompoundTag cp = blockList.get(i); - ListTag pos = (ListTag) cp.getListTag("pos"); + @SuppressWarnings("unchecked") ListTag pos = (ListTag) cp.getListTag("pos"); int x = pos.get(0).asInt(); int y = pos.get(1).asInt(); int z = pos.get(2).asInt(); diff --git a/src/main/java/com/volmit/iris/manager/EditManager.java b/src/main/java/com/volmit/iris/manager/EditManager.java index 460e116d0..1bbb37321 100644 --- a/src/main/java/com/volmit/iris/manager/EditManager.java +++ b/src/main/java/com/volmit/iris/manager/EditManager.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/IrisBoardManager.java b/src/main/java/com/volmit/iris/manager/IrisBoardManager.java index a591fd322..2c42115ec 100644 --- a/src/main/java/com/volmit/iris/manager/IrisBoardManager.java +++ b/src/main/java/com/volmit/iris/manager/IrisBoardManager.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager; import com.volmit.iris.Iris; @@ -14,14 +32,14 @@ import org.bukkit.event.player.PlayerChangedWorldEvent; import java.util.List; public class IrisBoardManager implements BoardProvider, Listener { - @DontObfuscate + private final BoardManager manager; private String mem = "..."; - public RollingSequence hits = new RollingSequence(20); - public RollingSequence tp = new RollingSequence(100); + public final RollingSequence hits = new RollingSequence(20); + public final RollingSequence tp = new RollingSequence(100); private final ChronoLatch cl = new ChronoLatch(1000); - @DontObfuscate + public IrisBoardManager() { Iris.instance.registerListener(this); //@builder @@ -37,7 +55,7 @@ public class IrisBoardManager implements BoardProvider, Listener { J.s(() -> updatePlayer(e.getPlayer())); } - @DontObfuscate + private boolean isIrisWorld(World w) { return IrisWorlds.isIrisWorld(w) && IrisWorlds.access(w).isStudio(); } @@ -56,7 +74,7 @@ public class IrisBoardManager implements BoardProvider, Listener { return C.GREEN + "Iris"; } - @DontObfuscate + @Override public List getLines(Player player) { KList v = new KList<>(); @@ -87,9 +105,9 @@ public class IrisBoardManager implements BoardProvider, Listener { 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; + memoryGuess += g.getCompound().getData().getObjectLoader().getTotalStorage() * 225L; + memoryGuess += parallaxChunks * 3500L; + memoryGuess += parallaxRegions * 1700000L; } tp.put(0); // TODO: CHUNK SPEED @@ -118,7 +136,7 @@ public class IrisBoardManager implements BoardProvider, Listener { return v; } - @DontObfuscate + public void disable() { manager.onDisable(); } diff --git a/src/main/java/com/volmit/iris/manager/IrisDataManager.java b/src/main/java/com/volmit/iris/manager/IrisDataManager.java index b90c49132..ba4cdfc3f 100644 --- a/src/main/java/com/volmit/iris/manager/IrisDataManager.java +++ b/src/main/java/com/volmit/iris/manager/IrisDataManager.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/IrisProject.java b/src/main/java/com/volmit/iris/manager/IrisProject.java index e6043d4ed..62b543c6b 100644 --- a/src/main/java/com/volmit/iris/manager/IrisProject.java +++ b/src/main/java/com/volmit/iris/manager/IrisProject.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager; import com.google.gson.Gson; @@ -23,6 +41,7 @@ import java.io.IOException; import java.util.Objects; import java.util.UUID; +@SuppressWarnings("ALL") @Data public class IrisProject { private File path; @@ -104,21 +123,18 @@ public class IrisProject { } private KList scanForErrors(IrisBiome biome, IrisObjectPlacement i) { - KList reports = new KList<>(); - return reports; + return new KList<>(); } private KList scanForErrors(IrisBiome biome, IrisBiomePaletteLayer i) { - KList reports = new KList<>(); - return reports; + return new KList<>(); } private KList scanForErrorsSeaLayers(IrisBiome biome, IrisBiomePaletteLayer i) { - KList reports = new KList<>(); - return reports; + return new KList<>(); } public boolean isOpen() { @@ -365,16 +381,16 @@ public class IrisProject { settings.put("json.maxItemsComputed", 30000); JSONArray schemas = new JSONArray(); IrisDataManager dm = new IrisDataManager(getPath()); - schemas.put(getSchemaEntry(IrisDimension.class, dm, "/dimensions/*.json")); - schemas.put(getSchemaEntry(IrisEntity.class, dm, "/entities/*.json")); - schemas.put(getSchemaEntry(IrisBiome.class, dm, "/biomes/*.json")); - schemas.put(getSchemaEntry(IrisRegion.class, dm, "/regions/*.json")); - schemas.put(getSchemaEntry(IrisGenerator.class, dm, "/generators/*.json")); - schemas.put(getSchemaEntry(IrisJigsawPiece.class, dm, "/jigsaw-pieces/*.json")); - schemas.put(getSchemaEntry(IrisJigsawPool.class, dm, "/jigsaw-pools/*.json")); - schemas.put(getSchemaEntry(IrisJigsawStructure.class, dm, "/jigsaw-structures/*.json")); - schemas.put(getSchemaEntry(IrisBlockData.class, dm, "/blocks/*.json")); - schemas.put(getSchemaEntry(IrisLootTable.class, dm, "/loot/*.json")); + schemas.put(getSchemaEntry(IrisDimension.class, dm, "/dimensions/*.json", "/dimensions/*/*.json", "/dimensions/*/*/*.json")); + schemas.put(getSchemaEntry(IrisEntity.class, dm, "/entities/*.json", "/entities/*/*.json", "/entities/*/*/*.json")); + schemas.put(getSchemaEntry(IrisBiome.class, dm, "/biomes/*.json", "/biomes/*/*.json", "/biomes/*/*/*.json")); + schemas.put(getSchemaEntry(IrisRegion.class, dm, "/regions/*.json", "/regions/*/*.json", "/regions/*/*/*.json")); + schemas.put(getSchemaEntry(IrisGenerator.class, dm, "/generators/*.json", "/generators/*/*.json", "/generators/*/*/*.json")); + schemas.put(getSchemaEntry(IrisJigsawPiece.class, dm, "/jigsaw-pieces/*.json", "/jigsaw-pieces/*/*.json", "/jigsaw-pieces/*/*/*.json")); + schemas.put(getSchemaEntry(IrisJigsawPool.class, dm, "/jigsaw-pools/*.json", "/jigsaw-pools/*/*.json", "/jigsaw-pools/*/*/*.json")); + schemas.put(getSchemaEntry(IrisJigsawStructure.class, dm, "/jigsaw-structures/*.json", "/jigsaw-structures/*/*/*.json", "/jigsaw-structures/*/*.json")); + schemas.put(getSchemaEntry(IrisBlockData.class, dm, "/blocks/*.json", "/blocks/*/*.json", "/blocks/*/*/*.json")); + schemas.put(getSchemaEntry(IrisLootTable.class, dm, "/loot/*.json", "/loot/*/*.json", "/loot/*/*/*.json")); settings.put("json.schemas", schemas); ws.put("settings", settings); diff --git a/src/main/java/com/volmit/iris/manager/ProjectManager.java b/src/main/java/com/volmit/iris/manager/ProjectManager.java index 75ba742d3..6aedd4700 100644 --- a/src/main/java/com/volmit/iris/manager/ProjectManager.java +++ b/src/main/java/com/volmit/iris/manager/ProjectManager.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager; import com.google.gson.Gson; @@ -12,7 +30,6 @@ import org.zeroturnaround.zip.ZipUtil; import org.zeroturnaround.zip.commons.FileUtils; import java.io.File; -import java.io.FileFilter; import java.io.IOException; import java.util.UUID; @@ -35,7 +52,7 @@ public class ProjectManager { if (m != null) { try { IO.copyFile(m, ignore); - } catch (IOException e) { + } catch (IOException ignored) { } } @@ -45,7 +62,8 @@ public class ProjectManager { } public static int countUniqueDimensions() { - int vv = counter.aquire(() -> { + + return counter.aquire(() -> { int v = 0; try { @@ -64,8 +82,6 @@ public class ProjectManager { return v; }); - - return vv; } public IrisDimension installIntoWorld(MortarSender sender, String type, File folder) { @@ -88,7 +104,7 @@ public class ProjectManager { try { FileUtils.copyDirectory(f, irispack); - } catch (IOException e) { + } catch (IOException ignored) { } } @@ -174,12 +190,13 @@ public class ProjectManager { } catch (Throwable e) { e.printStackTrace(); sender.sendMessage( - "Issue when unpacking. Please check/do the following:" + - "\n1. Do you have a functioning internet connection?" + - "\n2. Did the download corrupt?" + - "\n3. Try deleting the */plugins/iris/packs folder and re-download." + - "\n4. Download the pack from the GitHub repo: https://github.com/IrisDimensions/overworld" + - "\n5. Contact support (if all other options do not help)" + """ + Issue when unpacking. Please check/do the following: + 1. Do you have a functioning internet connection? + 2. Did the download corrupt? + 3. Try deleting the */plugins/iris/packs folder and re-download. + 4. Download the pack from the GitHub repo: https://github.com/IrisDimensions/overworld + 5. Contact support (if all other options do not help)""" ); } File dir = null; @@ -334,12 +351,7 @@ public class ProjectManager { } try { - FileUtils.copyDirectory(importPack, newPack, new FileFilter() { - @Override - public boolean accept(File pathname) { - return !pathname.getAbsolutePath().contains(".git"); - } - }, false); + FileUtils.copyDirectory(importPack, newPack, pathname -> !pathname.getAbsolutePath().contains(".git"), false); } catch (IOException e) { e.printStackTrace(); } diff --git a/src/main/java/com/volmit/iris/manager/SchemaBuilder.java b/src/main/java/com/volmit/iris/manager/SchemaBuilder.java index d3b6078ce..0c978ce74 100644 --- a/src/main/java/com/volmit/iris/manager/SchemaBuilder.java +++ b/src/main/java/com/volmit/iris/manager/SchemaBuilder.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager; import com.volmit.iris.Iris; @@ -9,6 +27,7 @@ import java.awt.*; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.List; +import java.util.Map; public class SchemaBuilder { private static final String SYMBOL_LIMIT__N = "*"; @@ -25,7 +44,7 @@ public class SchemaBuilder { public SchemaBuilder(Class root, IrisDataManager data) { this.data = data; warnings = new KList<>(); - this.definitions = new KMap(); + this.definitions = new KMap<>(); this.root = root; } @@ -44,8 +63,8 @@ public class SchemaBuilder { JSONObject defs = new JSONObject(); - for (String i : definitions.keySet()) { - defs.put(i, definitions.get(i)); + for (Map.Entry entry : definitions.entrySet()) { + defs.put(entry.getKey(), entry.getValue()); } schema.put("definitions", defs); @@ -93,625 +112,618 @@ public class SchemaBuilder { private JSONObject buildProperty(Field k, Class cl) { JSONObject prop = new JSONObject(); String type = getType(k.getType()); - KList description = new KList(); + KList description = new KList<>(); prop.put("!required", k.isAnnotationPresent(Required.class)); prop.put("type", type); String fancyType = "Unknown Type"; - if (type.equals("boolean")) { - fancyType = "Boolean"; - } else if (type.equals("integer")) { - fancyType = "Integer"; - if (k.isAnnotationPresent(MinNumber.class)) { - int min = (int) k.getDeclaredAnnotation(MinNumber.class).value(); - prop.put("minimum", min); - description.add(SYMBOL_LIMIT__N + " Minimum allowed is " + min); + switch (type) { + case "boolean" -> fancyType = "Boolean"; + case "integer" -> { + fancyType = "Integer"; + if (k.isAnnotationPresent(MinNumber.class)) { + int min = (int) k.getDeclaredAnnotation(MinNumber.class).value(); + prop.put("minimum", min); + description.add(SYMBOL_LIMIT__N + " Minimum allowed is " + min); + } + if (k.isAnnotationPresent(MaxNumber.class)) { + int max = (int) k.getDeclaredAnnotation(MaxNumber.class).value(); + prop.put("maximum", max); + description.add(SYMBOL_LIMIT__N + " Maximum allowed is " + max); + } } - - if (k.isAnnotationPresent(MaxNumber.class)) { - int max = (int) k.getDeclaredAnnotation(MaxNumber.class).value(); - prop.put("maximum", max); - description.add(SYMBOL_LIMIT__N + " Maximum allowed is " + max); + case "number" -> { + fancyType = "Number"; + if (k.isAnnotationPresent(MinNumber.class)) { + double min = k.getDeclaredAnnotation(MinNumber.class).value(); + prop.put("minimum", min); + description.add(SYMBOL_LIMIT__N + " Minimum allowed is " + min); + } + if (k.isAnnotationPresent(MaxNumber.class)) { + double max = k.getDeclaredAnnotation(MaxNumber.class).value(); + prop.put("maximum", max); + description.add(SYMBOL_LIMIT__N + " Maximum allowed is " + max); + } } - } else if (type.equals("number")) { - fancyType = "Number"; - if (k.isAnnotationPresent(MinNumber.class)) { - double min = k.getDeclaredAnnotation(MinNumber.class).value(); - prop.put("minimum", min); - description.add(SYMBOL_LIMIT__N + " Minimum allowed is " + min); - } - - if (k.isAnnotationPresent(MaxNumber.class)) { - double max = k.getDeclaredAnnotation(MaxNumber.class).value(); - prop.put("maximum", max); - description.add(SYMBOL_LIMIT__N + " Maximum allowed is " + max); - } - } else if (type.equals("string")) { - fancyType = "Text"; - if (k.isAnnotationPresent(MinNumber.class)) { - int min = (int) k.getDeclaredAnnotation(MinNumber.class).value(); - prop.put("minLength", min); - description.add(SYMBOL_LIMIT__N + " Minimum Length allowed is " + min); - } - - if (k.isAnnotationPresent(MaxNumber.class)) { - int max = (int) k.getDeclaredAnnotation(MaxNumber.class).value(); - prop.put("maxLength", max); - description.add(SYMBOL_LIMIT__N + " Maximum Length allowed is " + max); - } - - if (k.isAnnotationPresent(RegistryListBiome.class)) { - String key = "enum-reg-biome"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(data.getBiomeLoader().getPossibleKeys())); - definitions.put(key, j); + case "string" -> { + fancyType = "Text"; + if (k.isAnnotationPresent(MinNumber.class)) { + int min = (int) k.getDeclaredAnnotation(MinNumber.class).value(); + prop.put("minLength", min); + description.add(SYMBOL_LIMIT__N + " Minimum Length allowed is " + min); } - - fancyType = "Iris Biome"; - prop.put("$ref", "#/definitions/" + key); - description.add(SYMBOL_TYPE__N + " Must be a valid Biome (use ctrl+space for auto complete!)"); - - } else if (k.isAnnotationPresent(RegistryListMythical.class)) { - String key = "enum-reg-mythical"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(Iris.linkMythicMobs.getMythicMobTypes())); - definitions.put(key, j); + if (k.isAnnotationPresent(MaxNumber.class)) { + int max = (int) k.getDeclaredAnnotation(MaxNumber.class).value(); + prop.put("maxLength", max); + description.add(SYMBOL_LIMIT__N + " Maximum Length allowed is " + max); } - - fancyType = "Mythic Mob Type"; - prop.put("$ref", "#/definitions/" + key); - description.add(SYMBOL_TYPE__N + " Must be a valid Mythic Mob Type (use ctrl+space for auto complete!) Define mythic mobs with the mythic mobs plugin configuration files."); - } else if (k.isAnnotationPresent(RegistryListBlockType.class)) { - String key = "enum-block-type"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - JSONArray ja = new JSONArray(); - - for (String i : data.getBlockLoader().getPossibleKeys()) { - ja.put(i); - } - - for (String i : B.getBlockTypes()) { - ja.put(i); - } - - j.put("enum", ja); - definitions.put(key, j); - } - - fancyType = "Block Type"; - prop.put("$ref", "#/definitions/" + key); - description.add(SYMBOL_TYPE__N + " Must be a valid Block Type (use ctrl+space for auto complete!)"); - - } else if (k.isAnnotationPresent(RegistryListItemType.class)) { - String key = "enum-item-type"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", ITEM_TYPES); - definitions.put(key, j); - } - - fancyType = "Item Type"; - prop.put("$ref", "#/definitions/" + key); - description.add(SYMBOL_TYPE__N + " Must be a valid Item Type (use ctrl+space for auto complete!)"); - - } else if (k.isAnnotationPresent(RegistryListEntity.class)) { - String key = "enum-reg-entity"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(data.getEntityLoader().getPossibleKeys())); - definitions.put(key, j); - } - - fancyType = "Iris Entity"; - prop.put("$ref", "#/definitions/" + key); - description.add(SYMBOL_TYPE__N + " Must be a valid Iris Entity (use ctrl+space for auto complete!)"); - - } else if (k.isAnnotationPresent(RegistryListFont.class)) { - String key = "enum-font"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", FONT_TYPES); - definitions.put(key, j); - } - - fancyType = "Font Family"; - prop.put("$ref", "#/definitions/" + key); - description.add(SYMBOL_TYPE__N + " Must be a valid Font Family (use ctrl+space for auto complete!)"); - - } else if (k.isAnnotationPresent(RegistryListLoot.class)) { - String key = "enum-reg-loot-table"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(data.getLootLoader().getPossibleKeys())); - definitions.put(key, j); - } - - fancyType = "Iris Loot Table"; - prop.put("$ref", "#/definitions/" + key); - description.add(SYMBOL_TYPE__N + " Must be a valid Loot Table (use ctrl+space for auto complete!)"); - } else if (k.isAnnotationPresent(RegistryListDimension.class)) { - String key = "enum-reg-dimension"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(data.getDimensionLoader().getPossibleKeys())); - definitions.put(key, j); - } - - fancyType = "Iris Dimension"; - prop.put("$ref", "#/definitions/" + key); - description.add(SYMBOL_TYPE__N + " Must be a valid Dimension (use ctrl+space for auto complete!)"); - - } else if (k.isAnnotationPresent(RegistryListGenerator.class)) { - String key = "enum-reg-generator"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(data.getGeneratorLoader().getPossibleKeys())); - definitions.put(key, j); - } - - fancyType = "Iris Generator"; - prop.put("$ref", "#/definitions/" + key); - description.add(SYMBOL_TYPE__N + " Must be a valid Generator (use ctrl+space for auto complete!)"); - - } else if (k.isAnnotationPresent(RegistryListObject.class)) { - String key = "enum-reg-object"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(data.getObjectLoader().getPossibleKeys())); - definitions.put(key, j); - } - - fancyType = "Iris Object"; - prop.put("$ref", "#/definitions/" + key); - description.add(SYMBOL_TYPE__N + " Must be a valid Object (use ctrl+space for auto complete!)"); - - } else if (k.isAnnotationPresent(RegistryListRegion.class)) { - String key = "enum-reg-region"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(data.getRegionLoader().getPossibleKeys())); - definitions.put(key, j); - } - - fancyType = "Iris Region"; - prop.put("$ref", "#/definitions/" + key); - description.add(SYMBOL_TYPE__N + " Must be a valid Region (use ctrl+space for auto complete!)"); - - } else if (k.isAnnotationPresent(RegistryListJigsawPiece.class)) { - String key = "enum-reg-structure-piece"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(data.getJigsawPieceLoader().getPossibleKeys())); - definitions.put(key, j); - } - - fancyType = "Iris Jigsaw Piece"; - prop.put("$ref", "#/definitions/" + key); - description.add(SYMBOL_TYPE__N + " Must be a valid Jigsaw Piece (use ctrl+space for auto complete!)"); - } else if (k.isAnnotationPresent(RegistryListJigsaw.class)) { - String key = "enum-reg-jigsaw"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(data.getJigsawStructureLoader().getPossibleKeys())); - definitions.put(key, j); - } - - fancyType = "Iris Jigsaw"; - prop.put("$ref", "#/definitions/" + key); - description.add(SYMBOL_TYPE__N + " Must be a valid Jigsaw (use ctrl+space for auto complete!)"); - } else if (k.isAnnotationPresent(RegistryListJigsawPool.class)) { - String key = "enum-reg-structure-pool"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(data.getJigsawPoolLoader().getPossibleKeys())); - definitions.put(key, j); - } - - fancyType = "Iris Jigsaw Pool"; - prop.put("$ref", "#/definitions/" + key); - description.add(SYMBOL_TYPE__N + " Must be a valid Jigsaw Piece (use ctrl+space for auto complete!)"); - } else if (k.getType().equals(Enchantment.class)) { - String key = "enum-enchantment"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", ENCHANT_TYPES); - definitions.put(key, j); - } - - fancyType = "Enchantment Type"; - prop.put("$ref", "#/definitions/" + key); - description.add(SYMBOL_TYPE__N + " Must be a valid Enchantment Type (use ctrl+space for auto complete!)"); - } else if (k.getType().equals(PotionEffectType.class)) { - String key = "enum-potion-effect-type"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", POTION_TYPES); - definitions.put(key, j); - } - - fancyType = "Potion Effect Type"; - prop.put("$ref", "#/definitions/" + key); - description.add(SYMBOL_TYPE__N + " Must be a valid Potion Effect Type (use ctrl+space for auto complete!)"); - - } else if (k.getType().isEnum()) { - fancyType = k.getType().getSimpleName().replaceAll("\\QIris\\E", ""); - JSONArray a = new JSONArray(); - boolean advanced = k.getType().isAnnotationPresent(Desc.class); - for (Object gg : k.getType().getEnumConstants()) { - if (advanced) { - try { - JSONObject j = new JSONObject(); - String name = ((Enum) gg).name(); - j.put("const", name); - Desc dd = k.getType().getField(name).getAnnotation(Desc.class); - j.put("description", dd == null ? ("No Description for " + name) : dd.value()); - a.put(j); - } catch (Throwable e) { - e.printStackTrace(); - } - } else { - a.put(((Enum) gg).name()); - } - } - - String key = (advanced ? "oneof-" : "") + "enum-" + k.getType().getCanonicalName().replaceAll("\\Q.\\E", "-").toLowerCase(); - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put(advanced ? "oneOf" : "enum", a); - definitions.put(key, j); - } - - prop.put("$ref", "#/definitions/" + key); - description.add(SYMBOL_TYPE__N + " Must be a valid " + k.getType().getSimpleName().replaceAll("\\QIris\\E", "") + " (use ctrl+space for auto complete!)"); - - } - } else if (type.equals("object")) { - fancyType = k.getType().getSimpleName().replaceAll("\\QIris\\E", "") + " (Object)"; - - String key = "obj-" + k.getType().getCanonicalName().replaceAll("\\Q.\\E", "-").toLowerCase(); - - if (!definitions.containsKey(key)) { - definitions.put(key, new JSONObject()); - definitions.put(key, buildProperties(k.getType())); - } - - prop.put("$ref", "#/definitions/" + key); - } else if (type.equals("array")) { - fancyType = "List of Something...?"; - - ArrayType t = k.getDeclaredAnnotation(ArrayType.class); - - if (t != null) { - if (t.min() > 0) { - prop.put("minItems", t.min()); - if (t.min() == 1) { - description.add(SYMBOL_LIMIT__N + " At least one entry must be defined, or just remove this list."); - } else { - description.add(SYMBOL_LIMIT__N + " Requires at least " + t.min() + " entries."); - } - } - - String arrayType = getType(t.type()); - - if (arrayType.equals("integer")) { - fancyType = "List of Integers"; - } else if (arrayType.equals("number")) { - fancyType = "List of Numbers"; - } else if (arrayType.equals("object")) { - fancyType = "List of " + t.type().getSimpleName().replaceAll("\\QIris\\E", "") + "s (Objects)"; - String key = "obj-" + t.type().getCanonicalName().replaceAll("\\Q.\\E", "-").toLowerCase(); + if (k.isAnnotationPresent(RegistryListBiome.class)) { + String key = "enum-reg-biome"; if (!definitions.containsKey(key)) { - definitions.put(key, new JSONObject()); - definitions.put(key, buildProperties(t.type())); + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(data.getBiomeLoader().getPossibleKeys())); + definitions.put(key, j); } - JSONObject items = new JSONObject(); - items.put("$ref", "#/definitions/" + key); - prop.put("items", items); - } else if (arrayType.equals("string")) { - fancyType = "List of Text"; + fancyType = "Iris Biome"; + prop.put("$ref", "#/definitions/" + key); + description.add(SYMBOL_TYPE__N + " Must be a valid Biome (use ctrl+space for auto complete!)"); - if (k.isAnnotationPresent(RegistryListBiome.class)) { - fancyType = "List of Iris Biomes"; - String key = "enum-reg-biome"; + } else if (k.isAnnotationPresent(RegistryListMythical.class)) { + String key = "enum-reg-mythical"; - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(data.getBiomeLoader().getPossibleKeys())); - definitions.put(key, j); - } - - JSONObject items = new JSONObject(); - items.put("$ref", "#/definitions/" + key); - prop.put("items", items); - description.add(SYMBOL_TYPE__N + " Must be a valid Biome (use ctrl+space for auto complete!)"); - } else if (k.isAnnotationPresent(RegistryListMythical.class)) { - fancyType = "List of Mythic Mob Types"; - String key = "enum-reg-mythical"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - JSONArray ja = new JSONArray(); - - for (String i : Iris.linkMythicMobs.getMythicMobTypes()) { - ja.put(i); - } - - j.put("enum", ja); - definitions.put(key, j); - } - - JSONObject items = new JSONObject(); - items.put("$ref", "#/definitions/" + key); - prop.put("items", items); - description.add(SYMBOL_TYPE__N + " Must be a valid Mythic Mob Type (use ctrl+space for auto complete!) Configure mob types in the mythic mobs plugin configuration files."); - } else if (k.isAnnotationPresent(RegistryListBlockType.class)) { - fancyType = "List of Block Types"; - String key = "enum-block-type"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - JSONArray ja = new JSONArray(); - - for (String i : data.getBlockLoader().getPossibleKeys()) { - ja.put(i); - } - - for (String i : B.getBlockTypes()) { - ja.put(i); - } - - j.put("enum", ja); - definitions.put(key, j); - } - - JSONObject items = new JSONObject(); - items.put("$ref", "#/definitions/" + key); - prop.put("items", items); - description.add(SYMBOL_TYPE__N + " Must be a valid Block Type (use ctrl+space for auto complete!)"); - } else if (k.isAnnotationPresent(RegistryListItemType.class)) { - fancyType = "List of Item Types"; - String key = "enum-item-type"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", ITEM_TYPES); - definitions.put(key, j); - } - - JSONObject items = new JSONObject(); - items.put("$ref", "#/definitions/" + key); - prop.put("items", items); - description.add(SYMBOL_TYPE__N + " Must be a valid Item Type (use ctrl+space for auto complete!)"); - } else if (k.isAnnotationPresent(RegistryListEntity.class)) { - fancyType = "List of Iris Entities"; - String key = "enum-reg-entity"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(data.getEntityLoader().getPossibleKeys())); - definitions.put(key, j); - } - - JSONObject items = new JSONObject(); - items.put("$ref", "#/definitions/" + key); - prop.put("items", items); - description.add(SYMBOL_TYPE__N + " Must be a valid Iris Entity (use ctrl+space for auto complete!)"); - } else if (k.isAnnotationPresent(RegistryListFont.class)) { - String key = "enum-font"; - fancyType = "List of Font Families"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", FONT_TYPES); - definitions.put(key, j); - } - - JSONObject items = new JSONObject(); - items.put("$ref", "#/definitions/" + key); - prop.put("items", items); - description.add(SYMBOL_TYPE__N + " Must be a valid Font Family (use ctrl+space for auto complete!)"); - } else if (k.isAnnotationPresent(RegistryListLoot.class)) { - fancyType = "List of Iris Loot Tables"; - String key = "enum-reg-loot-table"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(data.getLootLoader().getPossibleKeys())); - definitions.put(key, j); - } - - JSONObject items = new JSONObject(); - items.put("$ref", "#/definitions/" + key); - prop.put("items", items); - description.add(SYMBOL_TYPE__N + " Must be a valid Loot Table (use ctrl+space for auto complete!)"); - } else if (k.isAnnotationPresent(RegistryListDimension.class)) { - fancyType = "List of Iris Dimensions"; - String key = "enum-reg-dimension"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(data.getDimensionLoader().getPossibleKeys())); - definitions.put(key, j); - } - - JSONObject items = new JSONObject(); - items.put("$ref", "#/definitions/" + key); - prop.put("items", items); - description.add(SYMBOL_TYPE__N + " Must be a valid Dimension (use ctrl+space for auto complete!)"); - } else if (k.isAnnotationPresent(RegistryListGenerator.class)) { - fancyType = "List of Iris Generators"; - String key = "enum-reg-generator"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(data.getGeneratorLoader().getPossibleKeys())); - definitions.put(key, j); - } - - JSONObject items = new JSONObject(); - items.put("$ref", "#/definitions/" + key); - prop.put("items", items); - description.add(SYMBOL_TYPE__N + " Must be a valid Generator (use ctrl+space for auto complete!)"); - } else if (k.isAnnotationPresent(RegistryListObject.class)) { - fancyType = "List of Iris Objects"; - String key = "enum-reg-object"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(data.getObjectLoader().getPossibleKeys())); - definitions.put(key, j); - } - - JSONObject items = new JSONObject(); - items.put("$ref", "#/definitions/" + key); - prop.put("items", items); - description.add(SYMBOL_TYPE__N + " Must be a valid Object (use ctrl+space for auto complete!)"); - } else if (k.isAnnotationPresent(RegistryListRegion.class)) { - fancyType = "List of Iris Regions"; - String key = "enum-reg-region"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(data.getRegionLoader().getPossibleKeys())); - definitions.put(key, j); - } - - JSONObject items = new JSONObject(); - items.put("$ref", "#/definitions/" + key); - prop.put("items", items); - description.add(SYMBOL_TYPE__N + " Must be a valid Region (use ctrl+space for auto complete!)"); - } else if (k.isAnnotationPresent(RegistryListJigsawPiece.class)) { - fancyType = "List of Iris Jigsaw Pieces"; - String key = "enum-reg-structure-piece"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(data.getJigsawPieceLoader().getPossibleKeys())); - definitions.put(key, j); - } - - JSONObject items = new JSONObject(); - items.put("$ref", "#/definitions/" + key); - prop.put("items", items); - description.add(SYMBOL_TYPE__N + " Must be a valid Jigsaw Piece (use ctrl+space for auto complete!)"); - } else if (k.isAnnotationPresent(RegistryListJigsawPool.class)) { - fancyType = "List of Iris Jigsaw Pools"; - String key = "enum-reg-structure-pool"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(data.getJigsawPoolLoader().getPossibleKeys())); - definitions.put(key, j); - } - - JSONObject items = new JSONObject(); - items.put("$ref", "#/definitions/" + key); - prop.put("items", items); - description.add(SYMBOL_TYPE__N + " Must be a valid Jigsaw Pool (use ctrl+space for auto complete!)"); - } else if (k.isAnnotationPresent(RegistryListJigsaw.class)) { - fancyType = "List of Iris Jigsaw Structures"; - String key = "enum-reg-jigsaw"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", new JSONArray(data.getJigsawStructureLoader().getPossibleKeys())); - definitions.put(key, j); - } - - JSONObject items = new JSONObject(); - items.put("$ref", "#/definitions/" + key); - prop.put("items", items); - description.add(SYMBOL_TYPE__N + " Must be a valid Jigsaw (use ctrl+space for auto complete!)"); - } else if (t.type().equals(Enchantment.class)) { - fancyType = "List of Enchantment Types"; - String key = "enum-enchantment"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", ENCHANT_TYPES); - definitions.put(key, j); - } - - JSONObject items = new JSONObject(); - items.put("$ref", "#/definitions/" + key); - prop.put("items", items); - description.add(SYMBOL_TYPE__N + " Must be a valid Enchantment Type (use ctrl+space for auto complete!)"); - } else if (t.type().equals(PotionEffectType.class)) { - fancyType = "List of Potion Effect Types"; - String key = "enum-potion-effect-type"; - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put("enum", POTION_TYPES); - definitions.put(key, j); - } - - JSONObject items = new JSONObject(); - items.put("$ref", "#/definitions/" + key); - prop.put("items", items); - description.add(SYMBOL_TYPE__N + " Must be a valid Potion Effect Type (use ctrl+space for auto complete!)"); - } else if (t.type().isEnum()) { - fancyType = "List of " + t.type().getSimpleName().replaceAll("\\QIris\\E", "") + "s"; - JSONArray a = new JSONArray(); - boolean advanced = t.type().isAnnotationPresent(Desc.class); - for (Object gg : t.type().getEnumConstants()) { - if (advanced) { - try { - JSONObject j = new JSONObject(); - String name = ((Enum) gg).name(); - j.put("const", name); - Desc dd = t.type().getField(name).getAnnotation(Desc.class); - j.put("description", dd == null ? ("No Description for " + name) : dd.value()); - a.put(j); - } catch (Throwable e) { - e.printStackTrace(); - } - } else { - a.put(((Enum) gg).name()); - } - } - - String key = (advanced ? "oneof-" : "") + "enum-" + t.type().getCanonicalName().replaceAll("\\Q.\\E", "-").toLowerCase(); - - if (!definitions.containsKey(key)) { - JSONObject j = new JSONObject(); - j.put(advanced ? "oneOf" : "enum", a); - definitions.put(key, j); - } - - JSONObject items = new JSONObject(); - items.put("$ref", "#/definitions/" + key); - prop.put("items", items); - description.add(SYMBOL_TYPE__N + " Must be a valid " + t.type().getSimpleName().replaceAll("\\QIris\\E", "") + " (use ctrl+space for auto complete!)"); + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(Iris.linkMythicMobs.getMythicMobTypes())); + definitions.put(key, j); } + + fancyType = "Mythic Mob Type"; + prop.put("$ref", "#/definitions/" + key); + description.add(SYMBOL_TYPE__N + " Must be a valid Mythic Mob Type (use ctrl+space for auto complete!) Define mythic mobs with the mythic mobs plugin configuration files."); + } else if (k.isAnnotationPresent(RegistryListBlockType.class)) { + String key = "enum-block-type"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + JSONArray ja = new JSONArray(); + + for (String i : data.getBlockLoader().getPossibleKeys()) { + ja.put(i); + } + + for (String i : B.getBlockTypes()) { + ja.put(i); + } + + j.put("enum", ja); + definitions.put(key, j); + } + + fancyType = "Block Type"; + prop.put("$ref", "#/definitions/" + key); + description.add(SYMBOL_TYPE__N + " Must be a valid Block Type (use ctrl+space for auto complete!)"); + + } else if (k.isAnnotationPresent(RegistryListItemType.class)) { + String key = "enum-item-type"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", ITEM_TYPES); + definitions.put(key, j); + } + + fancyType = "Item Type"; + prop.put("$ref", "#/definitions/" + key); + description.add(SYMBOL_TYPE__N + " Must be a valid Item Type (use ctrl+space for auto complete!)"); + + } else if (k.isAnnotationPresent(RegistryListEntity.class)) { + String key = "enum-reg-entity"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(data.getEntityLoader().getPossibleKeys())); + definitions.put(key, j); + } + + fancyType = "Iris Entity"; + prop.put("$ref", "#/definitions/" + key); + description.add(SYMBOL_TYPE__N + " Must be a valid Iris Entity (use ctrl+space for auto complete!)"); + + } else if (k.isAnnotationPresent(RegistryListFont.class)) { + String key = "enum-font"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", FONT_TYPES); + definitions.put(key, j); + } + + fancyType = "Font Family"; + prop.put("$ref", "#/definitions/" + key); + description.add(SYMBOL_TYPE__N + " Must be a valid Font Family (use ctrl+space for auto complete!)"); + + } else if (k.isAnnotationPresent(RegistryListLoot.class)) { + String key = "enum-reg-loot-table"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(data.getLootLoader().getPossibleKeys())); + definitions.put(key, j); + } + + fancyType = "Iris Loot Table"; + prop.put("$ref", "#/definitions/" + key); + description.add(SYMBOL_TYPE__N + " Must be a valid Loot Table (use ctrl+space for auto complete!)"); + } else if (k.isAnnotationPresent(RegistryListDimension.class)) { + String key = "enum-reg-dimension"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(data.getDimensionLoader().getPossibleKeys())); + definitions.put(key, j); + } + + fancyType = "Iris Dimension"; + prop.put("$ref", "#/definitions/" + key); + description.add(SYMBOL_TYPE__N + " Must be a valid Dimension (use ctrl+space for auto complete!)"); + + } else if (k.isAnnotationPresent(RegistryListGenerator.class)) { + String key = "enum-reg-generator"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(data.getGeneratorLoader().getPossibleKeys())); + definitions.put(key, j); + } + + fancyType = "Iris Generator"; + prop.put("$ref", "#/definitions/" + key); + description.add(SYMBOL_TYPE__N + " Must be a valid Generator (use ctrl+space for auto complete!)"); + + } else if (k.isAnnotationPresent(RegistryListObject.class)) { + String key = "enum-reg-object"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(data.getObjectLoader().getPossibleKeys())); + definitions.put(key, j); + } + + fancyType = "Iris Object"; + prop.put("$ref", "#/definitions/" + key); + description.add(SYMBOL_TYPE__N + " Must be a valid Object (use ctrl+space for auto complete!)"); + + } else if (k.isAnnotationPresent(RegistryListRegion.class)) { + String key = "enum-reg-region"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(data.getRegionLoader().getPossibleKeys())); + definitions.put(key, j); + } + + fancyType = "Iris Region"; + prop.put("$ref", "#/definitions/" + key); + description.add(SYMBOL_TYPE__N + " Must be a valid Region (use ctrl+space for auto complete!)"); + + } else if (k.isAnnotationPresent(RegistryListJigsawPiece.class)) { + String key = "enum-reg-structure-piece"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(data.getJigsawPieceLoader().getPossibleKeys())); + definitions.put(key, j); + } + + fancyType = "Iris Jigsaw Piece"; + prop.put("$ref", "#/definitions/" + key); + description.add(SYMBOL_TYPE__N + " Must be a valid Jigsaw Piece (use ctrl+space for auto complete!)"); + } else if (k.isAnnotationPresent(RegistryListJigsaw.class)) { + String key = "enum-reg-jigsaw"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(data.getJigsawStructureLoader().getPossibleKeys())); + definitions.put(key, j); + } + + fancyType = "Iris Jigsaw"; + prop.put("$ref", "#/definitions/" + key); + description.add(SYMBOL_TYPE__N + " Must be a valid Jigsaw (use ctrl+space for auto complete!)"); + } else if (k.isAnnotationPresent(RegistryListJigsawPool.class)) { + String key = "enum-reg-structure-pool"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(data.getJigsawPoolLoader().getPossibleKeys())); + definitions.put(key, j); + } + + fancyType = "Iris Jigsaw Pool"; + prop.put("$ref", "#/definitions/" + key); + description.add(SYMBOL_TYPE__N + " Must be a valid Jigsaw Piece (use ctrl+space for auto complete!)"); + } else if (k.getType().equals(Enchantment.class)) { + String key = "enum-enchantment"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", ENCHANT_TYPES); + definitions.put(key, j); + } + + fancyType = "Enchantment Type"; + prop.put("$ref", "#/definitions/" + key); + description.add(SYMBOL_TYPE__N + " Must be a valid Enchantment Type (use ctrl+space for auto complete!)"); + } else if (k.getType().equals(PotionEffectType.class)) { + String key = "enum-potion-effect-type"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", POTION_TYPES); + definitions.put(key, j); + } + + fancyType = "Potion Effect Type"; + prop.put("$ref", "#/definitions/" + key); + description.add(SYMBOL_TYPE__N + " Must be a valid Potion Effect Type (use ctrl+space for auto complete!)"); + + } else if (k.getType().isEnum()) { + fancyType = k.getType().getSimpleName().replaceAll("\\QIris\\E", ""); + JSONArray a = new JSONArray(); + boolean advanced = k.getType().isAnnotationPresent(Desc.class); + for (Object gg : k.getType().getEnumConstants()) { + if (advanced) { + try { + JSONObject j = new JSONObject(); + String name = ((Enum) gg).name(); + j.put("const", name); + Desc dd = k.getType().getField(name).getAnnotation(Desc.class); + j.put("description", dd == null ? ("No Description for " + name) : dd.value()); + a.put(j); + } catch (Throwable e) { + e.printStackTrace(); + } + } else { + a.put(((Enum) gg).name()); + } + } + + String key = (advanced ? "oneof-" : "") + "enum-" + k.getType().getCanonicalName().replaceAll("\\Q.\\E", "-").toLowerCase(); + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put(advanced ? "oneOf" : "enum", a); + definitions.put(key, j); + } + + prop.put("$ref", "#/definitions/" + key); + description.add(SYMBOL_TYPE__N + " Must be a valid " + k.getType().getSimpleName().replaceAll("\\QIris\\E", "") + " (use ctrl+space for auto complete!)"); + } - } else { - warnings.add("Undefined array type for field " + k.getName() + " (" + k.getType().getSimpleName() + ") in class " + cl.getSimpleName()); } - } else { - warnings.add("Unexpected Schema Type: " + type + " for field " + k.getName() + " (" + k.getType().getSimpleName() + ") in class " + cl.getSimpleName()); + case "object" -> { + fancyType = k.getType().getSimpleName().replaceAll("\\QIris\\E", "") + " (Object)"; + String key = "obj-" + k.getType().getCanonicalName().replaceAll("\\Q.\\E", "-").toLowerCase(); + if (!definitions.containsKey(key)) { + definitions.put(key, new JSONObject()); + definitions.put(key, buildProperties(k.getType())); + } + prop.put("$ref", "#/definitions/" + key); + } + case "array" -> { + fancyType = "List of Something...?"; + ArrayType t = k.getDeclaredAnnotation(ArrayType.class); + if (t != null) { + if (t.min() > 0) { + prop.put("minItems", t.min()); + if (t.min() == 1) { + description.add(SYMBOL_LIMIT__N + " At least one entry must be defined, or just remove this list."); + } else { + description.add(SYMBOL_LIMIT__N + " Requires at least " + t.min() + " entries."); + } + } + + String arrayType = getType(t.type()); + + switch (arrayType) { + case "integer" -> fancyType = "List of Integers"; + case "number" -> fancyType = "List of Numbers"; + case "object" -> { + fancyType = "List of " + t.type().getSimpleName().replaceAll("\\QIris\\E", "") + "s (Objects)"; + String key = "obj-" + t.type().getCanonicalName().replaceAll("\\Q.\\E", "-").toLowerCase(); + if (!definitions.containsKey(key)) { + definitions.put(key, new JSONObject()); + definitions.put(key, buildProperties(t.type())); + } + JSONObject items = new JSONObject(); + items.put("$ref", "#/definitions/" + key); + prop.put("items", items); + } + case "string" -> { + fancyType = "List of Text"; + if (k.isAnnotationPresent(RegistryListBiome.class)) { + fancyType = "List of Iris Biomes"; + String key = "enum-reg-biome"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(data.getBiomeLoader().getPossibleKeys())); + definitions.put(key, j); + } + + JSONObject items = new JSONObject(); + items.put("$ref", "#/definitions/" + key); + prop.put("items", items); + description.add(SYMBOL_TYPE__N + " Must be a valid Biome (use ctrl+space for auto complete!)"); + } else if (k.isAnnotationPresent(RegistryListMythical.class)) { + fancyType = "List of Mythic Mob Types"; + String key = "enum-reg-mythical"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + JSONArray ja = new JSONArray(); + + for (String i : Iris.linkMythicMobs.getMythicMobTypes()) { + ja.put(i); + } + + j.put("enum", ja); + definitions.put(key, j); + } + + JSONObject items = new JSONObject(); + items.put("$ref", "#/definitions/" + key); + prop.put("items", items); + description.add(SYMBOL_TYPE__N + " Must be a valid Mythic Mob Type (use ctrl+space for auto complete!) Configure mob types in the mythic mobs plugin configuration files."); + } else if (k.isAnnotationPresent(RegistryListBlockType.class)) { + fancyType = "List of Block Types"; + String key = "enum-block-type"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + JSONArray ja = new JSONArray(); + + for (String i : data.getBlockLoader().getPossibleKeys()) { + ja.put(i); + } + + for (String i : B.getBlockTypes()) { + ja.put(i); + } + + j.put("enum", ja); + definitions.put(key, j); + } + + JSONObject items = new JSONObject(); + items.put("$ref", "#/definitions/" + key); + prop.put("items", items); + description.add(SYMBOL_TYPE__N + " Must be a valid Block Type (use ctrl+space for auto complete!)"); + } else if (k.isAnnotationPresent(RegistryListItemType.class)) { + fancyType = "List of Item Types"; + String key = "enum-item-type"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", ITEM_TYPES); + definitions.put(key, j); + } + + JSONObject items = new JSONObject(); + items.put("$ref", "#/definitions/" + key); + prop.put("items", items); + description.add(SYMBOL_TYPE__N + " Must be a valid Item Type (use ctrl+space for auto complete!)"); + } else if (k.isAnnotationPresent(RegistryListEntity.class)) { + fancyType = "List of Iris Entities"; + String key = "enum-reg-entity"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(data.getEntityLoader().getPossibleKeys())); + definitions.put(key, j); + } + + JSONObject items = new JSONObject(); + items.put("$ref", "#/definitions/" + key); + prop.put("items", items); + description.add(SYMBOL_TYPE__N + " Must be a valid Iris Entity (use ctrl+space for auto complete!)"); + } else if (k.isAnnotationPresent(RegistryListFont.class)) { + String key = "enum-font"; + fancyType = "List of Font Families"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", FONT_TYPES); + definitions.put(key, j); + } + + JSONObject items = new JSONObject(); + items.put("$ref", "#/definitions/" + key); + prop.put("items", items); + description.add(SYMBOL_TYPE__N + " Must be a valid Font Family (use ctrl+space for auto complete!)"); + } else if (k.isAnnotationPresent(RegistryListLoot.class)) { + fancyType = "List of Iris Loot Tables"; + String key = "enum-reg-loot-table"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(data.getLootLoader().getPossibleKeys())); + definitions.put(key, j); + } + + JSONObject items = new JSONObject(); + items.put("$ref", "#/definitions/" + key); + prop.put("items", items); + description.add(SYMBOL_TYPE__N + " Must be a valid Loot Table (use ctrl+space for auto complete!)"); + } else if (k.isAnnotationPresent(RegistryListDimension.class)) { + fancyType = "List of Iris Dimensions"; + String key = "enum-reg-dimension"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(data.getDimensionLoader().getPossibleKeys())); + definitions.put(key, j); + } + + JSONObject items = new JSONObject(); + items.put("$ref", "#/definitions/" + key); + prop.put("items", items); + description.add(SYMBOL_TYPE__N + " Must be a valid Dimension (use ctrl+space for auto complete!)"); + } else if (k.isAnnotationPresent(RegistryListGenerator.class)) { + fancyType = "List of Iris Generators"; + String key = "enum-reg-generator"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(data.getGeneratorLoader().getPossibleKeys())); + definitions.put(key, j); + } + + JSONObject items = new JSONObject(); + items.put("$ref", "#/definitions/" + key); + prop.put("items", items); + description.add(SYMBOL_TYPE__N + " Must be a valid Generator (use ctrl+space for auto complete!)"); + } else if (k.isAnnotationPresent(RegistryListObject.class)) { + fancyType = "List of Iris Objects"; + String key = "enum-reg-object"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(data.getObjectLoader().getPossibleKeys())); + definitions.put(key, j); + } + + JSONObject items = new JSONObject(); + items.put("$ref", "#/definitions/" + key); + prop.put("items", items); + description.add(SYMBOL_TYPE__N + " Must be a valid Object (use ctrl+space for auto complete!)"); + } else if (k.isAnnotationPresent(RegistryListRegion.class)) { + fancyType = "List of Iris Regions"; + String key = "enum-reg-region"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(data.getRegionLoader().getPossibleKeys())); + definitions.put(key, j); + } + + JSONObject items = new JSONObject(); + items.put("$ref", "#/definitions/" + key); + prop.put("items", items); + description.add(SYMBOL_TYPE__N + " Must be a valid Region (use ctrl+space for auto complete!)"); + } else if (k.isAnnotationPresent(RegistryListJigsawPiece.class)) { + fancyType = "List of Iris Jigsaw Pieces"; + String key = "enum-reg-structure-piece"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(data.getJigsawPieceLoader().getPossibleKeys())); + definitions.put(key, j); + } + + JSONObject items = new JSONObject(); + items.put("$ref", "#/definitions/" + key); + prop.put("items", items); + description.add(SYMBOL_TYPE__N + " Must be a valid Jigsaw Piece (use ctrl+space for auto complete!)"); + } else if (k.isAnnotationPresent(RegistryListJigsawPool.class)) { + fancyType = "List of Iris Jigsaw Pools"; + String key = "enum-reg-structure-pool"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(data.getJigsawPoolLoader().getPossibleKeys())); + definitions.put(key, j); + } + + JSONObject items = new JSONObject(); + items.put("$ref", "#/definitions/" + key); + prop.put("items", items); + description.add(SYMBOL_TYPE__N + " Must be a valid Jigsaw Pool (use ctrl+space for auto complete!)"); + } else if (k.isAnnotationPresent(RegistryListJigsaw.class)) { + fancyType = "List of Iris Jigsaw Structures"; + String key = "enum-reg-jigsaw"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", new JSONArray(data.getJigsawStructureLoader().getPossibleKeys())); + definitions.put(key, j); + } + + JSONObject items = new JSONObject(); + items.put("$ref", "#/definitions/" + key); + prop.put("items", items); + description.add(SYMBOL_TYPE__N + " Must be a valid Jigsaw (use ctrl+space for auto complete!)"); + } else if (t.type().equals(Enchantment.class)) { + fancyType = "List of Enchantment Types"; + String key = "enum-enchantment"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", ENCHANT_TYPES); + definitions.put(key, j); + } + + JSONObject items = new JSONObject(); + items.put("$ref", "#/definitions/" + key); + prop.put("items", items); + description.add(SYMBOL_TYPE__N + " Must be a valid Enchantment Type (use ctrl+space for auto complete!)"); + } else if (t.type().equals(PotionEffectType.class)) { + fancyType = "List of Potion Effect Types"; + String key = "enum-potion-effect-type"; + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put("enum", POTION_TYPES); + definitions.put(key, j); + } + + JSONObject items = new JSONObject(); + items.put("$ref", "#/definitions/" + key); + prop.put("items", items); + description.add(SYMBOL_TYPE__N + " Must be a valid Potion Effect Type (use ctrl+space for auto complete!)"); + } else if (t.type().isEnum()) { + fancyType = "List of " + t.type().getSimpleName().replaceAll("\\QIris\\E", "") + "s"; + JSONArray a = new JSONArray(); + boolean advanced = t.type().isAnnotationPresent(Desc.class); + for (Object gg : t.type().getEnumConstants()) { + if (advanced) { + try { + JSONObject j = new JSONObject(); + String name = ((Enum) gg).name(); + j.put("const", name); + Desc dd = t.type().getField(name).getAnnotation(Desc.class); + j.put("description", dd == null ? ("No Description for " + name) : dd.value()); + a.put(j); + } catch (Throwable e) { + e.printStackTrace(); + } + } else { + a.put(((Enum) gg).name()); + } + } + + String key = (advanced ? "oneof-" : "") + "enum-" + t.type().getCanonicalName().replaceAll("\\Q.\\E", "-").toLowerCase(); + + if (!definitions.containsKey(key)) { + JSONObject j = new JSONObject(); + j.put(advanced ? "oneOf" : "enum", a); + definitions.put(key, j); + } + + JSONObject items = new JSONObject(); + items.put("$ref", "#/definitions/" + key); + prop.put("items", items); + description.add(SYMBOL_TYPE__N + " Must be a valid " + t.type().getSimpleName().replaceAll("\\QIris\\E", "") + " (use ctrl+space for auto complete!)"); + } + } + } + } else { + warnings.add("Undefined array type for field " + k.getName() + " (" + k.getType().getSimpleName() + ") in class " + cl.getSimpleName()); + } + } + default -> warnings.add("Unexpected Schema Type: " + type + " for field " + k.getName() + " (" + k.getType().getSimpleName() + ") in class " + cl.getSimpleName()); } KList d = new KList<>(); @@ -734,7 +746,7 @@ public class SchemaBuilder { d.add("* Default Value is " + value); } } - } catch (Throwable e) { + } catch (Throwable ignored) { } diff --git a/src/main/java/com/volmit/iris/manager/WandManager.java b/src/main/java/com/volmit/iris/manager/WandManager.java index 9b1f67c76..aacd365be 100644 --- a/src/main/java/com/volmit/iris/manager/WandManager.java +++ b/src/main/java/com/volmit/iris/manager/WandManager.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager; import com.volmit.iris.Iris; @@ -109,7 +127,7 @@ public class WandManager implements Listener { } Location lv = new Location(d[0].getWorld(), j, k, l).clone().add(0.5, 0.5, 0.5).clone().add(push); - Color color = Color.getHSBColor((float) (0.5f + (Math.sin((j + k + l + (p.getTicksLived() / 2)) / 20f) / 2)), 1, 1); + Color color = Color.getHSBColor((float) (0.5f + (Math.sin((j + k + l + (p.getTicksLived() / 2f)) / 20f) / 2)), 1, 1); int r = color.getRed(); int g = color.getGreen(); int b = color.getBlue(); diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIris.java b/src/main/java/com/volmit/iris/manager/command/CommandIris.java index 0be3616df..02bd9c00e 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIris.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIris.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisDownload.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisDownload.java index 5a6a46e18..bdecd724b 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisDownload.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisDownload.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command; import com.volmit.iris.Iris; @@ -29,6 +47,7 @@ public class CommandIrisDownload extends MortarCommand { for (String i : args) { if (i.equals("-t") || i.equals("--trim")) { trim = true; + break; } } diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisMetrics.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisMetrics.java index 44340e9c4..0b0eaff37 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisMetrics.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisMetrics.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisReload.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisReload.java index 41f528a8f..64f4b4589 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisReload.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisReload.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisUpdateProject.java b/src/main/java/com/volmit/iris/manager/command/CommandIrisUpdateProject.java index 8280d8f9d..ed0f450e0 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisUpdateProject.java +++ b/src/main/java/com/volmit/iris/manager/command/CommandIrisUpdateProject.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/PermissionIris.java b/src/main/java/com/volmit/iris/manager/command/PermissionIris.java index b47293ce3..c0065c85e 100644 --- a/src/main/java/com/volmit/iris/manager/command/PermissionIris.java +++ b/src/main/java/com/volmit/iris/manager/command/PermissionIris.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command; import com.volmit.iris.util.MortarPermission; diff --git a/src/main/java/com/volmit/iris/manager/command/PermissionIrisStudio.java b/src/main/java/com/volmit/iris/manager/command/PermissionIrisStudio.java index 06754b91c..232218e7b 100644 --- a/src/main/java/com/volmit/iris/manager/command/PermissionIrisStudio.java +++ b/src/main/java/com/volmit/iris/manager/command/PermissionIrisStudio.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command; import com.volmit.iris.util.MortarPermission; diff --git a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsaw.java b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsaw.java index e6e4d0e26..7de096185 100644 --- a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsaw.java +++ b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsaw.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.jigsaw; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawEdit.java b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawEdit.java index ff6390fe9..352d51e96 100644 --- a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawEdit.java +++ b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawEdit.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.jigsaw; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawExit.java b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawExit.java index 4ec791390..20aac2247 100644 --- a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawExit.java +++ b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawExit.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.jigsaw; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawNew.java b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawNew.java index 7b4f99f47..dff3ba497 100644 --- a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawNew.java +++ b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawNew.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.jigsaw; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawPlace.java b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawPlace.java index a857bb062..f6c736ddf 100644 --- a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawPlace.java +++ b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawPlace.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.jigsaw; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawSave.java b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawSave.java index bff3de7af..b9e744b1e 100644 --- a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawSave.java +++ b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawSave.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.jigsaw; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObject.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObject.java index b9c2c963d..251f7596c 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObject.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObject.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.object; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectContract.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectContract.java index fdfa09c21..adc8ea7e8 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectContract.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectContract.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.object; import com.volmit.iris.Iris; @@ -41,7 +59,7 @@ public class CommandIrisObjectContract extends MortarCommand { return true; } - int amt = args.length == 1 ? Integer.valueOf(args[0]) : 1; + int amt = args.length == 1 ? Integer.parseInt(args[0]) : 1; Location[] b = WandManager.getCuboid(p.getInventory().getItemInMainHand()); Location a1 = b[0].clone(); Location a2 = b[1].clone(); diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectDust.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectDust.java index b36494922..7b7942084 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectDust.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectDust.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.object; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectExpand.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectExpand.java index cb206611a..89b429168 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectExpand.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectExpand.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.object; import com.volmit.iris.Iris; @@ -41,7 +59,7 @@ public class CommandIrisObjectExpand extends MortarCommand { return true; } - int amt = args.length == 1 ? Integer.valueOf(args[0]) : 1; + int amt = args.length == 1 ? Integer.parseInt(args[0]) : 1; Location[] b = WandManager.getCuboid(p.getInventory().getItemInMainHand()); Location a1 = b[0].clone(); Location a2 = b[1].clone(); 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 b8cbef00b..9a4b71845 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 @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.object; import com.volmit.iris.Iris; @@ -7,12 +25,9 @@ import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import java.util.Set; - public class CommandIrisObjectP1 extends MortarCommand { public CommandIrisObjectP1() { super("p1"); 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 be87af517..3750c55cb 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 @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.object; import com.volmit.iris.Iris; @@ -7,12 +25,9 @@ import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import java.util.Set; - public class CommandIrisObjectP2 extends MortarCommand { public CommandIrisObjectP2() { super("p2"); diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectPaste.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectPaste.java index 00dd0e29f..3c5f32fac 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectPaste.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectPaste.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.object; import com.volmit.iris.Iris; @@ -10,13 +28,11 @@ import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import java.io.File; -import java.util.Set; public class CommandIrisObjectPaste extends MortarCommand { public CommandIrisObjectPaste() { @@ -63,6 +79,7 @@ public class CommandIrisObjectPaste extends MortarCommand { for (String i : args) { if (i.equalsIgnoreCase("-edit")) { intoWand = true; + break; } } diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectSave.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectSave.java index cf11a992e..69ec7b5ed 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectSave.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectSave.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.object; import com.volmit.iris.Iris; @@ -51,6 +69,7 @@ public class CommandIrisObjectSave extends MortarCommand { for (String i : args) { if (i.equals("-o")) { overwrite = true; + break; } } diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectShift.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectShift.java index edb485664..07f53aaa0 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectShift.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectShift.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.object; import com.volmit.iris.Iris; @@ -41,7 +59,7 @@ public class CommandIrisObjectShift extends MortarCommand { return true; } - int amt = args.length == 1 ? Integer.valueOf(args[0]) : 1; + int amt = args.length == 1 ? Integer.parseInt(args[0]) : 1; Location[] b = WandManager.getCuboid(p.getInventory().getItemInMainHand()); Location a1 = b[0].clone(); Location a2 = b[1].clone(); diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectWand.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectWand.java index 7b726b528..1afc5450b 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectWand.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectWand.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.object; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectXAY.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectXAY.java index fb83ae370..87129e8d8 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectXAY.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectXAY.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.object; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectXPY.java b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectXPY.java index 209259b92..db19986ec 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectXPY.java +++ b/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectXPY.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.object; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudio.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudio.java index a50f04df8..24fb9f79a 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudio.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudio.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioBeautify.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioBeautify.java index 623fef310..dbe4a0788 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioBeautify.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioBeautify.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioClose.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioClose.java index 749eb8838..de2054e00 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioClose.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioClose.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioConvert.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioConvert.java index 14ecdf360..0ed3977df 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioConvert.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioConvert.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioCreate.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioCreate.java index c8a4b1f93..b51132ce3 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioCreate.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioCreate.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioEditBiome.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioEditBiome.java index ff76c050c..28401d667 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioEditBiome.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioEditBiome.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorer.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorer.java index d0ca08f8b..14318b49e 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorer.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorerGenerator.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorerGenerator.java index 21f71ee75..a561dcaa1 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorerGenerator.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorerGenerator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; @@ -12,7 +30,7 @@ import com.volmit.iris.util.RNG; public class CommandIrisStudioExplorerGenerator extends MortarCommand { public CommandIrisStudioExplorerGenerator() { - super("generator", "gen", "g"); + super("generator", "gen"); setDescription("Preview created noise noises generators"); requiresPermission(Iris.perm.studio); setCategory("World"); diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioGoto.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioGoto.java index d9945b78a..d4b69d43f 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioGoto.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioGoto.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioHotload.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioHotload.java index c79e3f291..ca8d3510e 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioHotload.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioHotload.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioLoot.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioLoot.java index cf5de89d5..a45d6ac8b 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioLoot.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioLoot.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; @@ -72,7 +90,7 @@ public class CommandIrisStudioLoot extends MortarCommand { boolean fast = ffast; boolean add = fadd; - O ta = new O(); + O ta = new O<>(); ta.set(-1); ta.set(Bukkit.getScheduler().scheduleSyncRepeatingTask(Iris.instance, () -> diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioMap.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioMap.java index fe4a14ae6..cba8a1bcd 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioMap.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioMap.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioOpen.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioOpen.java index 441b884e3..a3e4b597c 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioOpen.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioOpen.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioPackage.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioPackage.java index 27a601543..6f372d270 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioPackage.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioPackage.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; @@ -40,6 +58,7 @@ public class CommandIrisStudioPackage extends MortarCommand { for (String i : args) { if (i.equalsIgnoreCase("-o")) { o = true; + break; } } diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioProfile.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioProfile.java index 91e0c7741..aec8f2c72 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioProfile.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioProfile.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; @@ -95,12 +113,7 @@ public class CommandIrisStudioProfile extends MortarCommand { in.setFunction(i); in.setHorizontalScale(8); - NoiseProvider np = new NoiseProvider() { - @Override - public double noise(double x, double z) { - return Math.random(); - } - }; + NoiseProvider np = (x, z) -> Math.random(); for (int j = 0; j < 3000; j++) { in.interpolate(j, -j, np); diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioSummon.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioSummon.java index 0b0accbc7..7fcad75fb 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioSummon.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioSummon.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioTPStudio.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioTPStudio.java index 2da7c274a..ab2396012 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioTPStudio.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioTPStudio.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; @@ -9,7 +27,7 @@ import org.bukkit.GameMode; public class CommandIrisStudioTPStudio extends MortarCommand { public CommandIrisStudioTPStudio() { - super("tps", "stp", "tpstudio"); + super("tps", "stp", "tpstudio", "tp"); requiresPermission(Iris.perm.studio); setDescription("Go to the spawn of the currently open studio world."); setCategory("Studio"); diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioUpdate.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioUpdate.java index 84bce9e66..4b72bbc13 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioUpdate.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioUpdate.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhat.java b/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhat.java index fe0bbd9bb..9bdb8e6cc 100644 --- a/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhat.java +++ b/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhat.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.what; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatBiome.java b/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatBiome.java index fc22eb4f0..47fcd6ae0 100644 --- a/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatBiome.java +++ b/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatBiome.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.what; import com.volmit.iris.Iris; @@ -45,7 +63,7 @@ public class CommandIrisWhatBiome extends MortarCommand { if (p.getLocation().getBlock().getBiome().equals(Biome.CUSTOM)) { try { sender.sendMessage("Data Pack Biome: " + INMS.get().getTrueBiomeBaseKey(p.getLocation()) + " (ID: " + INMS.get().getTrueBiomeBaseId(INMS.get().getTrueBiomeBase(p.getLocation())) + ")"); - } catch (Throwable ex) { + } catch (Throwable ignored) { } } diff --git a/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatBlock.java b/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatBlock.java index 528d79faf..b67c4bf97 100644 --- a/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatBlock.java +++ b/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatBlock.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.what; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatHand.java b/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatHand.java index 07c0346da..1eb0a0ac2 100644 --- a/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatHand.java +++ b/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatHand.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.what; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatObjects.java b/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatObjects.java index 15e498d28..57f4b9d4d 100644 --- a/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatObjects.java +++ b/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatObjects.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.what; import com.volmit.iris.Iris; @@ -36,6 +54,7 @@ public class CommandIrisWhatObjects extends MortarCommand { } + @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") @Override public boolean handle(MortarSender sender, String[] args) { if (sender.isPlayer()) { @@ -60,7 +79,7 @@ public class CommandIrisWhatObjects extends MortarCommand { int cz = l.getChunk().getZ(); new Spiraler(3, 3, (x, z) -> chunks.addIfMissing(world.getChunkAt(x + cx, z + cz))).drain(); } - } catch (Throwable e) { + } catch (Throwable ignored) { } @@ -200,6 +219,7 @@ public class CommandIrisWhatObjects extends MortarCommand { objects.compute(n1, (k1, v1) -> { + //noinspection ReplaceNullCheck if (v1 == null) { return new KMap<>(); } diff --git a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisCreate.java b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisCreate.java index 47a2cdbfd..7cda1755d 100644 --- a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisCreate.java +++ b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisCreate.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.world; import com.volmit.iris.Iris; @@ -42,24 +60,28 @@ public class CommandIrisCreate extends MortarCommand { String pre = split[0].toLowerCase(); - if (pre.equals("type")) { - for (String s : Iris.proj.getListing(true).keySet()) { - list.add("type=" + s); + switch (pre) { + case "type" -> { + for (String s : Iris.proj.getListing(true).keySet()) { + list.add("type=" + s); + } + if (!list.contains("type=overworld")) { + list.contains("type=overworld"); + } } - if (!list.contains("type=overworld")) { - list.contains("type=overworld"); + case "seed" -> { + list.add("seed=1337"); + list.add("seed=" + new Random().nextInt()); + list.add("seed=random"); + } + case "pregen" -> { + list.add("500"); + list.add("1000"); + list.add("2000"); + list.add("5k"); + list.add("10k"); + list.add("25k"); } - } else if (pre.equals("seed")) { - list.add("seed=1337"); - list.add("seed=" + new Random().nextInt()); - list.add("seed=random"); - } else if (pre.equals("pregen")) { - list.add("500"); - list.add("1000"); - list.add("2000"); - list.add("5k"); - list.add("10k"); - list.add("25k"); } } @@ -111,13 +133,13 @@ public class CommandIrisCreate extends MortarCommand { sender.sendMessage("You must remember to either have multiverse installed or use the Bukkit method, otherwise the world will go corrupt!"); sender.sendMessage("Wiki: https://volmitsoftware.gitbook.io/iris/getting-started"); - O b = new O(); + O b = new O<>(); b.set(true); if (sender.isPlayer()) { try { sender.player().teleport(world.get().getSpawnLocation()); - } catch (Throwable e) { + } catch (Throwable ignored) { } } @@ -130,9 +152,7 @@ public class CommandIrisCreate extends MortarCommand { sender.sendMessage("Expect server lag during this time. Use '/iris pregen stop' to cancel"); new Pregenerator(world.get(), size, () -> - { - b.set(true); - }); + b.set(true)); } World ww = world.get(); diff --git a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisFix.java b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisFix.java index 3cb98b5a2..c3170c168 100644 --- a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisFix.java +++ b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisFix.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.world; import com.volmit.iris.Iris; @@ -29,7 +47,7 @@ public class CommandIrisFix extends MortarCommand { return true; } - int viewDistance = args.length > 0 ? Integer.valueOf(args[0]) : -1; + int viewDistance = args.length > 0 ? Integer.parseInt(args[0]) : -1; if (viewDistance <= 1) { J.a(() -> { int fixed = a.getCompound().getDefaultEngine().getFramework().getEngineParallax().repairChunk(sender.player().getLocation().getChunk()); diff --git a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisPregen.java b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisPregen.java index 7b9ea39be..6db7e0e4e 100644 --- a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisPregen.java +++ b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisPregen.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.world; import com.volmit.iris.Iris; @@ -15,10 +33,11 @@ public class CommandIrisPregen extends MortarCommand { public CommandIrisPregen() { super("pregen", "preg", "p"); setDescription( - "Pregen this world with optional parameters: " + - "\n'1k' = 1000 by 1000 blocks, '1c' = 1 by 1 chunks, and '1r' = 32 by 32 chunks." + - "\nIf you are using the console or want to pregen a world you're not in:" + - "\nalso specify the name of the world. E.g. /ir pregen 5k world" + """ + Pregen this world with optional parameters:\s + '1k' = 1000 by 1000 blocks, '1c' = 1 by 1 chunks, and '1r' = 32 by 32 chunks. + If you are using the console or want to pregen a world you're not in: + also specify the name of the world. E.g. /ir pregen 5k world""" ); requiresPermission(Iris.perm.studio); setCategory("Pregen"); diff --git a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisRegen.java b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisRegen.java index c0d894651..ed19ca3af 100644 --- a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisRegen.java +++ b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisRegen.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.world; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisUpdateWorld.java b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisUpdateWorld.java index 36f84dd3e..22808dccc 100644 --- a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisUpdateWorld.java +++ b/src/main/java/com/volmit/iris/manager/command/world/CommandIrisUpdateWorld.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.world; import com.volmit.iris.Iris; @@ -30,6 +48,7 @@ public class CommandIrisUpdateWorld extends MortarCommand { for (String i : args) { if (i.equalsIgnoreCase("--fresh-download")) { fresh = true; + break; } } diff --git a/src/main/java/com/volmit/iris/manager/command/world/CommandLocate.java b/src/main/java/com/volmit/iris/manager/command/world/CommandLocate.java index c7382ef09..800cc34c4 100644 --- a/src/main/java/com/volmit/iris/manager/command/world/CommandLocate.java +++ b/src/main/java/com/volmit/iris/manager/command/world/CommandLocate.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.command.world; import com.volmit.iris.Iris; @@ -13,7 +31,7 @@ import org.bukkit.event.player.PlayerCommandPreprocessEvent; import java.util.Arrays; public class CommandLocate extends MortarCommand implements Listener { - CommandLocate instance; + final CommandLocate instance; @EventHandler public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event) { diff --git a/src/main/java/com/volmit/iris/manager/edit/BlockEditor.java b/src/main/java/com/volmit/iris/manager/edit/BlockEditor.java index 1f7239850..6a61874a3 100644 --- a/src/main/java/com/volmit/iris/manager/edit/BlockEditor.java +++ b/src/main/java/com/volmit/iris/manager/edit/BlockEditor.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.edit; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/manager/edit/BlockSignal.java b/src/main/java/com/volmit/iris/manager/edit/BlockSignal.java index f1b6a6a7c..b7139034d 100644 --- a/src/main/java/com/volmit/iris/manager/edit/BlockSignal.java +++ b/src/main/java/com/volmit/iris/manager/edit/BlockSignal.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.edit; import com.volmit.iris.scaffold.parallel.MultiBurst; @@ -10,6 +28,7 @@ import org.bukkit.entity.FallingBlock; import org.bukkit.entity.Player; import org.bukkit.util.Vector; +@SuppressWarnings("InstantiationOfUtilityClass") public class BlockSignal { public static void of(Block block, int ticks) { new BlockSignal(block, ticks); diff --git a/src/main/java/com/volmit/iris/manager/edit/BukkitBlockEditor.java b/src/main/java/com/volmit/iris/manager/edit/BukkitBlockEditor.java index 26c6ee9ca..792eda3e6 100644 --- a/src/main/java/com/volmit/iris/manager/edit/BukkitBlockEditor.java +++ b/src/main/java/com/volmit/iris/manager/edit/BukkitBlockEditor.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.edit; import com.volmit.iris.util.M; @@ -5,6 +23,7 @@ import org.bukkit.World; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; +@SuppressWarnings("ClassCanBeRecord") public class BukkitBlockEditor implements BlockEditor { private final World world; diff --git a/src/main/java/com/volmit/iris/manager/edit/DustRevealer.java b/src/main/java/com/volmit/iris/manager/edit/DustRevealer.java index 76223d193..a7c9e5527 100644 --- a/src/main/java/com/volmit/iris/manager/edit/DustRevealer.java +++ b/src/main/java/com/volmit/iris/manager/edit/DustRevealer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.edit; import com.volmit.iris.scaffold.IrisWorlds; @@ -8,6 +26,7 @@ import lombok.Data; import org.bukkit.World; import org.bukkit.block.Block; +@SuppressWarnings("ALL") @Data public class DustRevealer { private final ParallaxAccess parallax; diff --git a/src/main/java/com/volmit/iris/manager/edit/JigsawEditor.java b/src/main/java/com/volmit/iris/manager/edit/JigsawEditor.java index 454efe088..63a9bc342 100644 --- a/src/main/java/com/volmit/iris/manager/edit/JigsawEditor.java +++ b/src/main/java/com/volmit/iris/manager/edit/JigsawEditor.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.edit; import com.google.gson.Gson; diff --git a/src/main/java/com/volmit/iris/manager/edit/WEBlockEditor.java b/src/main/java/com/volmit/iris/manager/edit/WEBlockEditor.java index 9066c172a..ca1b1cd8a 100644 --- a/src/main/java/com/volmit/iris/manager/edit/WEBlockEditor.java +++ b/src/main/java/com/volmit/iris/manager/edit/WEBlockEditor.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.edit; import com.sk89q.worldedit.EditSession; @@ -44,7 +62,6 @@ public class WEBlockEditor implements BlockEditor { @Override public void close() { es.close(); - return; } @Override diff --git a/src/main/java/com/volmit/iris/manager/gui/IrisRenderer.java b/src/main/java/com/volmit/iris/manager/gui/IrisRenderer.java index 7800b45df..085b443b3 100644 --- a/src/main/java/com/volmit/iris/manager/gui/IrisRenderer.java +++ b/src/main/java/com/volmit/iris/manager/gui/IrisRenderer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.gui; import com.volmit.iris.scaffold.engine.Engine; @@ -6,6 +24,7 @@ import org.bukkit.Material; import java.awt.image.BufferedImage; +@SuppressWarnings("ClassCanBeRecord") public class IrisRenderer { private final Renderer renderer; diff --git a/src/main/java/com/volmit/iris/manager/gui/IrisVision.java b/src/main/java/com/volmit/iris/manager/gui/IrisVision.java index aec1110c6..ac4e19923 100644 --- a/src/main/java/com/volmit/iris/manager/gui/IrisVision.java +++ b/src/main/java/com/volmit/iris/manager/gui/IrisVision.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.gui; import com.volmit.iris.Iris; @@ -14,12 +32,10 @@ import java.awt.event.MouseMotionListener; import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelListener; import java.awt.image.BufferedImage; -import java.awt.image.ImageObserver; import java.io.File; import java.io.IOException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.concurrent.ThreadFactory; public class IrisVision extends JPanel implements MouseWheelListener { private static final long serialVersionUID = 2094606939770332040L; @@ -45,38 +61,32 @@ public class IrisVision extends JPanel implements MouseWheelListener { private final KMap fastpositions = new KMap<>(); private final KSet working = new KSet<>(); private final KSet workingfast = new KSet<>(); - private final ExecutorService e = Executors.newFixedThreadPool(8, new ThreadFactory() { - @Override - public Thread newThread(Runnable r) { - tid++; - Thread t = new Thread(r); - t.setName("Iris HD Renderer " + tid); - t.setPriority(Thread.MIN_PRIORITY); - t.setUncaughtExceptionHandler((et, e) -> - { - Iris.info("Exception encountered in " + et.getName()); - e.printStackTrace(); - }); + private final ExecutorService e = Executors.newFixedThreadPool(8, r -> { + tid++; + Thread t = new Thread(r); + t.setName("Iris HD Renderer " + tid); + t.setPriority(Thread.MIN_PRIORITY); + t.setUncaughtExceptionHandler((et, e) -> + { + Iris.info("Exception encountered in " + et.getName()); + e.printStackTrace(); + }); - return t; - } + return t; }); - private final ExecutorService eh = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors(), new ThreadFactory() { - @Override - public Thread newThread(Runnable r) { - tid++; - Thread t = new Thread(r); - t.setName("Iris Renderer " + tid); - t.setPriority(Thread.NORM_PRIORITY); - t.setUncaughtExceptionHandler((et, e) -> - { - Iris.info("Exception encountered in " + et.getName()); - e.printStackTrace(); - }); + private final ExecutorService eh = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors(), r -> { + tid++; + Thread t = new Thread(r); + t.setName("Iris Renderer " + tid); + t.setPriority(Thread.NORM_PRIORITY); + t.setUncaughtExceptionHandler((et, e) -> + { + Iris.info("Exception encountered in " + et.getName()); + e.printStackTrace(); + }); - return t; - } + return t; }); public IrisVision() { @@ -223,12 +233,7 @@ public class IrisVision extends JPanel implements MouseWheelListener { BufferedImage t = getTile(gg, iscale, Math.floorDiv((posX / iscale) + i, iscale) * iscale, Math.floorDiv((posZ / iscale) + j, iscale) * iscale, m); if (t != null) { - g.drawImage(t, i - ((posX / iscale) % (iscale)), j - ((posZ / iscale) % (iscale)), iscale, iscale, new ImageObserver() { - @Override - public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) { - return true; - } - }); + g.drawImage(t, i - ((posX / iscale) % (iscale)), j - ((posZ / iscale) % (iscale)), iscale, iscale, (img, infoflags, x, y, width, height) -> true); } } } @@ -280,7 +285,7 @@ public class IrisVision extends JPanel implements MouseWheelListener { if (file != null) { try { frame.setIconImage(ImageIO.read(file)); - } catch (IOException e) { + } catch (IOException ignored) { } } @@ -288,9 +293,7 @@ public class IrisVision extends JPanel implements MouseWheelListener { public static void launch(IrisAccess g, int i) { J.a(() -> - { - createAndShowGUI((x, z) -> g.getEngineAccess(i).draw(x, z), i, g.getCompound().getWorld()); - }); + createAndShowGUI((x, z) -> g.getEngineAccess(i).draw(x, z), i, g.getCompound().getWorld())); } public void mouseWheelMoved(MouseWheelEvent e) { @@ -303,6 +306,6 @@ public class IrisVision extends JPanel implements MouseWheelListener { positions.clear(); fastpositions.clear(); mscale = mscale + ((0.044 * mscale) * notches); - mscale = mscale < 0.00001 ? 0.00001 : mscale; + mscale = Math.max(mscale, 0.00001); } } diff --git a/src/main/java/com/volmit/iris/manager/gui/NoiseExplorer.java b/src/main/java/com/volmit/iris/manager/gui/NoiseExplorer.java index a2a539dc0..afe016593 100644 --- a/src/main/java/com/volmit/iris/manager/gui/NoiseExplorer.java +++ b/src/main/java/com/volmit/iris/manager/gui/NoiseExplorer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.gui; import com.volmit.iris.Iris; @@ -19,12 +37,16 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener { private static final long serialVersionUID = 2094606939770332040L; static JComboBox combo; + @SuppressWarnings("CanBeFinal") RollingSequence r = new RollingSequence(90); + @SuppressWarnings("CanBeFinal") boolean colorMode = true; double scale = 1; + @SuppressWarnings("CanBeFinal") static boolean hd = false; static double ascale = 10; CNG cng = NoiseStyle.STATIC.create(new RNG(RNG.r.nextLong())); + @SuppressWarnings("CanBeFinal") GroupedExecutor gx = new GroupedExecutor(Runtime.getRuntime().availableProcessors(), Thread.MAX_PRIORITY, "Iris Renderer"); ReentrantLock l = new ReentrantLock(); int[][] co; @@ -39,6 +61,7 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener { double mz = 0; static double mxx = 0; static double mzz = 0; + @SuppressWarnings("CanBeFinal") static boolean down = false; double lx = Double.MAX_VALUE; //MouseX double lz = Double.MAX_VALUE; //MouseY @@ -136,8 +159,7 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener { accuracy = down ? accuracy * 4 : accuracy; int v = 1000; - if (g instanceof Graphics2D) { - Graphics2D gg = (Graphics2D) g; + if (g instanceof Graphics2D gg) { if (getParent().getWidth() != w || getParent().getHeight() != h) { w = getParent().getWidth(); @@ -232,8 +254,8 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener { JFrame frame = new JFrame("Noise Explorer"); NoiseExplorer nv = new NoiseExplorer(); frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); - KList li = new KList(NoiseStyle.values()).toStringList(); - combo = new JComboBox(li.toArray(new String[li.size()])); + KList li = new KList<>(NoiseStyle.values()).toStringList(); + combo = new JComboBox<>(li.toArray(new String[0])); combo.setSelectedItem("STATIC"); combo.setFocusable(false); combo.addActionListener(e -> { @@ -266,7 +288,7 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener { } public static void launch() { - EventQueue.invokeLater(() -> createAndShowGUI()); + EventQueue.invokeLater(NoiseExplorer::createAndShowGUI); } static class HandScrollListener extends MouseAdapter { diff --git a/src/main/java/com/volmit/iris/manager/gui/Renderer.java b/src/main/java/com/volmit/iris/manager/gui/Renderer.java index 6e78906c2..252e8e62c 100644 --- a/src/main/java/com/volmit/iris/manager/gui/Renderer.java +++ b/src/main/java/com/volmit/iris/manager/gui/Renderer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.gui; import java.awt.*; diff --git a/src/main/java/com/volmit/iris/manager/gui/TileRender.java b/src/main/java/com/volmit/iris/manager/gui/TileRender.java index a2d2efdfa..e8da8bb4b 100644 --- a/src/main/java/com/volmit/iris/manager/gui/TileRender.java +++ b/src/main/java/com/volmit/iris/manager/gui/TileRender.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.gui; import lombok.Builder; diff --git a/src/main/java/com/volmit/iris/manager/link/BKLink.java b/src/main/java/com/volmit/iris/manager/link/BKLink.java index 1b6374975..aec8a9d6a 100644 --- a/src/main/java/com/volmit/iris/manager/link/BKLink.java +++ b/src/main/java/com/volmit/iris/manager/link/BKLink.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.link; import org.bukkit.Bukkit; @@ -22,8 +40,7 @@ public class BKLink { } public Plugin getBK() { - Plugin p = Bukkit.getPluginManager().getPlugin("BKCommonLib"); - return p; + return Bukkit.getPluginManager().getPlugin("BKCommonLib"); } } diff --git a/src/main/java/com/volmit/iris/manager/link/CitizensLink.java b/src/main/java/com/volmit/iris/manager/link/CitizensLink.java index 799c6677e..fcbeaed31 100644 --- a/src/main/java/com/volmit/iris/manager/link/CitizensLink.java +++ b/src/main/java/com/volmit/iris/manager/link/CitizensLink.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.link; import org.bukkit.Bukkit; @@ -12,21 +30,8 @@ public class CitizensLink { return getCitizens() != null; } - // public Entity spawn(EntityType type, String npcType, Location a) - // { - // if(!supported()) - // { - // return null; - // } - // - // NPC npc = CitizensAPI.getNPCRegistry().createNPC(type, ""); - // npc.spawn(a); - // return npc.getEntity(); - // } - public Plugin getCitizens() { - Plugin p = Bukkit.getPluginManager().getPlugin("Citizens"); - return p; + return Bukkit.getPluginManager().getPlugin("Citizens"); } } diff --git a/src/main/java/com/volmit/iris/manager/link/MultiverseCoreLink.java b/src/main/java/com/volmit/iris/manager/link/MultiverseCoreLink.java index d1d6f3996..531b00cae 100644 --- a/src/main/java/com/volmit/iris/manager/link/MultiverseCoreLink.java +++ b/src/main/java/com/volmit/iris/manager/link/MultiverseCoreLink.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.link; import com.volmit.iris.object.IrisDimension; @@ -100,9 +118,8 @@ public class MultiverseCoreLink { } public Plugin getMultiverse() { - Plugin p = Bukkit.getPluginManager().getPlugin("Multiverse-Core"); - return p; + return Bukkit.getPluginManager().getPlugin("Multiverse-Core"); } public String envName(World.Environment environment) { @@ -110,15 +127,12 @@ public class MultiverseCoreLink { return "normal"; } - switch (environment) { - case NORMAL: - return "normal"; - case NETHER: - return "nether"; - case THE_END: - return "end"; - } + return switch (environment) { + case NORMAL -> "normal"; + case NETHER -> "nether"; + case THE_END -> "end"; + default -> environment.toString().toLowerCase(); + }; - return environment.toString().toLowerCase(); } } diff --git a/src/main/java/com/volmit/iris/manager/link/MythicMobsLink.java b/src/main/java/com/volmit/iris/manager/link/MythicMobsLink.java index 8402dc36f..4f80ad9b7 100644 --- a/src/main/java/com/volmit/iris/manager/link/MythicMobsLink.java +++ b/src/main/java/com/volmit/iris/manager/link/MythicMobsLink.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.link; import com.volmit.iris.util.KList; @@ -37,12 +55,11 @@ public class MythicMobsLink { } } - return v.toArray(new String[v.size()]); + return v.toArray(new String[0]); } public Plugin getMythicMobs() { - Plugin p = Bukkit.getPluginManager().getPlugin("MythicMobs"); - return p; + return Bukkit.getPluginManager().getPlugin("MythicMobs"); } } diff --git a/src/main/java/com/volmit/iris/manager/report/Report.java b/src/main/java/com/volmit/iris/manager/report/Report.java index 56eeee6c7..e9a894cf6 100644 --- a/src/main/java/com/volmit/iris/manager/report/Report.java +++ b/src/main/java/com/volmit/iris/manager/report/Report.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.report; import lombok.Builder; @@ -14,6 +32,6 @@ public class Report { private final String suggestion = "No Suggestion"; public String toString() { - return type.toString() + ": " + title + ": " + message + ": Suggestion: " + suggestion; + return type + ": " + title + ": " + message + ": Suggestion: " + suggestion; } } diff --git a/src/main/java/com/volmit/iris/manager/report/ReportType.java b/src/main/java/com/volmit/iris/manager/report/ReportType.java index 5b4ffe11d..6264a01ed 100644 --- a/src/main/java/com/volmit/iris/manager/report/ReportType.java +++ b/src/main/java/com/volmit/iris/manager/report/ReportType.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.manager.report; public enum ReportType { diff --git a/src/main/java/com/volmit/iris/nms/BiomeBaseInjector.java b/src/main/java/com/volmit/iris/nms/BiomeBaseInjector.java new file mode 100644 index 000000000..c9e778e8b --- /dev/null +++ b/src/main/java/com/volmit/iris/nms/BiomeBaseInjector.java @@ -0,0 +1,28 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.volmit.iris.nms; + +@FunctionalInterface +public interface BiomeBaseInjector { + default void setBiome(int x, int z, Object biomeBase) { + setBiome(x, 0, z, biomeBase); + } + + void setBiome(int x, int y, int z, Object biomeBase); +} diff --git a/src/main/java/com/volmit/iris/nms/INMS.java b/src/main/java/com/volmit/iris/nms/INMS.java index 0cab540a4..4f9c8d8f5 100644 --- a/src/main/java/com/volmit/iris/nms/INMS.java +++ b/src/main/java/com/volmit/iris/nms/INMS.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.nms; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/nms/INMSBinding.java b/src/main/java/com/volmit/iris/nms/INMSBinding.java index ef5650599..1ebf216cc 100644 --- a/src/main/java/com/volmit/iris/nms/INMSBinding.java +++ b/src/main/java/com/volmit/iris/nms/INMSBinding.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.nms; import org.bukkit.Location; @@ -31,7 +49,7 @@ public interface INMSBinding { return c.createWorld(); } - int countCustomBiomes(); + int countCustomBiomes(); void forceBiomeInto(int x, int y, int z, Object somethingVeryDirty, ChunkGenerator.BiomeGrid chunk); } diff --git a/src/main/java/com/volmit/iris/nms/v17_1/NMSBinding17_1.java b/src/main/java/com/volmit/iris/nms/v17_1/NMSBinding17_1.java index 090f0addd..331e32ab2 100644 --- a/src/main/java/com/volmit/iris/nms/v17_1/NMSBinding17_1.java +++ b/src/main/java/com/volmit/iris/nms/v17_1/NMSBinding17_1.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.nms.v17_1; import com.volmit.iris.Iris; @@ -25,8 +43,7 @@ public class NMSBinding17_1 implements INMSBinding { private final KMap baseBiomeCache = new KMap<>(); private Field biomeStorageCache = null; - private Object getBiomeStorage(ChunkGenerator.BiomeGrid g) - { + private Object getBiomeStorage(ChunkGenerator.BiomeGrid g) { try { return getFieldForBiomeStorage(g).get(g); } catch (IllegalAccessException e) { @@ -39,8 +56,7 @@ public class NMSBinding17_1 implements INMSBinding { private Field getFieldForBiomeStorage(Object storage) { Field f = biomeStorageCache; - if (f != null) - { + if (f != null) { return f; } try { @@ -53,7 +69,7 @@ public class NMSBinding17_1 implements INMSBinding { Iris.error(storage.getClass().getCanonicalName()); } - biomeStorageCache = f; + biomeStorageCache = f; return null; } @@ -86,6 +102,7 @@ public class NMSBinding17_1 implements INMSBinding { return getCustomBiomeRegistry().d(ResourceKey.a(IRegistry.aO, new MinecraftKey(mckey))); } + @SuppressWarnings("OptionalGetWithoutIsPresent") @Override public String getKeyForBiomeBase(Object biomeBase) { return getCustomBiomeRegistry().c((BiomeBase) biomeBase).get().a().toString(); @@ -109,6 +126,7 @@ public class NMSBinding17_1 implements INMSBinding { try { Method f = from.getClass().getDeclaredMethod(name, classify(par)); f.setAccessible(true); + //noinspection unchecked return (T) f.invoke(from, par); } catch (Throwable e) { e.printStackTrace(); @@ -121,6 +139,7 @@ public class NMSBinding17_1 implements INMSBinding { try { Method f = from.getDeclaredMethod(name, classify(par)); f.setAccessible(true); + //noinspection unchecked return (T) f.invoke(null, par); } catch (Throwable e) { e.printStackTrace(); @@ -133,6 +152,7 @@ public class NMSBinding17_1 implements INMSBinding { try { Field f = from.getClass().getDeclaredField(name); f.setAccessible(true); + //noinspection unchecked return (T) f.get(from); } catch (Throwable e) { e.printStackTrace(); @@ -145,6 +165,7 @@ public class NMSBinding17_1 implements INMSBinding { try { Field f = t.getDeclaredField(name); f.setAccessible(true); + //noinspection unchecked return (T) f.get(null); } catch (Throwable e) { e.printStackTrace(); @@ -160,11 +181,13 @@ public class NMSBinding17_1 implements INMSBinding { if (v != null) { return v; } + //noinspection unchecked v = org.bukkit.craftbukkit.v1_17_R1.block.CraftBlock.biomeToBiomeBase((IRegistry) registry, biome); if (v == null) { // Ok so there is this new biome name called "CUSTOM" in Paper's new releases. // But, this does NOT exist within CraftBukkit which makes it return an error. // So, we will just return the ID that the plains biome returns instead. + //noinspection unchecked return org.bukkit.craftbukkit.v1_17_R1.block.CraftBlock.biomeToBiomeBase((IRegistry) registry, Biome.PLAINS); } baseBiomeCache.put(biome, v); @@ -188,16 +211,15 @@ public class NMSBinding17_1 implements INMSBinding { @Override public int countCustomBiomes() { AtomicInteger a = new AtomicInteger(0); - getCustomBiomeRegistry().d().stream().forEach((i) -> { + getCustomBiomeRegistry().d().forEach((i) -> { MinecraftKey k = i.getKey().a(); - if(k.getNamespace().equals("minecraft")) - { + if (k.getNamespace().equals("minecraft")) { return; } a.incrementAndGet(); - Iris.verbose("Custom Biome: " + k.toString()); + Iris.verbose("Custom Biome: " + k); }); return a.get(); @@ -207,7 +229,7 @@ public class NMSBinding17_1 implements INMSBinding { public void forceBiomeInto(int x, int y, int z, Object somethingVeryDirty, ChunkGenerator.BiomeGrid chunk) { try { BiomeStorage s = (BiomeStorage) getFieldForBiomeStorage(chunk).get(chunk); - s.setBiome(x,y,z, (BiomeBase) somethingVeryDirty); + s.setBiome(x, y, z, (BiomeBase) somethingVeryDirty); } catch (IllegalAccessException e) { e.printStackTrace(); } diff --git a/src/main/java/com/volmit/iris/nms/v1X/NMSBinding1X.java b/src/main/java/com/volmit/iris/nms/v1X/NMSBinding1X.java index 991e9bfcd..9eacde597 100644 --- a/src/main/java/com/volmit/iris/nms/v1X/NMSBinding1X.java +++ b/src/main/java/com/volmit/iris/nms/v1X/NMSBinding1X.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.nms.v1X; import com.volmit.iris.nms.INMSBinding; diff --git a/src/main/java/com/volmit/iris/object/CarvingMode.java b/src/main/java/com/volmit/iris/object/CarvingMode.java index 49c8ce3c5..443d21311 100644 --- a/src/main/java/com/volmit/iris/object/CarvingMode.java +++ b/src/main/java/com/volmit/iris/object/CarvingMode.java @@ -1,26 +1,45 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; @Desc("Defines if an object is allowed to place in carvings, surfaces or both.") public enum CarvingMode { @Desc("Only place this object on surfaces (NOT under carvings)") - @DontObfuscate + SURFACE_ONLY, @Desc("Only place this object under carvings (NOT on the surface)") - @DontObfuscate + CARVING_ONLY, @Desc("This object can place anywhere") - @DontObfuscate + ANYWHERE; + @SuppressWarnings("BooleanMethodIsAlwaysInverted") public boolean supportsCarving() { return this.equals(ANYWHERE) || this.equals(CARVING_ONLY); } + @SuppressWarnings("BooleanMethodIsAlwaysInverted") public boolean supportsSurface() { return this.equals(ANYWHERE) || this.equals(SURFACE_ONLY); } diff --git a/src/main/java/com/volmit/iris/object/DecorationPart.java b/src/main/java/com/volmit/iris/object/DecorationPart.java index 29dc2c747..96c6037ab 100644 --- a/src/main/java/com/volmit/iris/object/DecorationPart.java +++ b/src/main/java/com/volmit/iris/object/DecorationPart.java @@ -1,27 +1,44 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; @Desc("Represents a location where decorations should go") public enum DecorationPart { @Desc("The default, decorate anywhere") - @DontObfuscate + NONE, @Desc("Targets shore lines (typically for sugar cane)") - @DontObfuscate + SHORE_LINE, @Desc("Target sea surfaces (typically for lilypads)") - @DontObfuscate + SEA_SURFACE, @Desc("Targets the sea floor (entire placement must be bellow sea level)") - @DontObfuscate + SEA_FLOOR, @Desc("Decorates on cave & carving ceilings or underside of overhangs") - @DontObfuscate + CEILING, } diff --git a/src/main/java/com/volmit/iris/object/FontStyle.java b/src/main/java/com/volmit/iris/object/FontStyle.java index fe871ab07..f278c74a5 100644 --- a/src/main/java/com/volmit/iris/object/FontStyle.java +++ b/src/main/java/com/volmit/iris/object/FontStyle.java @@ -1,19 +1,36 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; @Desc("Represents a basic font style to apply to a font family") public enum FontStyle { @Desc("Plain old text") - @DontObfuscate + PLAIN, @Desc("Italicized Text") - @DontObfuscate + ITALIC, @Desc("Bold Text") - @DontObfuscate + BOLD, } diff --git a/src/main/java/com/volmit/iris/object/InferredType.java b/src/main/java/com/volmit/iris/object/InferredType.java index 1ecd02a54..5ba2be767 100644 --- a/src/main/java/com/volmit/iris/object/InferredType.java +++ b/src/main/java/com/volmit/iris/object/InferredType.java @@ -1,35 +1,52 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; @Desc("Represents a biome type") public enum InferredType { @Desc("Represents any shore biome type") - @DontObfuscate + SHORE, @Desc("Represents any land biome type") - @DontObfuscate + LAND, @Desc("Represents any sea biome type") - @DontObfuscate + SEA, @Desc("Represents any cave biome type") - @DontObfuscate + CAVE, @Desc("Represents any river biome type") - @DontObfuscate + RIVER, @Desc("Represents any lake biome type") - @DontObfuscate + LAKE, @Desc("Defers the type to whatever another biome type that already exists is.") - @DontObfuscate + DEFER } diff --git a/src/main/java/com/volmit/iris/object/InterpolationMethod.java b/src/main/java/com/volmit/iris/object/InterpolationMethod.java index 386696fba..b9bf58911 100644 --- a/src/main/java/com/volmit/iris/object/InterpolationMethod.java +++ b/src/main/java/com/volmit/iris/object/InterpolationMethod.java @@ -1,116 +1,133 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; @Desc("An interpolation method (or function) is simply a method of smoothing a position based on surrounding points on a grid. Bicubic for example is smoother, but has 4 times the checks than Bilinear for example. Try using BILINEAR_STARCAST_9 for beautiful results.") public enum InterpolationMethod { @Desc("No interpolation. Nearest Neighbor (bad for terrain, great for performance).") - @DontObfuscate + NONE, @Desc("Uses 4 nearby points in a square to calculate a 2d slope. Very fast but creates square artifacts. See: https://en.wikipedia.org/wiki/Bilinear_interpolation") - @DontObfuscate + BILINEAR, @Desc("Starcast is Iris's own creation. It uses raytrace checks to find a horizontal boundary nearby. 3 Checks in a circle. Typically starcast is used with another interpolation method. See BILINEAR_STARCAST_9 For example. Starcast is meant to 'break up' large, abrupt cliffs to make cheap interpolation smoother.") - @DontObfuscate + STARCAST_3, @Desc("Starcast is Iris's own creation. It uses raytrace checks to find a horizontal boundary nearby. 6 Checks in a circle. Typically starcast is used with another interpolation method. See BILINEAR_STARCAST_9 For example. Starcast is meant to 'break up' large, abrupt cliffs to make cheap interpolation smoother.") - @DontObfuscate + STARCAST_6, @Desc("Starcast is Iris's own creation. It uses raytrace checks to find a horizontal boundary nearby. 9 Checks in a circle. Typically starcast is used with another interpolation method. See BILINEAR_STARCAST_9 For example. Starcast is meant to 'break up' large, abrupt cliffs to make cheap interpolation smoother.") - @DontObfuscate + STARCAST_9, @Desc("Starcast is Iris's own creation. It uses raytrace checks to find a horizontal boundary nearby. 12 Checks in a circle. Typically starcast is used with another interpolation method. See BILINEAR_STARCAST_9 For example. Starcast is meant to 'break up' large, abrupt cliffs to make cheap interpolation smoother.") - @DontObfuscate + STARCAST_12, @Desc("Uses starcast to break up the abrupt sharp cliffs, then smooths the rest out with bilinear.") - @DontObfuscate + BILINEAR_STARCAST_3, @Desc("Uses starcast to break up the abrupt sharp cliffs, then smooths the rest out with bilinear.") - @DontObfuscate + BILINEAR_STARCAST_6, @Desc("Uses starcast to break up the abrupt sharp cliffs, then smooths the rest out with bilinear.") - @DontObfuscate + BILINEAR_STARCAST_9, @Desc("Uses starcast to break up the abrupt sharp cliffs, then smooths the rest out with bilinear.") - @DontObfuscate + BILINEAR_STARCAST_12, @Desc("Uses starcast to break up the abrupt sharp cliffs, then smooths the rest out with hermite.") - @DontObfuscate + HERMITE_STARCAST_3, @Desc("Uses starcast to break up the abrupt sharp cliffs, then smooths the rest out with hermite.") - @DontObfuscate + HERMITE_STARCAST_6, @Desc("Uses starcast to break up the abrupt sharp cliffs, then smooths the rest out with hermite.") - @DontObfuscate + HERMITE_STARCAST_9, @Desc("Uses starcast to break up the abrupt sharp cliffs, then smooths the rest out with hermite.") - @DontObfuscate + HERMITE_STARCAST_12, @Desc("Uses bilinear but on a bezier curve. See: https://en.wikipedia.org/wiki/Bezier_curve") - @DontObfuscate + BILINEAR_BEZIER, @Desc("Uses Bilinear but with parametric curves alpha 2.") - @DontObfuscate + BILINEAR_PARAMETRIC_2, @Desc("Uses Bilinear but with parametric curves alpha 4.") - @DontObfuscate + BILINEAR_PARAMETRIC_4, @Desc("Uses Bilinear but with parametric curves alpha 1.5.") - @DontObfuscate + BILINEAR_PARAMETRIC_1_5, @Desc("Bicubic noise creates 4, 4-point splines for a total of 16 checks. Bcubic can go higher than expected and lower than expected right before a large change in slope.") - @DontObfuscate + BICUBIC, @Desc("Hermite is similar to bicubic, but faster and it can be tuned a little bit") - @DontObfuscate + HERMITE, @Desc("Essentially bicubic with zero tension") - @DontObfuscate + CATMULL_ROM_SPLINE, @Desc("Essentially bicubic with max tension") - @DontObfuscate + HERMITE_TENSE, @Desc("Hermite is similar to bicubic, this variant reduces the dimple artifacts of bicubic") - @DontObfuscate + HERMITE_LOOSE, @Desc("Hermite is similar to bicubic, this variant reduces the dimple artifacts of bicubic") - @DontObfuscate + HERMITE_LOOSE_HALF_POSITIVE_BIAS, @Desc("Hermite is similar to bicubic, this variant reduces the dimple artifacts of bicubic") - @DontObfuscate + HERMITE_LOOSE_HALF_NEGATIVE_BIAS, @Desc("Hermite is similar to bicubic, this variant reduces the dimple artifacts of bicubic") - @DontObfuscate + HERMITE_LOOSE_FULL_POSITIVE_BIAS, @Desc("Hermite is similar to bicubic, this variant reduces the dimple artifacts of bicubic") - @DontObfuscate + HERMITE_LOOSE_FULL_NEGATIVE_BIAS, } diff --git a/src/main/java/com/volmit/iris/object/InventorySlotType.java b/src/main/java/com/volmit/iris/object/InventorySlotType.java index 93b180be2..8bdcc64f2 100644 --- a/src/main/java/com/volmit/iris/object/InventorySlotType.java +++ b/src/main/java/com/volmit/iris/object/InventorySlotType.java @@ -1,27 +1,44 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; @Desc("An inventory slot type is used to represent a type of slot for items to fit into in any given inventory.") public enum InventorySlotType { @Desc("Typically the one you want to go with. Storage represnents most slots in inventories.") - @DontObfuscate + STORAGE, @Desc("Used for the fuel slot in Furnaces, Blast furnaces, smokers etc.") - @DontObfuscate + FUEL, @Desc("Used for the cook slot in furnaces") - @DontObfuscate + FURNACE, @Desc("Used for the cook slot in blast furnaces") - @DontObfuscate + BLAST_FURNACE, @Desc("Used for the cook slot in smokers") - @DontObfuscate + SMOKER, } diff --git a/src/main/java/com/volmit/iris/object/IrisAttributeModifier.java b/src/main/java/com/volmit/iris/object/IrisAttributeModifier.java index 1ab25d8a6..0bbb40a46 100644 --- a/src/main/java/com/volmit/iris/object/IrisAttributeModifier.java +++ b/src/main/java/com/volmit/iris/object/IrisAttributeModifier.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.*; @@ -19,36 +37,27 @@ import org.bukkit.inventory.meta.ItemMeta; public class IrisAttributeModifier { @Required - @DontObfuscate @Desc("The Attribute type. This type is pulled from the game attributes. Zombie & Horse attributes will not work on non-zombie/horse entities.\nUsing an attribute on an item will have affects when held, or worn. There is no way to specify further granularity as the game picks this depending on the item type.") private Attribute attribute = null; @MinNumber(2) @Required - @DontObfuscate + @Desc("The Attribute Name is used internally only for the game. This value should be unique to all other attributes applied to this item/entity. It is not shown in game.") private String name = ""; - @DontObfuscate - @Desc("The application operation (add number is default). Add Number adds to the default value. \nAdd scalar_1 will multiply by 1 for example if the health is 20 and you multiply_scalar_1 by 0.5, the health will result in 30, not 10. Use negative values to achieve that.") private Operation operation = Operation.ADD_NUMBER; - @DontObfuscate - @Desc("Minimum amount for this modifier. Iris randomly chooses an amount, this is the minimum it can choose randomly for this attribute.") private double minAmount = 1; - - @DontObfuscate @Desc("Maximum amount for this modifier Iris randomly chooses an amount, this is the maximum it can choose randomly for this attribute.") private double maxAmount = 1; @MinNumber(0) @MaxNumber(1) - - @DontObfuscate @Desc("The chance that this attribute is applied (0 to 1). If the chance is 0.5 (50%), then Iris will only apply this attribute 50% of the time.") private double chance = 1; diff --git a/src/main/java/com/volmit/iris/object/IrisAxisRotationClamp.java b/src/main/java/com/volmit/iris/object/IrisAxisRotationClamp.java index 2e94b491d..eb5c181a4 100644 --- a/src/main/java/com/volmit/iris/object/IrisAxisRotationClamp.java +++ b/src/main/java/com/volmit/iris/object/IrisAxisRotationClamp.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.*; @@ -12,17 +30,15 @@ import lombok.experimental.Accessors; @Desc("Represents a rotation axis with intervals and maxes. The x and z axis values are defaulted to disabled. The Y axis defaults to on, rotating by 90 degree increments.") @Data public class IrisAxisRotationClamp { - @DontObfuscate + @Desc("Should this axis be rotated at all?") private boolean enabled = false; - private transient boolean forceLock = false; @Required @DependsOn({"max"}) @MinNumber(-360) @MaxNumber(360) - @DontObfuscate @Desc("The minimum angle (from) or set this and max to zero for any angle degrees. Set both to the same non-zero value to force it to that angle only") private double min = 0; @@ -30,7 +46,6 @@ public class IrisAxisRotationClamp { @DependsOn({"min"}) @MinNumber(-360) @MaxNumber(360) - @DontObfuscate @Desc("The maximum angle (to) or set this and min to zero for any angle degrees. Set both to the same non-zero value to force it to that angle only") private double max = 0; @@ -38,7 +53,6 @@ public class IrisAxisRotationClamp { @DependsOn({"min", "max"}) @MinNumber(0) @MaxNumber(360) - @DontObfuscate @Desc("Iris spins the axis but not freely. For example an interval of 90 would mean 4 possible angles (right angles) degrees. \nSetting this to 0 means totally free rotation.\n\nNote that a lot of structures can have issues with non 90 degree intervals because the minecraft block resolution is so low.") private double interval = 0; diff --git a/src/main/java/com/volmit/iris/object/IrisBiome.java b/src/main/java/com/volmit/iris/object/IrisBiome.java index b36266f2b..c3dc00502 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiome.java +++ b/src/main/java/com/volmit/iris/object/IrisBiome.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.Iris; @@ -18,165 +36,154 @@ import org.bukkit.block.data.BlockData; import java.awt.*; +@SuppressWarnings("DefaultAnnotationParam") @Accessors(chain = true) @NoArgsConstructor @AllArgsConstructor -@DontObfuscate + @Desc("Represents a biome in iris. Biomes are placed inside of regions and hold objects.\nA biome consists of layers (block palletes), decorations, objects & generators.") @Data @EqualsAndHashCode(callSuper = false) public class IrisBiome extends IrisRegistrant implements IRare { @MinNumber(2) @Required - @DontObfuscate + @Desc("This is the human readable name for this biome. This can and should be different than the file name. This is not used for loading biomes in other objects.") private String name = "A Biome"; - @DontObfuscate - @Desc("If the biome type custom is defined, specify this") - private IrisBiomeCustom custom; - @DontObfuscate + @ArrayType(min = 1, type = IrisBiomeCustom.class) + @Desc("If the biome type custom is defined, specify this") + private KList customDerivitives; + + @Desc("Entity spawns to override or add to this biome. Anytime an entity spawns, it has a chance to be replaced as one of these overrides.") @ArrayType(min = 1, type = IrisEntitySpawnOverride.class) private KList entitySpawnOverrides = new KList<>(); - @DontObfuscate + @Desc("Add random chances for terrain features") @ArrayType(min = 1, type = IrisFeaturePotential.class) private KList features = new KList<>(); - @DontObfuscate + @Desc("Entity spawns during generation") @ArrayType(min = 1, type = IrisEntityInitialSpawn.class) private KList entityInitialSpawns = new KList<>(); @ArrayType(min = 1, type = IrisEffect.class) - @DontObfuscate @Desc("Effects are ambient effects such as potion effects, random sounds, or even particles around each player. All of these effects are played via packets so two players won't see/hear each others effects.\nDue to performance reasons, effects will play arround the player even if where the effect was played is no longer in the biome the player is in.") private KList effects = new KList<>(); - @DontObfuscate + @DependsOn({"biomeStyle", "biomeZoom", "biomeScatter"}) @Desc("This changes the dispersion of the biome colors if multiple derivatives are chosen.") private IrisGeneratorStyle biomeStyle = NoiseStyle.SIMPLEX.style(); @ArrayType(min = 1, type = IrisBlockDrops.class) - @DontObfuscate @Desc("Define custom block drops for this biome") private KList blockDrops = new KList<>(); - @DontObfuscate + @Desc("Reference loot tables in this area") private IrisLootReference loot = new IrisLootReference(); @MinNumber(0.0001) - @DontObfuscate + @DependsOn({"biomeStyle", "biomeZoom", "biomeScatter"}) @Desc("This zooms in the biome colors if multiple derivatives are chosen") private double biomeZoom = 1; - @DontObfuscate + @Desc("Layers no longer descend from the surface block, they descend from the max possible height the biome can produce (constant) creating mesa like layers.") private boolean lockLayers = false; - @DontObfuscate + @Desc("The max layers to iterate below the surface for locked layer biomes (mesa).") private int lockLayersMax = 7; @MinNumber(1) @MaxNumber(512) - @DontObfuscate @Desc("The rarity of this biome (integer)") private int rarity = 1; - @DontObfuscate + @Desc("A color for visualizing this biome with a color. I.e. #F13AF5. This will show up on the map.") private String color = null; @Required - @DontObfuscate + @Desc("The raw derivative of this biome. This is required or the terrain will not properly generate. Use any vanilla biome type. Look in examples/biome-list.txt") private Biome derivative = Biome.THE_VOID; @Required - @DontObfuscate + @Desc("Override the derivative when vanilla places structures to this derivative. This is useful for example if you have an ocean biome, but you have set the derivative to desert to get a brown-ish color. To prevent desert structures from spawning on top of your ocean, you can set your vanillaDerivative to ocean, to allow for vanilla structures. Not defining this value will simply select the derivative.") private Biome vanillaDerivative = null; @ArrayType(min = 1, type = Biome.class) - @DontObfuscate @Desc("You can instead specify multiple biome derivatives to randomly scatter colors in this biome") private KList biomeScatter = new KList<>(); @ArrayType(min = 1, type = Biome.class) - @DontObfuscate @Desc("Since 1.13 supports 3D biomes, you can add different derivative colors for anything above the terrain. (Think swampy tree leaves with a desert looking grass surface)") private KList biomeSkyScatter = new KList<>(); - @DontObfuscate + @DependsOn({"children"}) @Desc("If this biome has children biomes, and the gen layer chooses one of this biomes children, how much smaller will it be (inside of this biome). Higher values means a smaller biome relative to this biome's size. Set higher than 1.0 and below 3.0 for best results.") private double childShrinkFactor = 1.5; - @DontObfuscate + @DependsOn({"children"}) @Desc("If this biome has children biomes, and the gen layer chooses one of this biomes children, How will it be shaped?") private IrisGeneratorStyle childStyle = NoiseStyle.CELLULAR_IRIS_DOUBLE.style(); @RegistryListBiome @ArrayType(min = 1, type = String.class) - @DontObfuscate @Desc("List any biome names (file names without.json) here as children. Portions of this biome can sometimes morph into their children. Iris supports cyclic relationships such as A > B > A > B. Iris will stop checking 9 biomes down the tree.") private KList children = new KList<>(); @ArrayType(min = 1, type = IrisJigsawStructurePlacement.class) - @DontObfuscate @Desc("Jigsaw structures") private KList jigsawStructures = new KList<>(); @RegistryListBiome - @DontObfuscate + @Desc("The carving biome. If specified the biome will be used when under a carving instead of this current biome.") private String carvingBiome = ""; - @DontObfuscate + @Desc("The default slab if iris decides to place a slab in this biome. Default is no slab.") private IrisBiomePaletteLayer slab = new IrisBiomePaletteLayer().zero(); - @DontObfuscate + @Desc("The default wall if iris decides to place a wall higher than 2 blocks (steep hills or possibly cliffs)") private IrisBiomePaletteLayer wall = new IrisBiomePaletteLayer().zero(); @Required @ArrayType(min = 1, type = IrisBiomePaletteLayer.class) - @DontObfuscate @Desc("This defines the layers of materials in this biome. Each layer has a palette and min/max height and some other properties. Usually a grassy/sandy layer then a dirt layer then a stone layer. Iris will fill in the remaining blocks below your layers with stone.") private KList layers = new KList().qadd(new IrisBiomePaletteLayer()); @ArrayType(min = 1, type = IrisBiomePaletteLayer.class) - @DontObfuscate @Desc("This defines the layers of materials in this biome. Each layer has a palette and min/max height and some other properties. Usually a grassy/sandy layer then a dirt layer then a stone layer. Iris will fill in the remaining blocks below your layers with stone.") - private KList seaLayers = new KList(); + private KList seaLayers = new KList<>(); @ArrayType(min = 1, type = IrisDecorator.class) - @DontObfuscate @Desc("Decorators are used for things like tall grass, bisected flowers, and even kelp or cactus (random heights)") - private KList decorators = new KList(); + private KList decorators = new KList<>(); @ArrayType(min = 1, type = IrisObjectPlacement.class) - @DontObfuscate @Desc("Objects define what schematics (iob files) iris will place in this biome") - private KList objects = new KList(); + private KList objects = new KList<>(); @Required @ArrayType(min = 1, type = IrisBiomeGeneratorLink.class) - @DontObfuscate @Desc("Generators for this biome. Multiple generators with different interpolation sizes will mix with other biomes how you would expect. This defines your biome height relative to the fluid height. Use negative for oceans.") private KList generators = new KList().qadd(new IrisBiomeGeneratorLink()); @ArrayType(min = 1, type = IrisDepositGenerator.class) - @DontObfuscate @Desc("Define biome deposit generators that add onto the existing regional and global deposit generators") private KList deposits = new KList<>(); @@ -200,9 +207,8 @@ public class IrisBiome extends IrisRegistrant implements IRare { return vanillaDerivative == null ? derivative : vanillaDerivative; } - public boolean isCustom() - { - return getCustom() != null; + public boolean isCustom() { + return getCustomDerivitives() != null && getCustomDerivitives().isNotEmpty(); } public double getGenLinkMax(String loadKey) { @@ -303,9 +309,7 @@ public class IrisBiome extends IrisRegistrant implements IRare { public CNG getBiomeGenerator(RNG random) { return biomeGenerator.aquire(() -> - { - return biomeStyle.create(random.nextParallelRNG(213949 + 228888 + getRarity() + getName().length())); - }); + biomeStyle.create(random.nextParallelRNG(213949 + 228888 + getRarity() + getName().length()))); } public CNG getChildrenGenerator(RNG random, int sig, double scale) { @@ -399,7 +403,7 @@ public class IrisBiome extends IrisRegistrant implements IRare { for (int i = 0; i < maxDepth; i++) { int offset = (255 - height) - i; int index = offset % data.size(); - real.add(data.get(index < 0 ? 0 : index)); + real.add(data.get(Math.max(index, 0))); } return real; @@ -517,6 +521,7 @@ public class IrisBiome extends IrisRegistrant implements IRare { return isSea() || isLake() || isRiver(); } + @SuppressWarnings("BooleanMethodIsAlwaysInverted") public boolean isShore() { if (inferredType == null) { return false; @@ -536,6 +541,14 @@ public class IrisBiome extends IrisRegistrant implements IRare { return biomeSkyScatter.get(getBiomeGenerator(rng).fit(0, biomeSkyScatter.size() - 1, x, y, z)); } + public IrisBiomeCustom getCustomBiome(RNG rng, double x, double y, double z) { + if (customDerivitives.size() == 1) { + return customDerivitives.get(0); + } + + return customDerivitives.get(getBiomeGenerator(rng).fit(0, customDerivitives.size() - 1, x, y, z)); + } + public KList getRealChildren(DataProvider g) { return realChildren.aquire(() -> { @@ -557,14 +570,14 @@ public class IrisBiome extends IrisRegistrant implements IRare { if (limit > 0) { for (String i : getChildren()) { IrisBiome b = g.getData().getBiomeLoader().load(i); - int l = limit; - m.addAll(b.getAllChildren(g, l)); + m.addAll(b.getAllChildren(g, limit)); } } - return new KList(m); + return new KList<>(m); } + //TODO: Test public Biome getGroundBiome(RNG rng, double x, double y, double z) { if (biomeScatter.isEmpty()) { return getDerivative(); diff --git a/src/main/java/com/volmit/iris/object/IrisBiomeCustom.java b/src/main/java/com/volmit/iris/object/IrisBiomeCustom.java index e9867ef54..28212a4b3 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiomeCustom.java +++ b/src/main/java/com/volmit/iris/object/IrisBiomeCustom.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.Iris; @@ -15,70 +33,65 @@ import java.awt.*; @Desc("A custom biome, generated through a datapack") @Data public class IrisBiomeCustom { - @DontObfuscate + @Required @Desc("The resource key of this biome. Just a simple id such as 'plains' or something.") private String id = ""; @MinNumber(-3) @MaxNumber(3) - @DontObfuscate @Desc("The biome's temperature") private double temperature = 0.8; @MinNumber(-3) @MaxNumber(3) - @DontObfuscate @Desc("The biome's downfall amount (snow / rain), see preci") private double humidity = 0.4; - @DontObfuscate + @Desc("The biome's downfall type") private IrisBiomeCustomPrecipType downfallType = IrisBiomeCustomPrecipType.rain; - @DontObfuscate + @Desc("The biome's category type") private IrisBiomeCustomCategory category = IrisBiomeCustomCategory.plains; - @DontObfuscate + @Desc("The color of the sky, top half of sky. (hex format)") private String skyColor = "#79a8e1"; - @DontObfuscate + @Desc("The color of the fog, bottom half of sky. (hex format)") private String fogColor = "#c0d8e1"; - @DontObfuscate + @Desc("The color of the water (hex format). Leave blank / don't define to not change") private String waterColor = "#3f76e4"; - @DontObfuscate + @Desc("The color of water fog (hex format). Leave blank / don't define to not change") private String waterFogColor = "#050533"; - @DontObfuscate + @Desc("The color of the grass (hex format). Leave blank / don't define to not change") private String grassColor = ""; - @DontObfuscate + @Desc("The color of foliage (hex format). Leave blank / don't define to not change") private String foliageColor = ""; - public String generateJson() - { + public String generateJson() { JSONObject effects = new JSONObject(); effects.put("sky_color", parseColor(getSkyColor())); effects.put("fog_color", parseColor(getFogColor())); effects.put("water_color", parseColor(getWaterColor())); effects.put("water_fog_color", parseColor(getWaterFogColor())); - if(getGrassColor() != null) - { + if (!getGrassColor().isEmpty()) { effects.put("grass_color", parseColor(getGrassColor())); } - if(getFoliageColor() != null) - { + if (!getFoliageColor().isEmpty()) { effects.put("foliage_color", parseColor(getFoliageColor())); } @@ -105,7 +118,7 @@ public class IrisBiomeCustom { try { return Color.decode(v).getRGB(); } catch (Throwable e) { - Iris.error("Error Parsing '''color''', (" + c+ ")"); + Iris.error("Error Parsing '''color''', (" + c + ")"); } return 0; diff --git a/src/main/java/com/volmit/iris/object/IrisBiomeCustomCategory.java b/src/main/java/com/volmit/iris/object/IrisBiomeCustomCategory.java index 8f1ece8f6..f578a8ea5 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiomeCustomCategory.java +++ b/src/main/java/com/volmit/iris/object/IrisBiomeCustomCategory.java @@ -1,7 +1,27 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; -public enum IrisBiomeCustomCategory -{ +import com.volmit.iris.util.Desc; + +@Desc("The custom biome category. Vanilla asks for this, basically what represents your biome closest?") +public enum IrisBiomeCustomCategory { beach, desert, extreme_hills, diff --git a/src/main/java/com/volmit/iris/object/IrisBiomeCustomPrecipType.java b/src/main/java/com/volmit/iris/object/IrisBiomeCustomPrecipType.java index 7a618f34f..105ddf112 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiomeCustomPrecipType.java +++ b/src/main/java/com/volmit/iris/object/IrisBiomeCustomPrecipType.java @@ -1,19 +1,36 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; -public enum IrisBiomeCustomPrecipType -{ +@Desc("Snow, rain, or nothing") +public enum IrisBiomeCustomPrecipType { @Desc("No downfall") - @DontObfuscate + none, @Desc("Rain downfall") - @DontObfuscate + rain, @Desc("Snow downfall") - @DontObfuscate + snow } diff --git a/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java b/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java index eda606f21..32626c5be 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java +++ b/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.scaffold.cache.AtomicCache; @@ -16,7 +34,7 @@ import lombok.experimental.Accessors; public class IrisBiomeGeneratorLink { @RegistryListGenerator - @DontObfuscate + @Desc("The generator id") private String generator = "default"; @@ -24,7 +42,7 @@ public class IrisBiomeGeneratorLink { @Required @MinNumber(-256) // TODO: WARNING HEIGHT @MaxNumber(256) // TODO: WARNING HEIGHT - @DontObfuscate + @Desc("The min block value (value + fluidHeight)") private int min = 0; @@ -32,7 +50,7 @@ public class IrisBiomeGeneratorLink { @Required @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/IrisBiomeMutation.java b/src/main/java/com/volmit/iris/object/IrisBiomeMutation.java index 211f5de6a..b45fb536d 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiomeMutation.java +++ b/src/main/java/com/volmit/iris/object/IrisBiomeMutation.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.scaffold.cache.AtomicCache; @@ -18,36 +36,31 @@ public class IrisBiomeMutation { @RegistryListBiome @Required @ArrayType(min = 1, type = String.class) - @DontObfuscate @Desc("One of The following biomes or regions must show up") private KList sideA = new KList<>(); @RegistryListBiome @Required @ArrayType(min = 1, type = String.class) - @DontObfuscate @Desc("One of The following biomes or regions must show up") private KList sideB = new KList<>(); @Required @MinNumber(1) @MaxNumber(1024) - @DontObfuscate @Desc("The scan radius for placing this mutator") private int radius = 16; @Required @MinNumber(1) @MaxNumber(32) - @DontObfuscate @Desc("How many tries per chunk to check for this mutation") private int checks = 2; @RegistryListObject @ArrayType(min = 1, type = IrisObjectPlacement.class) - @DontObfuscate @Desc("Objects define what schematics (iob files) iris will place in this biome mutation") - private KList objects = new KList(); + private KList objects = new KList<>(); private final transient AtomicCache> sideACache = new AtomicCache<>(); private final transient AtomicCache> sideBCache = new AtomicCache<>(); @@ -64,24 +77,26 @@ public class IrisBiomeMutation { KSet r = new KSet<>(); for (String i : s) { - String q = i; - if (q.startsWith("^")) { - r.addAll(xg.getData().getRegionLoader().load(q.substring(1)).getLandBiomes()); - continue; - } else if (q.startsWith("*")) { - String name = q.substring(1); + if (i.startsWith("^")) { + r.addAll(xg.getData().getRegionLoader().load(i.substring(1)).getLandBiomes()); + } else if (i.startsWith("*")) { + String name = i.substring(1); r.addAll(xg.getData().getBiomeLoader().load(name).getAllChildren(xg, 7)); - } else if (q.startsWith("!")) { - r.remove(q.substring(1)); - } else if (q.startsWith("!*")) { - String name = q.substring(2); - r.removeAll(xg.getData().getBiomeLoader().load(name).getAllChildren(xg, 7)); + } else if (i.startsWith("!")) { + r.remove(i.substring(1)); + } else if (i.startsWith("!*")) { + String name = i.substring(2); + + for(String g : xg.getData().getBiomeLoader().load(name).getAllChildren(xg, 7)) + { + r.remove(g); + } } else { - r.add(q); + r.add(i); } } - return new KList(r); + return new KList<>(r); } } diff --git a/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java b/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java index 8a61e269a..f6278efe5 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java +++ b/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.generator.noise.CNG; @@ -16,36 +34,34 @@ import org.bukkit.block.data.BlockData; @Desc("A layer of surface / subsurface material in biomes") @Data public class IrisBiomePaletteLayer { - @DontObfuscate + @Desc("The style of noise") private IrisGeneratorStyle style = NoiseStyle.STATIC.style(); @DependsOn({"minHeight", "maxHeight"}) @MinNumber(0) @MaxNumber(256) // TODO: WARNING HEIGHT - @DontObfuscate + @Desc("The min thickness of this layer") private int minHeight = 1; @DependsOn({"minHeight", "maxHeight"}) @MinNumber(1) @MaxNumber(256) // TODO: WARNING HEIGHT - @DontObfuscate + @Desc("The max thickness of this layer") private int maxHeight = 1; - @DontObfuscate + @Desc("If set, this layer will change size depending on the slope. If in bounds, the layer will get larger (taller) the closer to the center of this slope clip it is. If outside of the slipe's bounds, this layer will not show.") private IrisSlopeClip slopeCondition = new IrisSlopeClip(); @MinNumber(0.0001) - @DontObfuscate @Desc("The terrain zoom mostly for zooming in on a wispy palette") private double zoom = 5; @Required @ArrayType(min = 1, type = IrisBlockData.class) - @DontObfuscate @Desc("The palette of blocks to be used in this layer") private KList palette = new KList().qadd(new IrisBlockData("GRASS_BLOCK")); diff --git a/src/main/java/com/volmit/iris/object/IrisBlockData.java b/src/main/java/com/volmit/iris/object/IrisBlockData.java index 08c136705..f4fc4a766 100644 --- a/src/main/java/com/volmit/iris/object/IrisBlockData.java +++ b/src/main/java/com/volmit/iris/object/IrisBlockData.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.Iris; @@ -11,6 +29,9 @@ import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import org.bukkit.block.data.BlockData; +import java.util.Map; + +@SuppressWarnings("DefaultAnnotationParam") @Accessors(chain = true) @NoArgsConstructor @AllArgsConstructor @@ -20,29 +41,28 @@ import org.bukkit.block.data.BlockData; public class IrisBlockData extends IrisRegistrant { @RegistryListBlockType @Required - @DontObfuscate + @Desc("The block to use") private String block = "air"; @Desc("Debug this block by printing it to the console when it's used") - @DontObfuscate + private boolean debug = false; - @DontObfuscate + @Desc("The resource key. Typically Minecraft") private String key = "minecraft"; @MinNumber(1) @MaxNumber(1000) - @DontObfuscate @Desc("The weight is used when this block data is inside of a list of blockdata. A weight of two is just as if you placed two of the same block data values in the same list making it more common when randomly picked.") private int weight = 1; - @DontObfuscate + @Desc("If the block cannot be created on this version, Iris will attempt to use this backup block data instead.") private IrisBlockData backup = null; - @DontObfuscate + @Desc("Optional properties for this block data such as 'waterlogged': true") private KMap data = new KMap<>(); @@ -60,8 +80,8 @@ public class IrisBlockData extends IrisRegistrant { KList r = new KList<>(); - for (String i : data.keySet()) { - r.add(i + "=" + filter(data.get(i).toString())); + for (Map.Entry entry : data.entrySet()) { + r.add(entry.getKey() + "=" + filter(entry.getValue().toString())); } return "[" + r.toString(",") + "]"; @@ -177,13 +197,13 @@ public class IrisBlockData extends IrisRegistrant { try { return Integer.valueOf(string); - } catch (Throwable e) { + } catch (Throwable ignored) { } try { return Double.valueOf(string).intValue(); - } catch (Throwable e) { + } catch (Throwable ignored) { } diff --git a/src/main/java/com/volmit/iris/object/IrisBlockDrops.java b/src/main/java/com/volmit/iris/object/IrisBlockDrops.java index 9f8edc7dd..fee02ac61 100644 --- a/src/main/java/com/volmit/iris/object/IrisBlockDrops.java +++ b/src/main/java/com/volmit/iris/object/IrisBlockDrops.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.manager.IrisDataManager; @@ -19,22 +37,22 @@ public class IrisBlockDrops { @Required @ArrayType(min = 1, type = IrisBlockData.class) @Desc("The blocks that drop loot") - private KList blocks = new KList(); + private KList blocks = new KList<>(); + - @DontObfuscate @Desc("If exact blocks is set to true, minecraft:barrel[axis=x] will only drop for that axis. When exact is false (default) any barrel will drop the defined drops.") private boolean exactBlocks = false; - @DontObfuscate + @Desc("Add in specific items to drop") @ArrayType(min = 1, type = IrisLoot.class) private KList drops = new KList<>(); - @DontObfuscate + @Desc("If this is in a biome, setting skipParents to true will ignore the drops in the region and dimension for this block type. The default (false) will allow all three nodes to fire and add to a list of drops.") private boolean skipParents = false; - @DontObfuscate + @Desc("Removes the default vanilla block drops and only drops the given items & any parent loot tables specified for this block type.") private boolean replaceVanillaDrops = false; @@ -65,6 +83,8 @@ public class IrisBlockDrops { return false; } + // TODO: WARNING USES RNG.R + @Deprecated public void fillDrops(boolean debug, KList d) { for (IrisLoot i : getDrops()) { if (RNG.r.i(1, i.getRarity()) == i.getRarity()) { diff --git a/src/main/java/com/volmit/iris/object/IrisCarveLayer.java b/src/main/java/com/volmit/iris/object/IrisCarveLayer.java index b03e524e8..835418e43 100644 --- a/src/main/java/com/volmit/iris/object/IrisCarveLayer.java +++ b/src/main/java/com/volmit/iris/object/IrisCarveLayer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.generator.noise.CNG; @@ -15,31 +33,27 @@ import lombok.experimental.Accessors; @Data public class IrisCarveLayer { @Required - @DontObfuscate + @Desc("The 4d slope this carve layer follows") private IrisGeneratorStyle style = new IrisGeneratorStyle(); @MaxNumber(512) @MinNumber(-128) - @DontObfuscate @Desc("The max height") private int maxHeight = 220; @MinNumber(0.0) @MaxNumber(1.0) - @DontObfuscate @Desc("The full percentage means the 4D opacity of this carver will decay from 100% to 0% at the min & max vertical ranges. Setting the percent to 1.0 will make a very drastic & charp change at the edge of the vertical min & max. Where as 0.15 means only 15% of the vertical range will actually be 100% opacity.") private double fullPercent = 0.5; @MaxNumber(512) @MinNumber(-128) - @DontObfuscate @Desc("The min height") private int minHeight = 147; @MaxNumber(1) @MinNumber(0) - @DontObfuscate @Desc("The threshold used as: \n\ncarved = noise(x,y,z) > threshold") private double threshold = 0.5; diff --git a/src/main/java/com/volmit/iris/object/IrisCaveFluid.java b/src/main/java/com/volmit/iris/object/IrisCaveFluid.java index 24c670cb6..da24d72f8 100644 --- a/src/main/java/com/volmit/iris/object/IrisCaveFluid.java +++ b/src/main/java/com/volmit/iris/object/IrisCaveFluid.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.manager.IrisDataManager; @@ -18,16 +36,15 @@ public class IrisCaveFluid { @Required @MaxNumber(255) @MinNumber(0) - @DontObfuscate @Desc("The fluid height of the cave") private int fluidHeight = 35; - @DontObfuscate + @Desc("Insead of fluidHeight & below being fluid, turning inverse height on will simply spawn fluid in this cave layer from min(max_height, cave_height) to the fluid height. Basically, fluid will spawn above the fluidHeight value instead of below the fluidHeight.") private boolean inverseHeight = false; @Required - @DontObfuscate + @Desc("The fluid type that should spawn here") private IrisBlockData fluidType = new IrisBlockData("CAVE_AIR"); diff --git a/src/main/java/com/volmit/iris/object/IrisCaveLayer.java b/src/main/java/com/volmit/iris/object/IrisCaveLayer.java index 74bde0b8f..dd1be56d8 100644 --- a/src/main/java/com/volmit/iris/object/IrisCaveLayer.java +++ b/src/main/java/com/volmit/iris/object/IrisCaveLayer.java @@ -1,7 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; import com.volmit.iris.util.MinNumber; import com.volmit.iris.util.Required; import lombok.AllArgsConstructor; @@ -16,30 +33,28 @@ import lombok.experimental.Accessors; @Data public class IrisCaveLayer { @Required - @DontObfuscate + @Desc("The vertical slope this cave layer follows") private IrisShapedGeneratorStyle verticalSlope = new IrisShapedGeneratorStyle(); @Required - @DontObfuscate + @Desc("The horizontal slope this cave layer follows") private IrisShapedGeneratorStyle horizontalSlope = new IrisShapedGeneratorStyle(); - @DontObfuscate + @Desc("If defined, a cave fluid will fill this cave below (or above) the specified fluidHeight in this object.") private IrisCaveFluid fluid = new IrisCaveFluid(); @MinNumber(0.001) - @DontObfuscate @Desc("The cave zoom. Higher values makes caves spread out further and branch less often, but are thicker.") private double caveZoom = 1D; @MinNumber(0.001) - @DontObfuscate @Desc("The cave thickness.") private double caveThickness = 1D; - @DontObfuscate + @Desc("If set to true, this cave layer can break the surface") private boolean canBreakSurface = false; diff --git a/src/main/java/com/volmit/iris/object/IrisColor.java b/src/main/java/com/volmit/iris/object/IrisColor.java index 8774bd713..4e87029f2 100644 --- a/src/main/java/com/volmit/iris/object/IrisColor.java +++ b/src/main/java/com/volmit/iris/object/IrisColor.java @@ -1,8 +1,25 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.scaffold.cache.AtomicCache; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; import com.volmit.iris.util.MaxNumber; import com.volmit.iris.util.MinNumber; import lombok.Data; @@ -17,25 +34,25 @@ import java.awt.*; @Desc("Represents a color") @Data public class IrisColor { - @DontObfuscate + @MaxNumber(7) @MinNumber(6) @Desc("Pass in a 6 digit hexadecimal color to fill R G and B values. You can also include the # symbol, but it's not required.") private String hex = null; - @DontObfuscate + @MaxNumber(255) @MinNumber(0) @Desc("Represents the red channel. Only define this if you are not defining the hex value.") private int red = 0; - @DontObfuscate + @MaxNumber(255) @MinNumber(0) @Desc("Represents the green channel. Only define this if you are not defining the hex value.") private int green = 0; - @DontObfuscate + @MaxNumber(255) @MinNumber(0) @Desc("Represents the blue channel. Only define this if you are not defining the hex value.") @@ -49,7 +66,7 @@ public class IrisColor { String v = (hex.startsWith("#") ? hex : "#" + hex).trim(); try { return Color.decode(v); - } catch (Throwable e) { + } catch (Throwable ignored) { } } @@ -73,8 +90,8 @@ public class IrisColor { int g = 0; int b = 0; - for (int i = 0; i < c.length; i++) { - int rgb = c[i].getRGB(); + for (Color value : c) { + int rgb = value.getRGB(); int a1 = (rgb >> 24 & 0xff); int r1 = ((rgb & 0xff0000) >> 16); int g1 = ((rgb & 0xff00) >> 8); diff --git a/src/main/java/com/volmit/iris/object/IrisCompat.java b/src/main/java/com/volmit/iris/object/IrisCompat.java index a1f3b6384..6edf71b33 100644 --- a/src/main/java/com/volmit/iris/object/IrisCompat.java +++ b/src/main/java/com/volmit/iris/object/IrisCompat.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.google.gson.Gson; @@ -149,8 +167,6 @@ public class IrisCompat { } } catch (JsonSyntaxException e) { e.printStackTrace(); - } catch (IOException e) { - throw e; } return def; diff --git a/src/main/java/com/volmit/iris/object/IrisCompatabilityBlockFilter.java b/src/main/java/com/volmit/iris/object/IrisCompatabilityBlockFilter.java index ad0b5f691..2da2d9c38 100644 --- a/src/main/java/com/volmit/iris/object/IrisCompatabilityBlockFilter.java +++ b/src/main/java/com/volmit/iris/object/IrisCompatabilityBlockFilter.java @@ -1,10 +1,27 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.Iris; import com.volmit.iris.scaffold.cache.AtomicCache; import com.volmit.iris.util.B; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; import com.volmit.iris.util.Required; import lombok.AllArgsConstructor; import lombok.Data; @@ -19,16 +36,16 @@ import org.bukkit.block.data.BlockData; @Data public class IrisCompatabilityBlockFilter { @Required - @DontObfuscate + @Desc("When iris sees this block, and it's not reconized") private String when = ""; @Required - @DontObfuscate + @Desc("Replace it with this block. Dont worry if this block is also not reconized, iris repeat this compat check.") private String supplement = ""; - @DontObfuscate + @Desc("If exact is true, it compares block data for example minecraft:some_log[axis=x]") private boolean exact = false; diff --git a/src/main/java/com/volmit/iris/object/IrisCompatabilityItemFilter.java b/src/main/java/com/volmit/iris/object/IrisCompatabilityItemFilter.java index 6d4a012fa..93011b4cd 100644 --- a/src/main/java/com/volmit/iris/object/IrisCompatabilityItemFilter.java +++ b/src/main/java/com/volmit/iris/object/IrisCompatabilityItemFilter.java @@ -1,10 +1,27 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.Iris; import com.volmit.iris.scaffold.cache.AtomicCache; import com.volmit.iris.util.B; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; import com.volmit.iris.util.Required; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,12 +34,12 @@ import org.bukkit.Material; @Data public class IrisCompatabilityItemFilter { @Required - @DontObfuscate + @Desc("When iris sees this block, and it's not reconized") private String when = ""; @Required - @DontObfuscate + @Desc("Replace it with this block. Dont worry if this block is also not reconized, iris repeat this compat check.") private String supplement = ""; diff --git a/src/main/java/com/volmit/iris/object/IrisDecorator.java b/src/main/java/com/volmit/iris/object/IrisDecorator.java index 2f197c8b2..27bc2054b 100644 --- a/src/main/java/com/volmit/iris/object/IrisDecorator.java +++ b/src/main/java/com/volmit/iris/object/IrisDecorator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.Iris; @@ -17,64 +35,59 @@ import org.bukkit.block.data.BlockData; @Desc("A biome decorator is used for placing flowers, grass, cacti and so on") @Data public class IrisDecorator { - @DontObfuscate + @Desc("The varience dispersion is used when multiple blocks are put in the palette. Scatter scrambles them, Wispy shows streak-looking varience") private IrisGeneratorStyle variance = NoiseStyle.STATIC.style(); - @DontObfuscate + @Desc("Forcefully place this decorant anywhere it is supposed to go even if it should not go on a specific surface block. For example, you could force tallgrass to place on top of stone by using this.") private boolean forcePlace = false; - @DontObfuscate + @Desc("Dispersion is used to pick places to spawn. Scatter randomly places them (vanilla) or Wispy for a streak like patch system.") private IrisGeneratorStyle style = NoiseStyle.STATIC.style(); @DependsOn({"stackMin", "stackMax"}) - @DontObfuscate @Desc("If this decorator has a height more than 1 this changes how it picks the height between your maxes. Scatter = random, Wispy = wavy heights") private IrisGeneratorStyle heightVariance = NoiseStyle.STATIC.style(); - @DontObfuscate + @Desc("Tells iris where this decoration is a part of. I.e. SHORE_LINE or SEA_SURFACE") private DecorationPart partOf = DecorationPart.NONE; @DependsOn({"stackMin", "stackMax"}) @MinNumber(1) @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) // TODO: WARNING HEIGHT - @DontObfuscate + @Desc("The maximum repeat stack height") private int stackMax = 1; @Required @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)") // TODO: WARNING HEIGHT private double chance = 0.1; @Required @ArrayType(min = 1, type = IrisBlockData.class) - @DontObfuscate @Desc("The palette of blocks to pick from when this decorator needs to place.") private KList palette = new KList().qadd(new IrisBlockData("grass")); @ArrayType(min = 1, type = IrisBlockData.class) - @DontObfuscate @Desc("The palette of blocks used at the very top of a 'stackMax' of higher than 1. For example, bamboo tops.") - private KList topPalette = new KList(); + private KList topPalette = new KList<>(); @DependsOn("topPalette") @MinNumber(0.01) @MaxNumber(1.0) - @DontObfuscate @Desc("When the stack passes the top threshold, the top palette will start being used instead of the normal palette.") private double topThreshold = 1.0; @@ -94,9 +107,7 @@ public class IrisDecorator { public CNG getHeightGenerator(RNG rng, IrisDataManager data) { return heightGenerator.aquire(() -> - { - return heightVariance.create(rng.nextParallelRNG(getBlockData(data).size() + stackMax + stackMin)); - }); + heightVariance.create(rng.nextParallelRNG(getBlockData(data).size() + stackMax + stackMin))); } public CNG getGenerator(RNG rng, IrisDataManager data) { @@ -210,6 +221,7 @@ public class IrisDecorator { }); } + @SuppressWarnings("BooleanMethodIsAlwaysInverted") public boolean isStacking() { return getStackMax() > 1; } diff --git a/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java b/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java index 67b26fe88..8ade96569 100644 --- a/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java +++ b/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.manager.IrisDataManager; @@ -19,54 +37,48 @@ public class IrisDepositGenerator { @Required @MinNumber(0) @MaxNumber(256) // TODO: WARNING HEIGHT - @DontObfuscate + @Desc("The minimum height this deposit can generate at") private int minHeight = 7; @Required @MinNumber(0) @MaxNumber(256) // TODO: WARNING HEIGHT - @DontObfuscate + @Desc("The maximum height this deposit can generate at") private int maxHeight = 55; @Required @MinNumber(1) @MaxNumber(32) - @DontObfuscate @Desc("The minimum amount of deposit blocks per clump") private int minSize = 3; @Required @MinNumber(1) @MaxNumber(32) - @DontObfuscate @Desc("The maximum amount of deposit blocks per clump") private int maxSize = 5; @Required @MinNumber(1) @MaxNumber(128) - @DontObfuscate @Desc("The maximum amount of clumps per chunk") private int maxPerChunk = 3; @Required @MinNumber(0) @MaxNumber(128) - @DontObfuscate @Desc("The minimum amount of clumps per chunk") private int minPerChunk = 1; @Required @ArrayType(min = 1, type = IrisBlockData.class) - @DontObfuscate @Desc("The palette of blocks to be used in this deposit generator") - private KList palette = new KList(); + private KList palette = new KList<>(); @MinNumber(1) @MaxNumber(64) - @DontObfuscate @Desc("Ore varience is how many different objects clumps iris will create") private int varience = 3; diff --git a/src/main/java/com/volmit/iris/object/IrisDimension.java b/src/main/java/com/volmit/iris/object/IrisDimension.java index 938cde1f7..6bf73d4a9 100644 --- a/src/main/java/com/volmit/iris/object/IrisDimension.java +++ b/src/main/java/com/volmit/iris/object/IrisDimension.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.Iris; @@ -11,7 +29,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.World.Environment; import org.bukkit.block.data.BlockData; @@ -19,6 +36,7 @@ import org.bukkit.block.data.BlockData; import java.io.File; import java.io.IOException; +@SuppressWarnings("DefaultAnnotationParam") @Accessors(chain = true) @AllArgsConstructor @NoArgsConstructor @@ -31,7 +49,7 @@ public class IrisDimension extends IrisRegistrant { @MinNumber(2) @Required - @DontObfuscate + @Desc("The human readable name of this dimension") private String name = "A Dimension"; @@ -39,296 +57,273 @@ public class IrisDimension extends IrisRegistrant { @ArrayType(min = 1, type = IrisDimensionIndex.class) private KList dimensionalComposite = new KList<>(); - @DontObfuscate + @Desc("Create an inverted dimension in the sky (like the nether)") private IrisDimension sky = null; @RegistryListJigsaw - @DontObfuscate + @Desc("If defined, Iris will place the given jigsaw structure where minecraft should place the overworld stronghold.") private String stronghold; - @DontObfuscate + @Desc("Improves the biome grid variation by shuffling the cell grid more depending on the seed. This makes biomes across multiple seeds look far different than before.") private boolean aggressiveBiomeReshuffle = false; - @DontObfuscate + @Desc("Instead of a flat bottom, applies a clamp (using this noise style) to the bottom instead of a flat bottom. Useful for carving out center-dimensions in a dimension composite world.") private IrisShapedGeneratorStyle undercarriage = null; - @DontObfuscate + @Desc("Upon joining this world, Iris will send a resource pack request to the client. If they have previously selected yes, it will auto-switch depending on which dimension they go to.") private String resourcePack = ""; - @DontObfuscate + @Desc("Entity spawns to override or add to this dimension") @ArrayType(min = 1, type = IrisEntitySpawnOverride.class) private KList entitySpawnOverrides = new KList<>(); - @DontObfuscate + @Desc("Add specific features in exact positions") @ArrayType(min = 1, type = IrisFeaturePositional.class) private KList specificFeatures = new KList<>(); - @DontObfuscate + @Desc("Entity spawns during generation") @ArrayType(min = 1, type = IrisEntityInitialSpawn.class) private KList entityInitialSpawns = new KList<>(); - @DontObfuscate + @Desc("Add random chances for terrain features") @ArrayType(min = 1, type = IrisFeaturePotential.class) private KList features = new KList<>(); - @DontObfuscate + @Desc("Reference loot tables in this area") private IrisLootReference loot = new IrisLootReference(); @MinNumber(0) - @DontObfuscate @Desc("The version of this dimension. Changing this will stop users from accidentally upgrading (and breaking their worlds).") private int version = 1; @ArrayType(min = 1, type = IrisBlockDrops.class) - @DontObfuscate @Desc("Define custom block drops for this dimension") private KList blockDrops = new KList<>(); - @DontObfuscate + @Desc("Should bedrock be generated or not.") private boolean bedrock = true; @MinNumber(0) @MaxNumber(1) - @DontObfuscate @Desc("The land chance. Up to 1.0 for total land or 0.0 for total sea") private double landChance = 0.625; - @DontObfuscate + @Desc("The placement style of regions") private IrisGeneratorStyle regionStyle = NoiseStyle.CELLULAR_IRIS_DOUBLE.style(); - @DontObfuscate + @Desc("The placement style of land/sea") private IrisGeneratorStyle continentalStyle = NoiseStyle.CELLULAR_IRIS_DOUBLE.style(); - @DontObfuscate + @Desc("The placement style of biomes") private IrisGeneratorStyle landBiomeStyle = NoiseStyle.CELLULAR_IRIS_DOUBLE.style(); - @DontObfuscate + @Desc("The placement style of biomes") private IrisGeneratorStyle shoreBiomeStyle = NoiseStyle.CELLULAR_IRIS_DOUBLE.style(); - @DontObfuscate + @Desc("The placement style of biomes") private IrisGeneratorStyle seaBiomeStyle = NoiseStyle.CELLULAR_IRIS_DOUBLE.style(); - @DontObfuscate + @Desc("The placement style of biomes") private IrisGeneratorStyle caveBiomeStyle = NoiseStyle.CELLULAR_IRIS_DOUBLE.style(); - @DontObfuscate + @Desc("The placement style of biomes") private IrisGeneratorStyle riverBiomeStyle = NoiseStyle.CELLULAR_IRIS_DOUBLE.style(); - @DontObfuscate + @Desc("The placement style of biomes") private IrisGeneratorStyle lakeBiomeStyle = NoiseStyle.CELLULAR_IRIS_DOUBLE.style(); - @DontObfuscate + @Desc("The placement style of biomes") private IrisGeneratorStyle islandBiomeStyle = NoiseStyle.CELLULAR_IRIS_DOUBLE.style(); - @DontObfuscate + @Desc("The placement style of biomes") private IrisGeneratorStyle islandBiomeChanceStyle = NoiseStyle.CELLULAR_HEIGHT_IRIS_DOUBLE.style(); - @DontObfuscate + @Desc("The placement style of biomes") private IrisGeneratorStyle skylandBiomeStyle = NoiseStyle.CELLULAR_IRIS_DOUBLE.style(); - @DontObfuscate + @Desc("Generate caves or not.") private boolean caves = true; - @DontObfuscate + @Desc("Instead of filling objects with air, fills them with cobweb so you can see them") private boolean debugSmartBore = false; - @DontObfuscate + @Desc("Carve terrain or not") private boolean carving = true; - @DontObfuscate + @Desc("If defined, If air is defined below the area, this fluid will always place") private IrisCaveFluid forceFluid = new IrisCaveFluid(); - @DontObfuscate + @Desc("Generate decorations or not") private boolean decorate = true; - @DontObfuscate + @Desc("Generate ravines or not") private boolean ravines = false; @MinNumber(1) - @DontObfuscate @Desc("The rarity of a ravine layer having a lib (or rib) that sticks in or out by one block. Minecraft's default is 3.") private int ravineRibRarity = 2; @MinNumber(1) - @DontObfuscate @Desc("The rarity of ravines. Each chunk has a 1 in X chance") private int ravineRarity = 50; - @DontObfuscate + @Desc("Use post processing or not") private boolean postProcessing = true; - @DontObfuscate + @Desc("Add slabs in post processing") private boolean postProcessingSlabs = true; - @DontObfuscate + @Desc("Add painted walls in post processing") private boolean postProcessingWalls = true; - @DontObfuscate + @Desc("Use post processing for caves or not") private boolean postProcessCaves = true; - @DontObfuscate + @Desc("The world environment") private Environment environment = Environment.NORMAL; @RegistryListRegion @Required @ArrayType(min = 1, type = String.class) - @DontObfuscate @Desc("Define all of the regions to include in this dimension. Dimensions -> Regions -> Biomes -> Objects etc") private KList regions = new KList<>(); @ArrayType(min = 1, type = IrisJigsawStructurePlacement.class) - @DontObfuscate @Desc("Jigsaw structures") private KList jigsawStructures = new KList<>(); @Required @MinNumber(0) @MaxNumber(255) - @DontObfuscate @Desc("The fluid height for this dimension") private int fluidHeight = 63; @RegistryListBiome - @DontObfuscate + @Desc("Keep this either undefined or empty. Setting any biome name into this will force iris to only generate the specified biome. Great for testing.") private String focus = ""; @RegistryListBiome - @DontObfuscate + @Desc("Keep this either undefined or empty. Setting any region name into this will force iris to only generate the specified region. Great for testing.") private String focusRegion = ""; @MinNumber(0.0001) @MaxNumber(512) - @DontObfuscate @Desc("Zoom in or out the biome size. Higher = bigger biomes") private double biomeZoom = 5D; @MinNumber(0.0001) @MaxNumber(512) - @DontObfuscate @Desc("Zoom in or out the terrain. This stretches the terrain. Due to performance improvements, Higher than 2.0 may cause weird rounding artifacts. Lower = more terrain changes per block. Its a true zoom-out.") private double terrainZoom = 1D; @MinNumber(0) @MaxNumber(360) - @DontObfuscate @Desc("You can rotate the input coordinates by an angle. This can make terrain appear more natural (less sharp corners and lines). This literally rotates the entire dimension by an angle. Hint: Try 12 degrees or something not on a 90 or 45 degree angle.") private double dimensionAngleDeg = 0; @MinNumber(0) @MaxNumber(8192) - @DontObfuscate @Desc("Coordinate fracturing applies noise to the input coordinates. This creates the 'iris swirls' and wavy features. The distance pushes these waves further into places they shouldnt be. This is a block value multiplier.") private double coordFractureDistance = 20; @MinNumber(0.0001) @MaxNumber(512) - @DontObfuscate @Desc("Coordinate fracturing zoom. Higher = less frequent warping, Lower = more frequent and rapid warping / swirls.") private double coordFractureZoom = 8; @MinNumber(0.0001) @MaxNumber(512) - @DontObfuscate @Desc("This zooms in the land space") private double landZoom = 1; @MinNumber(0.0001) @MaxNumber(512) - @DontObfuscate @Desc("This zooms oceanic biomes") private double seaZoom = 1; @MinNumber(0.0001) @MaxNumber(512) - @DontObfuscate @Desc("Zoom in continents") private double continentZoom = 1; @MinNumber(0.0001) @MaxNumber(512) - @DontObfuscate @Desc("Change the size of regions") private double regionZoom = 1; - @DontObfuscate + @Desc("Disable this to stop placing schematics in biomes") private boolean placeObjects = true; - @DontObfuscate + @Desc("Prevent Leaf decay as if placed in creative mode") private boolean preventLeafDecay = false; @ArrayType(min = 1, type = IrisDepositGenerator.class) - @DontObfuscate @Desc("Define global deposit generators") private KList deposits = new KList<>(); @ArrayType(min = 1, type = IrisShapedGeneratorStyle.class) - @DontObfuscate @Desc("Overlay additional noise on top of the interoplated terrain.") private KList overlayNoise = new KList<>(); @ArrayType(min = 1, type = IrisCaveLayer.class) - @DontObfuscate @Desc("Define cave layers") private KList caveLayers = new KList<>(); @ArrayType(min = 1, type = IrisCarveLayer.class) - @DontObfuscate @Desc("Define carve layers") private KList carveLayers = new KList<>(); @MinNumber(0.0001) @MaxNumber(512) - @DontObfuscate @Desc("The rock zoom mostly for zooming in on a wispy palette") private double rockZoom = 5; - @DontObfuscate + @Desc("The palette of blocks for 'stone'") private IrisMaterialPalette rockPalette = new IrisMaterialPalette().qclear().qadd("stone"); - @DontObfuscate + @Desc("The palette of blocks for 'water'") private IrisMaterialPalette fluidPalette = new IrisMaterialPalette().qclear().qadd("water"); @ArrayType(min = 1, type = IrisBiomeMutation.class) - @DontObfuscate @Desc("Define biome mutations for this dimension") private KList mutations = new KList<>(); @@ -458,43 +453,45 @@ public class IrisDimension extends IrisRegistrant { return landBiomeStyle; } - public boolean installDataPack(DataProvider data, File datapacks) - { + public boolean installDataPack(DataProvider data, File datapacks) { boolean write = false; boolean changed = false; - for(IrisBiome i : getAllBiomes(data)) - { - if(i.isCustom()) - { + IO.delete(new File(datapacks, "iris/data/" + getLoadKey())); + + for (IrisBiome i : getAllBiomes(data)) { + if (i.isCustom()) { write = true; - File output = new File(datapacks, "iris/data/" + getLoadKey() + "/worldgen/biome/" + i.getCustom().getId() + ".json"); - if(!output.exists()) - { - changed = true; - } + for (IrisBiomeCustom j : i.getCustomDerivitives()) { + File output = new File(datapacks, "iris/data/" + getLoadKey() + "/worldgen/biome/" + j.getId() + ".json"); - Iris.verbose(" Installing Data Pack Biome: " + output.getPath()); - output.getParentFile().mkdirs(); - try { - IO.writeAll(output, i.getCustom().generateJson()); - } catch (IOException e) { - e.printStackTrace(); + if (!output.exists()) { + changed = true; + } + + Iris.verbose(" Installing Data Pack Biome: " + output.getPath()); + output.getParentFile().mkdirs(); + try { + IO.writeAll(output, j.generateJson()); + } catch (IOException e) { + e.printStackTrace(); + } } } } - if(write) - { + if (write) { File mcm = new File(datapacks, "iris/pack.mcmeta"); try { - IO.writeAll(mcm, "{\n" + - " \"pack\": {\n" + - " \"description\": \"Iris Data Pack. This pack contains all installed Iris Packs' resources.\",\n" + - " \"pack_format\": 7\n" + - " }\n" + - "}\n"); + IO.writeAll(mcm, """ + { + "pack": { + "description": "Iris Data Pack. This pack contains all installed Iris Packs' resources.", + "pack_format": 7 + } + } + """); } catch (IOException e) { e.printStackTrace(); } diff --git a/src/main/java/com/volmit/iris/object/IrisDimensionIndex.java b/src/main/java/com/volmit/iris/object/IrisDimensionIndex.java index f50fd2a61..ea1bc6ce6 100644 --- a/src/main/java/com/volmit/iris/object/IrisDimensionIndex.java +++ b/src/main/java/com/volmit/iris/object/IrisDimensionIndex.java @@ -1,12 +1,34 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; -import com.volmit.iris.util.*; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.MinNumber; +import com.volmit.iris.util.RegistryListDimension; +import com.volmit.iris.util.Required; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +@SuppressWarnings("DefaultAnnotationParam") @Accessors(chain = true) @NoArgsConstructor @AllArgsConstructor @@ -15,19 +37,19 @@ import lombok.experimental.Accessors; @EqualsAndHashCode(callSuper = false) public class IrisDimensionIndex { @Required - @DontObfuscate + @Desc("The weight of this dimension. If there are 2 dimensions, if the weight is the same on both, both dimensions will take up 128 blocks of height.") private double weight = 1D; - @DontObfuscate + @Desc("If inverted is set to true, the dimension will be updide down in the world") private boolean inverted = false; - @DontObfuscate + @Desc("Only one dimension layer should be set to primary. The primary dimension layer is where players spawn, and the biomes that the vanilla structure system uses to figure out what structures to place.") private boolean primary = false; - @DontObfuscate + @Required @RegistryListDimension @MinNumber(1) diff --git a/src/main/java/com/volmit/iris/object/IrisDirection.java b/src/main/java/com/volmit/iris/object/IrisDirection.java index 2d4abe649..eb96dd101 100644 --- a/src/main/java/com/volmit/iris/object/IrisDirection.java +++ b/src/main/java/com/volmit/iris/object/IrisDirection.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.Cuboid.CuboidDirection; @@ -7,6 +25,8 @@ import org.bukkit.block.BlockFace; import org.bukkit.block.data.type.Jigsaw; import org.bukkit.util.Vector; +import java.util.Map; + /** * Directions * @@ -29,35 +49,15 @@ public enum IrisDirection { private final CuboidDirection f; public static IrisDirection getDirection(BlockFace f) { - switch (f) { - case DOWN: - return DOWN_NEGATIVE_Y; - case EAST: - case EAST_NORTH_EAST: - case EAST_SOUTH_EAST: - return EAST_POSITIVE_X; - case NORTH: - case NORTH_NORTH_WEST: - case NORTH_EAST: - case NORTH_NORTH_EAST: - case NORTH_WEST: - return NORTH_NEGATIVE_Z; - case SELF: - case UP: - return UP_POSITIVE_Y; - case SOUTH: - case SOUTH_EAST: - case SOUTH_SOUTH_EAST: - case SOUTH_SOUTH_WEST: - case SOUTH_WEST: - return SOUTH_POSITIVE_Z; - case WEST: - case WEST_NORTH_WEST: - case WEST_SOUTH_WEST: - return WEST_NEGATIVE_X; - } + return switch (f) { + case DOWN -> DOWN_NEGATIVE_Y; + case EAST, EAST_NORTH_EAST, EAST_SOUTH_EAST -> EAST_POSITIVE_X; + case NORTH, NORTH_NORTH_WEST, NORTH_EAST, NORTH_NORTH_EAST, NORTH_WEST -> NORTH_NEGATIVE_Z; + case SELF, UP -> UP_POSITIVE_Y; + case SOUTH, SOUTH_EAST, SOUTH_SOUTH_EAST, SOUTH_SOUTH_WEST, SOUTH_WEST -> SOUTH_POSITIVE_Z; + case WEST, WEST_NORTH_WEST, WEST_SOUTH_WEST -> WEST_NEGATIVE_X; + }; - return DOWN_NEGATIVE_Y; } public static IrisDirection fromJigsawBlock(String direction) { @@ -72,46 +72,26 @@ public enum IrisDirection { } public static IrisDirection getDirection(Jigsaw.Orientation orientation) { - switch (orientation) { - case DOWN_EAST: - case UP_EAST: - case EAST_UP: - return EAST_POSITIVE_X; - case DOWN_NORTH: - case UP_NORTH: - case NORTH_UP: - return NORTH_NEGATIVE_Z; - case DOWN_SOUTH: - case UP_SOUTH: - case SOUTH_UP: - return SOUTH_POSITIVE_Z; - case DOWN_WEST: - case UP_WEST: - case WEST_UP: - return WEST_NEGATIVE_X; - } + return switch (orientation) { + case DOWN_EAST, UP_EAST, EAST_UP -> EAST_POSITIVE_X; + case DOWN_NORTH, UP_NORTH, NORTH_UP -> NORTH_NEGATIVE_Z; + case DOWN_SOUTH, UP_SOUTH, SOUTH_UP -> SOUTH_POSITIVE_Z; + case DOWN_WEST, UP_WEST, WEST_UP -> WEST_NEGATIVE_X; + }; - return null; } @Override public String toString() { - switch (this) { - case DOWN_NEGATIVE_Y: - return "Down"; - case EAST_POSITIVE_X: - return "East"; - case NORTH_NEGATIVE_Z: - return "North"; - case SOUTH_POSITIVE_Z: - return "South"; - case UP_POSITIVE_Y: - return "Up"; - case WEST_NEGATIVE_X: - return "West"; - } + return switch (this) { + case DOWN_NEGATIVE_Y -> "Down"; + case EAST_POSITIVE_X -> "East"; + case NORTH_NEGATIVE_Z -> "North"; + case SOUTH_POSITIVE_Z -> "South"; + case UP_POSITIVE_Y -> "Up"; + case WEST_NEGATIVE_X -> "West"; + }; - return "?"; } public boolean isVertical() { @@ -191,9 +171,10 @@ public enum IrisDirection { public Vector angle(Vector initial, IrisDirection d) { calculatePermutations(); - for (GBiset i : permute.keySet()) { + for (Map.Entry, DOP> entry : permute.entrySet()) { + GBiset i = entry.getKey(); if (i.getA().equals(this) && i.getB().equals(d)) { - return permute.get(i).op(initial); + return entry.getValue().op(initial); } } @@ -316,11 +297,11 @@ public enum IrisDirection { return; } - permute = new KMap, DOP>(); + permute = new KMap<>(); for (IrisDirection i : udnews()) { for (IrisDirection j : udnews()) { - GBiset b = new GBiset(i, j); + GBiset b = new GBiset<>(i, j); if (i.equals(j)) { permute.put(b, new DOP("DIRECT") { @@ -400,37 +381,23 @@ public enum IrisDirection { } public BlockFace getFace() { - switch (this) { - case DOWN_NEGATIVE_Y: - return BlockFace.DOWN; - case EAST_POSITIVE_X: - return BlockFace.EAST; - case NORTH_NEGATIVE_Z: - return BlockFace.NORTH; - case SOUTH_POSITIVE_Z: - return BlockFace.SOUTH; - case UP_POSITIVE_Y: - return BlockFace.UP; - case WEST_NEGATIVE_X: - return BlockFace.WEST; - } + return switch (this) { + case DOWN_NEGATIVE_Y -> BlockFace.DOWN; + case EAST_POSITIVE_X -> BlockFace.EAST; + case NORTH_NEGATIVE_Z -> BlockFace.NORTH; + case SOUTH_POSITIVE_Z -> BlockFace.SOUTH; + case UP_POSITIVE_Y -> BlockFace.UP; + case WEST_NEGATIVE_X -> BlockFace.WEST; + }; - return null; } public Axis getAxis() { - switch (this) { - case DOWN_NEGATIVE_Y: - case UP_POSITIVE_Y: - return Axis.Y; - case EAST_POSITIVE_X: - case WEST_NEGATIVE_X: - return Axis.X; - case NORTH_NEGATIVE_Z: - case SOUTH_POSITIVE_Z: - return Axis.Z; - } + return switch (this) { + case DOWN_NEGATIVE_Y, UP_POSITIVE_Y -> Axis.Y; + case EAST_POSITIVE_X, WEST_NEGATIVE_X -> Axis.X; + case NORTH_NEGATIVE_Z, SOUTH_POSITIVE_Z -> Axis.Z; + }; - return null; } } diff --git a/src/main/java/com/volmit/iris/object/IrisEffect.java b/src/main/java/com/volmit/iris/object/IrisEffect.java index 479b67daa..12b5316ba 100644 --- a/src/main/java/com/volmit/iris/object/IrisEffect.java +++ b/src/main/java/com/volmit/iris/object/IrisEffect.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.Iris; @@ -22,150 +40,129 @@ import org.bukkit.potion.PotionEffectType; @Data public class IrisEffect { - @DontObfuscate + @Desc("The potion effect to apply in this area") private String potionEffect = ""; - @DontObfuscate + @Desc("The particle effect to apply in the area") private Particle particleEffect = null; @DependsOn({"particleEffect"}) @MinNumber(-32) @MaxNumber(32) - @DontObfuscate @Desc("Randomly offset from the surface to this surface+value") private int particleOffset = 0; @DependsOn({"particleEffect"}) @MinNumber(-8) @MaxNumber(8) - @DontObfuscate @Desc("The alt x, usually represents motion if the particle count is zero. Otherwise an offset.") private double particleAltX = 0; @DependsOn({"particleEffect"}) @MinNumber(-8) @MaxNumber(8) - @DontObfuscate @Desc("The alt y, usually represents motion if the particle count is zero. Otherwise an offset.") private double particleAltY = 0; @DependsOn({"particleEffect"}) @MinNumber(-8) @MaxNumber(8) - @DontObfuscate @Desc("The alt z, usually represents motion if the particle count is zero. Otherwise an offset.") private double particleAltZ = 0; @DependsOn({"particleEffect"}) - @DontObfuscate @Desc("Randomize the altX by -altX to altX") private boolean randomAltX = true; @DependsOn({"particleEffect"}) - @DontObfuscate @Desc("Randomize the altY by -altY to altY") private boolean randomAltY = false; @DependsOn({"particleEffect"}) - @DontObfuscate @Desc("Randomize the altZ by -altZ to altZ") private boolean randomAltZ = true; - @DontObfuscate + @Desc("The sound to play") private Sound sound = null; @DependsOn({"sound"}) @MinNumber(0) @MaxNumber(512) - @DontObfuscate @Desc("The max distance from the player the sound will play") private int soundDistance = 12; @DependsOn({"sound", "maxPitch"}) @MinNumber(0.01) @MaxNumber(1.99) - @DontObfuscate @Desc("The minimum sound pitch") private double minPitch = 0.5D; @DependsOn({"sound", "minVolume"}) @MinNumber(0.01) @MaxNumber(1.99) - @DontObfuscate @Desc("The max sound pitch") private double maxPitch = 1.5D; @DependsOn({"sound"}) @MinNumber(0.001) @MaxNumber(512) - @DontObfuscate @Desc("The sound volume.") private double volume = 1.5D; @DependsOn({"particleEffect"}) @MinNumber(0) @MaxNumber(512) - @DontObfuscate @Desc("The particle count. Try setting to zero for using the alt xyz to a motion value instead of an offset") private int particleCount = 0; @DependsOn({"particleEffect"}) @MinNumber(0) @MaxNumber(64) - @DontObfuscate @Desc("How far away from the player particles can play") private int particleDistance = 20; @DependsOn({"particleEffect"}) @MinNumber(0) @MaxNumber(128) - @DontObfuscate @Desc("How wide the particles can play (player's view left and right) RADIUS") private int particleDistanceWidth = 24; @DependsOn({"particleEffect"}) - @DontObfuscate @Desc("An extra value for some particles... Which bukkit doesn't even document.") private double extra = 0; @DependsOn({"potionEffect"}) @MinNumber(-1) @MaxNumber(1024) - @DontObfuscate @Desc("The Potion Strength or -1 to disable") private int potionStrength = -1; @DependsOn({"potionEffect", "potionTicksMin"}) @MinNumber(1) - @DontObfuscate @Desc("The max time the potion will last for") private int potionTicksMax = 155; @DependsOn({"potionEffect", "potionTicksMax"}) @MinNumber(1) - @DontObfuscate @Desc("The min time the potion will last for") private int potionTicksMin = 75; @Required @MinNumber(0) - @DontObfuscate @Desc("The effect interval in milliseconds") private int interval = 150; @DependsOn({"particleEffect"}) @MinNumber(0) @MaxNumber(16) - @DontObfuscate @Desc("The effect distance start away") private int particleAway = 5; @Required @MinNumber(1) - @DontObfuscate @Desc("The chance is 1 in CHANCE per interval") private int chance = 50; @@ -193,7 +190,7 @@ public class IrisEffect { return t; } } - } catch (Throwable e) { + } catch (Throwable ignored) { } @@ -215,9 +212,7 @@ public class IrisEffect { if (sound != null) { Location part = p.getLocation().clone().add(RNG.r.i(-soundDistance, soundDistance), RNG.r.i(-soundDistance, soundDistance), RNG.r.i(-soundDistance, soundDistance)); - J.s(() -> { - p.playSound(part, getSound(), (float) volume, (float) RNG.r.d(minPitch, maxPitch)); - }); + J.s(() -> p.playSound(part, getSound(), (float) volume, (float) RNG.r.d(minPitch, maxPitch))); } if (particleEffect != null) { @@ -226,23 +221,19 @@ public class IrisEffect { part.setY(Math.round(g.getHeight(part.getBlockX(), part.getBlockZ())) + 1); part.add(RNG.r.d(), 0, RNG.r.d()); if (extra != 0) { - J.s(() -> { - p.spawnParticle(particleEffect, part.getX(), part.getY() + RNG.r.i(particleOffset), - part.getZ(), - particleCount, - randomAltX ? RNG.r.d(-particleAltX, particleAltX) : particleAltX, - randomAltY ? RNG.r.d(-particleAltY, particleAltY) : particleAltY, - randomAltZ ? RNG.r.d(-particleAltZ, particleAltZ) : particleAltZ, - extra); - }); + J.s(() -> p.spawnParticle(particleEffect, part.getX(), part.getY() + RNG.r.i(particleOffset), + part.getZ(), + particleCount, + randomAltX ? RNG.r.d(-particleAltX, particleAltX) : particleAltX, + randomAltY ? RNG.r.d(-particleAltY, particleAltY) : particleAltY, + randomAltZ ? RNG.r.d(-particleAltZ, particleAltZ) : particleAltZ, + extra)); } else { - J.s(() -> { - p.spawnParticle(particleEffect, part.getX(), part.getY() + RNG.r.i(particleOffset), part.getZ(), - particleCount, - randomAltX ? RNG.r.d(-particleAltX, particleAltX) : particleAltX, - randomAltY ? RNG.r.d(-particleAltY, particleAltY) : particleAltY, - randomAltZ ? RNG.r.d(-particleAltZ, particleAltZ) : particleAltZ); - }); + J.s(() -> p.spawnParticle(particleEffect, part.getX(), part.getY() + RNG.r.i(particleOffset), part.getZ(), + particleCount, + randomAltX ? RNG.r.d(-particleAltX, particleAltX) : particleAltX, + randomAltY ? RNG.r.d(-particleAltY, particleAltY) : particleAltY, + randomAltZ ? RNG.r.d(-particleAltZ, particleAltZ) : particleAltZ)); } } @@ -253,18 +244,14 @@ public class IrisEffect { return; } - J.s(() -> { - p.removePotionEffect(getRealType()); - }); + J.s(() -> p.removePotionEffect(getRealType())); } - J.s(() -> { - p.addPotionEffect(new PotionEffect(getRealType(), - RNG.r.i(Math.min(potionTicksMax, potionTicksMin), - Math.max(potionTicksMax, potionTicksMin)), - getPotionStrength(), - true, false, false)); - }); + J.s(() -> p.addPotionEffect(new PotionEffect(getRealType(), + RNG.r.i(Math.min(potionTicksMax, potionTicksMin), + Math.max(potionTicksMax, potionTicksMin)), + getPotionStrength(), + true, false, false))); } } } diff --git a/src/main/java/com/volmit/iris/object/IrisEnchantment.java b/src/main/java/com/volmit/iris/object/IrisEnchantment.java index cd0fee53a..0687b272d 100644 --- a/src/main/java/com/volmit/iris/object/IrisEnchantment.java +++ b/src/main/java/com/volmit/iris/object/IrisEnchantment.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.*; @@ -19,23 +37,20 @@ import java.lang.reflect.Field; public class IrisEnchantment { @Required - @DontObfuscate + @Desc("The enchantment") private String enchantment = ""; @MinNumber(1) - @DontObfuscate @Desc("Minimum amount of this loot") private int minLevel = 1; @MinNumber(1) - @DontObfuscate @Desc("Maximum amount of this loot") private int maxLevel = 1; @MinNumber(0) @MaxNumber(1) - @DontObfuscate @Desc("The chance that this enchantment is applied (0 to 1)") private double chance = 1; @@ -48,7 +63,7 @@ public class IrisEnchantment { } meta.addEnchant(getEnchant(), getLevel(rng), true); } - } catch (Throwable e) { + } catch (Throwable ignored) { } } diff --git a/src/main/java/com/volmit/iris/object/IrisEntity.java b/src/main/java/com/volmit/iris/object/IrisEntity.java index a365241aa..1e3840149 100644 --- a/src/main/java/com/volmit/iris/object/IrisEntity.java +++ b/src/main/java/com/volmit/iris/object/IrisEntity.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.Iris; @@ -24,115 +42,116 @@ import java.util.Collection; import java.util.Random; import java.util.concurrent.atomic.AtomicReference; +@SuppressWarnings("ALL") @Accessors(chain = true) @NoArgsConstructor @AllArgsConstructor -@DontObfuscate + @Desc("Represents an iris entity.") @Data @EqualsAndHashCode(callSuper = false) public class IrisEntity extends IrisRegistrant { @Required - @DontObfuscate + @Desc("The type of entity to spawn. To spawn a mythic mob, set this type to unknown and define mythic type.") private EntityType type = EntityType.UNKNOWN; @RegistryListMythical @Desc("The type of mythic mob (if mythic mobs is installed). If this is set, make sure to set 'type' to UNKNOWN") - @DontObfuscate + private String mythicalType = ""; - @DontObfuscate + @Desc("The custom name of this entity") private String customName = ""; - @DontObfuscate + @Desc("Should the name on this entity be visible even if you arent looking at it.") private boolean customNameVisible = false; - @DontObfuscate + @Desc("If this entity type is a mob, should it be aware of it's surroundings & interact with the world.") private boolean aware = true; - @DontObfuscate + @Desc("If this entity type is a creature, should it have ai goals.") private boolean ai = true; - @DontObfuscate + @Desc("Should this entity be glowing") private boolean glowing = false; - @DontObfuscate + @Desc("Should gravity apply to this entity") private boolean gravity = true; - @DontObfuscate + @Desc("When an entity is invulnerable it can only be damaged by players increative mode.") private boolean invulnerable = false; - @DontObfuscate + @Desc("When an entity is silent it will not produce any sound.") private boolean silent = false; - @DontObfuscate + @Desc("Should this entity be allowed to pickup items") private boolean pickupItems = false; - @DontObfuscate + @Desc("Should this entity be removed when far away") private boolean removable = true; - @DontObfuscate + @Desc("Entity helmet equipment") private IrisLoot helmet = null; - @DontObfuscate + @Desc("Entity chestplate equipment") private IrisLoot chestplate = null; - @DontObfuscate + @Desc("Entity boots equipment") private IrisLoot boots = null; - @DontObfuscate + @Desc("Entity leggings equipment") private IrisLoot leggings = null; - @DontObfuscate + @Desc("Entity main hand equipment") private IrisLoot mainHand = null; - @DontObfuscate + @Desc("Entity off hand equipment") private IrisLoot offHand = null; - @DontObfuscate + @Desc("Make other entities ride this entity") @ArrayType(min = 1, type = IrisEntity.class) private KList passengers = new KList<>(); - @DontObfuscate + @Desc("Attribute modifiers for this entity") @ArrayType(min = 1, type = IrisAttributeModifier.class) private KList attributes = new KList<>(); - @DontObfuscate + @Desc("Loot tables for drops") private IrisLootReference loot = new IrisLootReference(); - @DontObfuscate + @Desc("If specified, this entity will be leashed by this entity. I.e. THIS ENTITY Leashed by SPECIFIED. This has no effect on EnderDragons, Withers, Players, or Bats.Non-living entities excluding leashes will not persist as leashholders.") private IrisEntity leashHolder = null; - @DontObfuscate + @Desc("The main gene for a panda if the entity type is a panda") private Gene pandaMainGene = Gene.NORMAL; - @DontObfuscate + @Desc("The hidden gene for a panda if the entity type is a panda") private Gene pandaHiddenGene = Gene.NORMAL; - @DontObfuscate + @Desc("The this entity is ageable, set it's baby status") private boolean baby = false; @@ -268,7 +287,7 @@ public class IrisEntity extends IrisRegistrant { J.s(() -> ae.set(doSpawn(at))); PrecisionStopwatch p = PrecisionStopwatch.start(); - while (ae == null) { + while (ae.get() == null) { J.sleep(3); } diff --git a/src/main/java/com/volmit/iris/object/IrisEntityInitialSpawn.java b/src/main/java/com/volmit/iris/object/IrisEntityInitialSpawn.java index ab73b5725..a8269c635 100644 --- a/src/main/java/com/volmit/iris/object/IrisEntityInitialSpawn.java +++ b/src/main/java/com/volmit/iris/object/IrisEntityInitialSpawn.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.scaffold.cache.AtomicCache; @@ -19,22 +37,19 @@ import org.bukkit.entity.Entity; public class IrisEntityInitialSpawn { @RegistryListEntity @Required - @DontObfuscate + @Desc("The entity") private String entity = ""; @MinNumber(1) - @DontObfuscate @Desc("The 1 in RARITY chance for this entity to spawn") private int rarity = 1; @MinNumber(1) - @DontObfuscate @Desc("The minumum of this entity to spawn") private int minSpawns = 1; @MinNumber(1) - @DontObfuscate @Desc("The max of this entity to spawn") private int maxSpawns = 1; diff --git a/src/main/java/com/volmit/iris/object/IrisEntitySpawnOverride.java b/src/main/java/com/volmit/iris/object/IrisEntitySpawnOverride.java index 66cb48f64..f9dca3a19 100644 --- a/src/main/java/com/volmit/iris/object/IrisEntitySpawnOverride.java +++ b/src/main/java/com/volmit/iris/object/IrisEntitySpawnOverride.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.scaffold.cache.AtomicCache; @@ -21,24 +39,22 @@ public class IrisEntitySpawnOverride { @RegistryListEntity @Required - @DontObfuscate + @Desc("The entity") private String entity = ""; @Required - @DontObfuscate + @Desc("If the following entity type spawns, spawn this entity. Set to unknown for any entity spawn") private EntityType trigger = EntityType.UNKNOWN; - @DontObfuscate @Desc("If the source is triggered, cancel spawning the original entity instead of ADDING a new entity.") private boolean cancelSourceSpawn = false; @MinNumber(1) - @DontObfuscate @Desc("The 1 in RARITY chance for this entity to spawn") private int rarity = 1; diff --git a/src/main/java/com/volmit/iris/object/IrisFeature.java b/src/main/java/com/volmit/iris/object/IrisFeature.java index 3c043d2b3..a3c78cfb3 100644 --- a/src/main/java/com/volmit/iris/object/IrisFeature.java +++ b/src/main/java/com/volmit/iris/object/IrisFeature.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.google.gson.Gson; @@ -12,62 +30,62 @@ import java.io.DataOutputStream; import java.io.IOException; @Data -@DontObfuscate + @NoArgsConstructor @AllArgsConstructor @Desc("Represents an Iris zone") public class IrisFeature { @Required - @DontObfuscate + @Desc("The block radius of this zone") private double blockRadius = 32; @MinNumber(0) @MaxNumber(1) @Required - @DontObfuscate + @Desc("The chance an object that should be place actually will place. Set to below 1 to affect objects in this zone") private double objectChance = 1; @Required - @DontObfuscate + @Desc("The interpolation radius of this zone") private double interpolationRadius = 7; @Required - @DontObfuscate + @MaxNumber(1) @MinNumber(0) @Desc("The strength of this effect") private double strength = 0.75; @Required - @DontObfuscate + @Desc("The interpolator to use for smoothing the strength") private InterpolationMethod interpolator = InterpolationMethod.BILINEAR_STARCAST_9; @Required - @DontObfuscate + @Desc("If set, this will shift the terrain height in blocks (up or down)") private double shiftHeight = 0; @Required - @DontObfuscate + @Desc("If set, this will force the terrain closer to the specified height.") private double convergeToHeight = -1; @Required - @DontObfuscate + @Desc("Multiplies the input noise") private double multiplyHeight = 1; @Required - @DontObfuscate + @Desc("Invert the zone so that anything outside this zone is affected.") private boolean invertZone = false; @Required - @DontObfuscate + @Desc("Add additional noise to this spot") private IrisGeneratorStyle addNoise = NoiseStyle.FLAT.style(); diff --git a/src/main/java/com/volmit/iris/object/IrisFeaturePositional.java b/src/main/java/com/volmit/iris/object/IrisFeaturePositional.java index d8a71f336..b27163a65 100644 --- a/src/main/java/com/volmit/iris/object/IrisFeaturePositional.java +++ b/src/main/java/com/volmit/iris/object/IrisFeaturePositional.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.google.gson.Gson; @@ -11,7 +29,7 @@ import java.io.DataOutputStream; import java.io.IOException; @Data -@DontObfuscate + @NoArgsConstructor @Desc("Represents an Iris zone") public class IrisFeaturePositional { @@ -22,17 +40,17 @@ public class IrisFeaturePositional { } @Required - @DontObfuscate + @Desc("The x coordinate of this zone") private int x; @Required - @DontObfuscate + @Desc("The z coordinate of this zone") private int z; @Required - @DontObfuscate + @Desc("The Terrain Feature to apply") private IrisFeature feature; diff --git a/src/main/java/com/volmit/iris/object/IrisFeaturePotential.java b/src/main/java/com/volmit/iris/object/IrisFeaturePotential.java index 9e1f17d70..e43dbe3d0 100644 --- a/src/main/java/com/volmit/iris/object/IrisFeaturePotential.java +++ b/src/main/java/com/volmit/iris/object/IrisFeaturePotential.java @@ -1,21 +1,42 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; -import com.volmit.iris.util.*; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.MinNumber; +import com.volmit.iris.util.RNG; +import com.volmit.iris.util.Required; import lombok.Data; @Data -@DontObfuscate + @Desc("Represents a potential Iris zone") public class IrisFeaturePotential { @MinNumber(0) @Required - @DontObfuscate + @Desc("The rarity is 1 in X chance per chunk") private int rarity = 100; @Required - @DontObfuscate + @Desc("") private IrisFeature zone = new IrisFeature(); diff --git a/src/main/java/com/volmit/iris/object/IrisGenerator.java b/src/main/java/com/volmit/iris/object/IrisGenerator.java index d84c8826b..d9eee3459 100644 --- a/src/main/java/com/volmit/iris/object/IrisGenerator.java +++ b/src/main/java/com/volmit/iris/object/IrisGenerator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.Iris; @@ -12,6 +30,7 @@ import lombok.experimental.Accessors; import java.util.List; +@SuppressWarnings("DefaultAnnotationParam") @Accessors(chain = true) @NoArgsConstructor @AllArgsConstructor @@ -20,75 +39,67 @@ import java.util.List; @EqualsAndHashCode(callSuper = false) public class IrisGenerator extends IrisRegistrant { @MinNumber(0.001) - @DontObfuscate @Desc("The zoom or frequency.") private double zoom = 1; @MinNumber(0) - @DontObfuscate @Desc("The opacity, essentially a multiplier on the output.") private double opacity = 1; - @DontObfuscate + @Desc("Multiply the compsites instead of adding them") private boolean multiplicitive = false; @MinNumber(0.001) - @DontObfuscate @Desc("The size of the cell fractures") private double cellFractureZoom = 1D; @MinNumber(0) - @DontObfuscate @Desc("Cell Fracture Coordinate Shuffling") private double cellFractureShuffle = 12D; - @DontObfuscate + @Desc("The height of fracture cells. Set to 0 to disable") private double cellFractureHeight = 0D; @MinNumber(0) @MaxNumber(1) - @DontObfuscate @Desc("How big are the cells (X,Z) relative to the veins that touch them. Between 0 and 1. 0.1 means thick veins, small cells.") private double cellPercentSize = 0.75D; - @DontObfuscate + @Desc("The offset to shift this noise x") private double offsetX = 0; - @DontObfuscate + @Desc("The offset to shift this noise z") private double offsetZ = 0; @Required - @DontObfuscate + @Desc("The seed for this generator") private long seed = 1; @Required - @DontObfuscate + @Desc("The interpolator to use when smoothing this generator into other regions & generators") private IrisInterpolator interpolator = new IrisInterpolator(); @MinNumber(0) @MaxNumber(8192) - @DontObfuscate @Desc("Cliff Height Max. Disable with 0 for min and max") private double cliffHeightMax = 0; @MinNumber(0) @MaxNumber(8192) - @DontObfuscate @Desc("Cliff Height Min. Disable with 0 for min and max") private double cliffHeightMin = 0; @ArrayType(min = 1, type = IrisNoiseGenerator.class) - @DontObfuscate @Desc("The list of noise gens this gen contains.") - private KList composite = new KList(); + private KList composite = new KList<>(); + - @DontObfuscate @Desc("The noise gen for cliff height.") private IrisNoiseGenerator cliffHeightGenerator = new IrisNoiseGenerator(); diff --git a/src/main/java/com/volmit/iris/object/IrisGeneratorStyle.java b/src/main/java/com/volmit/iris/object/IrisGeneratorStyle.java index b825a61c9..02c1dc9c4 100644 --- a/src/main/java/com/volmit/iris/object/IrisGeneratorStyle.java +++ b/src/main/java/com/volmit/iris/object/IrisGeneratorStyle.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.generator.noise.CNG; @@ -16,35 +34,35 @@ import lombok.experimental.Accessors; public class IrisGeneratorStyle { @Required - @DontObfuscate + @Desc("The chance is 1 in CHANCE per interval") private NoiseStyle style = NoiseStyle.IRIS; - @DontObfuscate + @MinNumber(0.00001) @Desc("The zoom of this style") private double zoom = 1; - @DontObfuscate + @MinNumber(0.00001) @Desc("The Output multiplier. Only used if parent is fracture.") private double multiplier = 1; - @DontObfuscate + @Desc("If set to true, each dimension will be fractured with a different order of input coordinates. This is usually 2 or 3 times slower than normal.") private boolean maxFractureAccuracy = false; - @DontObfuscate + @Desc("Apply a generator to the coordinate field fed into this parent generator. I.e. Distort your generator with another generator.") private IrisGeneratorStyle fracture = null; - @DontObfuscate + @MinNumber(0.01562) @MaxNumber(64) @Desc("The exponent") private double exponent = 1; - private final transient AtomicCache cng = new AtomicCache(); + private final transient AtomicCache cng = new AtomicCache<>(); public IrisGeneratorStyle(NoiseStyle s) { this.style = s; @@ -69,6 +87,7 @@ public class IrisGeneratorStyle { }); } + @SuppressWarnings("BooleanMethodIsAlwaysInverted") public boolean isFlat() { return style.equals(NoiseStyle.FLAT); } diff --git a/src/main/java/com/volmit/iris/object/IrisInterpolator.java b/src/main/java/com/volmit/iris/object/IrisInterpolator.java index d173129da..2d01f63b1 100644 --- a/src/main/java/com/volmit/iris/object/IrisInterpolator.java +++ b/src/main/java/com/volmit/iris/object/IrisInterpolator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.*; @@ -14,14 +32,13 @@ import lombok.experimental.Accessors; public class IrisInterpolator { @Required - @DontObfuscate + @Desc("The interpolation method when two biomes use different heights but this same generator") private InterpolationMethod function = InterpolationMethod.BICUBIC; @Required @MinNumber(1) @MaxNumber(8192) - @DontObfuscate @Desc("The range checked horizontally. Smaller ranges yeild more detail but are not as smooth.") private double horizontalScale = 3; diff --git a/src/main/java/com/volmit/iris/object/IrisJigsawPiece.java b/src/main/java/com/volmit/iris/object/IrisJigsawPiece.java index 375c09d93..7ebb4bd00 100644 --- a/src/main/java/com/volmit/iris/object/IrisJigsawPiece.java +++ b/src/main/java/com/volmit/iris/object/IrisJigsawPiece.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.scaffold.cache.AtomicCache; @@ -11,28 +29,29 @@ import org.bukkit.util.BlockVector; import java.io.IOException; +@SuppressWarnings("DefaultAnnotationParam") @Accessors(chain = true) @NoArgsConstructor @AllArgsConstructor -@DontObfuscate + @Desc("Represents a structure tile") @Data @EqualsAndHashCode(callSuper = false) public class IrisJigsawPiece extends IrisRegistrant { @RegistryListObject @Required - @DontObfuscate + @Desc("The object this piece represents") private String object = ""; @Required - @DontObfuscate + @ArrayType(type = IrisJigsawPieceConnector.class, min = 1) @Desc("The connectors this object contains") private KList connectors = new KList<>(); @Desc("Configure everything about the object placement. Please don't define this unless you actually need it as using this option will slow down the jigsaw deign stage. Use this where you need it, just avoid using it everywhere to keep things fast.") - @DontObfuscate + private IrisObjectPlacement placementOptions = new IrisObjectPlacement().setMode(ObjectPlaceMode.FAST_MAX_HEIGHT); private transient AtomicCache max2dDim = new AtomicCache<>(); diff --git a/src/main/java/com/volmit/iris/object/IrisJigsawPieceConnector.java b/src/main/java/com/volmit/iris/object/IrisJigsawPieceConnector.java index 2f7c846c9..a43348edd 100644 --- a/src/main/java/com/volmit/iris/object/IrisJigsawPieceConnector.java +++ b/src/main/java/com/volmit/iris/object/IrisJigsawPieceConnector.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.*; @@ -7,29 +25,30 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +@SuppressWarnings("DefaultAnnotationParam") @Accessors(chain = true) @NoArgsConstructor @AllArgsConstructor -@DontObfuscate + @Desc("Represents a structure tile") @Data @EqualsAndHashCode(callSuper = false) public class IrisJigsawPieceConnector { @Required - @DontObfuscate + @Desc("The name of this connector, such as entry, or table node. This is a name for organization. Other connectors can specifically use targetName to target a specific connector type. Multiple connectors can use the same name.") private String name = ""; @Required - @DontObfuscate + @Desc("Target a piece's connector with the specified name. For any piece's connector, define * or don't define it.") private String targetName = "*"; - @DontObfuscate + @Desc("Rotates the placed piece on this connector. If rotation is enabled, this connector will effectivley rotate, if this connector is facing the Z direction, then the connected piece would rotate in the X,Y direction in 90 degree segments.") private boolean rotateConnector = false; - @DontObfuscate + @Desc("If set to true, this connector is allowed to place pieces inside of it's own piece. For example if you are adding a light post, or house on top of a path piece, you would set this to true to allow the piece to collide with the path bounding box.") private boolean innerConnector = false; @@ -40,31 +59,31 @@ public class IrisJigsawPieceConnector { private KList pools = new KList<>(); @RegistryListEntity - @DontObfuscate + @Desc("Pick an entity to spawn on this connector") private String spawnEntity; - @DontObfuscate + @Desc("Stop the entity from despawning") private boolean keepEntity; - @DontObfuscate + @MaxNumber(50) @MinNumber(1) @Desc("The amount of entities to spawn (must be a whole number)") private int entityCount = 1; - @DontObfuscate + @Desc("The relative position this connector is located at for connecting to other pieces") @Required private IrisPosition position = new IrisPosition(0, 0, 0); - @DontObfuscate + @Desc("The relative position to this connector to place entities at") @DependsOn({"spawnEntity"}) private IrisPosition entityPosition = null; - @DontObfuscate + @Desc("The direction this connector is facing. If the direction is set to UP, then pieces will place ABOVE the connector.") @Required private IrisDirection direction = IrisDirection.UP_POSITIVE_Y; diff --git a/src/main/java/com/volmit/iris/object/IrisJigsawPlacement.java b/src/main/java/com/volmit/iris/object/IrisJigsawPlacement.java index dee3c4cb7..69de0c108 100644 --- a/src/main/java/com/volmit/iris/object/IrisJigsawPlacement.java +++ b/src/main/java/com/volmit/iris/object/IrisJigsawPlacement.java @@ -1,6 +1,27 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; -import com.volmit.iris.util.*; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.MinNumber; +import com.volmit.iris.util.RegistryListJigsaw; +import com.volmit.iris.util.Required; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -14,13 +35,12 @@ import lombok.experimental.Accessors; public class IrisJigsawPlacement { @RegistryListJigsaw @Required - @DontObfuscate + @Desc("The jigsaw structure to use") private String structure = ""; @Required @MinNumber(1) - @DontObfuscate @Desc("The rarity for this jigsaw structure to place on a per chunk basis") private int rarity = 29; } diff --git a/src/main/java/com/volmit/iris/object/IrisJigsawPool.java b/src/main/java/com/volmit/iris/object/IrisJigsawPool.java index 682d18359..39eee924b 100644 --- a/src/main/java/com/volmit/iris/object/IrisJigsawPool.java +++ b/src/main/java/com/volmit/iris/object/IrisJigsawPool.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.*; @@ -7,17 +25,18 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +@SuppressWarnings("DefaultAnnotationParam") @Accessors(chain = true) @NoArgsConstructor @AllArgsConstructor -@DontObfuscate + @Desc("Represents a structure piece pool") @Data @EqualsAndHashCode(callSuper = false) public class IrisJigsawPool extends IrisRegistrant { @RegistryListJigsawPiece @Required - @DontObfuscate + @ArrayType(min = 1, type = String.class) @Desc("A list of structure piece pools") private KList pieces = new KList<>(); diff --git a/src/main/java/com/volmit/iris/object/IrisJigsawStructure.java b/src/main/java/com/volmit/iris/object/IrisJigsawStructure.java index f99057e8f..4f70f3d20 100644 --- a/src/main/java/com/volmit/iris/object/IrisJigsawStructure.java +++ b/src/main/java/com/volmit/iris/object/IrisJigsawStructure.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.Iris; @@ -9,36 +27,36 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +@SuppressWarnings("DefaultAnnotationParam") @Accessors(chain = true) @NoArgsConstructor @AllArgsConstructor -@DontObfuscate + @Desc("Represents a jigsaw structure") @Data @EqualsAndHashCode(callSuper = false) public class IrisJigsawStructure extends IrisRegistrant { @RegistryListJigsawPiece @Required - @DontObfuscate + @ArrayType(min = 1, type = String.class) @Desc("The starting pieces. Randomly chooses a starting piece, then connects pieces using the pools define in the starting piece.") private KList pieces = new KList<>(); @MaxNumber(32) @MinNumber(1) - @DontObfuscate @Desc("The maximum pieces that can step out from the center piece") private int maxDepth = 9; - @DontObfuscate + @Desc("Jigsaw grows the parallax layer which slows iris down a bit. Since there are so many pieces, Iris takes the avg piece size and calculates the parallax radius from that. Unless your structures are using only the biggest pieces, your structure should fit in the chosen size fine. If you are seeing cut-off parts of your structures or broken terrain, turn this option on. This option will pick the biggest piece dimensions and multiply it by your (maxDepth+1) * 2 as the size to grow the parallax layer by. But typically keep this off.") private boolean useMaxPieceSizeForParallaxRadius = false; @Desc("Add a noise feature to this village") - @DontObfuscate + private IrisFeature feature = null; - @DontObfuscate + @Desc("If set to true, iris will look for any pieces with only one connector in valid pools for edge connectors and attach them to 'terminate' the paths/piece connectors. Essentially it caps off ends. For example in a village, Iris would add houses to the ends of roads where possible. For terminators to be selected, they can only have one connector or they wont be chosen.") private boolean terminate = true; diff --git a/src/main/java/com/volmit/iris/object/IrisJigsawStructurePlacement.java b/src/main/java/com/volmit/iris/object/IrisJigsawStructurePlacement.java index 99594b411..819457c95 100644 --- a/src/main/java/com/volmit/iris/object/IrisJigsawStructurePlacement.java +++ b/src/main/java/com/volmit/iris/object/IrisJigsawStructurePlacement.java @@ -1,7 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; import com.volmit.iris.util.RegistryListJigsaw; import com.volmit.iris.util.Required; import lombok.AllArgsConstructor; @@ -10,21 +27,22 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +@SuppressWarnings("DefaultAnnotationParam") @Accessors(chain = true) @NoArgsConstructor @AllArgsConstructor -@DontObfuscate + @Desc("Represents a jigsaw structure placer") @Data @EqualsAndHashCode(callSuper = false) public class IrisJigsawStructurePlacement extends IrisRegistrant { @RegistryListJigsaw @Required - @DontObfuscate + @Desc("The structure to place") private String structure; - @DontObfuscate + @Required @Desc("The 1 in X chance rarity") private int rarity = 100; diff --git a/src/main/java/com/volmit/iris/object/IrisLoot.java b/src/main/java/com/volmit/iris/object/IrisLoot.java index 600c31301..c91f547fb 100644 --- a/src/main/java/com/volmit/iris/object/IrisLoot.java +++ b/src/main/java/com/volmit/iris/object/IrisLoot.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.Iris; @@ -25,81 +43,73 @@ import java.awt.*; @Desc("Represents a loot entry") @Data public class IrisLoot { - @DontObfuscate + @Desc("The target inventory slot types to fill this loot with") private InventorySlotType slotTypes = InventorySlotType.STORAGE; @MinNumber(1) - @DontObfuscate @Desc("The sub rarity of this loot. Calculated after this loot table has been picked.") private int rarity = 1; @MinNumber(1) - @DontObfuscate @Desc("Minimum amount of this loot") private int minAmount = 1; @MinNumber(1) - @DontObfuscate @Desc("Maximum amount of this loot") private int maxAmount = 1; @MinNumber(1) - @DontObfuscate @Desc("The display name of this item") private String displayName = null; @MinNumber(0) @MaxNumber(1) - @DontObfuscate @Desc("Minimum durability percent") private double minDurability = 0; @MinNumber(0) @MaxNumber(1) - @DontObfuscate @Desc("Maximum durability percent") private double maxDurability = 1; - @DontObfuscate + @Desc("Define a custom model identifier 1.14+ only") private Integer customModel = null; - @DontObfuscate + @Desc("Set this to true to prevent it from being broken") private boolean unbreakable = false; @ArrayType(min = 1, type = ItemFlag.class) - @DontObfuscate @Desc("The item flags to add") private KList itemFlags = new KList<>(); - @DontObfuscate + @Desc("Apply enchantments to this item") @ArrayType(min = 1, type = IrisEnchantment.class) private KList enchantments = new KList<>(); - @DontObfuscate + @Desc("Apply attribute modifiers to this item") @ArrayType(min = 1, type = IrisAttributeModifier.class) private KList attributes = new KList<>(); @ArrayType(min = 1, type = String.class) - @DontObfuscate @Desc("Add lore to this item") private KList lore = new KList<>(); @RegistryListItemType @Required - @DontObfuscate + @Desc("This is the item or block type. Does not accept minecraft:*. Only materials such as DIAMOND_SWORD or DIRT.") private String type = ""; - @DontObfuscate + @Desc("The dye color") private DyeColor dyeColor = null; - @DontObfuscate + @Desc("The leather armor color") private String leatherColor = null; @@ -114,8 +124,7 @@ public class IrisLoot { ItemStack is = new ItemStack(getType(), Math.max(1, rng.i(getMinAmount(), getMaxAmount()))); ItemMeta m = is.getItemMeta(); - if (getType().getMaxDurability() > 0 && m instanceof Damageable) { - Damageable d = (Damageable) m; + if (getType().getMaxDurability() > 0 && m instanceof Damageable d) { int max = getType().getMaxDurability(); d.setDamage((int) Math.round(Math.max(0, Math.min(max, (1D - rng.d(getMinDurability(), getMaxDurability())) * max)))); } @@ -176,7 +185,7 @@ public class IrisLoot { is.setItemMeta(m); return is; - } catch (Throwable e) { + } catch (Throwable ignored) { } @@ -198,8 +207,7 @@ public class IrisLoot { ItemStack is = new ItemStack(getType(), Math.max(1, rng.i(getMinAmount(), getMaxAmount()))); ItemMeta m = is.getItemMeta(); - if (getType().getMaxDurability() > 0 && m instanceof Damageable) { - Damageable d = (Damageable) m; + if (getType().getMaxDurability() > 0 && m instanceof Damageable d) { int max = getType().getMaxDurability(); d.setDamage((int) Math.round(Math.max(0, Math.min(max, (1D - rng.d(getMinDurability(), getMaxDurability())) * max)))); } @@ -251,7 +259,7 @@ public class IrisLoot { m.setLore(lore); is.setItemMeta(m); return is; - } catch (Throwable e) { + } catch (Throwable ignored) { } } diff --git a/src/main/java/com/volmit/iris/object/IrisLootReference.java b/src/main/java/com/volmit/iris/object/IrisLootReference.java index e7489daca..cf5b156fc 100644 --- a/src/main/java/com/volmit/iris/object/IrisLootReference.java +++ b/src/main/java/com/volmit/iris/object/IrisLootReference.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.scaffold.cache.AtomicCache; @@ -15,18 +33,17 @@ import lombok.experimental.Accessors; @Data public class IrisLootReference { - @DontObfuscate + @Desc("Add = add on top of parent tables, Replace = clear first then add these. Clear = Remove all and dont add loot from this or parent.") private LootMode mode = LootMode.ADD; - @DontObfuscate + @RegistryListLoot @ArrayType(min = 1, type = String.class) @Desc("Add loot table registries here") private KList tables = new KList<>(); @MinNumber(0) - @DontObfuscate @Desc("Increase the chance of loot in this area") private double multiplier = 1D; diff --git a/src/main/java/com/volmit/iris/object/IrisLootTable.java b/src/main/java/com/volmit/iris/object/IrisLootTable.java index 7dcaa3c0b..ced2acb21 100644 --- a/src/main/java/com/volmit/iris/object/IrisLootTable.java +++ b/src/main/java/com/volmit/iris/object/IrisLootTable.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.*; @@ -9,6 +27,7 @@ import lombok.experimental.Accessors; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; +@SuppressWarnings("DefaultAnnotationParam") @Accessors(chain = true) @NoArgsConstructor @AllArgsConstructor @@ -19,26 +38,23 @@ public class IrisLootTable extends IrisRegistrant { @Required @Desc("The name of this loot table") - @DontObfuscate + @MinNumber(2) private String name = ""; @MinNumber(1) - @DontObfuscate @Desc("The rarity as in 1 in X chance") private int rarity = 1; @MinNumber(1) - @DontObfuscate @Desc("The maximum amount of loot that can be picked in this table at a time.") private int maxPicked = 5; @MinNumber(0) - @DontObfuscate @Desc("The minimum amount of loot that can be picked in this table at a time.") private int minPicked = 1; - @DontObfuscate + @Desc("The loot in this table") @ArrayType(min = 1, type = IrisLoot.class) private KList loot = new KList<>(); diff --git a/src/main/java/com/volmit/iris/object/IrisMaterialPalette.java b/src/main/java/com/volmit/iris/object/IrisMaterialPalette.java index 8905bae0c..e984a4e2a 100644 --- a/src/main/java/com/volmit/iris/object/IrisMaterialPalette.java +++ b/src/main/java/com/volmit/iris/object/IrisMaterialPalette.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.generator.noise.CNG; @@ -16,18 +34,16 @@ import org.bukkit.block.data.BlockData; @Desc("A palette of materials") @Data public class IrisMaterialPalette { - @DontObfuscate + @Desc("The style of noise") private IrisGeneratorStyle style = NoiseStyle.STATIC.style(); @MinNumber(0.0001) - @DontObfuscate @Desc("The terrain zoom mostly for zooming in on a wispy palette") private double zoom = 5; @Required @ArrayType(min = 1, type = IrisBlockData.class) - @DontObfuscate @Desc("The palette of blocks to be used in this layer") private KList palette = new KList().qadd(new IrisBlockData("STONE")); diff --git a/src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java b/src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java index 70a5b0b08..79a09c79b 100644 --- a/src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java +++ b/src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.generator.noise.CNG; @@ -16,68 +34,64 @@ import lombok.experimental.Accessors; public class IrisNoiseGenerator { @MinNumber(0.0001) - @DontObfuscate @Desc("The coordinate input zoom") private double zoom = 1; - @DontObfuscate + @Desc("Reverse the output. So that noise = -noise + opacity") private boolean negative = false; @MinNumber(0) - @DontObfuscate @Desc("The output multiplier") private double opacity = 1; - @DontObfuscate + @Desc("Coordinate offset x") private double offsetX = 0; - @DontObfuscate + @Desc("Height output offset y") private double offsetY = 0; - @DontObfuscate + @Desc("Coordinate offset z") private double offsetZ = 0; @Required - @DontObfuscate + @Desc("The seed") private long seed = 0; - @DontObfuscate + @Desc("Apply a parametric curve on the output") private boolean parametric = false; - @DontObfuscate + @Desc("Apply a bezier curve on the output") private boolean bezier = false; - @DontObfuscate + @Desc("Apply a sin-center curve on the output (0, and 1 = 0 and 0.5 = 1.0 using a sinoid shape.)") private boolean sinCentered = false; - @DontObfuscate + @Desc("The exponent noise^EXPONENT") private double exponent = 1; - @DontObfuscate + @Desc("Enable / disable. Outputs offsetY if disabled") private boolean enabled = true; @Required - @DontObfuscate + @Desc("The Noise Style") private IrisGeneratorStyle style = NoiseStyle.IRIS.style(); @MinNumber(1) - @DontObfuscate @Desc("Multiple octaves for multple generators of changing zooms added together") private int octaves = 1; @ArrayType(min = 1, type = IrisNoiseGenerator.class) - @DontObfuscate @Desc("Apply a child noise generator to fracture the input coordinates of this generator") private KList fracture = new KList<>(); @@ -124,7 +138,7 @@ public class IrisNoiseGenerator { } public KList getAllComposites() { - KList g = new KList(); + KList g = new KList<>(); g.add(this); diff --git a/src/main/java/com/volmit/iris/object/IrisObject.java b/src/main/java/com/volmit/iris/object/IrisObject.java index f996c80a2..86ddb26c1 100644 --- a/src/main/java/com/volmit/iris/object/IrisObject.java +++ b/src/main/java/com/volmit/iris/object/IrisObject.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.Iris; @@ -20,12 +38,10 @@ import org.bukkit.util.BlockVector; import org.bukkit.util.Vector; import java.io.*; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.function.Consumer; +@SuppressWarnings("DefaultAnnotationParam") @Accessors(chain = true) @Data @EqualsAndHashCode(callSuper = false) @@ -196,7 +212,7 @@ public class IrisObject extends IrisRegistrant { center = new BlockVector(w / 2, h / 2, d / 2); } - @SuppressWarnings("resource") + @SuppressWarnings({"resource", "RedundantSuppression"}) public static BlockVector sampleSize(File file) throws IOException { FileInputStream in = new FileInputStream(file); DataInputStream din = new DataInputStream(in); @@ -774,7 +790,7 @@ public class IrisObject extends IrisRegistrant { } } - public IrisObject scaled(double scale) { + public IrisObject scaled(double scale, IrisObjectPlacementScaleInterpolator interpolation) { Vector sm1 = new Vector(scale - 1, scale - 1, scale - 1); scale = Math.max(0.001, Math.min(50, scale)); if (scale < 1) { @@ -793,28 +809,33 @@ public class IrisObject extends IrisRegistrant { if (getD() == 2) { center = center.setZ(center.getBlockZ() + 0.5); } - HashMap placeBlock = new HashMap(); + @SuppressWarnings({"unchecked", "rawtypes"}) HashMap placeBlock = new HashMap(); IrisObject oo = new IrisObject((int) Math.ceil((w * scale) + (scale * 2)), (int) Math.ceil((h * scale) + (scale * 2)), (int) Math.ceil((d * scale) + (scale * 2))); - for (BlockVector i : blocks.keySet()) { - BlockData bd = blocks.get(i); - placeBlock.put(i.clone().add(HALF).subtract(center) + for (Map.Entry entry : blocks.entrySet()) { + BlockData bd = entry.getValue(); + placeBlock.put(entry.getKey().clone().add(HALF).subtract(center) .multiply(scale).toBlockVector(), bd); } - for (BlockVector v : placeBlock.keySet()) { + for (Map.Entry entry : placeBlock.entrySet()) { + BlockVector v = entry.getKey(); if (scale > 1) { for (BlockVector vec : blocksBetweenTwoPoints(v.clone().add(center), v.clone().add(center).add(sm1))) { - oo.getBlocks().put(vec, placeBlock.get(v)); + oo.getBlocks().put(vec, entry.getValue()); } } else { - oo.setUnsigned(v.getBlockX(), v.getBlockY(), v.getBlockZ(), placeBlock.get(v)); + oo.setUnsigned(v.getBlockX(), v.getBlockY(), v.getBlockZ(), entry.getValue()); } } if (scale > 1) { - // oo.trihermite((int) Math.round(scale)); + switch (interpolation) { + case TRILINEAR -> oo.trilinear((int) Math.round(scale)); + case TRICUBIC -> oo.tricubic((int) Math.round(scale)); + case TRIHERMITE -> oo.trihermite((int) Math.round(scale)); + } } return oo; @@ -921,14 +942,14 @@ public class IrisObject extends IrisRegistrant { double d = Double.MAX_VALUE; - for (BlockVector i : blocks.keySet()) { - BlockData dat = blocks.get(i); + for (Map.Entry entry : blocks.entrySet()) { + BlockData dat = entry.getValue(); if (dat.getMaterial().isAir()) { continue; } - double dx = i.distanceSquared(vv); + double dx = entry.getKey().distanceSquared(vv); if (dx < d) { d = dx; diff --git a/src/main/java/com/volmit/iris/object/IrisObjectLimit.java b/src/main/java/com/volmit/iris/object/IrisObjectLimit.java index e60d331b4..e32d59ee3 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectLimit.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectLimit.java @@ -1,7 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; import com.volmit.iris.util.MaxNumber; import com.volmit.iris.util.MinNumber; import lombok.AllArgsConstructor; @@ -18,13 +35,11 @@ public class IrisObjectLimit { @MinNumber(0) @MaxNumber(255) - @DontObfuscate @Desc("The minimum height for placement (bottom of object)") private int minimumHeight = 0; @MinNumber(0) @MaxNumber(255) - @DontObfuscate @Desc("The maximum height for placement (top of object)") private int maximumHeight = 255; diff --git a/src/main/java/com/volmit/iris/object/IrisObjectLoot.java b/src/main/java/com/volmit/iris/object/IrisObjectLoot.java index ec2d540b1..183d05c88 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectLoot.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectLoot.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.manager.IrisDataManager; @@ -16,22 +34,22 @@ import org.bukkit.block.data.BlockData; @Data public class IrisObjectLoot { - @DontObfuscate + @ArrayType(min = 1, type = IrisBlockData.class) @Desc("The list of blocks this loot table should apply to") private KList filter = new KList<>(); @Desc("Exactly match the block data or not") - @DontObfuscate + private boolean exact = false; - @DontObfuscate + @Desc("The loot table name") @Required @RegistryListLoot private String name; - @DontObfuscate + @Desc("The weight of this loot table being chosen") private int weight = 1; diff --git a/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java b/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java index 12cf41ae4..a379d541c 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.Iris; @@ -24,116 +42,107 @@ public class IrisObjectPlacement { @RegistryListObject @Required @ArrayType(min = 1, type = String.class) - @DontObfuscate @Desc("List of objects to place") private KList place = new KList<>(); @Desc("Rotate this objects placement") private IrisObjectRotation rotation = new IrisObjectRotation(); - @DontObfuscate + @Desc("Limit the max height or min height of placement.") private IrisObjectLimit clamp = new IrisObjectLimit(); @MinNumber(0) @MaxNumber(1) - @DontObfuscate @Desc("The maximum layer level of a snow filter overtop of this placement. Set to 0 to disable. Max of 1.") private double snow = 0; @Required @MinNumber(0) @MaxNumber(1) - @DontObfuscate @Desc("The chance for this to place in a chunk. If you need multiple per chunk, set this to 1 and use density.") private double chance = 1; @MinNumber(1) - @DontObfuscate @Desc("If the chance check passes, place this many in a single chunk") private int density = 1; @MaxNumber(64) @MinNumber(0) - @DontObfuscate @Desc("If the place mode is set to stilt, you can over-stilt it even further into the ground. Especially useful when using fast stilt due to inaccuracies.") private int overStilt = 0; @MaxNumber(64) @MinNumber(0) - @DontObfuscate @Desc("When bore is enabled, expand max-y of the cuboid it removes") private int boreExtendMaxY = 0; @MaxNumber(64) @MinNumber(-1) - @DontObfuscate @Desc("When bore is enabled, lower min-y of the cuboid it removes") private int boreExtendMinY = 0; - @DontObfuscate + @Desc("If set to true, objects will place on the terrain height, ignoring the water surface.") private boolean underwater = false; - @DontObfuscate + @Desc("If set to true, objects will place in carvings (such as underground) or under an overhang.") private CarvingMode carvingSupport = CarvingMode.SURFACE_ONLY; - @DontObfuscate + @Desc("If this is defined, this object wont place on the terrain heightmap, but instead on this virtual heightmap") private IrisNoiseGenerator heightmap; - @DontObfuscate + @Desc("If set to true, Iris will try to fill the insides of 'rooms' and 'pockets' where air should fit based off of raytrace checks. This prevents a village house placing in an area where a tree already exists, and instead replaces the parts of the tree where the interior of the structure is. \n\nThis operation does not affect warmed-up generation speed however it does slow down loading objects.") private boolean smartBore = false; - @DontObfuscate + @Desc("If set to true, Blocks placed underwater that could be waterlogged are waterlogged.") private boolean waterloggable = false; - @DontObfuscate + @Desc("If set to true, objects will place on the fluid height level Such as boats.") private boolean onwater = false; - @DontObfuscate + @Desc("If set to true, this object will only place parts of itself where blocks already exist. Warning: Melding is very performance intensive!") private boolean meld = false; - @DontObfuscate + @Desc("If set to true, this object will place from the ground up instead of height checks when not y locked to the surface. This is not compatable with X and Z axis rotations (it may look off)") private boolean bottom = false; - @DontObfuscate + @Desc("If set to true, air will be placed before the schematic places.") private boolean bore = false; - @DontObfuscate + @Desc("Use a generator to warp the field of coordinates. Using simplex for example would make a square placement warp like a flag") private IrisGeneratorStyle warp = new IrisGeneratorStyle(NoiseStyle.FLAT); - @DontObfuscate + @Desc("If the place mode is set to CENTER_HEIGHT_RIGID and you have an X/Z translation, Turning on translate center will also translate the center height check.") private boolean translateCenter = false; - @DontObfuscate + @Desc("The placement mode") private ObjectPlaceMode mode = ObjectPlaceMode.CENTER_HEIGHT; @ArrayType(min = 1, type = IrisObjectReplace.class) - @DontObfuscate @Desc("Find and replace blocks") private KList edit = new KList<>(); - @DontObfuscate + @Desc("Translate this object's placement") private IrisObjectTranslate translate = new IrisObjectTranslate(); - @DontObfuscate + @Desc("Scale Objects") private IrisObjectScale scale = new IrisObjectScale(); @ArrayType(min = 1, type = IrisObjectLoot.class) - @DontObfuscate @Desc("The loot tables to apply to these objects") private KList loot = new KList<>(); @@ -168,9 +177,7 @@ public class IrisObjectPlacement { public CNG getSurfaceWarp(RNG rng) { return surfaceWarp.aquire(() -> - { - return getWarp().create(rng); - }); + getWarp().create(rng)); } public double warp(RNG rng, double x, double y, double z) { @@ -203,10 +210,10 @@ public class IrisObjectPlacement { private transient AtomicCache cache = new AtomicCache<>(); - private class TableCache { - transient WeightedRandom global = new WeightedRandom<>(); - transient KMap> basic = new KMap<>(); - transient KMap>> exact = new KMap<>(); + private static class TableCache { + final transient WeightedRandom global = new WeightedRandom<>(); + final transient KMap> basic = new KMap<>(); + final transient KMap>> exact = new KMap<>(); } private TableCache getCache(IrisDataManager manager) { diff --git a/src/main/java/com/volmit/iris/object/IrisObjectPlacementScaleInterpolator.java b/src/main/java/com/volmit/iris/object/IrisObjectPlacementScaleInterpolator.java new file mode 100644 index 000000000..8c7f33547 --- /dev/null +++ b/src/main/java/com/volmit/iris/object/IrisObjectPlacementScaleInterpolator.java @@ -0,0 +1,40 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.volmit.iris.object; + +import com.volmit.iris.util.Desc; + +@Desc("Use 3D Interpolation on scaled objects if they are larger than the origin.") +public enum IrisObjectPlacementScaleInterpolator { + + @Desc("Don't interpolate, big cubes") + NONE, + + + @Desc("Uses linear interpolation in 3 dimensions, generally pretty good, but slow") + TRILINEAR, + + + @Desc("Uses cubic spline interpolation in 3 dimensions, even better, but extreme slowdowns") + TRICUBIC, + + + @Desc("Uses hermite spline interpolation in 3 dimensions, even better, but extreme slowdowns") + TRIHERMITE +} diff --git a/src/main/java/com/volmit/iris/object/IrisObjectReplace.java b/src/main/java/com/volmit/iris/object/IrisObjectReplace.java index 7450728d8..f718a2a3e 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectReplace.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectReplace.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.generator.noise.CNG; @@ -19,22 +37,22 @@ public class IrisObjectReplace { @ArrayType(min = 1, type = IrisBlockData.class) @Required @Desc("Find this block") - @DontObfuscate + private KList find = new KList<>(); @Required @Desc("Replace it with this block palette") - @DontObfuscate + private IrisMaterialPalette replace = new IrisMaterialPalette(); @Desc("Exactly match the block data or not") - @DontObfuscate + private boolean exact = false; @MinNumber(0) @MaxNumber(1) @Desc("Modifies the chance the block is replaced") - @DontObfuscate + private float chance = 1; private final transient AtomicCache replaceGen = new AtomicCache<>(); diff --git a/src/main/java/com/volmit/iris/object/IrisObjectRotation.java b/src/main/java/com/volmit/iris/object/IrisObjectRotation.java index 24c82cc8a..b38e602f5 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectRotation.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectRotation.java @@ -1,7 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; import com.volmit.iris.util.KList; import lombok.AllArgsConstructor; import lombok.Data; @@ -21,19 +38,19 @@ import java.util.List; @Desc("Configures rotation for iris") @Data public class IrisObjectRotation { - @DontObfuscate + @Desc("If this rotator is enabled or not") private boolean enabled = true; - @DontObfuscate + @Desc("The x axis rotation") private IrisAxisRotationClamp xAxis = new IrisAxisRotationClamp(); - @DontObfuscate + @Desc("The y axis rotation") private IrisAxisRotationClamp yAxis = new IrisAxisRotationClamp(true, false, 0, 0, 90); - @DontObfuscate + @Desc("The z axis rotation") private IrisAxisRotationClamp zAxis = new IrisAxisRotationClamp(); @@ -173,47 +190,29 @@ public class IrisObjectRotation { } public BlockFace faceForAxis(Axis axis) { - switch (axis) { - case X: - return BlockFace.EAST; - case Y: - return BlockFace.UP; - case Z: - return BlockFace.NORTH; - } + return switch (axis) { + case X -> BlockFace.EAST; + case Y -> BlockFace.UP; + case Z -> BlockFace.NORTH; + }; - return BlockFace.NORTH; } public Axis axisFor(BlockFace f) { - switch (f) { - case NORTH: - case SOUTH: - return Axis.Z; - case EAST: - case WEST: - return Axis.X; - case UP: - case DOWN: - return Axis.Y; - } + return switch (f) { + case NORTH, SOUTH -> Axis.Z; + case EAST, WEST -> Axis.X; + default -> Axis.Y; + }; - return Axis.Y; } public Axis axisFor2D(BlockFace f) { - switch (f) { - case NORTH: - case SOUTH: - return Axis.Z; - case EAST: - case WEST: - case UP: - case DOWN: - return Axis.X; - } + return switch (f) { + case EAST, WEST, UP, DOWN -> Axis.X; + default -> Axis.Z; + }; - return Axis.Z; } public BlockData rotate(BlockData dd, int spinxx, int spinyy, int spinzz) { @@ -227,8 +226,7 @@ public class IrisObjectRotation { return d; } - if (d instanceof Directional) { - Directional g = ((Directional) d); + if (d instanceof Directional g) { BlockFace f = g.getFacing(); BlockVector bv = new BlockVector(f.getModX(), f.getModY(), f.getModZ()); bv = rotate(bv.clone(), spinx, spiny, spinz); @@ -239,8 +237,7 @@ public class IrisObjectRotation { } else if (!g.getMaterial().isSolid()) { d = null; } - } else if (d instanceof Rotatable) { - Rotatable g = ((Rotatable) d); + } else if (d instanceof Rotatable g) { BlockFace f = g.getRotation(); BlockVector bv = new BlockVector(f.getModX(), 0, f.getModZ()); @@ -258,9 +255,8 @@ public class IrisObjectRotation { if (!a.equals(((Orientable) d).getAxis()) && ((Orientable) d).getAxes().contains(a)) { ((Orientable) d).setAxis(a); } - } else if (d instanceof MultipleFacing) { + } else if (d instanceof MultipleFacing g) { List faces = new KList<>(); - MultipleFacing g = (MultipleFacing) d; for (BlockFace i : g.getFaces()) { BlockVector bv = new BlockVector(i.getModX(), i.getModY(), i.getModZ()); @@ -279,9 +275,8 @@ public class IrisObjectRotation { for (BlockFace i : faces) { g.setFace(i, true); } - } else if (d.getMaterial().equals(Material.NETHER_PORTAL) && d instanceof Orientable) { + } else if (d.getMaterial().equals(Material.NETHER_PORTAL) && d instanceof Orientable g) { //TODO: Fucks up logs - Orientable g = ((Orientable) d); BlockFace f = faceForAxis(g.getAxis()); BlockVector bv = new BlockVector(f.getModX(), f.getModY(), f.getModZ()); bv = rotate(bv.clone(), spinx, spiny, spinz); @@ -289,7 +284,7 @@ public class IrisObjectRotation { Axis a = !g.getAxes().contains(Axis.Y) ? axisFor(t) : axisFor2D(t); ((Orientable) d).setAxis(a); } - } catch (Throwable throwable) { + } catch (Throwable ignored) { } @@ -414,6 +409,7 @@ public class IrisObjectRotation { return enabled && zAxis.isEnabled(); } + @SuppressWarnings("BooleanMethodIsAlwaysInverted") public boolean canRotate() { return canRotateX() || canRotateY() || canRotateZ(); } diff --git a/src/main/java/com/volmit/iris/object/IrisObjectScale.java b/src/main/java/com/volmit/iris/object/IrisObjectScale.java index a582b5e2c..a1fdff6e6 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectScale.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectScale.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; @@ -15,22 +33,23 @@ import lombok.experimental.Accessors; public class IrisObjectScale { @MinNumber(1) @MaxNumber(32) - @DontObfuscate @Desc("Iris Objects are scaled and cached to speed up placements. Because of this extra memory is used, so we evenly distribute variations across the defined scale range, then pick one randomly. If the differences is small, use a lower number. For more possibilities on the scale spectrum, increase this at the cost of memory.") private int variations = 7; @MinNumber(0.01) @MaxNumber(50) - @DontObfuscate @Desc("The minimum scale") private double minimumScale = 1; @MinNumber(0.01) @MaxNumber(50) - @DontObfuscate @Desc("The maximum height for placement (top of object)") private double maximumScale = 1; + + @Desc("If this object is scaled up beyond its origin size, specify a 3D interpolator") + private IrisObjectPlacementScaleInterpolator interpolation = IrisObjectPlacementScaleInterpolator.NONE; + private final transient ConcurrentLinkedHashMap> cache = new ConcurrentLinkedHashMap.Builder>() .initialCapacity(64) @@ -68,7 +87,7 @@ public class IrisObjectScale { KList c = new KList<>(); for (double i = minimumScale; i < maximumScale; i += (maximumScale - minimumScale) / (double) (Math.min(variations, 32))) { - c.add(origin.scaled(i)); + c.add(origin.scaled(i, getInterpolation())); } return c; diff --git a/src/main/java/com/volmit/iris/object/IrisObjectTranslate.java b/src/main/java/com/volmit/iris/object/IrisObjectTranslate.java index b076183bf..f4e2fff80 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectTranslate.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectTranslate.java @@ -1,6 +1,27 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; -import com.volmit.iris.util.*; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.MaxNumber; +import com.volmit.iris.util.MinNumber; +import com.volmit.iris.util.Required; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -16,26 +37,26 @@ public class IrisObjectTranslate { @MinNumber(-128) // TODO: WARNING HEIGHT @MaxNumber(128) // TODO: WARNING HEIGHT - @DontObfuscate + @Desc("The x shift in blocks") private int x = 0; @Required @MinNumber(-256) // TODO: WARNING HEIGHT @MaxNumber(256) // TODO: WARNING HEIGHT - @DontObfuscate + @Desc("The x shift in blocks") private int y = 0; @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) // 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/IrisPosition.java b/src/main/java/com/volmit/iris/object/IrisPosition.java index 3924e98d3..01f69a136 100644 --- a/src/main/java/com/volmit/iris/object/IrisPosition.java +++ b/src/main/java/com/volmit/iris/object/IrisPosition.java @@ -1,7 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,15 +34,15 @@ import org.bukkit.util.Vector; @Desc("Represents a position") @Data public class IrisPosition { - @DontObfuscate + @Desc("The x position") private int x = 0; - @DontObfuscate + @Desc("The y position") private int y = 0; - @DontObfuscate + @Desc("The z position") private int z = 0; diff --git a/src/main/java/com/volmit/iris/object/IrisPosition2D.java b/src/main/java/com/volmit/iris/object/IrisPosition2D.java index a4f918a7e..02fc05ef4 100644 --- a/src/main/java/com/volmit/iris/object/IrisPosition2D.java +++ b/src/main/java/com/volmit/iris/object/IrisPosition2D.java @@ -1,7 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -13,11 +30,11 @@ import lombok.experimental.Accessors; @Desc("Represents a position") @Data public class IrisPosition2D { - @DontObfuscate + @Desc("The x position") private int x = 0; - @DontObfuscate + @Desc("The z position") private int z = 0; } diff --git a/src/main/java/com/volmit/iris/object/IrisPotionEffect.java b/src/main/java/com/volmit/iris/object/IrisPotionEffect.java index ba978f87a..2500acaf4 100644 --- a/src/main/java/com/volmit/iris/object/IrisPotionEffect.java +++ b/src/main/java/com/volmit/iris/object/IrisPotionEffect.java @@ -1,8 +1,29 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.Iris; import com.volmit.iris.scaffold.cache.AtomicCache; -import com.volmit.iris.util.*; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.MaxNumber; +import com.volmit.iris.util.MinNumber; +import com.volmit.iris.util.Required; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -14,34 +35,32 @@ import org.bukkit.potion.PotionEffectType; @Accessors(chain = true) @NoArgsConstructor @AllArgsConstructor -@DontObfuscate + @Desc("An iris potion effect") @Data public class IrisPotionEffect { @Required - @DontObfuscate + @Desc("The potion effect to apply in this area") private String potionEffect = ""; @Required @MinNumber(-1) @MaxNumber(1024) - @DontObfuscate @Desc("The Potion Strength or -1 to disable") private int strength = -1; @Required @MinNumber(1) - @DontObfuscate @Desc("The time the potion will last for") private int ticks = 200; - @DontObfuscate + @Desc("Is the effect ambient") private boolean ambient = false; - @DontObfuscate + @Desc("Is the effect showing particles") private boolean particles = true; @@ -64,7 +83,7 @@ public class IrisPotionEffect { return t; } } - } catch (Throwable e) { + } catch (Throwable ignored) { } diff --git a/src/main/java/com/volmit/iris/object/IrisRange.java b/src/main/java/com/volmit/iris/object/IrisRange.java index 8b7f3623f..2deb107e8 100644 --- a/src/main/java/com/volmit/iris/object/IrisRange.java +++ b/src/main/java/com/volmit/iris/object/IrisRange.java @@ -1,7 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; import com.volmit.iris.util.RNG; import lombok.AllArgsConstructor; import lombok.Data; @@ -14,11 +31,11 @@ import lombok.experimental.Accessors; @Desc("Represents a range") @Data public class IrisRange { - @DontObfuscate + @Desc("The minimum value") private double min = 16; - @DontObfuscate + @Desc("The maximum value") private double max = 32; diff --git a/src/main/java/com/volmit/iris/object/IrisRareObject.java b/src/main/java/com/volmit/iris/object/IrisRareObject.java index d3d9a3ab2..27ad7dad5 100644 --- a/src/main/java/com/volmit/iris/object/IrisRareObject.java +++ b/src/main/java/com/volmit/iris/object/IrisRareObject.java @@ -1,16 +1,38 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; -import com.volmit.iris.util.*; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.MinNumber; +import com.volmit.iris.util.RegistryListObject; +import com.volmit.iris.util.Required; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +@SuppressWarnings("DefaultAnnotationParam") @Accessors(chain = true) @NoArgsConstructor @AllArgsConstructor -@DontObfuscate + @Desc("Represents a structure tile") @Data @EqualsAndHashCode(callSuper = false) @@ -19,12 +41,12 @@ public class IrisRareObject { @Required @MinNumber(1) @Desc("The rarity is 1 in X") - @DontObfuscate + private int rarity = 1; @RegistryListObject @Required @Desc("The object to place if rarity check passed") - @DontObfuscate + private String object = ""; } diff --git a/src/main/java/com/volmit/iris/object/IrisRegion.java b/src/main/java/com/volmit/iris/object/IrisRegion.java index 29e435176..fa50f6c6b 100644 --- a/src/main/java/com/volmit/iris/object/IrisRegion.java +++ b/src/main/java/com/volmit/iris/object/IrisRegion.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.Iris; @@ -11,10 +29,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; - import java.awt.Color; import java.util.Random; + +@SuppressWarnings("DefaultAnnotationParam") @Accessors(chain = true) @NoArgsConstructor @AllArgsConstructor @@ -24,158 +43,134 @@ import java.util.Random; public class IrisRegion extends IrisRegistrant implements IRare { @MinNumber(2) @Required - @DontObfuscate + @Desc("The name of the region") private String name = "A Region"; @ArrayType(min = 1, type = IrisJigsawStructurePlacement.class) - @DontObfuscate @Desc("Jigsaw structures") private KList jigsawStructures = new KList<>(); - @DontObfuscate + @Desc("Add random chances for terrain features") @ArrayType(min = 1, type = IrisFeaturePotential.class) private KList features = new KList<>(); @ArrayType(min = 1, type = IrisEffect.class) - @DontObfuscate @Desc("Effects are ambient effects such as potion effects, random sounds, or even particles around each player. All of these effects are played via packets so two players won't see/hear each others effects.\nDue to performance reasons, effects will play arround the player even if where the effect was played is no longer in the biome the player is in.") private KList effects = new KList<>(); - @DontObfuscate + @Desc("Entity spawns to override or add to this region") @ArrayType(min = 1, type = IrisEntitySpawnOverride.class) private KList entitySpawnOverrides = new KList<>(); - @DontObfuscate + @Desc("Entity spawns during generation") @ArrayType(min = 1, type = IrisEntityInitialSpawn.class) private KList entityInitialSpawns = new KList<>(); @MinNumber(1) @MaxNumber(128) - @DontObfuscate @Desc("The rarity of the region") private int rarity = 1; @ArrayType(min = 1, type = IrisBlockDrops.class) - @DontObfuscate @Desc("Define custom block drops for this region") private KList blockDrops = new KList<>(); @MinNumber(0.0001) @MaxNumber(1) - @DontObfuscate @Desc("The shore ration (How much percent of land should be a shore)") private double shoreRatio = 0.13; @ArrayType(min = 1, type = IrisObjectPlacement.class) - @DontObfuscate @Desc("Objects define what schematics (iob files) iris will place in this region") - private KList objects = new KList(); + private KList objects = new KList<>(); @MinNumber(0) - @DontObfuscate @Desc("The min shore height") private double shoreHeightMin = 1.2; - @DontObfuscate + @Desc("Reference loot tables in this area") private IrisLootReference loot = new IrisLootReference(); @MinNumber(0) - @DontObfuscate @Desc("The the max shore height") private double shoreHeightMax = 3.2; @MinNumber(0.0001) - @DontObfuscate @Desc("The varience of the shore height") private double shoreHeightZoom = 3.14; @MinNumber(0.0001) - @DontObfuscate @Desc("How large land biomes are in this region") private double landBiomeZoom = 1; @MinNumber(0.0001) - @DontObfuscate @Desc("How large shore biomes are in this region") private double shoreBiomeZoom = 1; @MinNumber(0.0001) - @DontObfuscate @Desc("How large lake biomes are in this region") private double lakeBiomeZoom = 1; @MinNumber(0.0001) - @DontObfuscate @Desc("How large river biomes are in this region") private double riverBiomeZoom = 1; @MinNumber(0.0001) - @DontObfuscate @Desc("How large sea biomes are in this region") private double seaBiomeZoom = 1; @MinNumber(0.0001) - @DontObfuscate @Desc("How large cave biomes are in this region") private double caveBiomeZoom = 1; @MinNumber(0.0001) @MaxNumber(1) - @DontObfuscate @Desc("The biome implosion ratio, how much to implode biomes into children (chance)") private double biomeImplosionRatio = 0.4; @RegistryListBiome @Required @ArrayType(min = 1, type = String.class) - @DontObfuscate @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.") private KList landBiomes = new KList<>(); @RegistryListBiome @Required @ArrayType(min = 1, type = String.class) - @DontObfuscate @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.") private KList seaBiomes = new KList<>(); @RegistryListBiome @Required @ArrayType(min = 1, type = String.class) - @DontObfuscate @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.") private KList shoreBiomes = new KList<>(); @RegistryListBiome @ArrayType(min = 1, type = String.class) - @DontObfuscate @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.") private KList riverBiomes = new KList<>(); @RegistryListBiome @ArrayType(min = 1, type = String.class) - @DontObfuscate @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.") private KList lakeBiomes = new KList<>(); @RegistryListBiome @ArrayType(min = 1, type = String.class) - @DontObfuscate @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.") private KList caveBiomes = new KList<>(); @ArrayType(min = 1, type = IrisRegionRidge.class) - @DontObfuscate @Desc("Ridge biomes create a vein-like network like rivers through this region") private KList ridgeBiomes = new KList<>(); @ArrayType(min = 1, type = IrisRegionSpot.class) - @DontObfuscate @Desc("Spot biomes splotch themselves across this region like lakes") private KList spotBiomes = new KList<>(); @@ -183,43 +178,40 @@ public class IrisRegion extends IrisRegistrant implements IRare { @Desc("Define regional deposit generators that add onto the global deposit generators") private KList deposits = new KList<>(); - @DontObfuscate + @Desc("The style of rivers") private IrisGeneratorStyle riverStyle = NoiseStyle.VASCULAR_THIN.style().zoomed(7.77); - @DontObfuscate + @Desc("The style of lakes") private IrisGeneratorStyle lakeStyle = NoiseStyle.CELLULAR_IRIS_THICK.style(); - @DontObfuscate + @Desc("The style of river chances") private IrisGeneratorStyle riverChanceStyle = NoiseStyle.SIMPLEX.style().zoomed(4); - @DontObfuscate + @Desc("Generate lakes in this region") private boolean lakes = true; - @DontObfuscate + @Desc("Generate rivers in this region") private boolean rivers = true; @MinNumber(1) - @DontObfuscate @Desc("Generate lakes in this region") private int lakeRarity = 22; @MinNumber(1) - @DontObfuscate @Desc("Generate rivers in this region") private int riverRarity = 3; @MinNumber(0) @MaxNumber(1) - @DontObfuscate @Desc("Generate rivers in this region") private double riverThickness = 0.1; - @DontObfuscate + @Desc("A color for visualizing this region with a color. I.e. #F13AF5. This will show up on the map.") private String color = null; @@ -325,7 +317,7 @@ public class IrisRegion extends IrisRegistrant implements IRare { public KList getRidgeBiomeKeys() { return cacheRidge.aquire(() -> { - KList cacheRidge = new KList(); + KList cacheRidge = new KList<>(); ridgeBiomes.forEach((i) -> cacheRidge.add(i.getBiome())); return cacheRidge; @@ -335,7 +327,7 @@ public class IrisRegion extends IrisRegistrant implements IRare { public KList getSpotBiomeKeys() { return cacheSpot.aquire(() -> { - KList cacheSpot = new KList(); + KList cacheSpot = new KList<>(); spotBiomes.forEach((i) -> cacheSpot.add(i.getBiome())); return cacheSpot; }); @@ -343,9 +335,7 @@ public class IrisRegion extends IrisRegistrant implements IRare { public CNG getShoreHeightGenerator() { return shoreHeightGenerator.aquire(() -> - { - return CNG.signature(new RNG((long) (getName().length() + getLandBiomeZoom() + getLandBiomes().size() + 3458612))); - }); + CNG.signature(new RNG((long) (getName().length() + getLandBiomeZoom() + getLandBiomes().size() + 3458612)))); } public double getShoreHeight(double x, double z) { diff --git a/src/main/java/com/volmit/iris/object/IrisRegionRidge.java b/src/main/java/com/volmit/iris/object/IrisRegionRidge.java index faf463dda..58791df44 100644 --- a/src/main/java/com/volmit/iris/object/IrisRegionRidge.java +++ b/src/main/java/com/volmit/iris/object/IrisRegionRidge.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.generator.noise.CellGenerator; @@ -17,23 +35,21 @@ public class IrisRegionRidge { @RegistryListBiome @Required - @DontObfuscate + @Desc("The biome name") private String biome = ""; @Required - @DontObfuscate + @Desc("The type this biome should override (land sea or shore)") private InferredType type = InferredType.LAND; - @DontObfuscate @Desc("What type this spot is (i.e. target SEA but as LAND) like an island. Default matches the target type") private InferredType as = InferredType.DEFER; - @DontObfuscate @Desc("Use the distance from cell value to add or remove noise value. (Forces depth or height)") private double noiseMultiplier = 0; @@ -41,41 +57,34 @@ public class IrisRegionRidge { @Required @MinNumber(0) @MaxNumber(1) - @DontObfuscate @Desc("The chance this biome will be placed in a given spot") private double chance = 0.75; @MinNumber(0) - @DontObfuscate @Desc("The scale of the biome ridge. Higher values = wider veins & bigger connected cells") private double scale = 5; - @DontObfuscate @Desc("The chance scale (cell chances)") private double chanceScale = 4; @MinNumber(0) - @DontObfuscate @Desc("The shuffle, how 'natural' this looks. Compared to pure polygons") private double shuffle = 16; @MinNumber(0) - @DontObfuscate @Desc("The chance shuffle (polygon cell chances)") private double chanceShuffle = 128; @MinNumber(0) - @DontObfuscate @Desc("The thickness of the vein") private double thickness = 0.125; - @DontObfuscate @Desc("If the noise multiplier is below zero, what should the air be filled with?") private IrisBiomePaletteLayer air = new IrisBiomePaletteLayer().zero(); diff --git a/src/main/java/com/volmit/iris/object/IrisRegionSpot.java b/src/main/java/com/volmit/iris/object/IrisRegionSpot.java index ee836bb6c..ceef60133 100644 --- a/src/main/java/com/volmit/iris/object/IrisRegionSpot.java +++ b/src/main/java/com/volmit/iris/object/IrisRegionSpot.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.generator.noise.CellGenerator; @@ -17,40 +35,37 @@ public class IrisRegionSpot { @RegistryListBiome @Required - @DontObfuscate + @Desc("The biome to be placed") private String biome = ""; @Required - @DontObfuscate + @Desc("Where this spot overrides. Land sea or shore") private InferredType type = InferredType.LAND; - @DontObfuscate + @Desc("What type this spot is (i.e. target SEA but as LAND) like an island. Default matches the target type") private InferredType as = InferredType.DEFER; - @DontObfuscate + @Desc("Use the distance from cell value to add or remove noise value. (Forces depth or height)") private double noiseMultiplier = 0; @MinNumber(0) - @DontObfuscate @Desc("The scale of splotches") private double scale = 1; @Required @MinNumber(1) - @DontObfuscate @Desc("Rarity is how often this splotch appears. higher = less often") private double rarity = 1; @MinNumber(0) - @DontObfuscate @Desc("The shuffle or how natural the splotch looks like (anti-polygon)") private double shuffle = 128; - @DontObfuscate + @Desc("If the noise multiplier is below zero, what should the air be filled with?") private IrisBiomePaletteLayer air = new IrisBiomePaletteLayer().zero(); diff --git a/src/main/java/com/volmit/iris/object/IrisRegistrant.java b/src/main/java/com/volmit/iris/object/IrisRegistrant.java index d59351cf0..26fceaa04 100644 --- a/src/main/java/com/volmit/iris/object/IrisRegistrant.java +++ b/src/main/java/com/volmit/iris/object/IrisRegistrant.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.manager.IrisDataManager; diff --git a/src/main/java/com/volmit/iris/object/IrisShapedGeneratorStyle.java b/src/main/java/com/volmit/iris/object/IrisShapedGeneratorStyle.java index 43f17b97b..fb6f4029a 100644 --- a/src/main/java/com/volmit/iris/object/IrisShapedGeneratorStyle.java +++ b/src/main/java/com/volmit/iris/object/IrisShapedGeneratorStyle.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.*; @@ -13,7 +31,7 @@ import lombok.experimental.Accessors; @Data public class IrisShapedGeneratorStyle { @Required - @DontObfuscate + @Desc("The generator id") private IrisGeneratorStyle generator = new IrisGeneratorStyle(NoiseStyle.IRIS); @@ -22,14 +40,14 @@ public class IrisShapedGeneratorStyle { @MinNumber(-256) // TODO: WARNING HEIGHT @MaxNumber(256) // TODO: WARNING HEIGHT - @DontObfuscate + @Desc("The min block value") private int min = 0; @Required @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/object/IrisSlopeClip.java b/src/main/java/com/volmit/iris/object/IrisSlopeClip.java index de974af4b..779b26737 100644 --- a/src/main/java/com/volmit/iris/object/IrisSlopeClip.java +++ b/src/main/java/com/volmit/iris/object/IrisSlopeClip.java @@ -1,7 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; import com.volmit.iris.util.MaxNumber; import com.volmit.iris.util.MinNumber; import lombok.AllArgsConstructor; @@ -17,13 +34,11 @@ import lombok.experimental.Accessors; public class IrisSlopeClip { @MinNumber(0) @MaxNumber(255) - @DontObfuscate @Desc("The minimum slope for placement") private double minimumSlope = 0; @MinNumber(0) @MaxNumber(255) - @DontObfuscate @Desc("The maximum slope for placement") private double maximumSlope = 10; @@ -31,6 +46,7 @@ public class IrisSlopeClip { return minimumSlope <= 0 && maximumSlope >= 10; } + @SuppressWarnings("BooleanMethodIsAlwaysInverted") public boolean isValid(double slope) { if (isDefault()) { return true; diff --git a/src/main/java/com/volmit/iris/object/LootMode.java b/src/main/java/com/volmit/iris/object/LootMode.java index 20b4a9bca..66fa156fc 100644 --- a/src/main/java/com/volmit/iris/object/LootMode.java +++ b/src/main/java/com/volmit/iris/object/LootMode.java @@ -1,19 +1,36 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; @Desc("A loot mode is used to descrive what to do with the existing loot layers before adding this loot. Using ADD will simply add this table to the building list of tables (i.e. add dimension tables, region tables then biome tables). By using clear or replace, you remove the parent tables before and add just your tables.") public enum LootMode { @Desc("Add to the existing parent loot tables") - @DontObfuscate + ADD, @Desc("Clear all loot tables then add this table") - @DontObfuscate + CLEAR, @Desc("Replace all loot tables with this table (same as clear)") - @DontObfuscate + REPLACE } diff --git a/src/main/java/com/volmit/iris/object/NoiseStyle.java b/src/main/java/com/volmit/iris/object/NoiseStyle.java index a9255d980..09aad03c1 100644 --- a/src/main/java/com/volmit/iris/object/NoiseStyle.java +++ b/src/main/java/com/volmit/iris/object/NoiseStyle.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.generator.noise.CNG; @@ -5,430 +23,429 @@ import com.volmit.iris.generator.noise.CNGFactory; import com.volmit.iris.generator.noise.NoiseType; import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; import com.volmit.iris.util.RNG; @Desc("Styles of noise") -@DontObfuscate + public enum NoiseStyle { @Desc("White Noise is like static. Useful for block scattering but not terrain.") - @DontObfuscate + STATIC(rng -> new CNG(rng, NoiseType.WHITE, 1D, 1)), @Desc("Wispy Perlin-looking simplex noise. The 'iris' style noise.") - @DontObfuscate + IRIS(rng -> CNG.signature(rng).scale(1)), @Desc("Classic German Engineering") - @DontObfuscate + NOWHERE(rng -> CNG.signaturePerlin(rng).scale(0.776).bake()), @Desc("Classic German Engineering") - @DontObfuscate + NOWHERE_CELLULAR(rng -> CNG.signaturePerlin(rng, NoiseType.CELLULAR).scale(1).bake()), @Desc("Classic German Engineering") - @DontObfuscate + NOWHERE_SIMPLEX(rng -> CNG.signaturePerlin(rng, NoiseType.SIMPLEX).scale(1).bake()), @Desc("Classic German Engineering") - @DontObfuscate + NOWHERE_GLOB(rng -> CNG.signaturePerlin(rng, NoiseType.GLOB).scale(1).bake()), @Desc("Classic German Engineering") - @DontObfuscate + NOWHERE_VASCULAR(rng -> CNG.signaturePerlin(rng, NoiseType.VASCULAR).scale(1).bake()), @Desc("Classic German Engineering") - @DontObfuscate + NOWHERE_CUBIC(rng -> CNG.signaturePerlin(rng, NoiseType.CUBIC).scale(1).bake()), @Desc("Classic German Engineering") - @DontObfuscate + NOWHERE_SUPERFRACTAL(rng -> CNG.signaturePerlin(rng, NoiseType.FRACTAL_RIGID_MULTI_SIMPLEX).scale(1).bake()), @Desc("Classic German Engineering") - @DontObfuscate + NOWHERE_FRACTAL(rng -> CNG.signaturePerlin(rng, NoiseType.FRACTAL_BILLOW_PERLIN).scale(1).bake()), @Desc("Wispy Perlin-looking simplex noise. The 'iris' style noise.") - @DontObfuscate + IRIS_DOUBLE(rng -> CNG.signatureDouble(rng).scale(1)), @Desc("Wispy Perlin-looking simplex noise. The 'iris' style noise.") - @DontObfuscate + IRIS_THICK(rng -> CNG.signatureThick(rng).scale(1)), @Desc("Wispy Perlin-looking simplex noise. The 'iris' style noise.") - @DontObfuscate + IRIS_HALF(rng -> CNG.signatureHalf(rng).scale(1)), @Desc("Basic, Smooth & Fast Simplex noise.") - @DontObfuscate + SIMPLEX(rng -> new CNG(rng, 1D, 1).scale(1)), @Desc("Very Detailed smoke using simplex fractured with fractal billow simplex at high octaves.") - @DontObfuscate + FRACTAL_SMOKE(rng -> new CNG(rng, 1D, 1).fractureWith(new CNG(rng.nextParallelRNG(1), NoiseType.FRACTAL_BILLOW_SIMPLEX, 1D, 8).scale(0.2), 1000).scale(0.34)), @Desc("Thinner Veins.") - @DontObfuscate + VASCULAR_THIN(rng -> new CNG(rng.nextParallelRNG(1), NoiseType.VASCULAR, 1D, 1).scale(1).pow(0.65)), @Desc("Cells of simplex noise") - @DontObfuscate + SIMPLEX_CELLS(rng -> new CNG(rng.nextParallelRNG(1), NoiseType.SIMPLEX, 1D, 1).scale(1).fractureWith(new CNG(rng.nextParallelRNG(8), NoiseType.CELLULAR, 1D, 1).scale(1), 200)), @Desc("Veins of simplex noise") - @DontObfuscate + SIMPLEX_VASCULAR(rng -> new CNG(rng.nextParallelRNG(1), NoiseType.SIMPLEX, 1D, 1).scale(1).fractureWith(new CNG(rng.nextParallelRNG(8), NoiseType.VASCULAR, 1D, 1).scale(1), 200)), @Desc("Very Detailed fluid using simplex fractured with fractal billow simplex at high octaves.") - @DontObfuscate + FRACTAL_WATER(rng -> new CNG(rng, 1D, 1).fractureWith(new CNG(rng.nextParallelRNG(1), NoiseType.FRACTAL_FBM_SIMPLEX, 1D, 9).scale(0.03), 9900).scale(1.14)), @Desc("Perlin. Like simplex but more natural") - @DontObfuscate + PERLIN(rng -> new CNG(rng, NoiseType.PERLIN, 1D, 1).scale(1.15)), @Desc("Perlin. Like simplex but more natural") - @DontObfuscate + PERLIN_IRIS(rng -> CNG.signature(rng, NoiseType.PERLIN).scale(1.47)), @Desc("Perlin. Like simplex but more natural") - @DontObfuscate + PERLIN_IRIS_HALF(rng -> CNG.signatureHalf(rng, NoiseType.PERLIN).scale(1.47)), @Desc("Perlin. Like simplex but more natural") - @DontObfuscate + PERLIN_IRIS_DOUBLE(rng -> CNG.signatureDouble(rng, NoiseType.PERLIN).scale(1.47)), @Desc("Perlin. Like simplex but more natural") - @DontObfuscate + PERLIN_IRIS_THICK(rng -> CNG.signatureThick(rng, NoiseType.PERLIN).scale(1.47)), @Desc("Billow Fractal Perlin Noise.") - @DontObfuscate + FRACTAL_BILLOW_PERLIN(rng -> new CNG(rng, NoiseType.FRACTAL_BILLOW_PERLIN, 1D, 1).scale(1.47)), @Desc("Billow Fractal Perlin Noise. 2 Octaves") - @DontObfuscate + BIOCTAVE_FRACTAL_BILLOW_PERLIN(rng -> new CNG(rng, NoiseType.FRACTAL_BILLOW_PERLIN, 1D, 2).scale(1.17)), @Desc("Billow Fractal Simplex Noise. Single octave.") - @DontObfuscate + FRACTAL_BILLOW_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_BILLOW_SIMPLEX, 1D, 1)), @Desc("FBM Fractal Simplex Noise. Single octave.") - @DontObfuscate + FRACTAL_FBM_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_FBM_SIMPLEX, 1D, 1)), @Desc("Billow Fractal Iris Noise. Single octave.") - @DontObfuscate + FRACTAL_BILLOW_IRIS(rng -> CNG.signature(rng, NoiseType.FRACTAL_BILLOW_SIMPLEX)), @Desc("FBM Fractal Iris Noise. Single octave.") - @DontObfuscate + FRACTAL_FBM_IRIS(rng -> CNG.signature(rng, NoiseType.FRACTAL_FBM_SIMPLEX)), @Desc("Billow Fractal Iris Noise. Single octave.") - @DontObfuscate + FRACTAL_BILLOW_IRIS_HALF(rng -> CNG.signatureHalf(rng, NoiseType.FRACTAL_BILLOW_SIMPLEX)), @Desc("FBM Fractal Iris Noise. Single octave.") - @DontObfuscate + FRACTAL_FBM_IRIS_HALF(rng -> CNG.signatureHalf(rng, NoiseType.FRACTAL_FBM_SIMPLEX)), @Desc("Billow Fractal Iris Noise. Single octave.") - @DontObfuscate + FRACTAL_BILLOW_IRIS_THICK(rng -> CNG.signatureThick(rng, NoiseType.FRACTAL_BILLOW_SIMPLEX)), @Desc("FBM Fractal Iris Noise. Single octave.") - @DontObfuscate + FRACTAL_FBM_IRIS_THICK(rng -> CNG.signatureThick(rng, NoiseType.FRACTAL_FBM_SIMPLEX)), @Desc("Rigid Multi Fractal Simplex Noise. Single octave.") - @DontObfuscate + FRACTAL_RM_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_RIGID_MULTI_SIMPLEX, 1D, 1)), @Desc("Billow Fractal Simplex Noise. 2 octaves.") - @DontObfuscate + BIOCTAVE_FRACTAL_BILLOW_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_BILLOW_SIMPLEX, 1D, 2)), @Desc("FBM Fractal Simplex Noise. 2 octaves.") - @DontObfuscate + BIOCTAVE_FRACTAL_FBM_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_FBM_SIMPLEX, 1D, 2)), @Desc("Rigid Multi Fractal Simplex Noise. 2 octaves.") - @DontObfuscate + BIOCTAVE_FRACTAL_RM_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_RIGID_MULTI_SIMPLEX, 1D, 2)), @Desc("Rigid Multi Fractal Simplex Noise. 3 octaves.") - @DontObfuscate + TRIOCTAVE_FRACTAL_RM_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_RIGID_MULTI_SIMPLEX, 1D, 3)), @Desc("Billow Fractal Simplex Noise. 3 octaves.") - @DontObfuscate + TRIOCTAVE_FRACTAL_BILLOW_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_BILLOW_SIMPLEX, 1D, 3)), @Desc("FBM Fractal Simplex Noise. 3 octaves.") - @DontObfuscate + TRIOCTAVE_FRACTAL_FBM_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_FBM_SIMPLEX, 1D, 3)), @Desc("Rigid Multi Fractal Simplex Noise. 4 octaves.") - @DontObfuscate + QUADOCTAVE_FRACTAL_RM_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_RIGID_MULTI_SIMPLEX, 1D, 4)), @Desc("Billow Fractal Simplex Noise. 4 octaves.") - @DontObfuscate + QUADOCTAVE_FRACTAL_BILLOW_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_BILLOW_SIMPLEX, 1D, 4)), @Desc("FBM Fractal Simplex Noise. 4 octaves.") - @DontObfuscate + QUADOCTAVE_FRACTAL_FBM_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_FBM_SIMPLEX, 1D, 4)), @Desc("Rigid Multi Fractal Simplex Noise. 5 octaves.") - @DontObfuscate + QUINTOCTAVE_FRACTAL_RM_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_RIGID_MULTI_SIMPLEX, 1D, 5)), @Desc("Billow Fractal Simplex Noise. 5 octaves.") - @DontObfuscate + QUINTOCTAVE_FRACTAL_BILLOW_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_BILLOW_SIMPLEX, 1D, 5)), @Desc("FBM Fractal Simplex Noise. 5 octaves.") - @DontObfuscate + QUINTOCTAVE_FRACTAL_FBM_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_FBM_SIMPLEX, 1D, 5)), @Desc("Rigid Multi Fractal Simplex Noise. 6 octaves.") - @DontObfuscate + SEXOCTAVE_FRACTAL_RM_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_RIGID_MULTI_SIMPLEX, 1D, 6)), @Desc("Billow Fractal Simplex Noise. 6 octaves.") - @DontObfuscate + SEXOCTAVE_FRACTAL_BILLOW_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_BILLOW_SIMPLEX, 1D, 6)), @Desc("FBM Fractal Simplex Noise. 6 octaves.") - @DontObfuscate + SEXOCTAVE_FRACTAL_FBM_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_FBM_SIMPLEX, 1D, 6)), @Desc("Rigid Multi Fractal Simplex Noise. 7 octaves.") - @DontObfuscate + SEPTOCTAVE_FRACTAL_RM_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_RIGID_MULTI_SIMPLEX, 1D, 7)), @Desc("Billow Fractal Simplex Noise. 7 octaves.") - @DontObfuscate + SEPTOCTAVE_FRACTAL_BILLOW_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_BILLOW_SIMPLEX, 1D, 7)), @Desc("FBM Fractal Simplex Noise. 7 octaves.") - @DontObfuscate + SEPTOCTAVE_FRACTAL_FBM_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_FBM_SIMPLEX, 1D, 7)), @Desc("Rigid Multi Fractal Simplex Noise. 8 octaves.") - @DontObfuscate + OCTOCTAVE_FRACTAL_RM_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_RIGID_MULTI_SIMPLEX, 1D, 8)), @Desc("Billow Fractal Simplex Noise. 8 octaves.") - @DontObfuscate + OCTOCTAVE_FRACTAL_BILLOW_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_BILLOW_SIMPLEX, 1D, 8)), @Desc("FBM Fractal Simplex Noise. 8 octaves.") - @DontObfuscate + OCTOCTAVE_FRACTAL_FBM_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_FBM_SIMPLEX, 1D, 8)), @Desc("Rigid Multi Fractal Simplex Noise. 9 octaves.") - @DontObfuscate + NONOCTAVE_FRACTAL_RM_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_RIGID_MULTI_SIMPLEX, 1D, 9)), @Desc("Billow Fractal Simplex Noise. 9 octaves.") - @DontObfuscate + NONOCTAVE_FRACTAL_BILLOW_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_BILLOW_SIMPLEX, 1D, 9)), @Desc("FBM Fractal Simplex Noise. 9 octaves.") - @DontObfuscate + NONOCTAVE_FRACTAL_FBM_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_FBM_SIMPLEX, 1D, 9)), @Desc("Rigid Multi Fractal Simplex Noise. 10 octaves.") - @DontObfuscate + VIGOCTAVE_FRACTAL_RM_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_RIGID_MULTI_SIMPLEX, 1D, 10)), @Desc("Billow Fractal Simplex Noise. 10 octaves.") - @DontObfuscate + VIGOCTAVE_FRACTAL_BILLOW_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_BILLOW_SIMPLEX, 1D, 10)), @Desc("FBM Fractal Simplex Noise. 10 octaves.") - @DontObfuscate + VIGOCTAVE_FRACTAL_FBM_SIMPLEX(rng -> new CNG(rng, NoiseType.FRACTAL_FBM_SIMPLEX, 1D, 10)), @Desc("Basic, Smooth & Fast Simplex noise. Uses 2 octaves") - @DontObfuscate + BIOCTAVE_SIMPLEX(rng -> new CNG(rng, 1D, 2).scale(1D / 2D)), @Desc("Basic, Smooth & Fast Simplex noise. Uses 3 octaves") - @DontObfuscate + TRIOCTAVE_SIMPLEX(rng -> new CNG(rng, 1D, 3).scale(1D / 3D)), @Desc("Basic, Smooth & Fast Simplex noise. Uses 4 octaves") - @DontObfuscate + QUADOCTAVE_SIMPLEX(rng -> new CNG(rng, 1D, 4).scale(1D / 4D)), @Desc("Basic, Smooth & Fast Simplex noise. Uses 5 octaves") - @DontObfuscate + QUINTOCTAVE_SIMPLEX(rng -> new CNG(rng, 1D, 5).scale(1D / 5D)), @Desc("Basic, Smooth & Fast Simplex noise. Uses 6 octaves") - @DontObfuscate + SEXOCTAVE_SIMPLEX(rng -> new CNG(rng, 1D, 6).scale(1D / 6D)), @Desc("Basic, Smooth & Fast Simplex noise. Uses 7 octaves") - @DontObfuscate + SEPTOCTAVE_SIMPLEX(rng -> new CNG(rng, 1D, 7).scale(1D / 12D)), @Desc("Basic, Smooth & Fast Simplex noise. Uses 8 octaves") - @DontObfuscate + OCTOCTAVE_SIMPLEX(rng -> new CNG(rng, 1D, 8).scale(1D / 25D)), @Desc("Basic, Smooth & Fast Simplex noise. Uses 9 octaves") - @DontObfuscate + NONOCTAVE_SIMPLEX(rng -> new CNG(rng, 1D, 9).scale(1D / 50D)), @Desc("Basic, Smooth & Fast Simplex noise. Uses 10 octaves") - @DontObfuscate + VIGOCTAVE_SIMPLEX(rng -> new CNG(rng, 1D, 10).scale(1D / 100D)), @Desc("Glob noise is like cellular, but with globs...") - @DontObfuscate + GLOB(rng -> new CNG(rng, NoiseType.GLOB, 1D, 1)), @Desc("Glob noise is like cellular, but with globs...") - @DontObfuscate + GLOB_IRIS(rng -> CNG.signature(rng, NoiseType.GLOB)), @Desc("Glob noise is like cellular, but with globs...") - @DontObfuscate + GLOB_IRIS_HALF(rng -> CNG.signatureHalf(rng, NoiseType.GLOB)), @Desc("Glob noise is like cellular, but with globs...") - @DontObfuscate + GLOB_IRIS_DOUBLE(rng -> CNG.signatureDouble(rng, NoiseType.GLOB)), @Desc("Glob noise is like cellular, but with globs...") - @DontObfuscate + GLOB_IRIS_THICK(rng -> CNG.signatureThick(rng, NoiseType.GLOB)), @Desc("Cubic Noise") - @DontObfuscate + CUBIC(rng -> new CNG(rng, NoiseType.CUBIC, 1D, 1).scale(256)), @Desc("Fractal Cubic Noise") - @DontObfuscate + FRACTAL_CUBIC(rng -> new CNG(rng, NoiseType.FRACTAL_CUBIC, 1D, 1).scale(2)), @Desc("Fractal Cubic Noise With Iris Swirls") - @DontObfuscate + FRACTAL_CUBIC_IRIS(rng -> CNG.signature(rng, NoiseType.FRACTAL_CUBIC).scale(2)), @Desc("Fractal Cubic Noise With Iris Swirls") - @DontObfuscate + FRACTAL_CUBIC_IRIS_THICK(rng -> CNG.signatureThick(rng, NoiseType.FRACTAL_CUBIC).scale(2)), @Desc("Fractal Cubic Noise With Iris Swirls") - @DontObfuscate + FRACTAL_CUBIC_IRIS_HALF(rng -> CNG.signatureHalf(rng, NoiseType.FRACTAL_CUBIC).scale(2)), @Desc("Fractal Cubic Noise With Iris Swirls") - @DontObfuscate + FRACTAL_CUBIC_IRIS_DOUBLE(rng -> CNG.signatureDouble(rng, NoiseType.FRACTAL_CUBIC).scale(2)), @Desc("Fractal Cubic Noise, 2 Octaves") - @DontObfuscate + BIOCTAVE_FRACTAL_CUBIC(rng -> new CNG(rng, NoiseType.FRACTAL_CUBIC, 1D, 2).scale(2)), @Desc("Fractal Cubic Noise, 3 Octaves") - @DontObfuscate + TRIOCTAVE_FRACTAL_CUBIC(rng -> new CNG(rng, NoiseType.FRACTAL_CUBIC, 1D, 3).scale(1.5)), @Desc("Fractal Cubic Noise, 4 Octaves") - @DontObfuscate + QUADOCTAVE_FRACTAL_CUBIC(rng -> new CNG(rng, NoiseType.FRACTAL_CUBIC, 1D, 4).scale(1)), @Desc("Cubic Noise") - @DontObfuscate + CUBIC_IRIS(rng -> CNG.signature(rng, NoiseType.CUBIC).scale(256)), @Desc("Cubic Noise") - @DontObfuscate + CUBIC_IRIS_HALF(rng -> CNG.signatureHalf(rng, NoiseType.CUBIC).scale(256)), @Desc("Cubic Noise") - @DontObfuscate + CUBIC_IRIS_DOUBLE(rng -> CNG.signatureDouble(rng, NoiseType.CUBIC).scale(256)), @Desc("Cubic Noise") - @DontObfuscate + CUBIC_IRIS_THICK(rng -> CNG.signatureThick(rng, NoiseType.CUBIC).scale(256)), @Desc("Cellular noise creates the same noise level for cells, changes noise level on cell borders.") - @DontObfuscate + CELLULAR(rng -> new CNG(rng, NoiseType.CELLULAR, 1D, 1)), @Desc("Cellular noise creates the same noise level for cells, changes noise level on cell borders. Cells are distorted using Iris styled wispy noise.") - @DontObfuscate + CELLULAR_IRIS(rng -> CNG.signature(rng, NoiseType.CELLULAR)), @Desc("Cellular noise creates the same noise level for cells, changes noise level on cell borders. Cells are distorted using Iris styled wispy noise.") - @DontObfuscate + CELLULAR_IRIS_THICK(rng -> CNG.signatureThick(rng, NoiseType.CELLULAR)), @Desc("Cellular noise creates the same noise level for cells, changes noise level on cell borders. Cells are distorted using Iris styled wispy noise.") - @DontObfuscate + CELLULAR_IRIS_DOUBLE(rng -> CNG.signatureDouble(rng, NoiseType.CELLULAR)), @Desc("Cellular noise creates the same noise level for cells, changes noise level on cell borders. Cells are distorted using Iris styled wispy noise.") - @DontObfuscate + CELLULAR_IRIS_HALF(rng -> CNG.signatureHalf(rng, NoiseType.CELLULAR)), @Desc("Inverse of vascular, height gets to 1.0 as it approaches the center of a cell") - @DontObfuscate + CELLULAR_HEIGHT(rng -> new CNG(rng, NoiseType.CELLULAR_HEIGHT, 1D, 1)), @Desc("Inverse of vascular, height gets to 1.0 as it approaches the center of a cell, using the iris style.") - @DontObfuscate + CELLULAR_HEIGHT_IRIS(rng -> CNG.signature(rng, NoiseType.CELLULAR_HEIGHT)), @Desc("Inverse of vascular, height gets to 1.0 as it approaches the center of a cell, using the iris style.") - @DontObfuscate + CELLULAR_HEIGHT_IRIS_DOUBLE(rng -> CNG.signatureDouble(rng, NoiseType.CELLULAR_HEIGHT)), @Desc("Inverse of vascular, height gets to 1.0 as it approaches the center of a cell, using the iris style.") - @DontObfuscate + CELLULAR_HEIGHT_IRIS_THICK(rng -> CNG.signatureThick(rng, NoiseType.CELLULAR_HEIGHT)), @Desc("Inverse of vascular, height gets to 1.0 as it approaches the center of a cell, using the iris style.") - @DontObfuscate + CELLULAR_HEIGHT_IRIS_HALF(rng -> CNG.signatureHalf(rng, NoiseType.CELLULAR_HEIGHT)), @Desc("Vascular noise gets higher as the position nears a cell border.") - @DontObfuscate + VASCULAR(rng -> new CNG(rng, NoiseType.VASCULAR, 1D, 1)), @Desc("It always returns 0.5") - @DontObfuscate + FLAT(rng -> new CNG(rng, NoiseType.FLAT, 1D, 1)), @Desc("Vascular noise gets higher as the position nears a cell border. Cells are distorted using Iris styled wispy noise.") - @DontObfuscate + VASCULAR_IRIS(rng -> CNG.signature(rng, NoiseType.VASCULAR)), @Desc("Vascular noise gets higher as the position nears a cell border. Cells are distorted using Iris styled wispy noise.") - @DontObfuscate + VASCULAR_IRIS_DOUBLE(rng -> CNG.signatureDouble(rng, NoiseType.VASCULAR)), @Desc("Vascular noise gets higher as the position nears a cell border. Cells are distorted using Iris styled wispy noise.") - @DontObfuscate + VASCULAR_IRIS_THICK(rng -> CNG.signatureThick(rng, NoiseType.VASCULAR)), @Desc("Vascular noise gets higher as the position nears a cell border. Cells are distorted using Iris styled wispy noise.") - @DontObfuscate + VASCULAR_IRIS_HALF(rng -> CNG.signatureHalf(rng, NoiseType.VASCULAR)), ; diff --git a/src/main/java/com/volmit/iris/object/ObjectPlaceMode.java b/src/main/java/com/volmit/iris/object/ObjectPlaceMode.java index fa5d513b8..a58579035 100644 --- a/src/main/java/com/volmit/iris/object/ObjectPlaceMode.java +++ b/src/main/java/com/volmit/iris/object/ObjectPlaceMode.java @@ -1,43 +1,60 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object; import com.volmit.iris.util.Desc; -import com.volmit.iris.util.DontObfuscate; @Desc("Object Place modes are useful for positioning objects just right. The default value is CENTER_HEIGHT.") public enum ObjectPlaceMode { @Desc("The default place mode. This mode picks a center point (where the center of the object will be) and takes the height. That height is used for the whole object.") - @DontObfuscate + CENTER_HEIGHT, @Desc("Samples a lot of points where the object will cover (horizontally) and picks the highest height, that height is then used to place the object. This mode is useful for preventing any part of your object from being buried though it will float off of cliffs.") - @DontObfuscate + MAX_HEIGHT, @Desc("Samples only 4 points where the object will cover (horizontally) and picks the highest height, that height is then used to place the object. This mode is useful for preventing any part of your object from being buried though it will float off of cliffs.\"") - @DontObfuscate + FAST_MAX_HEIGHT, @Desc("Samples a lot of points where the object will cover (horizontally) and picks the lowest height, that height is then used to place the object. This mode is useful for preventing any part of your object from overhanging a cliff though it gets buried a lot") - @DontObfuscate + MIN_HEIGHT, @Desc("Samples only 4 points where the object will cover (horizontally) and picks the lowest height, that height is then used to place the object. This mode is useful for preventing any part of your object from overhanging a cliff though it gets buried a lot") - @DontObfuscate + FAST_MIN_HEIGHT, @Desc("Stilting is MAX_HEIGHT but it repeats the bottom most block of your object until it hits the surface. This is expensive because it has to first sample every height value for each x,z position of your object. Avoid using this unless its structures for performance reasons.") - @DontObfuscate + STILT, @Desc("Just like stilting but very inaccurate. Useful for stilting a lot of objects without too much care on accuracy (you can use the over-stilt value to force stilts under ground further)") - @DontObfuscate + FAST_STILT, @Desc("Samples the height of the terrain at every x,z position of your object and pushes it down to the surface. It's pretty much like a melt function over the terrain.") - @DontObfuscate + PAINT, @Desc("Applies multiple terrain features into the parallax layer before this object places to distort the height, essentially vacuuming the terrain's heightmap closer to the bottom of this object. Uses MAX_HEIGHT to place") - @DontObfuscate + VACUUM } diff --git a/src/main/java/com/volmit/iris/object/tile/TileBanner.java b/src/main/java/com/volmit/iris/object/tile/TileBanner.java index 206b126cf..1893d16e6 100644 --- a/src/main/java/com/volmit/iris/object/tile/TileBanner.java +++ b/src/main/java/com/volmit/iris/object/tile/TileBanner.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object.tile; import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; @@ -20,7 +38,7 @@ import java.util.List; public class TileBanner implements TileData { public static final int id = 2; - private List patterns = new ArrayList(); + private List patterns = new ArrayList<>(); private DyeColor baseColor; @Override @@ -45,6 +63,7 @@ public class TileBanner implements TileData { this.baseColor = banner.getBaseColor(); } + @SuppressWarnings("MethodDoesntCallSuperMethod") @Override public TileBanner clone() { TileBanner ts = new TileBanner(); @@ -77,9 +96,10 @@ public class TileBanner implements TileData { } } + @SuppressWarnings("deprecation") @Override public void toNBT(CompoundTag tag) { - ListTag listTag = (ListTag) ListTag.createUnchecked(CompoundTag.class); + @SuppressWarnings("unchecked") ListTag listTag = (ListTag) ListTag.createUnchecked(CompoundTag.class); for (Pattern p : patterns) { CompoundTag pattern = new CompoundTag(); pattern.putString("Pattern", p.getPattern().getIdentifier()); @@ -90,43 +110,9 @@ public class TileBanner implements TileData { } public boolean isBanner(Material material) { - switch (material) { - - case RED_BANNER: - case RED_WALL_BANNER: - case ORANGE_BANNER: - case ORANGE_WALL_BANNER: - case YELLOW_BANNER: - case YELLOW_WALL_BANNER: - case LIME_BANNER: - case LIME_WALL_BANNER: - case GREEN_BANNER: - case GREEN_WALL_BANNER: - case CYAN_BANNER: - case CYAN_WALL_BANNER: - case LIGHT_BLUE_BANNER: - case LIGHT_BLUE_WALL_BANNER: - case BLUE_BANNER: - case BLUE_WALL_BANNER: - case PURPLE_BANNER: - case PURPLE_WALL_BANNER: - case MAGENTA_BANNER: - case MAGENTA_WALL_BANNER: - case PINK_BANNER: - case PINK_WALL_BANNER: - case WHITE_BANNER: - case WHITE_WALL_BANNER: - case LIGHT_GRAY_BANNER: - case LIGHT_GRAY_WALL_BANNER: - case GRAY_BANNER: - case GRAY_WALL_BANNER: - case BLACK_BANNER: - case BLACK_WALL_BANNER: - case BROWN_BANNER: - case BROWN_WALL_BANNER: - return true; - default: - return false; - } + return switch (material) { + case RED_BANNER, RED_WALL_BANNER, ORANGE_BANNER, ORANGE_WALL_BANNER, YELLOW_BANNER, YELLOW_WALL_BANNER, LIME_BANNER, LIME_WALL_BANNER, GREEN_BANNER, GREEN_WALL_BANNER, CYAN_BANNER, CYAN_WALL_BANNER, LIGHT_BLUE_BANNER, LIGHT_BLUE_WALL_BANNER, BLUE_BANNER, BLUE_WALL_BANNER, PURPLE_BANNER, PURPLE_WALL_BANNER, MAGENTA_BANNER, MAGENTA_WALL_BANNER, PINK_BANNER, PINK_WALL_BANNER, WHITE_BANNER, WHITE_WALL_BANNER, LIGHT_GRAY_BANNER, LIGHT_GRAY_WALL_BANNER, GRAY_BANNER, GRAY_WALL_BANNER, BLACK_BANNER, BLACK_WALL_BANNER, BROWN_BANNER, BROWN_WALL_BANNER -> true; + default -> false; + }; } } diff --git a/src/main/java/com/volmit/iris/object/tile/TileData.java b/src/main/java/com/volmit/iris/object/tile/TileData.java index 8b73aac3f..e14dc3bff 100644 --- a/src/main/java/com/volmit/iris/object/tile/TileData.java +++ b/src/main/java/com/volmit/iris/object/tile/TileData.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object.tile; import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; @@ -11,6 +29,7 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +@SuppressWarnings("ALL") public interface TileData extends Cloneable { KList> registry = setup(); @@ -27,7 +46,7 @@ public interface TileData extends Cloneable { static TileData read(DataInputStream s) throws Throwable { int id = s.readShort(); - TileData d = registry.get(id).getClass().getConstructor().newInstance(); + @SuppressWarnings("unchecked") TileData d = registry.get(id).getClass().getConstructor().newInstance(); d.fromBinary(s); return d; } @@ -44,7 +63,7 @@ public interface TileData extends Cloneable { if (i.isApplicable(data)) { try { - TileData s = i.getClass().getConstructor().newInstance(); + @SuppressWarnings("unchecked") TileData s = i.getClass().getConstructor().newInstance(); s.fromBukkitTry(block.getState()); return s; } catch (Throwable e) { @@ -66,6 +85,7 @@ public interface TileData extends Cloneable { default boolean toBukkitTry(BlockState t) { try { + //noinspection unchecked toBukkit((T) t); return true; } catch (Throwable e) { @@ -77,6 +97,7 @@ public interface TileData extends Cloneable { default boolean fromBukkitTry(BlockState t) { try { + //noinspection unchecked fromBukkit((T) t); return true; } catch (Throwable e) { diff --git a/src/main/java/com/volmit/iris/object/tile/TileSign.java b/src/main/java/com/volmit/iris/object/tile/TileSign.java index 52b19cc2b..8d94dcd95 100644 --- a/src/main/java/com/volmit/iris/object/tile/TileSign.java +++ b/src/main/java/com/volmit/iris/object/tile/TileSign.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object.tile; import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; @@ -48,6 +66,7 @@ public class TileSign implements TileData { dyeColor = sign.getColor(); } + @SuppressWarnings("MethodDoesntCallSuperMethod") @Override public TileSign clone() { TileSign ts = new TileSign(); diff --git a/src/main/java/com/volmit/iris/object/tile/TileSpawner.java b/src/main/java/com/volmit/iris/object/tile/TileSpawner.java index 0849b18d2..d64dd5e8d 100644 --- a/src/main/java/com/volmit/iris/object/tile/TileSpawner.java +++ b/src/main/java/com/volmit/iris/object/tile/TileSpawner.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.object.tile; import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; @@ -37,6 +55,7 @@ public class TileSpawner implements TileData { entityType = sign.getSpawnedType(); } + @SuppressWarnings("MethodDoesntCallSuperMethod") @Override public TileSpawner clone() { TileSpawner ts = new TileSpawner(); @@ -57,7 +76,7 @@ public class TileSpawner implements TileData { @Override public void toNBT(CompoundTag tag) { - ListTag potentials = (ListTag) ListTag.createUnchecked(CompoundTag.class); + @SuppressWarnings("unchecked") ListTag potentials = (ListTag) ListTag.createUnchecked(CompoundTag.class); CompoundTag t = new CompoundTag(); CompoundTag ent = new CompoundTag(); ent.putString("id", entityType.getKey().toString()); diff --git a/src/main/java/com/volmit/iris/pregen/DirectWorldWriter.java b/src/main/java/com/volmit/iris/pregen/DirectWorldWriter.java index 42e08f839..8d04b205a 100644 --- a/src/main/java/com/volmit/iris/pregen/DirectWorldWriter.java +++ b/src/main/java/com/volmit/iris/pregen/DirectWorldWriter.java @@ -1,5 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.pregen; +import com.volmit.iris.Iris; import com.volmit.iris.nms.INMS; import com.volmit.iris.scaffold.cache.Cache; import com.volmit.iris.scaffold.data.mca.Chunk; @@ -21,6 +40,7 @@ import java.io.File; import java.io.IOException; import java.util.Map; +@SuppressWarnings("EmptyMethod") public class DirectWorldWriter { private final File worldFolder; private final Map writeBuffer; @@ -72,21 +92,20 @@ public class DirectWorldWriter { return B.getAir(); } - String p = tag.getString("Name"); + StringBuilder p = new StringBuilder(tag.getString("Name")); if (tag.containsKey("Properties")) { CompoundTag props = tag.getCompoundTag("Properties"); - p += "["; - KList m = new KList<>(); + p.append('['); for (String i : props.keySet()) { - m.add(i + "=" + props.getString(i)); + p.append(i).append('=').append(props.getString(i)).append(','); } - p += m.toString(",") + "]"; + p.deleteCharAt(p.length() - 1).append(']'); } - BlockData b = B.getOrNull(p); + BlockData b = B.getOrNull(p.toString()); if (b == null) { return B.getAir(); @@ -139,7 +158,7 @@ public class DirectWorldWriter { } return getBlockData(tag); - } catch (Throwable e) { + } catch (Throwable ignored) { } return B.get("AIR"); @@ -216,4 +235,21 @@ public class DirectWorldWriter { return biomeIds; } + + public void verify(int mcaox, int mcaoz) { + MCAFile file = getMCA(mcaox, mcaoz); + + for(int i = 0; i < 32; i++) + { + for(int j = 0; j < 32; j++) + { + Chunk c = file.getChunk(i, j); + + if(c == null) + { + Iris.warn("Chunk " + ((mcaox << 5) + i) + ", " + ((mcaoz << 5) + j) + " is null in MCA File " + mcaox + ", " + mcaoz); + } + } + } + } } diff --git a/src/main/java/com/volmit/iris/pregen/Pregenerator.java b/src/main/java/com/volmit/iris/pregen/Pregenerator.java index 00fb9c1c6..b6459b277 100644 --- a/src/main/java/com/volmit/iris/pregen/Pregenerator.java +++ b/src/main/java/com/volmit/iris/pregen/Pregenerator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.pregen; import com.volmit.iris.Iris; @@ -21,7 +39,6 @@ import java.awt.*; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.image.BufferedImage; -import java.awt.image.ImageObserver; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -29,6 +46,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Comparator; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; @@ -74,6 +92,7 @@ public class Pregenerator implements Listener { private final ChronoLatch latch; private IrisAccess access; private final KList regionReload; + private KList wait = new KList<>(); public Pregenerator(World world, int blockSize, Runnable onComplete) { this(world, blockSize); @@ -137,8 +156,6 @@ public class Pregenerator implements Listener { drawMCA(xx, zz, COLOR_MCA_PREPARE); if (access != null && generateMCARegion(xx, zz, burst, access, mcaIteration)) { flushWorld(); - } else { - drawMCA(xx, zz, COLOR_MCA_DEFERRED); } }); @@ -165,6 +182,11 @@ public class Pregenerator implements Listener { flushWorld(); } + while(wait.isNotEmpty()) + { + J.sleep(50); + } + burst.shutdownNow(); directWriter.flush(); flushWorld(); @@ -205,6 +227,7 @@ public class Pregenerator implements Listener { private boolean generateMCARegion(int x, int z, MultiBurst burst, IrisAccess access, Consumer3> mcaIteration) { if (!Iris.instance.isMCA()) { + generateDeferedMCARegion(x, z, burst, mcaIteration); return false; } @@ -227,13 +250,10 @@ public class Pregenerator implements Listener { })); e.complete(); directWriter.flush(); - if (!install(mcg, mca)) { - drawMCA(x, z, COLOR_MCA_DEFERRED); - generated.set(generated.get() - 1024); - } totalChunks.getAndAdd(1024); mcaDefer.add(new ChunkPosition(x, z)); - } else { + install(mcg, mca); + } else { totalChunks.getAndAdd(1024); mcaDefer.add(new ChunkPosition(x, z)); e.complete(); @@ -272,49 +292,47 @@ public class Pregenerator implements Listener { } private void generateDeferedMCARegion(int x, int z, MultiBurst burst, Consumer3> mcaIteration) { - BurstExecutor e = burst.burst(1024); int mcaox = x << 5; int mcaoz = z << 5; if (PaperLib.isPaper()) { method.set("PaperAsync (Slow)"); + + while(wait.size() > 8192) + { + J.sleep(25); + } + mcaIteration.accept(mcaox, mcaoz, (ii, jj) -> { - e.queue(() -> { - try { - CompletableFuture cc = PaperLib.getChunkAtAsync(world, ii, jj); - draw(ii, jj, COLOR_MCA_GENERATE_SLOW_ASYNC); - cc.join(); - draw(ii, jj, COLOR_MCA_GENERATED); - generated.getAndIncrement(); - vcax.set(ii); - vcaz.set(jj); - } catch (Throwable ex) { - draw(ii, jj, COLOR_ERROR); - ChunkPosition pos = new ChunkPosition(ii, jj); - errors.add(pos); - totalChunks.addAndGet(1024); - mcaDefer.add(new ChunkPosition(pos.getX() >> 5, pos.getZ() >> 5)); - Iris.warn("Hole Detected in Chunk: " + pos.getX() + ", " + pos.getZ() + " (at block " + (pos.getX() << 4) + ", " + lowestBedrock + ", " + (pos.getZ() << 4) + ")"); + ChunkPosition cx = new ChunkPosition(ii,jj); + PaperLib.getChunkAtAsync(world, ii, jj).thenAccept((c) -> { + draw(ii, jj, COLOR_MCA_GENERATE_SLOW_ASYNC); + draw(ii, jj, COLOR_MCA_GENERATED); + generated.getAndIncrement(); + vcax.set(ii); + vcaz.set(jj); + + synchronized (wait) + { + wait.remove(cx); } }); + + wait.add(cx); }); - e.complete(); } else { AtomicInteger m = new AtomicInteger(); method.set("Spigot (Very Slow)"); KList q = new KList<>(); - mcaIteration.accept(mcaox, mcaoz, (ii, jj) -> { - q.add(() -> { - draw(ii, jj, COLOR_MCA_GENERATE_SLOW); - world.getChunkAt(ii, jj).load(true); - Chunk c = world.getChunkAt(ii, jj); - draw(ii, jj, COLOR_MCA_GENERATED); - checkForError(c); - m.getAndIncrement(); - generated.getAndIncrement(); - vcax.set(ii); - vcaz.set(jj); - }); - }); + mcaIteration.accept(mcaox, mcaoz, (ii, jj) -> q.add(() -> { + draw(ii, jj, COLOR_MCA_GENERATE_SLOW); + world.getChunkAt(ii, jj).load(true); + Chunk c = world.getChunkAt(ii, jj); + draw(ii, jj, COLOR_MCA_GENERATED); + m.getAndIncrement(); + generated.getAndIncrement(); + vcax.set(ii); + vcaz.set(jj); + })); ChronoLatch tick = new ChronoLatch(1000); new SR(0) { @Override @@ -330,7 +348,7 @@ public class Pregenerator implements Listener { try { q.pop().run(); - } catch (Throwable e) { + } catch (Throwable ignored) { } } @@ -342,19 +360,6 @@ public class Pregenerator implements Listener { } } - private void checkForError(Chunk c) { - if (lowestBedrock >= 0 && lowestBedrock < 256) { - if (!c.getBlock(14, lowestBedrock, 14).getType().equals(Material.BEDROCK)) { - ChunkPosition pos = new ChunkPosition(c.getX(), c.getZ()); - errors.add(pos); - totalChunks.addAndGet(1024); - mcaDefer.add(new ChunkPosition(pos.getX() >> 5, pos.getZ() >> 5)); - draw(pos.getX(), pos.getZ(), COLOR_ERROR); - Iris.warn("Hole Detected in Chunk: " + pos.getX() + ", " + pos.getZ() + " (at block " + (pos.getX() << 4) + ", " + lowestBedrock + ", " + (pos.getZ() << 4) + ")"); - } - } - } - private KList computeChunkOrder() { ChunkPosition center = new ChunkPosition(15, 15); KList p = new KList<>(); @@ -506,18 +511,13 @@ public class Pregenerator implements Listener { while (order.isNotEmpty()) { try { order.pop().run(); - } catch (Throwable e) { + } catch (Throwable ignored) { } } l.unlock(); - g.drawImage(image, 0, 0, getParent().getWidth(), getParent().getHeight(), new ImageObserver() { - @Override - public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) { - return true; - } - }); + g.drawImage(image, 0, 0, getParent().getWidth(), getParent().getHeight(), (img, infoflags, x, y, width, height) -> true); g.setColor(Color.WHITE); g.setFont(new Font("Hevetica", Font.BOLD, 28)); @@ -557,11 +557,7 @@ public class Pregenerator implements Listener { @SuppressWarnings("deprecation") private static MCAPregenGui createAndShowGUI(Pregenerator j) throws HeadlessException { JFrame frame; - try { - frame = new JFrame("Pregen View"); - } catch (HeadlessException e) { - throw e; - } + frame = new JFrame("Pregen View"); MCAPregenGui nv = new MCAPregenGui(); frame.addKeyListener(nv); nv.l = new ReentrantLock(); @@ -584,7 +580,7 @@ public class Pregenerator implements Listener { if (file != null) { try { frame.setIconImage(ImageIO.read(file)); - } catch (IOException e) { + } catch (IOException ignored) { } } diff --git a/src/main/java/com/volmit/iris/scaffold/IrisWorldCreator.java b/src/main/java/com/volmit/iris/scaffold/IrisWorldCreator.java index 263b3ffb8..98fd0258a 100644 --- a/src/main/java/com/volmit/iris/scaffold/IrisWorldCreator.java +++ b/src/main/java/com/volmit/iris/scaffold/IrisWorldCreator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold; import com.volmit.iris.manager.IrisDataManager; diff --git a/src/main/java/com/volmit/iris/scaffold/IrisWorlds.java b/src/main/java/com/volmit/iris/scaffold/IrisWorlds.java index e19925557..1b538b53b 100644 --- a/src/main/java/com/volmit/iris/scaffold/IrisWorlds.java +++ b/src/main/java/com/volmit/iris/scaffold/IrisWorlds.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold; import com.volmit.iris.Iris; @@ -9,6 +27,7 @@ import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.entity.Player; +@SuppressWarnings("ALL") public class IrisWorlds { private static final KMap provisioned = new KMap<>(); diff --git a/src/main/java/com/volmit/iris/scaffold/cache/AtomicCache.java b/src/main/java/com/volmit/iris/scaffold/cache/AtomicCache.java index 24c5eab28..abf0b2f0e 100644 --- a/src/main/java/com/volmit/iris/scaffold/cache/AtomicCache.java +++ b/src/main/java/com/volmit/iris/scaffold/cache/AtomicCache.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.cache; import com.volmit.iris.util.IrisLock; @@ -50,6 +68,7 @@ public class AtomicCache { if (this.t != null && M.ms() - a > 1000) { if (this.t != null) { + //noinspection NonAtomicOperationOnVolatileField validations++; } @@ -82,6 +101,7 @@ public class AtomicCache { } if (M.ms() - a > 1000) { + //noinspection NonAtomicOperationOnVolatileField validations++; return this.t; } diff --git a/src/main/java/com/volmit/iris/scaffold/cache/Cache.java b/src/main/java/com/volmit/iris/scaffold/cache/Cache.java index 583cce6cd..a04a36df6 100644 --- a/src/main/java/com/volmit/iris/scaffold/cache/Cache.java +++ b/src/main/java/com/volmit/iris/scaffold/cache/Cache.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.cache; import org.bukkit.Chunk; diff --git a/src/main/java/com/volmit/iris/scaffold/cache/Multicache.java b/src/main/java/com/volmit/iris/scaffold/cache/Multicache.java index bf0cad559..b2540fb66 100644 --- a/src/main/java/com/volmit/iris/scaffold/cache/Multicache.java +++ b/src/main/java/com/volmit/iris/scaffold/cache/Multicache.java @@ -1,10 +1,26 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.cache; public interface Multicache { - @SuppressWarnings("hiding") Cache getCache(int id); - @SuppressWarnings("hiding") Cache createCache(); } \ No newline at end of file diff --git a/src/main/java/com/volmit/iris/scaffold/data/DataPalette.java b/src/main/java/com/volmit/iris/scaffold/data/DataPalette.java index 7c36b2211..28a3a00b0 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/DataPalette.java +++ b/src/main/java/com/volmit/iris/scaffold/data/DataPalette.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data; import com.volmit.iris.util.KList; @@ -40,8 +58,8 @@ public class DataPalette { synchronized (palette) { dos.writeShort(getPalette().size() + Short.MIN_VALUE); - for (int i = 0; i < palette.size(); i++) { - adapter.write(palette.get(i), dos); + for (T t : palette) { + adapter.write(t, dos); } } } diff --git a/src/main/java/com/volmit/iris/scaffold/data/DataProvider.java b/src/main/java/com/volmit/iris/scaffold/data/DataProvider.java index c986a3c54..ad8bcf816 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/DataProvider.java +++ b/src/main/java/com/volmit/iris/scaffold/data/DataProvider.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data; import com.volmit.iris.manager.IrisDataManager; diff --git a/src/main/java/com/volmit/iris/scaffold/data/IOAdapter.java b/src/main/java/com/volmit/iris/scaffold/data/IOAdapter.java index f2fd79347..e7f223262 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/IOAdapter.java +++ b/src/main/java/com/volmit/iris/scaffold/data/IOAdapter.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data; import java.io.DataInputStream; diff --git a/src/main/java/com/volmit/iris/scaffold/data/io/Deserializer.java b/src/main/java/com/volmit/iris/scaffold/data/io/Deserializer.java index 6b30a3207..c8a398285 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/io/Deserializer.java +++ b/src/main/java/com/volmit/iris/scaffold/data/io/Deserializer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.io; import java.io.*; diff --git a/src/main/java/com/volmit/iris/scaffold/data/io/ExceptionBiFunction.java b/src/main/java/com/volmit/iris/scaffold/data/io/ExceptionBiFunction.java index a252ac428..980ce601c 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/io/ExceptionBiFunction.java +++ b/src/main/java/com/volmit/iris/scaffold/data/io/ExceptionBiFunction.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.io; @FunctionalInterface diff --git a/src/main/java/com/volmit/iris/scaffold/data/io/ExceptionTriConsumer.java b/src/main/java/com/volmit/iris/scaffold/data/io/ExceptionTriConsumer.java index 91a7c9314..34d1aa9ec 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/io/ExceptionTriConsumer.java +++ b/src/main/java/com/volmit/iris/scaffold/data/io/ExceptionTriConsumer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.io; @FunctionalInterface diff --git a/src/main/java/com/volmit/iris/scaffold/data/io/MaxDepthIO.java b/src/main/java/com/volmit/iris/scaffold/data/io/MaxDepthIO.java index 31ab52d5c..9fcf1802d 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/io/MaxDepthIO.java +++ b/src/main/java/com/volmit/iris/scaffold/data/io/MaxDepthIO.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.io; public interface MaxDepthIO { diff --git a/src/main/java/com/volmit/iris/scaffold/data/io/MaxDepthReachedException.java b/src/main/java/com/volmit/iris/scaffold/data/io/MaxDepthReachedException.java index e74f4388b..a12b1bb28 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/io/MaxDepthReachedException.java +++ b/src/main/java/com/volmit/iris/scaffold/data/io/MaxDepthReachedException.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.io; /** diff --git a/src/main/java/com/volmit/iris/scaffold/data/io/Serializer.java b/src/main/java/com/volmit/iris/scaffold/data/io/Serializer.java index bfe2f83e2..807695058 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/io/Serializer.java +++ b/src/main/java/com/volmit/iris/scaffold/data/io/Serializer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.io; import java.io.*; diff --git a/src/main/java/com/volmit/iris/scaffold/data/io/StringDeserializer.java b/src/main/java/com/volmit/iris/scaffold/data/io/StringDeserializer.java index 655c27470..c9167a6bd 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/io/StringDeserializer.java +++ b/src/main/java/com/volmit/iris/scaffold/data/io/StringDeserializer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.io; import java.io.*; diff --git a/src/main/java/com/volmit/iris/scaffold/data/io/StringSerializer.java b/src/main/java/com/volmit/iris/scaffold/data/io/StringSerializer.java index 49ba63655..5e2ca5e50 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/io/StringSerializer.java +++ b/src/main/java/com/volmit/iris/scaffold/data/io/StringSerializer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.io; import java.io.*; diff --git a/src/main/java/com/volmit/iris/scaffold/data/mca/Chunk.java b/src/main/java/com/volmit/iris/scaffold/data/mca/Chunk.java index 4c8de7d1c..e9ea20ca9 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/mca/Chunk.java +++ b/src/main/java/com/volmit/iris/scaffold/data/mca/Chunk.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.mca; import com.volmit.iris.scaffold.data.nbt.io.NBTDeserializer; diff --git a/src/main/java/com/volmit/iris/scaffold/data/mca/CompressionType.java b/src/main/java/com/volmit/iris/scaffold/data/mca/CompressionType.java index d50dd4add..3707548d8 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/mca/CompressionType.java +++ b/src/main/java/com/volmit/iris/scaffold/data/mca/CompressionType.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.mca; import java.io.IOException; diff --git a/src/main/java/com/volmit/iris/scaffold/data/mca/ExceptionFunction.java b/src/main/java/com/volmit/iris/scaffold/data/mca/ExceptionFunction.java index 2b7afe1a0..91ab587a4 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/mca/ExceptionFunction.java +++ b/src/main/java/com/volmit/iris/scaffold/data/mca/ExceptionFunction.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.mca; @FunctionalInterface diff --git a/src/main/java/com/volmit/iris/scaffold/data/mca/LoadFlags.java b/src/main/java/com/volmit/iris/scaffold/data/mca/LoadFlags.java index 4b19a6d79..d73ef54c1 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/mca/LoadFlags.java +++ b/src/main/java/com/volmit/iris/scaffold/data/mca/LoadFlags.java @@ -1,24 +1,42 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.mca; public class LoadFlags { - public static long BIOMES = 0x0001; - public static long HEIGHTMAPS = 0x0002; - public static long CARVING_MASKS = 0x0004; - public static long ENTITIES = 0x0008; - public static long TILE_ENTITIES = 0x0010; - public static long TILE_TICKS = 0x0040; - public static long LIQUID_TICKS = 0x0080; - public static long TO_BE_TICKED = 0x0100; - public static long POST_PROCESSING = 0x0200; - public static long STRUCTURES = 0x0400; - public static long BLOCK_LIGHTS = 0x0800; - public static long BLOCK_STATES = 0x1000; - public static long SKY_LIGHT = 0x2000; - public static long LIGHTS = 0x4000; - public static long LIQUIDS_TO_BE_TICKED = 0x8000; + public static final long BIOMES = 0x0001; + public static final long HEIGHTMAPS = 0x0002; + public static final long CARVING_MASKS = 0x0004; + public static final long ENTITIES = 0x0008; + public static final long TILE_ENTITIES = 0x0010; + public static final long TILE_TICKS = 0x0040; + public static final long LIQUID_TICKS = 0x0080; + public static final long TO_BE_TICKED = 0x0100; + public static final long POST_PROCESSING = 0x0200; + public static final long STRUCTURES = 0x0400; + public static final long BLOCK_LIGHTS = 0x0800; + public static final long BLOCK_STATES = 0x1000; + public static final long SKY_LIGHT = 0x2000; + public static final long LIGHTS = 0x4000; + public static final long LIQUIDS_TO_BE_TICKED = 0x8000; - public static long ALL_DATA = 0xffffffffffffffffL; + public static final long ALL_DATA = 0xffffffffffffffffL; } diff --git a/src/main/java/com/volmit/iris/scaffold/data/mca/MCAFile.java b/src/main/java/com/volmit/iris/scaffold/data/mca/MCAFile.java index c110be66b..f4b11cad6 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/mca/MCAFile.java +++ b/src/main/java/com/volmit/iris/scaffold/data/mca/MCAFile.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.mca; import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; @@ -5,6 +23,7 @@ import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; import java.io.IOException; import java.io.RandomAccessFile; +@SuppressWarnings("ALL") public class MCAFile { /** @@ -13,7 +32,7 @@ public class MCAFile { public static final int DEFAULT_DATA_VERSION = 1628; private final int regionX; - private final int regionZ; + private final int regionZ; private Chunk[] chunks; /** @@ -62,7 +81,7 @@ public class MCAFile { raf.seek(4096 + i * 4); int timestamp = raf.readInt(); Chunk chunk = new Chunk(timestamp); - raf.seek(4096 * offset + 4); //+4: skip data size + raf.seek(4096L * offset + 4); //+4: skip data size chunk.deserialize(raf, loadFlags); chunks[i] = chunk; } @@ -113,7 +132,7 @@ public class MCAFile { if (chunk == null) { continue; } - raf.seek(4096 * globalOffset); + raf.seek(4096L * globalOffset); lastWritten = chunk.serialize(raf, chunkXOffset + cx, chunkZOffset + cz); if (lastWritten == 0) { @@ -124,14 +143,14 @@ public class MCAFile { int sectors = (lastWritten >> 12) + (lastWritten % 4096 == 0 ? 0 : 1); - raf.seek(index * 4); + raf.seek(index * 4L); raf.writeByte(globalOffset >>> 16); raf.writeByte(globalOffset >> 8 & 0xFF); raf.writeByte(globalOffset & 0xFF); raf.writeByte(sectors); // write timestamp - raf.seek(index * 4 + 4096); + raf.seek(index * 4L + 4096); raf.writeInt(changeLastUpdate ? timestamp : chunk.getLastMCAUpdate()); globalOffset += sectors; @@ -140,7 +159,7 @@ public class MCAFile { // padding if (lastWritten % 4096 != 0) { - raf.seek(globalOffset * 4096 - 1); + raf.seek(globalOffset * 4096L - 1); raf.write(0); } return chunksWritten; diff --git a/src/main/java/com/volmit/iris/scaffold/data/mca/MCAUtil.java b/src/main/java/com/volmit/iris/scaffold/data/mca/MCAUtil.java index 13523bcc5..5330c8025 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/mca/MCAUtil.java +++ b/src/main/java/com/volmit/iris/scaffold/data/mca/MCAUtil.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.mca; import java.io.File; diff --git a/src/main/java/com/volmit/iris/scaffold/data/mca/Section.java b/src/main/java/com/volmit/iris/scaffold/data/mca/Section.java index 91003c0b2..c73a55a07 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/mca/Section.java +++ b/src/main/java/com/volmit/iris/scaffold/data/mca/Section.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.mca; import com.volmit.iris.scaffold.data.nbt.tag.ByteArrayTag; @@ -87,10 +105,11 @@ public class Section { return null; } + @SuppressWarnings("ClassCanBeRecord") private static class PaletteIndex { - CompoundTag data; - int index; + final CompoundTag data; + final int index; PaletteIndex(CompoundTag data, int index) { this.data = data; @@ -121,7 +140,7 @@ public class Section { int index = getBlockIndex(blockX, blockY, blockZ); int paletteIndex = getPaletteIndex(index); return palette.get(paletteIndex); - } catch (Throwable e) { + } catch (Throwable ignored) { } diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTDeserializer.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTDeserializer.java index d9398b8a6..1e58af87f 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTDeserializer.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTDeserializer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.io; import com.volmit.iris.scaffold.data.io.Deserializer; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTInputStream.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTInputStream.java index ddefc6fcb..c7da2b884 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTInputStream.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTInputStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.io; import com.volmit.iris.scaffold.data.io.ExceptionBiFunction; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTOutputStream.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTOutputStream.java index a9cc4f13a..62ad2eb7a 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTOutputStream.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTOutputStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.io; import com.volmit.iris.scaffold.data.io.ExceptionTriConsumer; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTSerializer.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTSerializer.java index 6f7cbb321..2bbf7c2d2 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTSerializer.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTSerializer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.io; import com.volmit.iris.scaffold.data.io.Serializer; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTUtil.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTUtil.java index 6f11e681f..5dc47cd80 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTUtil.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTUtil.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.io; import com.volmit.iris.scaffold.data.nbt.tag.Tag; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NamedTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NamedTag.java index 27996f552..f85052817 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NamedTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NamedTag.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.io; import com.volmit.iris.scaffold.data.nbt.tag.Tag; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/ParseException.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/ParseException.java index 50d8b8614..3478ba7f9 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/ParseException.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/ParseException.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.io; import java.io.IOException; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTDeserializer.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTDeserializer.java index 4f5ddebbc..e8b84bd96 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTDeserializer.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTDeserializer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.io; import com.volmit.iris.scaffold.data.io.StringDeserializer; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTParser.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTParser.java index ed3c36001..1fd2d9d20 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTParser.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTParser.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.io; import com.volmit.iris.scaffold.data.io.MaxDepthIO; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTSerializer.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTSerializer.java index 14e8db35f..31b724ff7 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTSerializer.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTSerializer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.io; import com.volmit.iris.scaffold.data.io.StringSerializer; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTUtil.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTUtil.java index d50edaf4b..e47836912 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTUtil.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTUtil.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.io; import com.volmit.iris.scaffold.data.nbt.tag.Tag; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTWriter.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTWriter.java index e9bf82fd3..c3a2de04d 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTWriter.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTWriter.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.io; import com.volmit.iris.scaffold.data.io.MaxDepthIO; @@ -12,6 +30,7 @@ import java.util.regex.Pattern; /** * SNBTWriter creates an SNBT String. */ +@SuppressWarnings("ClassCanBeRecord") public final class SNBTWriter implements MaxDepthIO { private static final Pattern NON_QUOTE_PATTERN = Pattern.compile("[a-zA-Z_.+\\-]+"); diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/StringPointer.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/StringPointer.java index eb1582a96..adfd33f73 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/StringPointer.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/StringPointer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.io; public class StringPointer { @@ -48,6 +66,7 @@ public class StringPointer { throw parseException("missing end quote"); } + @SuppressWarnings("BooleanMethodIsAlwaysInverted") public boolean nextArrayElement() { skipWhitespace(); if (hasNext() && currentChar() == ',') { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ArrayTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ArrayTag.java index 9b0527d4b..84a48565b 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ArrayTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ArrayTag.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.tag; import java.lang.reflect.Array; @@ -36,7 +54,7 @@ public abstract class ArrayTag extends Tag { return arrayToString("", ""); } - protected String arrayToString(String prefix, String suffix) { + protected String arrayToString(@SuppressWarnings("SameParameterValue") String prefix, @SuppressWarnings("SameParameterValue") String suffix) { StringBuilder sb = new StringBuilder("[").append(prefix).append("".equals(prefix) ? "" : ";"); for (int i = 0; i < length(); i++) { sb.append(i == 0 ? "" : ",").append(Array.get(getValue(), i)).append(suffix); diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ByteArrayTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ByteArrayTag.java index 66fcacb38..c3e6e979b 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ByteArrayTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ByteArrayTag.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.tag; import java.util.Arrays; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ByteTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ByteTag.java index 11fb41eb3..0fcb91c25 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ByteTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ByteTag.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.tag; public class ByteTag extends NumberTag implements Comparable { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/CompoundTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/CompoundTag.java index 0dbcad873..7bc880947 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/CompoundTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/CompoundTag.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.tag; import com.volmit.iris.scaffold.data.io.MaxDepthIO; @@ -6,6 +24,7 @@ import com.volmit.iris.util.KMap; import java.util.*; import java.util.function.BiConsumer; +@SuppressWarnings("ALL") public class CompoundTag extends Tag>> implements Iterable>>, Comparable, MaxDepthIO { public static final byte ID = 10; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/DoubleTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/DoubleTag.java index 5615c0dc1..d2d73b72d 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/DoubleTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/DoubleTag.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.tag; public class DoubleTag extends NumberTag implements Comparable { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/EndTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/EndTag.java index 7cfc6910b..d89bfe4b8 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/EndTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/EndTag.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.tag; public final class EndTag extends Tag { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/FloatTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/FloatTag.java index d70fea0c7..fca970a43 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/FloatTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/FloatTag.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.tag; public class FloatTag extends NumberTag implements Comparable { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/IntArrayTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/IntArrayTag.java index ebf2f6ae0..ab84c8561 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/IntArrayTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/IntArrayTag.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.tag; import java.util.Arrays; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/IntTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/IntTag.java index 52118e832..906e66beb 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/IntTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/IntTag.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.tag; public class IntTag extends NumberTag implements Comparable { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ListTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ListTag.java index 55c529ec9..e7c65dbe4 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ListTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ListTag.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.tag; import com.volmit.iris.scaffold.data.io.MaxDepthIO; @@ -13,6 +31,7 @@ import java.util.function.Consumer; * The type of an empty untyped {@link ListTag} can be set by using any of the {@code add()} * methods or any of the {@code as...List()} methods. */ +@SuppressWarnings("ALL") public class ListTag> extends Tag> implements Iterable, Comparable>, MaxDepthIO { public static final byte ID = 9; @@ -50,7 +69,7 @@ public class ListTag> extends Tag> implements Iterable< * @param initialCapacity The initial capacity of the returned List * @return An instance of {@link List} with an initial capacity of 3 */ - private static List createEmptyValue(int initialCapacity) { + private static List createEmptyValue(@SuppressWarnings("SameParameterValue") int initialCapacity) { return new KList<>(initialCapacity); } diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/LongArrayTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/LongArrayTag.java index 86ae5b5a4..6ac91bb45 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/LongArrayTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/LongArrayTag.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.tag; import java.util.Arrays; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/LongTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/LongTag.java index 5a1ce76d1..b52b62ab0 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/LongTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/LongTag.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.tag; public class LongTag extends NumberTag implements Comparable { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/NonNullEntrySet.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/NonNullEntrySet.java index e94e90322..9ae678749 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/NonNullEntrySet.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/NonNullEntrySet.java @@ -1,5 +1,25 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.tag; +import org.jetbrains.annotations.NotNull; + import java.util.Collection; import java.util.Iterator; import java.util.Map; @@ -9,6 +29,7 @@ import java.util.Set; * A decorator for the Set returned by CompoundTag#entrySet() * that disallows setting null values. */ +@SuppressWarnings("ClassCanBeRecord") class NonNullEntrySet implements Set> { private final Set> set; @@ -43,7 +64,7 @@ class NonNullEntrySet implements Set> { } @Override - public T[] toArray(T[] a) { + public T[] toArray(@NotNull T[] a) { return set.toArray(a); } @@ -58,22 +79,22 @@ class NonNullEntrySet implements Set> { } @Override - public boolean containsAll(Collection c) { + public boolean containsAll(@NotNull Collection c) { return set.containsAll(c); } @Override - public boolean addAll(Collection> c) { + public boolean addAll(@NotNull Collection> c) { return set.addAll(c); } @Override - public boolean retainAll(Collection c) { + public boolean retainAll(@NotNull Collection c) { return set.retainAll(c); } @Override - public boolean removeAll(Collection c) { + public boolean removeAll(@NotNull Collection c) { return set.removeAll(c); } @@ -127,6 +148,7 @@ class NonNullEntrySet implements Set> { return entry.setValue(value); } + @SuppressWarnings("EqualsWhichDoesntCheckParameterClass") @Override public boolean equals(Object o) { return entry.equals(o); diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/NumberTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/NumberTag.java index c1641f0a6..32e37b62e 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/NumberTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/NumberTag.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.tag; public abstract class NumberTag> extends Tag { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ShortTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ShortTag.java index ea08f9c65..75a701597 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ShortTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ShortTag.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.tag; public class ShortTag extends NumberTag implements Comparable { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/StringTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/StringTag.java index c7f1f59d5..c00acc02b 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/StringTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/StringTag.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.tag; public class StringTag extends Tag implements Comparable { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/Tag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/Tag.java index 2f04eb65a..709c7ac6e 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/Tag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/Tag.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.data.nbt.tag; import com.volmit.iris.scaffold.data.io.MaxDepthReachedException; @@ -49,6 +67,7 @@ public abstract class Tag implements Cloneable { temp.put("\t", "\\\\t"); temp.put("\r", "\\\\r"); temp.put("\"", "\\\\\""); + //noinspection Java9CollectionFactory ESCAPE_CHARACTERS = Collections.unmodifiableMap(temp); } @@ -172,7 +191,6 @@ public abstract class Tag implements Cloneable { * * @return A clone of this Tag. */ - @SuppressWarnings("CloneDoesntDeclareCloneNotSupportedException") public abstract Tag clone(); /** @@ -184,7 +202,8 @@ public abstract class Tag implements Cloneable { * the end of the string. * @return The escaped string. */ - protected static String escapeString(String s, boolean lenient) { + @SuppressWarnings("StringBufferMayBeStringBuilder") + protected static String escapeString(String s, @SuppressWarnings("SameParameterValue") boolean lenient) { StringBuffer sb = new StringBuffer(); Matcher m = ESCAPE_PATTERN.matcher(s); while (m.find()) { diff --git a/src/main/java/com/volmit/iris/scaffold/engine/BlockUpdater.java b/src/main/java/com/volmit/iris/scaffold/engine/BlockUpdater.java index 2b408805e..444c4461f 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/BlockUpdater.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/BlockUpdater.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/Engine.java b/src/main/java/com/volmit/iris/scaffold/engine/Engine.java index e0dbc0803..45d200750 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/Engine.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/Engine.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.manager.IrisDataManager; @@ -97,7 +115,7 @@ public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootPro Color bc = ibc != null ? ibc : biome.isAquatic() ? Color.BLUE : Color.YELLOW; Color f = IrisColor.blend(rc, bc, bc, Color.getHSBColor(0, 0, (float) heightFactor)); - return f; + return IrisColor.blend(rc, bc, bc, Color.getHSBColor(0, 0, (float) heightFactor)); } @Override @@ -195,11 +213,10 @@ public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootPro if (slot != null) { KList tables = getLootTables(rx, block); - InventorySlotType slott = slot; try { InventoryHolder m = (InventoryHolder) block.getState(); - addItems(false, m.getInventory(), rx, tables, slott, x, y, z, 15); + addItems(false, m.getInventory(), rx, tables, slot, x, y, z, 15); } catch (Throwable ignored) { } @@ -238,7 +255,7 @@ public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootPro try { Arrays.parallelSort(nitems, (a, b) -> rng.nextInt()); break; - } catch (Throwable e) { + } catch (Throwable ignored) { } } diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineActuator.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineActuator.java index 5c4557740..f369ce9f5 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineActuator.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineActuator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.scaffold.hunk.Hunk; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedActuator.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedActuator.java index 054677dab..a91cc4665 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedActuator.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedActuator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.scaffold.hunk.Hunk; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedBiModifier.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedBiModifier.java index 6fa933e45..a15036674 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedBiModifier.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedBiModifier.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.scaffold.hunk.Hunk; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedComponent.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedComponent.java index 51e57859a..cfbd83cc3 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedComponent.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedComponent.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.util.RollingSequence; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedModifier.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedModifier.java index 4015763b1..494cca7a1 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedModifier.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedModifier.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.scaffold.hunk.Hunk; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedWorldManager.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedWorldManager.java index 3225c54e0..40f96d556 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedWorldManager.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedWorldManager.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineBiModifier.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineBiModifier.java index a75552b37..bcb41e96b 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineBiModifier.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineBiModifier.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.scaffold.hunk.Hunk; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineComponent.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineComponent.java index 2b5bc1e4f..561440934 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineComponent.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineComponent.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.Iris; 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 c7bb9255f..2d3d1c028 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java @@ -1,9 +1,29 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; import com.volmit.iris.generator.IrisEngineCompound; import com.volmit.iris.manager.IrisDataManager; +import com.volmit.iris.nms.BiomeBaseInjector; +import com.volmit.iris.nms.INMS; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDimension; import com.volmit.iris.object.IrisPosition; @@ -89,7 +109,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce new MortarSender(i, Iris.instance.getTag()).sendMessage("Dimension Hotloaded"); i.playSound(i.getLocation(), Sound.ITEM_BOTTLE_FILL, 1f, 1.25f); } - } catch (Throwable e) { + } catch (Throwable ignored) { } }); @@ -111,7 +131,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce J.a(() -> hotloader.check()); getComposite().clean(); } - } catch (Throwable e) { + } catch (Throwable ignored) { } @@ -295,7 +315,6 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce /** * Place strongholds in the world * - * @param world */ public void placeStrongholds(World world) { EngineData metadata = getComposite().getEngineMetadata(); @@ -310,7 +329,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce Class clazz = Class.forName("net.minecraft.world.level.chunk.ChunkGenerator"); Class clazzSG = Class.forName("net.minecraft.world.level.levelgen.feature.StructureGenerator"); Class clazzBP = Class.forName("net.minecraft.core.BlockPosition"); - Constructor bpCon = clazzBP.getConstructor(int.class, int.class, int.class); + @SuppressWarnings("rawtypes") Constructor bpCon = clazzBP.getConstructor(int.class, int.class, int.class); //By default, we place 9 strongholds. One near 0,0 and 8 all around it at about 10_000 blocks out int[][] coords = {{0, 0}, {7000, -7000}, {10000, 0}, {7000, 7000}, {0, 10000}, {-7000, 7000}, {-10000, 0}, {-7000, -7000}, {0, -10000}}; @@ -338,7 +357,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce }); } - CompletableFuture all = CompletableFuture.allOf(futures.toArray(new CompletableFuture[futures.size()])); + CompletableFuture all = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])); all.thenAccept((_void) -> { //Once all futures for all 9 strongholds have completed for (CompletableFuture future : futures) { try { @@ -387,7 +406,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce /** * Get BlockPosition for nearest stronghold from the provided position */ - private Object getBP(Class clazz, Class clazzSG, Class clazzBP, Object nmsWorld, Object pos, Object chunkGenerator) throws NoSuchFieldException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, ClassNotFoundException { + private Object getBP(Class clazz, Class clazzSG, Class clazzBP, Object nmsWorld, Object pos, Object chunkGenerator) throws NoSuchFieldException, NoSuchMethodException, IllegalAccessException, InvocationTargetException { final String stronghold = "k"; //1.17_01 mapping Object structureGeneratorStronghold = clazzSG.getDeclaredField(stronghold).get(null); @@ -398,14 +417,13 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce int.class, boolean.class ); - Object nearestPOS = getNearestGeneratedFeature.invoke(chunkGenerator, + return getNearestGeneratedFeature.invoke(chunkGenerator, nmsWorld, structureGeneratorStronghold, pos, 100, false ); - return nearestPOS; } private File getDataFolder(World world) { @@ -445,17 +463,26 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce int ox = x << 4; int oz = z << 4; com.volmit.iris.scaffold.data.mca.Chunk cc = writer.getChunk(x, z); + BiomeBaseInjector injector = (xx, yy, zz, biomeBase) -> cc.setBiomeAt(ox + xx, yy, oz + zz, INMS.get().getTrueBiomeBaseId(biomeBase)); + //noinspection deprecation generateChunkRawData(w, x, z, new TerrainChunk() { + @Override + public BiomeBaseInjector getBiomeBaseInjector() { + return injector; + } + @Override public void setRaw(ChunkData data) { } + @NotNull @Override public Biome getBiome(int x, int z) { return Biome.THE_VOID; } + @NotNull @Override public Biome getBiome(int x, int y, int z) { return Biome.THE_VOID; @@ -468,7 +495,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce @Override public void setBiome(int x, int y, int z, Biome bio) { - writer.setBiome((ox + x), y, oz + z, bio); + writer.setBiome(ox + x, y, oz + z, bio); } @Override @@ -493,6 +520,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce cc.setBlockStateAt(xx, y, zz, DirectWorldWriter.getCompound(blockData), false); } + @NotNull @Override public BlockData getBlockData(int x, int y, int z) { if (y > getMaxHeight()) { @@ -744,17 +772,27 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce clearRegeneratedLists(x, z); int xx = x * 16; int zz = z * 16; + BiomeBaseInjector inj = (a, b, c, d) -> { + }; + //noinspection deprecation generateChunkRawData(getComposite().getWorld(), x, z, new TerrainChunk() { + @Override + public BiomeBaseInjector getBiomeBaseInjector() { + return inj; + } + @Override public void setRaw(ChunkData data) { } + @NotNull @Override public Biome getBiome(int x, int z) { return Biome.THE_VOID; } + @NotNull @Override public Biome getBiome(int x, int y, int z) { return Biome.THE_VOID; @@ -787,6 +825,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce } } + @NotNull @Override public BlockData getBlockData(int x, int y, int z) { return Iris.edit.get(compound.getWorld(), x + xx, y, z + zz); @@ -916,7 +955,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce try { dim.getDimensionalComposite().forEach((m) -> IrisDataManager.loadAnyDimension(m.getDimension()).getAllAnyBiomes().forEach((i) -> v.put(i.getLoadKey(), i))); - } catch (Throwable e) { + } catch (Throwable ignored) { } 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 1c33e34fd..425c80a8f 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompound.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompound.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.generator.actuator.IrisTerrainActuator; @@ -122,7 +140,7 @@ public interface EngineCompound extends Listener, Hotloadable, DataProvider { try { dim.getDimensionalComposite().forEach((m) -> getData().getDimensionLoader().load(m.getDimension()).getAllBiomes(this).forEach((i) -> v.put(i.getLoadKey(), i))); - } catch (Throwable e) { + } catch (Throwable ignored) { } diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineData.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineData.java index 8da659d4d..c5e240066 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineData.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineData.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.google.gson.Gson; @@ -28,7 +46,7 @@ public class EngineData { try { f.getParentFile().mkdirs(); return new Gson().fromJson(IO.readAll(f), EngineData.class); - } catch (Throwable e) { + } catch (Throwable ignored) { } diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineDecorator.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineDecorator.java index 4f862579d..4caeb70b0 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineDecorator.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineDecorator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.object.IrisBiome; @@ -12,6 +30,7 @@ public interface EngineDecorator extends EngineComponent { decorate(x, z, realX, realX, realX, realZ, realZ, realZ, data, biome, height, max); } + @SuppressWarnings("BooleanMethodIsAlwaysInverted") default boolean canGoOn(BlockData decorant, BlockData atop) { if (atop == null || B.isAir(atop)) { return false; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineEffects.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineEffects.java index 3d7d7b416..4577413f7 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineEffects.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineEffects.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; public interface EngineEffects extends EngineComponent { diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineFramework.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineFramework.java index 9378d1b86..fc2303fd2 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineFramework.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineFramework.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.generator.IrisComplex; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineMetrics.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineMetrics.java index d17c0174d..592a8cffa 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineMetrics.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineMetrics.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.util.AtomicRollingSequence; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineModifier.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineModifier.java index 7834a8a2e..fc5b9851d 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineModifier.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineModifier.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.scaffold.hunk.Hunk; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java index 5b0bd832e..d7bb241da 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.Iris; @@ -23,6 +41,7 @@ import org.bukkit.util.Consumer; import java.io.IOException; import java.util.List; +import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -194,6 +213,7 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { } } + @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter") default void generateParallaxArea(int x, int z) { try { PrecisionStopwatch p = PrecisionStopwatch.start(); @@ -222,33 +242,38 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { } burst.complete(); - burst = MultiBurst.burst.burst(bs); - for (i = -s; i <= s; i++) { - int ii = i; - for (j = -s; j <= s; j++) { - int jj = j; - burst.queue(() -> { - KList a = generateParallaxVacuumLayer(ii + x, jj + z); - synchronized (a) { - after.addAll(a); - } - }); + if(getEngine().getDimension().isPlaceObjects()) + { + burst = MultiBurst.burst.burst(bs); + + for (i = -s; i <= s; i++) { + int ii = i; + for (j = -s; j <= s; j++) { + int jj = j; + burst.queue(() -> { + KList a = generateParallaxVacuumLayer(ii + x, jj + z); + synchronized (a) { + after.addAll(a); + } + }); + } } + + burst.complete(); + burst = MultiBurst.burst.burst(bs); + + for (i = -s; i <= s; i++) { + int ii = i; + for (j = -s; j <= s; j++) { + int jj = j; + burst.queue(() -> generateParallaxLayer(ii + x, jj + z)); + } + } + + burst.complete(); } - burst.complete(); - burst = MultiBurst.burst.burst(bs); - - for (i = -s; i <= s; i++) { - int ii = i; - for (j = -s; j <= s; j++) { - int jj = j; - burst.queue(() -> generateParallaxLayer(ii + x, jj + z)); - } - } - - burst.complete(); MultiBurst.burst.burst(after); getParallaxAccess().setChunkGenerated(x, z); p.end(); @@ -264,14 +289,19 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { if (getParallaxAccess().isParallaxGenerated(x, z)) { return after; } - int xx = x << 4; - int zz = z << 4; - RNG rng = new RNG(Cache.key(x, z)).nextParallelRNG(getEngine().getTarget().getWorld().getSeed()); - IrisRegion region = getComplex().getRegionStream().get(xx + 8, zz + 8); - IrisBiome biome = getComplex().getTrueBiomeStream().get(xx + 8, zz + 8); - after.addAll(generateParallaxJigsaw(rng, x, z, biome, region)); - generateParallaxSurface(rng, x, z, biome, region, true); - generateParallaxMutations(rng, x, z, true); + + if(getEngine().getDimension().isPlaceObjects()) + { + int xx = x << 4; + int zz = z << 4; + RNG rng = new RNG(Cache.key(x, z)).nextParallelRNG(getEngine().getTarget().getWorld().getSeed()); + IrisRegion region = getComplex().getRegionStream().get(xx + 8, zz + 8); + IrisBiome biome = getComplex().getTrueBiomeStream().get(xx + 8, zz + 8); + after.addAll(generateParallaxJigsaw(rng, x, z, biome, region)); + generateParallaxSurface(rng, x, z, biome, region, true); + generateParallaxMutations(rng, x, z, true); + } + return after; } @@ -336,51 +366,55 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { default KList generateParallaxJigsaw(RNG rng, int x, int z, IrisBiome biome, IrisRegion region) { KList placeAfter = new KList<>(); - boolean placed = false; - if (getEngine().getDimension().getStronghold() != null) { - List poss = getEngine().getCompound().getStrongholdPositions(); + if(getEngine().getDimension().isPlaceObjects()) + { + boolean placed = false; - if (poss != null) { - for (IrisPosition pos : poss) { - if (x == pos.getX() >> 4 && z == pos.getZ() >> 4) { - IrisJigsawStructure structure = getData().getJigsawStructureLoader().load(getEngine().getDimension().getStronghold()); - placeAfter.addAll(placeStructure(pos, structure, rng)); + if (getEngine().getDimension().getStronghold() != null) { + List poss = getEngine().getCompound().getStrongholdPositions(); + + if (poss != null) { + for (IrisPosition pos : poss) { + if (x == pos.getX() >> 4 && z == pos.getZ() >> 4) { + IrisJigsawStructure structure = getData().getJigsawStructureLoader().load(getEngine().getDimension().getStronghold()); + placeAfter.addAll(placeStructure(pos, structure, rng)); + placed = true; + } + } + } + } + + if (!placed) { + for (IrisJigsawStructurePlacement i : biome.getJigsawStructures()) { + if (rng.nextInt(i.getRarity()) == 0) { + IrisPosition position = new IrisPosition((x << 4) + rng.nextInt(15), 0, (z << 4) + rng.nextInt(15)); + IrisJigsawStructure structure = getData().getJigsawStructureLoader().load(i.getStructure()); + placeAfter.addAll(placeStructure(position, structure, rng)); placed = true; } } } - } - if (!placed) { - for (IrisJigsawStructurePlacement i : biome.getJigsawStructures()) { - if (rng.nextInt(i.getRarity()) == 0) { - IrisPosition position = new IrisPosition((x << 4) + rng.nextInt(15), 0, (z << 4) + rng.nextInt(15)); - IrisJigsawStructure structure = getData().getJigsawStructureLoader().load(i.getStructure()); - placeAfter.addAll(placeStructure(position, structure, rng)); - placed = true; + if (!placed) { + for (IrisJigsawStructurePlacement i : region.getJigsawStructures()) { + if (rng.nextInt(i.getRarity()) == 0) { + IrisPosition position = new IrisPosition((x << 4) + rng.nextInt(15), 0, (z << 4) + rng.nextInt(15)); + IrisJigsawStructure structure = getData().getJigsawStructureLoader().load(i.getStructure()); + placeAfter.addAll(placeStructure(position, structure, rng)); + placed = true; + } } } - } - if (!placed) { - for (IrisJigsawStructurePlacement i : region.getJigsawStructures()) { - if (rng.nextInt(i.getRarity()) == 0) { - IrisPosition position = new IrisPosition((x << 4) + rng.nextInt(15), 0, (z << 4) + rng.nextInt(15)); - IrisJigsawStructure structure = getData().getJigsawStructureLoader().load(i.getStructure()); - placeAfter.addAll(placeStructure(position, structure, rng)); - placed = true; - } - } - } - - if (!placed) { - for (IrisJigsawStructurePlacement i : getEngine().getDimension().getJigsawStructures()) { - if (rng.nextInt(i.getRarity()) == 0) { - IrisPosition position = new IrisPosition((x << 4) + rng.nextInt(15), 0, (z << 4) + rng.nextInt(15)); - IrisJigsawStructure structure = getData().getJigsawStructureLoader().load(i.getStructure()); - placeAfter.addAll(placeStructure(position, structure, rng)); - placed = true; + if (!placed) { + for (IrisJigsawStructurePlacement i : getEngine().getDimension().getJigsawStructures()) { + if (rng.nextInt(i.getRarity()) == 0) { + IrisPosition position = new IrisPosition((x << 4) + rng.nextInt(15), 0, (z << 4) + rng.nextInt(15)); + IrisJigsawStructure structure = getData().getJigsawStructureLoader().load(i.getStructure()); + placeAfter.addAll(placeStructure(position, structure, rng)); + placed = true; + } } } } @@ -543,101 +577,68 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { int jig = 0; KSet objects = new KSet<>(); KMap> scalars = new KMap<>(); - KList r = getAllRegions(); - KList b = getAllBiomes(); + int x = xg.get(); + int z = zg.get(); - for (IrisBiome i : b) { - for (IrisObjectPlacement j : i.getObjects()) { - if (j.getScale().canScaleBeyond()) { - scalars.put(j.getScale(), j.getPlace()); - } else { - objects.addAll(j.getPlace()); + if(getEngine().getDimension().isPlaceObjects()) + { + KList r = getAllRegions(); + KList b = getAllBiomes(); + + for (IrisBiome i : b) { + for (IrisObjectPlacement j : i.getObjects()) { + if (j.getScale().canScaleBeyond()) { + scalars.put(j.getScale(), j.getPlace()); + } else { + objects.addAll(j.getPlace()); + } + } + + for (IrisJigsawStructurePlacement j : i.getJigsawStructures()) { + jig = Math.max(jig, getData().getJigsawStructureLoader().load(j.getStructure()).getMaxDimension()); } } - for (IrisJigsawStructurePlacement j : i.getJigsawStructures()) { - jig = Math.max(jig, getData().getJigsawStructureLoader().load(j.getStructure()).getMaxDimension()); - } - } + for (IrisRegion i : r) { + for (IrisObjectPlacement j : i.getObjects()) { + if (j.getScale().canScaleBeyond()) { + scalars.put(j.getScale(), j.getPlace()); + } else { + objects.addAll(j.getPlace()); + } + } - for (IrisRegion i : r) { - for (IrisObjectPlacement j : i.getObjects()) { - if (j.getScale().canScaleBeyond()) { - scalars.put(j.getScale(), j.getPlace()); - } else { - objects.addAll(j.getPlace()); + for (IrisJigsawStructurePlacement j : i.getJigsawStructures()) { + jig = Math.max(jig, getData().getJigsawStructureLoader().load(j.getStructure()).getMaxDimension()); } } - for (IrisJigsawStructurePlacement j : i.getJigsawStructures()) { + for (IrisJigsawStructurePlacement j : getEngine().getDimension().getJigsawStructures()) { jig = Math.max(jig, getData().getJigsawStructureLoader().load(j.getStructure()).getMaxDimension()); } - } - for (IrisJigsawStructurePlacement j : getEngine().getDimension().getJigsawStructures()) { - jig = Math.max(jig, getData().getJigsawStructureLoader().load(j.getStructure()).getMaxDimension()); - } - - if (getEngine().getDimension().getStronghold() != null) { - try { - jig = Math.max(jig, getData().getJigsawStructureLoader().load(getEngine().getDimension().getStronghold()).getMaxDimension()); - } catch (Throwable e) { - Iris.error("THIS IS THE ONE"); - e.printStackTrace(); - } - } - - Iris.verbose("Checking sizes for " + Form.f(objects.size()) + " referenced objects."); - BurstExecutor e = MultiBurst.burst.burst(objects.size()); - KMap sizeCache = new KMap<>(); - for (String i : objects) { - e.queue(() -> { + if (getEngine().getDimension().getStronghold() != null) { try { - BlockVector bv = sizeCache.compute(i, (k, v) -> { - if (v != null) { - return v; - } - - try { - return IrisObject.sampleSize(getData().getObjectLoader().findFile(i)); - } catch (IOException ioException) { - ioException.printStackTrace(); - } - - return null; - }); - - if (bv == null) { - throw new RuntimeException(); - } - - warn(i, bv); - - synchronized (xg) { - xg.getAndSet(Math.max(bv.getBlockX(), xg.get())); - } - - synchronized (zg) { - zg.getAndSet(Math.max(bv.getBlockZ(), zg.get())); - } - } catch (Throwable ignored) { - + jig = Math.max(jig, getData().getJigsawStructureLoader().load(getEngine().getDimension().getStronghold()).getMaxDimension()); + } catch (Throwable e) { + Iris.error("THIS IS THE ONE"); + e.printStackTrace(); } - }); - } + } - for (IrisObjectScale i : scalars.keySet()) { - double ms = i.getMaximumScale(); - for (String j : scalars.get(i)) { + Iris.verbose("Checking sizes for " + Form.f(objects.size()) + " referenced objects."); + BurstExecutor e = MultiBurst.burst.burst(objects.size()); + KMap sizeCache = new KMap<>(); + for (String i : objects) { e.queue(() -> { try { - BlockVector bv = sizeCache.compute(j, (k, v) -> { + BlockVector bv = sizeCache.compute(i, (k, v) -> { if (v != null) { return v; } try { - return IrisObject.sampleSize(getData().getObjectLoader().findFile(j)); + return IrisObject.sampleSize(getData().getObjectLoader().findFile(i)); } catch (IOException ioException) { ioException.printStackTrace(); } @@ -649,46 +650,85 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { throw new RuntimeException(); } - warnScaled(j, bv, ms); + warn(i, bv); synchronized (xg) { - xg.getAndSet((int) Math.max(Math.ceil(bv.getBlockX() * ms), xg.get())); + xg.getAndSet(Math.max(bv.getBlockX(), xg.get())); } synchronized (zg) { - zg.getAndSet((int) Math.max(Math.ceil(bv.getBlockZ() * ms), zg.get())); + zg.getAndSet(Math.max(bv.getBlockZ(), zg.get())); } } catch (Throwable ignored) { } }); } - } - e.complete(); + for (Map.Entry> entry : scalars.entrySet()) { + double ms = entry.getKey().getMaximumScale(); + for (String j : entry.getValue()) { + e.queue(() -> { + try { + BlockVector bv = sizeCache.compute(j, (k, v) -> { + if (v != null) { + return v; + } - int x = xg.get(); - int z = zg.get(); + try { + return IrisObject.sampleSize(getData().getObjectLoader().findFile(j)); + } catch (IOException ioException) { + ioException.printStackTrace(); + } - for (IrisDepositGenerator i : getEngine().getDimension().getDeposits()) { - int max = i.getMaxDimension(); - x = Math.max(max, x); - z = Math.max(max, z); - } + return null; + }); - for (IrisRegion v : r) { - for (IrisDepositGenerator i : v.getDeposits()) { + if (bv == null) { + throw new RuntimeException(); + } + + warnScaled(j, bv, ms); + + synchronized (xg) { + xg.getAndSet((int) Math.max(Math.ceil(bv.getBlockX() * ms), xg.get())); + } + + synchronized (zg) { + zg.getAndSet((int) Math.max(Math.ceil(bv.getBlockZ() * ms), zg.get())); + } + } catch (Throwable ignored) { + + } + }); + } + } + + e.complete(); + + x = xg.get(); + z = zg.get(); + + for (IrisDepositGenerator i : getEngine().getDimension().getDeposits()) { int max = i.getMaxDimension(); x = Math.max(max, x); z = Math.max(max, z); } - } - for (IrisBiome v : b) { - for (IrisDepositGenerator i : v.getDeposits()) { - int max = i.getMaxDimension(); - x = Math.max(max, x); - z = Math.max(max, z); + for (IrisRegion v : r) { + for (IrisDepositGenerator i : v.getDeposits()) { + int max = i.getMaxDimension(); + x = Math.max(max, x); + z = Math.max(max, z); + } + } + + for (IrisBiome v : b) { + for (IrisDepositGenerator i : v.getDeposits()) { + int max = i.getMaxDimension(); + x = Math.max(max, x); + z = Math.max(max, z); + } } } diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EnginePlayer.java b/src/main/java/com/volmit/iris/scaffold/engine/EnginePlayer.java index 850d461aa..571e5d36c 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EnginePlayer.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EnginePlayer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.object.IrisBiome; @@ -34,7 +52,7 @@ public class EnginePlayer { for (IrisEffect j : region.getEffects()) { try { j.apply(player, getEngine()); - } catch (Throwable e) { + } catch (Throwable ignored) { } } @@ -44,7 +62,7 @@ public class EnginePlayer { for (IrisEffect j : biome.getEffects()) { try { j.apply(player, getEngine()); - } catch (Throwable e) { + } catch (Throwable ignored) { } } @@ -63,7 +81,7 @@ public class EnginePlayer { lastSample = M.ms(); sampleBiomeRegion(); } - } catch (Throwable ew) { + } catch (Throwable ignored) { } } 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 603635509..23de7fb3b 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineTarget.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineTarget.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.manager.IrisDataManager; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineWorldManager.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineWorldManager.java index aefc66d1f..afa88d372 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineWorldManager.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineWorldManager.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import org.bukkit.Chunk; @@ -5,6 +23,7 @@ import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.entity.EntitySpawnEvent; +@SuppressWarnings("EmptyMethod") public interface EngineWorldManager { void close(); diff --git a/src/main/java/com/volmit/iris/scaffold/engine/Fallible.java b/src/main/java/com/volmit/iris/scaffold/engine/Fallible.java index 5dc94c894..f94827be1 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/Fallible.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/Fallible.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; public interface Fallible { diff --git a/src/main/java/com/volmit/iris/scaffold/engine/GeneratorAccess.java b/src/main/java/com/volmit/iris/scaffold/engine/GeneratorAccess.java index 8d1caa834..4ed7bc429 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/GeneratorAccess.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/GeneratorAccess.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.manager.IrisDataManager; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/Hotloadable.java b/src/main/java/com/volmit/iris/scaffold/engine/Hotloadable.java index a51d4a2f6..1d78e2bc7 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/Hotloadable.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/Hotloadable.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; public interface Hotloadable { diff --git a/src/main/java/com/volmit/iris/scaffold/engine/IrisAccess.java b/src/main/java/com/volmit/iris/scaffold/engine/IrisAccess.java index 4f22459d4..f11318439 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/IrisAccess.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/IrisAccess.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.manager.IrisDataManager; @@ -17,6 +35,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; +@SuppressWarnings("EmptyMethod") public interface IrisAccess extends Hotloadable, DataProvider { void directWriteMCA(World w, int x, int z, DirectWorldWriter writer, MultiBurst burst); diff --git a/src/main/java/com/volmit/iris/scaffold/engine/IrisAccessProvider.java b/src/main/java/com/volmit/iris/scaffold/engine/IrisAccessProvider.java index b94f25f83..71a1f7055 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/IrisAccessProvider.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/IrisAccessProvider.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; public interface IrisAccessProvider { diff --git a/src/main/java/com/volmit/iris/scaffold/engine/LootProvider.java b/src/main/java/com/volmit/iris/scaffold/engine/LootProvider.java index a913d1f52..13b70652c 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/LootProvider.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/LootProvider.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.object.InventorySlotType; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/PlacedObject.java b/src/main/java/com/volmit/iris/scaffold/engine/PlacedObject.java index 7dbafab06..e2c8d74d1 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/PlacedObject.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/PlacedObject.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.object.IrisObject; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/PregeneratedData.java b/src/main/java/com/volmit/iris/scaffold/engine/PregeneratedData.java index 0ba6582e5..29330f9bb 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/PregeneratedData.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/PregeneratedData.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.engine; import com.volmit.iris.scaffold.hunk.Hunk; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/Hunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/Hunk.java index 99914e65d..d8361064b 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/Hunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/Hunk.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk; import com.volmit.iris.scaffold.hunk.io.HunkIOAdapter; @@ -20,6 +38,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; +@SuppressWarnings("ALL") public interface Hunk { /** * Create a hunk view from a source hunk. This view reads and writes through to @@ -230,11 +249,11 @@ public interface Hunk { } default int getMax2DParallelism() { - return (int) Math.pow(getMinimumDimension() / 2, 2); + return (int) Math.pow(getMinimumDimension() / 2f, 2); } default int getMax3DParallelism() { - return (int) Math.pow(getMinimumDimension() / 2, 3); + return (int) Math.pow(getMinimumDimension() / 2f, 3); } default int filterDimension(int dim) { @@ -730,7 +749,7 @@ public interface Hunk { } } - return this; + return this; } default Hunk getSections2D(int sections, Consumer5, Runnable> v, Consumer4> inserter) { @@ -758,7 +777,7 @@ public interface Hunk { } } - return this; + return this; } default Hunk getSections2DYLimit(int sections, int ymin, int ymax, Consumer5, Runnable> v, Consumer4> inserter) { diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/HunkFace.java b/src/main/java/com/volmit/iris/scaffold/hunk/HunkFace.java index 99dd6abb9..e15d0c0d4 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/HunkFace.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/HunkFace.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk; public enum HunkFace { diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/io/BasicHunkIOAdapter.java b/src/main/java/com/volmit/iris/scaffold/hunk/io/BasicHunkIOAdapter.java index 744399fbc..823d13622 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/io/BasicHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/io/BasicHunkIOAdapter.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.io; import com.volmit.iris.scaffold.hunk.Hunk; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/io/BlockDataHunkIOAdapter.java b/src/main/java/com/volmit/iris/scaffold/hunk/io/BlockDataHunkIOAdapter.java index 113122f21..801f34824 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/io/BlockDataHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/io/BlockDataHunkIOAdapter.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.io; import com.volmit.iris.util.B; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/io/BooleanHunkIOAdapter.java b/src/main/java/com/volmit/iris/scaffold/hunk/io/BooleanHunkIOAdapter.java index 03a467308..25c3f94fc 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/io/BooleanHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/io/BooleanHunkIOAdapter.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.io; import java.io.DataInputStream; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkIOAdapter.java b/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkIOAdapter.java index 6c913150b..db9d8d588 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkIOAdapter.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.io; import com.volmit.iris.scaffold.data.IOAdapter; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkRegion.java b/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkRegion.java index 60db695c3..421cd201e 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkRegion.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkRegion.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.io; import com.volmit.iris.util.*; @@ -8,6 +26,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.util.Map; +@SuppressWarnings("SynchronizeOnNonFinalField") public class HunkRegion { private final File folder; private CompoundTag compound; @@ -45,7 +64,7 @@ public class HunkRegion { Map v = readTag.getValue(); if (!(v instanceof KMap)) { - return new CompoundTag(readTag.getName(), new KMap(v)); + return new CompoundTag(readTag.getName(), new KMap<>(v)); } return readTag; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkRegionSlice.java b/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkRegionSlice.java index 79cae2ace..382e082e0 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkRegionSlice.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkRegionSlice.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.io; import com.volmit.iris.Iris; @@ -72,7 +90,7 @@ public class HunkRegionSlice { } public synchronized void save() { - BurstExecutor e = MultiBurst.burst.burst(); + BurstExecutor e = MultiBurst.burstAux.burst(); for (ChunkPosition i : save.copy()) { if (i == null) { continue; @@ -82,7 +100,7 @@ public class HunkRegionSlice { try { lock.withNasty(i.getX(), i.getZ(), () -> save.remove(i)); - } catch (Throwable ef) { + } catch (Throwable ignored) { } } diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/io/PaletteHunkIOAdapter.java b/src/main/java/com/volmit/iris/scaffold/hunk/io/PaletteHunkIOAdapter.java index d774b5575..779d6f615 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/io/PaletteHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/io/PaletteHunkIOAdapter.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.io; import com.volmit.iris.scaffold.data.DataPalette; @@ -16,7 +34,7 @@ public abstract class PaletteHunkIOAdapter implements HunkIOAdapter { dos.writeShort(t.getHeight() + Short.MIN_VALUE); dos.writeShort(t.getDepth() + Short.MIN_VALUE); AtomicInteger nonNull = new AtomicInteger(0); - DataPalette palette = new DataPalette(); + DataPalette palette = new DataPalette<>(); t.iterateSync((x, y, z, w) -> { if (w != null) { diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/io/StringHunkIOAdapter.java b/src/main/java/com/volmit/iris/scaffold/hunk/io/StringHunkIOAdapter.java index cb8f6da6b..ec6f5960b 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/io/StringHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/io/StringHunkIOAdapter.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.io; import java.io.DataInputStream; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/io/TileDataHunkIOAdapter.java b/src/main/java/com/volmit/iris/scaffold/hunk/io/TileDataHunkIOAdapter.java index daed44b87..0bf6f6a03 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/io/TileDataHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/io/TileDataHunkIOAdapter.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.io; import com.volmit.iris.object.tile.TileData; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/storage/ArrayHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/storage/ArrayHunk.java index f80022489..c9dbc6596 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/storage/ArrayHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/storage/ArrayHunk.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.storage; import com.volmit.iris.scaffold.hunk.Hunk; @@ -6,6 +24,7 @@ import lombok.EqualsAndHashCode; import java.util.Arrays; +@SuppressWarnings("Lombok") @Data @EqualsAndHashCode(callSuper = false) public class ArrayHunk extends StorageHunk implements Hunk { diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicDoubleHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicDoubleHunk.java index 53d2ea3a9..a15e269b9 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicDoubleHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicDoubleHunk.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.storage; import com.google.common.util.concurrent.AtomicDoubleArray; @@ -5,6 +23,7 @@ import com.volmit.iris.scaffold.hunk.Hunk; import lombok.Data; import lombok.EqualsAndHashCode; +@SuppressWarnings({"DefaultAnnotationParam", "Lombok"}) @Data @EqualsAndHashCode(callSuper = false) public class AtomicDoubleHunk extends StorageHunk implements Hunk { diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicHunk.java index 53ede25c8..796becf28 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicHunk.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.storage; import com.volmit.iris.scaffold.hunk.Hunk; @@ -6,6 +24,7 @@ import lombok.EqualsAndHashCode; import java.util.concurrent.atomic.AtomicReferenceArray; +@SuppressWarnings({"DefaultAnnotationParam", "Lombok"}) @Data @EqualsAndHashCode(callSuper = false) public class AtomicHunk extends StorageHunk implements Hunk { @@ -13,7 +32,7 @@ public class AtomicHunk extends StorageHunk implements Hunk { public AtomicHunk(int w, int h, int d) { super(w, h, d); - data = new AtomicReferenceArray(w * h * d); + data = new AtomicReferenceArray<>(w * h * d); } @Override diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicIntegerHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicIntegerHunk.java index b2c315bfb..747824de3 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicIntegerHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicIntegerHunk.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.storage; import com.volmit.iris.scaffold.hunk.Hunk; @@ -6,6 +24,7 @@ import lombok.EqualsAndHashCode; import java.util.concurrent.atomic.AtomicIntegerArray; +@SuppressWarnings({"DefaultAnnotationParam", "Lombok"}) @Data @EqualsAndHashCode(callSuper = false) public class AtomicIntegerHunk extends StorageHunk implements Hunk { diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicLongHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicLongHunk.java index aee5c2a65..d1eafe184 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicLongHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicLongHunk.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.storage; import com.volmit.iris.scaffold.hunk.Hunk; @@ -6,6 +24,7 @@ import lombok.EqualsAndHashCode; import java.util.concurrent.atomic.AtomicLongArray; +@SuppressWarnings({"DefaultAnnotationParam", "Lombok"}) @Data @EqualsAndHashCode(callSuper = false) public class AtomicLongHunk extends StorageHunk implements Hunk { diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/storage/MappedHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/storage/MappedHunk.java index 931aa7e7d..6a6d6d6bf 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/storage/MappedHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/storage/MappedHunk.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.storage; import com.volmit.iris.scaffold.hunk.Hunk; @@ -8,6 +26,7 @@ import lombok.EqualsAndHashCode; import java.util.Map; +@SuppressWarnings({"DefaultAnnotationParam", "Lombok"}) @Data @EqualsAndHashCode(callSuper = false) public class MappedHunk extends StorageHunk implements Hunk { diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/storage/StorageHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/storage/StorageHunk.java index dfeeb242a..0923ca814 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/storage/StorageHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/storage/StorageHunk.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.storage; import com.volmit.iris.scaffold.hunk.Hunk; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/storage/SynchronizedArrayHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/storage/SynchronizedArrayHunk.java index 8bc5e6136..2ff7aa2c3 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/storage/SynchronizedArrayHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/storage/SynchronizedArrayHunk.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.storage; import com.volmit.iris.scaffold.hunk.Hunk; @@ -6,6 +24,7 @@ import lombok.EqualsAndHashCode; import java.util.Arrays; +@SuppressWarnings({"DefaultAnnotationParam", "Lombok"}) @Data @EqualsAndHashCode(callSuper = false) public class SynchronizedArrayHunk extends StorageHunk implements Hunk { 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 f5a86d361..1862360af 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 @@ -1,15 +1,33 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.view; import com.volmit.iris.nms.INMS; import com.volmit.iris.scaffold.hunk.Hunk; import com.volmit.iris.util.LinkedTerrainChunk; -import com.volmit.iris.util.TerrainChunk; -import net.minecraft.world.level.chunk.BiomeStorage; +import lombok.Getter; import org.bukkit.block.Biome; -import org.bukkit.craftbukkit.v1_17_R1.generator.CustomChunkGenerator; import org.bukkit.generator.ChunkGenerator.BiomeGrid; +@SuppressWarnings("ClassCanBeRecord") public class BiomeGridHunkView implements Hunk { + @Getter private final BiomeGrid chunk; public BiomeGridHunkView(BiomeGrid chunk) { @@ -43,11 +61,10 @@ public class BiomeGridHunkView implements Hunk { } public void forceBiomeBaseInto(int x, int y, int z, Object somethingVeryDirty) { - if(chunk instanceof LinkedTerrainChunk) - { - INMS.get().forceBiomeInto(x,y,z,somethingVeryDirty,((LinkedTerrainChunk) chunk).getRawBiome()); + if (chunk instanceof LinkedTerrainChunk) { + INMS.get().forceBiomeInto(x, y, z, somethingVeryDirty, ((LinkedTerrainChunk) chunk).getRawBiome()); return; } - INMS.get().forceBiomeInto(x,y,z,somethingVeryDirty,chunk); + INMS.get().forceBiomeInto(x, y, z, somethingVeryDirty, chunk); } } diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkBiomeHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkBiomeHunkView.java index a8e6fdd20..7389d4d31 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkBiomeHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkBiomeHunkView.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.view; import com.volmit.iris.Iris; @@ -5,6 +23,7 @@ import com.volmit.iris.scaffold.hunk.Hunk; import org.bukkit.Chunk; import org.bukkit.block.Biome; +@SuppressWarnings("ClassCanBeRecord") public class ChunkBiomeHunkView implements Hunk { private final Chunk chunk; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkDataHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkDataHunkView.java index 96b9162e9..b3d10c16c 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkDataHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkDataHunkView.java @@ -1,9 +1,28 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.view; import com.volmit.iris.scaffold.hunk.Hunk; import org.bukkit.block.data.BlockData; import org.bukkit.generator.ChunkGenerator.ChunkData; +@SuppressWarnings("ClassCanBeRecord") public class ChunkDataHunkView implements Hunk { private final ChunkData chunk; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkHunkView.java index f520580d6..fb5499901 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkHunkView.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.view; import com.volmit.iris.Iris; @@ -5,6 +23,7 @@ import com.volmit.iris.scaffold.hunk.Hunk; import org.bukkit.Chunk; import org.bukkit.block.data.BlockData; +@SuppressWarnings("ClassCanBeRecord") public class ChunkHunkView implements Hunk { private final Chunk chunk; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/DriftHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/DriftHunkView.java index 08d758b9b..c3844ce09 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/DriftHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/DriftHunkView.java @@ -1,7 +1,26 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.view; import com.volmit.iris.scaffold.hunk.Hunk; +@SuppressWarnings("ClassCanBeRecord") public class DriftHunkView implements Hunk { private final int ox; private final int oy; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/FringedHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/FringedHunkView.java index 06b31bf8c..1946550e5 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/FringedHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/FringedHunkView.java @@ -1,7 +1,26 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.view; import com.volmit.iris.scaffold.hunk.Hunk; +@SuppressWarnings("ClassCanBeRecord") public class FringedHunkView implements Hunk { private final Hunk src; private final Hunk out; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/HunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/HunkView.java index 1b7ee2fb2..acd62e55f 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/HunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/HunkView.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.view; import com.volmit.iris.scaffold.hunk.Hunk; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/InvertedHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/InvertedHunkView.java index d2f98b28e..e272f4181 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/InvertedHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/InvertedHunkView.java @@ -1,7 +1,26 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.view; import com.volmit.iris.scaffold.hunk.Hunk; +@SuppressWarnings("ClassCanBeRecord") public class InvertedHunkView implements Hunk { private final Hunk src; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/ListeningHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/ListeningHunk.java index 15cf86ecc..2378c6ec4 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/ListeningHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/ListeningHunk.java @@ -1,8 +1,27 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.view; import com.volmit.iris.scaffold.hunk.Hunk; import com.volmit.iris.util.Consumer4; +@SuppressWarnings("ClassCanBeRecord") public class ListeningHunk implements Hunk { private final Hunk src; private final Consumer4 listener; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/ReadOnlyHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/ReadOnlyHunk.java index a5347286d..c136ee08b 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/ReadOnlyHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/ReadOnlyHunk.java @@ -1,7 +1,26 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.view; import com.volmit.iris.scaffold.hunk.Hunk; +@SuppressWarnings("ClassCanBeRecord") public class ReadOnlyHunk implements Hunk { private final Hunk src; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedXHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedXHunkView.java index 3ae7c2f3d..abe5e1de1 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedXHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedXHunkView.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.view; import com.volmit.iris.scaffold.hunk.Hunk; @@ -15,8 +33,8 @@ public class RotatedXHunkView implements Hunk { @Override public void setRaw(int x, int y, int z, T t) { - int yc = (int) Math.round(cos * (getHeight() / 2) - sin * (getDepth() / 2)); - int zc = (int) Math.round(sin * (getHeight() / 2) + cos * (getDepth() / 2)); + int yc = (int) Math.round(cos * (getHeight() / 2f) - sin * (getDepth() / 2f)); + int zc = (int) Math.round(sin * (getHeight() / 2f) + cos * (getDepth() / 2f)); src.setIfExists(x, (int) Math.round(cos * (y - yc) - sin * (z - zc)) - yc, (int) Math.round(sin * y - yc + cos * (z - zc)) - zc, @@ -25,8 +43,8 @@ public class RotatedXHunkView implements Hunk { @Override public T getRaw(int x, int y, int z) { - int yc = (int) Math.round(cos * (getHeight() / 2) - sin * (getDepth() / 2)); - int zc = (int) Math.round(sin * (getHeight() / 2) + cos * (getDepth() / 2)); + int yc = (int) Math.round(cos * (getHeight() / 2f) - sin * (getDepth() / 2f)); + int zc = (int) Math.round(sin * (getHeight() / 2f) + cos * (getDepth() / 2f)); return src.getIfExists(x, (int) Math.round(cos * (y - yc) - sin * (z - zc)) - yc, (int) Math.round(sin * y - yc + cos * (z - zc)) - zc diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedYHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedYHunkView.java index 22526d231..6bdf5be26 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedYHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedYHunkView.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.view; import com.volmit.iris.scaffold.hunk.Hunk; @@ -15,8 +33,8 @@ public class RotatedYHunkView implements Hunk { @Override public void setRaw(int x, int y, int z, T t) { - int xc = (int) Math.round(cos * (getWidth() / 2) + sin * (getDepth() / 2)); - int zc = (int) Math.round(-sin * (getWidth() / 2) + cos * (getDepth() / 2)); + int xc = (int) Math.round(cos * (getWidth() / 2f) + sin * (getDepth() / 2f)); + int zc = (int) Math.round(-sin * (getWidth() / 2f) + cos * (getDepth() / 2f)); src.setIfExists((int) Math.round(cos * (x - xc) + sin * (z - zc)) - xc, y, @@ -25,8 +43,8 @@ public class RotatedYHunkView implements Hunk { @Override public T getRaw(int x, int y, int z) { - int xc = (int) Math.round(cos * (getWidth() / 2) + sin * (getDepth() / 2)); - int zc = (int) Math.round(-sin * (getWidth() / 2) + cos * (getDepth() / 2)); + int xc = (int) Math.round(cos * (getWidth() / 2f) + sin * (getDepth() / 2f)); + int zc = (int) Math.round(-sin * (getWidth() / 2f) + cos * (getDepth() / 2f)); return src.getIfExists( (int) Math.round(cos * (x - xc) + sin * (z - zc)) - xc, y, diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedZHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedZHunkView.java index 62db555ef..7bfb957ce 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedZHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedZHunkView.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.view; import com.volmit.iris.scaffold.hunk.Hunk; @@ -15,15 +33,15 @@ public class RotatedZHunkView implements Hunk { @Override public void setRaw(int x, int y, int z, T t) { - int xc = (int) Math.round(cos * (getWidth() / 2) - sin * (getHeight() / 2)); - int yc = (int) Math.round(sin * (getWidth() / 2) + cos * (getHeight() / 2)); + int xc = (int) Math.round(cos * (getWidth() / 2f) - sin * (getHeight() / 2f)); + int yc = (int) Math.round(sin * (getWidth() / 2f) + cos * (getHeight() / 2f)); src.setIfExists((int) Math.round(cos * (x - xc) - sin * (y - yc)) - xc, (int) Math.round(sin * (x - xc) + cos * (y - yc)) - yc, z, t); } @Override public T getRaw(int x, int y, int z) { - int xc = (int) Math.round(cos * (getWidth() / 2) - sin * (getHeight() / 2)); - int yc = (int) Math.round(sin * (getWidth() / 2) + cos * (getHeight() / 2)); + int xc = (int) Math.round(cos * (getWidth() / 2f) - sin * (getHeight() / 2f)); + int yc = (int) Math.round(sin * (getWidth() / 2f) + cos * (getHeight() / 2f)); return src.getIfExists((int) Math.round(cos * (x - xc) - sin * (y - yc)) - xc, (int) Math.round(sin * (x - xc) + cos * (y - yc)) - yc , z); diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/SynchronizedHunkView.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/SynchronizedHunkView.java index af983ebb2..ae989a33a 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/SynchronizedHunkView.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/SynchronizedHunkView.java @@ -1,7 +1,26 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.view; import com.volmit.iris.scaffold.hunk.Hunk; +@SuppressWarnings("ClassCanBeRecord") public class SynchronizedHunkView implements Hunk { private final Hunk src; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/WriteTrackHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/view/WriteTrackHunk.java index 5b58401d8..3f990738b 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/WriteTrackHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/view/WriteTrackHunk.java @@ -1,9 +1,28 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.hunk.view; import com.volmit.iris.scaffold.hunk.Hunk; import java.util.concurrent.atomic.AtomicBoolean; +@SuppressWarnings("ClassCanBeRecord") public class WriteTrackHunk implements Hunk { private final Hunk src; private final AtomicBoolean b; diff --git a/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedPiece.java b/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedPiece.java index 09c29ebfb..a1931a6b9 100644 --- a/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedPiece.java +++ b/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedPiece.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.jigsaw; import com.volmit.iris.manager.IrisDataManager; @@ -17,6 +35,7 @@ import org.bukkit.block.data.BlockData; import org.bukkit.inventory.InventoryHolder; import org.bukkit.util.BlockVector; +@SuppressWarnings("ALL") @Data public class PlannedPiece { private IrisPosition position; diff --git a/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedStructure.java b/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedStructure.java index fc08912c8..21eb48e53 100644 --- a/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedStructure.java +++ b/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedStructure.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.jigsaw; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/BlockFaceSetSection.java b/src/main/java/com/volmit/iris/scaffold/lighting/BlockFaceSetSection.java index b47e50b5e..713d98393 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/BlockFaceSetSection.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/BlockFaceSetSection.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.lighting; import com.bergerkiller.bukkit.common.collections.BlockFaceSet; diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/FlatRegionInfo.java b/src/main/java/com/volmit/iris/scaffold/lighting/FlatRegionInfo.java index ffc34aa6f..d184eb076 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/FlatRegionInfo.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/FlatRegionInfo.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.lighting; import com.bergerkiller.bukkit.common.utils.WorldUtil; @@ -132,7 +150,6 @@ public class FlatRegionInfo { * Adds another Region Y-coordinate to the list. * The set of chunks and other properties are copied. * - * @param ry * @return new flat region info object with updated ry */ public FlatRegionInfo addRegionYCoordinate(int ry) { diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/FlatRegionInfoMap.java b/src/main/java/com/volmit/iris/scaffold/lighting/FlatRegionInfoMap.java index 186cd760f..b676594dd 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/FlatRegionInfoMap.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/FlatRegionInfoMap.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.lighting; import com.bergerkiller.bukkit.common.bases.IntVector3; @@ -46,8 +64,6 @@ public class FlatRegionInfoMap { /** * Gets whether a chunk exists * - * @param cx - * @param cz * @return True if the chunk exists */ public boolean containsChunk(int cx, int cz) { @@ -58,8 +74,6 @@ public class FlatRegionInfoMap { /** * Gets whether a chunk, and all its 8 neighbours, exist * - * @param cx - * @param cz * @return True if the chunk and all its neighbours exist */ public boolean containsChunkAndNeighbours(int cx, int cz) { @@ -89,7 +103,6 @@ public class FlatRegionInfoMap { * Computes all the region Y-coordinates used by a region and its neighbouring 8 regions. * The returned array is sorted in increasing order and is distinct (no duplicate values). * - * @param region * @return region and neighbouring regions' Y-coordinates */ public int[] getRegionYCoordinatesSelfAndNeighbours(FlatRegionInfo region) { @@ -116,11 +129,10 @@ public class FlatRegionInfoMap { * Creates a region information mapping of all existing chunks of a world * that are currently loaded. No further loading is required. * - * @param world * @return region info map */ public static FlatRegionInfoMap createLoaded(World world) { - LongHashMap regions = new LongHashMap(); + LongHashMap regions = new LongHashMap<>(); for (Chunk chunk : world.getLoadedChunks()) { int rx = WorldUtil.chunkToRegionIndex(chunk.getX()); int rz = WorldUtil.chunkToRegionIndex(chunk.getZ()); @@ -133,7 +145,7 @@ public class FlatRegionInfoMap { // Refresh y-coordinates for (Integer y_coord : WorldUtil.getLoadedSectionCoordinates(chunk)) { - new_info = new_info.addRegionYCoordinate(WorldUtil.chunkToRegionIndex(y_coord.intValue())); + new_info = new_info.addRegionYCoordinate(WorldUtil.chunkToRegionIndex(y_coord)); } // Add chunk to region bitset @@ -151,11 +163,10 @@ public class FlatRegionInfoMap { /** * Creates a region information mapping of all existing chunks of a world * - * @param world * @return region info map */ public static FlatRegionInfoMap create(World world) { - LongHashMap regions = new LongHashMap(); + LongHashMap regions = new LongHashMap<>(); // Obtain the region coordinates in 3d space (vertical too!) Set regionCoordinates = WorldUtil.getWorldRegions3(world); diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingAutoClean.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingAutoClean.java index 01f879c07..18a9e4693 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingAutoClean.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingAutoClean.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.lighting; import com.bergerkiller.bukkit.common.Task; @@ -12,7 +30,7 @@ import java.util.HashMap; * Handles the automatic cleanup of chunk lighting when chunks are generated */ public class LightingAutoClean { - private static final HashMap queues = new HashMap(); + private static final HashMap queues = new HashMap<>(); private static Task autoCleanTask = null; /** diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingCategory.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingCategory.java index 765459e29..732c11e93 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingCategory.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingCategory.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.lighting; import com.bergerkiller.bukkit.common.collections.BlockFaceSet; @@ -149,16 +167,12 @@ public enum LightingCategory { /** * Initializes the lighting in the chunk for this category * - * @param chunk */ public abstract void initialize(LightingChunk chunk); /** * Gets the y-coordinate to start processing from when spreading light around * - * @param chunk - * @param x - * @param z * @return start y-coordinate */ public abstract int getStartY(LightingChunk chunk, int x, int z); @@ -167,8 +181,6 @@ public enum LightingCategory { * Sets whether this category of light is dirty, indicating this category of light is all good, * or that more work is needed spreading light around. * - * @param chunk - * @param dirty */ public abstract void setDirty(LightingChunk chunk, boolean dirty); @@ -176,10 +188,6 @@ public enum LightingCategory { * Gets the light level in a section at the coordinates specified. * No bounds checking is performed. * - * @param section - * @param x - * @param y - * @param z * @return light level */ public abstract int get(LightingCube section, int x, int y, int z); @@ -188,11 +196,6 @@ public enum LightingCategory { * Sets the light level in a section at the coordinates specified. * No bounds checking is performed. * - * @param section - * @param x - * @param y - * @param z - * @param level */ public abstract void set(LightingCube section, int x, int y, int z, int level); } \ No newline at end of file diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingChunk.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingChunk.java index a11c4bd66..7b0996953 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingChunk.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingChunk.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.lighting; import com.bergerkiller.bukkit.common.bases.IntVector2; @@ -16,6 +34,7 @@ import org.bukkit.World; import java.util.Arrays; import java.util.Collection; import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -139,7 +158,7 @@ public class LightingChunk { .map(WorldUtil::regionToChunkIndex) .flatMap(base_cy -> IntStream.range(base_cy, base_cy + WorldUtil.CHUNKS_PER_REGION_AXIS)) .mapToObj(cy -> WorldUtil.getSection(chunk, cy)) - .filter(section -> section != null) + .filter(Objects::nonNull) .collect(Collectors.toList()); // Then process all the gathered chunk sections into a LightingChunkSection in parallel @@ -150,7 +169,7 @@ public class LightingChunk { } // Add to mapping - this.sections = new IntHashMap(); + this.sections = new IntHashMap<>(); for (LightingCube lightingChunkSection : lightingChunkSectionList) { this.sections.put(lightingChunkSection.cy, lightingChunkSection); } @@ -379,11 +398,10 @@ public class LightingChunk { } else if (++loops > 100) { lasterrx += this.chunkX << 4; lasterrz += this.chunkZ << 4; - StringBuilder msg = new StringBuilder(); - msg.append("Failed to fix all " + category.getName() + " lighting at ["); - msg.append(lasterrx).append('/').append(lasterry); - msg.append('/').append(lasterrz).append(']'); - Iris.warn(msg.toString()); + String msg = "Failed to fix all " + category.getName() + " lighting at [" + + lasterrx + '/' + lasterry + + '/' + lasterrz + ']'; + Iris.warn(msg); break; } } @@ -439,7 +457,7 @@ public class LightingChunk { try { for (CompletableFuture future : futures) { - if (future.get().booleanValue()) { + if (future.get()) { ChunkHandle.fromBukkit(chunk).markDirty(); return Boolean.TRUE; } diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingChunkNeighboring.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingChunkNeighboring.java index e7a8939ef..04b7374fa 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingChunkNeighboring.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingChunkNeighboring.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.lighting; /** @@ -39,8 +57,6 @@ public class LightingChunkNeighboring { /** * Gets the neighbor representing the given relative chunk * - * @param deltaChunkX - * @param deltaChunkZ * @return neighbor */ public LightingChunk get(int deltaChunkX, int deltaChunkZ) { @@ -50,8 +66,6 @@ public class LightingChunkNeighboring { /** * Gets a relative neighboring chunk, and then a vertical cube in that chunk, if possible. * - * @param deltaChunkX - * @param deltaChunkZ * @param cy Cube absolute y-coordinate * @return cube, null if the chunk or cube is not available */ @@ -63,8 +77,6 @@ public class LightingChunkNeighboring { /** * Sets the neighbor representing the given relative chunk * - * @param deltaChunkX - * @param deltaChunkZ * @param neighbor to set to */ public void set(int deltaChunkX, int deltaChunkZ, LightingChunk neighbor) { diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingCube.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingCube.java index e5a6a75f2..fea892a60 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingCube.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingCube.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.lighting; import com.bergerkiller.bukkit.common.collections.BlockFaceSet; @@ -117,9 +135,6 @@ public class LightingCube { * higher light value if all these tests pass. * The x/y/z coordinates are allowed to check neighboring cubes. * - * @param category - * @param old_light - * @param faceMask * @param x The X-coordinate of the block (-1 to 16) * @param y The Y-coordinate of the block (-1 to 16) * @param z The Z-coordinate of the block (-1 to 16) @@ -290,7 +305,7 @@ public class LightingCube { } } } catch (Throwable t) { - CompletableFuture exceptionally = new CompletableFuture(); + CompletableFuture exceptionally = new CompletableFuture<>(); exceptionally.completeExceptionally(t); return exceptionally; } diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingCubeNeighboring.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingCubeNeighboring.java index 7b0ffebb1..9f5809801 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingCubeNeighboring.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingCubeNeighboring.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.lighting; /** @@ -41,9 +59,6 @@ public class LightingCubeNeighboring { /** * Gets the neighbor representing the given relative cube * - * @param deltaCubeX - * @param deltaCubeY - * @param deltaCubeZ * @return neighbor, null if no neighbor is available here */ public LightingCube get(int deltaCubeX, int deltaCubeY, int deltaCubeZ) { @@ -53,9 +68,6 @@ public class LightingCubeNeighboring { /** * Sets the neighbor representing the given relative cube * - * @param deltaCubeX - * @param deltaCubeY - * @param deltaCubeZ * @param neighbor to set to, is allowed to be null to set to 'none' */ public void set(int deltaCubeX, int deltaCubeY, int deltaCubeZ, LightingCube neighbor) { diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingForcedChunkCache.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingForcedChunkCache.java index d1dd047b8..d3866b252 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingForcedChunkCache.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingForcedChunkCache.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.lighting; import com.bergerkiller.bukkit.common.chunk.ForcedChunk; @@ -12,7 +30,7 @@ import java.util.Map; * Reduces chunk unloading-loading grind. */ public class LightingForcedChunkCache { - private static final Map _cache = new HashMap(); + private static final Map _cache = new HashMap<>(); public static ForcedChunk get(World world, int x, int z) { ForcedChunk cached; @@ -45,6 +63,7 @@ public class LightingForcedChunkCache { } } + @SuppressWarnings("ClassCanBeRecord") private static final class Key { public final World world; public final int x; @@ -63,8 +82,7 @@ public class LightingForcedChunkCache { @Override public boolean equals(Object o) { - if (o instanceof Key) { - Key other = (Key) o; + if (o instanceof Key other) { return other.x == this.x && other.z == this.z && other.world == this.world; diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingService.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingService.java index 4120d8aca..94855868c 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingService.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingService.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.lighting; import com.bergerkiller.bukkit.common.AsyncTask; @@ -18,6 +36,7 @@ import org.bukkit.entity.Player; import java.util.*; +@SuppressWarnings("ALL") public class LightingService extends AsyncTask { private static final Set recipientsForDone = new HashSet(); private static final LinkedList tasks = new LinkedList(); diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingTask.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingTask.java index 389aa550e..c5f4731d4 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingTask.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingTask.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.lighting; import org.bukkit.World; diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingTaskBatch.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingTaskBatch.java index becf3ed01..597cd7e42 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingTaskBatch.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingTaskBatch.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.lighting; import com.bergerkiller.bukkit.common.bases.IntVector2; @@ -11,6 +29,7 @@ import org.bukkit.Chunk; import org.bukkit.World; import java.util.Arrays; +import java.util.Comparator; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; @@ -57,13 +76,7 @@ public class LightingTaskBatch implements LightingTask { } // Sort the array along the axis. This makes chunk loading more efficient. - Arrays.sort(coordinates, (a, b) -> { - int comp = Integer.compare(a.x, b.x); - if (comp == 0) { - comp = Integer.compare(a.z, b.z); - } - return comp; - }); + Arrays.sort(coordinates, Comparator.comparingInt((IntVector2 a) -> a.x).thenComparingInt(a -> a.z)); // Turn back into a long[] array for memory efficiency this.chunks_coords = Stream.of(coordinates).mapToLong(c -> MathUtil.longHashToLong(c.x, c.z)).toArray(); @@ -90,7 +103,8 @@ public class LightingTaskBatch implements LightingTask { coords[i] = MathUtil.longHashToLong(chunks[i].chunkX, chunks[i].chunkZ); } return coords; - } else if (this.chunks_coords != null) { + } else //noinspection ReplaceNullCheck + if (this.chunks_coords != null) { return this.chunks_coords; } else { return new long[0]; @@ -130,6 +144,7 @@ public class LightingTaskBatch implements LightingTask { return this.timeStarted; } + @SuppressWarnings("ClassCanBeRecord") private static final class BatchChunkInfo { public final int cx; public final int cz; @@ -217,6 +232,7 @@ public class LightingTaskBatch implements LightingTask { } } + @SuppressWarnings("BooleanMethodIsAlwaysInverted") private boolean waitForCheckAborted(CompletableFuture future) { while (!aborted) { try { @@ -292,7 +308,7 @@ public class LightingTaskBatch implements LightingTask { chunkFutures = new CompletableFuture[this.chunks.length]; } for (int i = 0; i < chunkFutures.length; i++) { - chunkFutures[i] = new CompletableFuture(); + chunkFutures[i] = new CompletableFuture<>(); } // Start loading up to [asyncLoadConcurrency] number of chunks right now @@ -478,7 +494,7 @@ public class LightingTaskBatch implements LightingTask { applyFutures[i] = lc.saveToChunk(bchunk).whenComplete((changed, t) -> { if (t != null) { t.printStackTrace(); - } else if (changed.booleanValue()) { + } else if (changed) { WorldUtil.queueChunkSendLight(world, lc.chunkX, lc.chunkZ); } diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingTaskWorld.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingTaskWorld.java index f90a22dca..ce5133f4e 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingTaskWorld.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingTaskWorld.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.lighting; import com.bergerkiller.bukkit.common.utils.CommonUtil; @@ -49,12 +67,13 @@ public class LightingTaskWorld implements LightingTask { } } + @SuppressWarnings("NonAtomicOperationOnVolatileField") @Override public void process() { // Load regions on the main thread // TODO: Can use main thread executor instead this.timeStarted = System.currentTimeMillis(); - final CompletableFuture regionsLoadedFuture = new CompletableFuture(); + final CompletableFuture regionsLoadedFuture = new CompletableFuture<>(); CommonUtil.nextTick(() -> { try { if (this.options.getLoadedChunksOnly()) { diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingUtil.java b/src/main/java/com/volmit/iris/scaffold/lighting/LightingUtil.java index ae5bdb870..469f2815a 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingUtil.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/LightingUtil.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.lighting; import com.bergerkiller.bukkit.common.utils.MathUtil; diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/TimeDurationFormat.java b/src/main/java/com/volmit/iris/scaffold/lighting/TimeDurationFormat.java index e5b714565..925e0da50 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/TimeDurationFormat.java +++ b/src/main/java/com/volmit/iris/scaffold/lighting/TimeDurationFormat.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.lighting; import java.text.SimpleDateFormat; @@ -20,7 +38,6 @@ public class TimeDurationFormat { * Creates a new time duration format. The format accepts the same formatting * tokens as the Date formatter does. * - * @param format * @throws IllegalArgumentException if the input format is invalid */ public TimeDurationFormat(String format) { @@ -35,7 +52,6 @@ public class TimeDurationFormat { /** * Formats the duration * - * @param durationMillis * @return formatted string */ public String format(long durationMillis) { diff --git a/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxAccess.java b/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxAccess.java index 108b084ac..fff50ba15 100644 --- a/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxAccess.java +++ b/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxAccess.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.parallax; import com.volmit.iris.object.tile.TileData; diff --git a/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxChunkMeta.java b/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxChunkMeta.java index faffa93c1..3377362cc 100644 --- a/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxChunkMeta.java +++ b/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxChunkMeta.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.parallax; import com.google.gson.Gson; @@ -17,7 +35,7 @@ import java.util.function.Function; @AllArgsConstructor @Data public class ParallaxChunkMeta { - public static final Function> adapter = (c) -> new PaletteHunkIOAdapter() { + public static final Function> adapter = (c) -> new PaletteHunkIOAdapter<>() { @Override public void write(ParallaxChunkMeta parallaxChunkMeta, DataOutputStream dos) throws IOException { dos.writeUTF(new Gson().toJson(parallaxChunkMeta)); diff --git a/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxRegion.java b/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxRegion.java index 49d7de34a..2879ad298 100644 --- a/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxRegion.java +++ b/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxRegion.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.parallax; import com.volmit.iris.object.tile.TileData; diff --git a/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxWorld.java b/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxWorld.java index 48a6a09d2..128206d35 100644 --- a/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxWorld.java +++ b/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxWorld.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.parallax; import com.volmit.iris.IrisSettings; @@ -12,6 +30,7 @@ import org.bukkit.block.data.BlockData; import java.io.File; import java.io.IOException; +@SuppressWarnings("ALL") public class ParallaxWorld implements ParallaxAccess { private final KMap loadedRegions; private final KList save; diff --git a/src/main/java/com/volmit/iris/scaffold/parallel/BurstExecutor.java b/src/main/java/com/volmit/iris/scaffold/parallel/BurstExecutor.java index 8d987d105..7151132f7 100644 --- a/src/main/java/com/volmit/iris/scaffold/parallel/BurstExecutor.java +++ b/src/main/java/com/volmit/iris/scaffold/parallel/BurstExecutor.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.parallel; import com.volmit.iris.util.KList; @@ -6,6 +24,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; +@SuppressWarnings("ALL") public class BurstExecutor { private final ExecutorService executor; private final KList> futures; @@ -15,6 +34,7 @@ public class BurstExecutor { futures = new KList>(burstSizeEstimate); } + @SuppressWarnings("UnusedReturnValue") public CompletableFuture queue(Runnable r) { synchronized (futures) { CompletableFuture c = CompletableFuture.runAsync(r, executor); @@ -52,7 +72,7 @@ public class BurstExecutor { } try { - CompletableFuture.allOf(futures.toArray(new CompletableFuture[futures.size()])).get(); + CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).get(); futures.clear(); } catch (InterruptedException | ExecutionException e) { e.printStackTrace(); diff --git a/src/main/java/com/volmit/iris/scaffold/parallel/BurstedHunk.java b/src/main/java/com/volmit/iris/scaffold/parallel/BurstedHunk.java index a1f1ced4e..7f6b401fa 100644 --- a/src/main/java/com/volmit/iris/scaffold/parallel/BurstedHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/parallel/BurstedHunk.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.parallel; import com.volmit.iris.scaffold.hunk.Hunk; diff --git a/src/main/java/com/volmit/iris/scaffold/parallel/GridLock.java b/src/main/java/com/volmit/iris/scaffold/parallel/GridLock.java index 0f471da34..ce373bb93 100644 --- a/src/main/java/com/volmit/iris/scaffold/parallel/GridLock.java +++ b/src/main/java/com/volmit/iris/scaffold/parallel/GridLock.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.parallel; import com.volmit.iris.scaffold.hunk.Hunk; diff --git a/src/main/java/com/volmit/iris/scaffold/parallel/MultiBurst.java b/src/main/java/com/volmit/iris/scaffold/parallel/MultiBurst.java index 3aad2c506..5d9ba0089 100644 --- a/src/main/java/com/volmit/iris/scaffold/parallel/MultiBurst.java +++ b/src/main/java/com/volmit/iris/scaffold/parallel/MultiBurst.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.parallel; import com.volmit.iris.Iris; @@ -5,30 +23,31 @@ import com.volmit.iris.util.KList; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.concurrent.ThreadFactory; public class MultiBurst { - public static MultiBurst burst = new MultiBurst(Runtime.getRuntime().availableProcessors()); + public static final MultiBurst burst = new MultiBurst("Iris Burster", 10, Runtime.getRuntime().availableProcessors()); + public static final MultiBurst burstAux = new MultiBurst("Iris Aux Burster", 8, Runtime.getRuntime().availableProcessors()/2); private final ExecutorService service; private ExecutorService syncService; private int tid; - public MultiBurst(int tc) { - service = Executors.newFixedThreadPool(tc, new ThreadFactory() { - @Override - public Thread newThread(Runnable r) { - tid++; - Thread t = new Thread(r); - t.setName("Iris Generator " + tid); - t.setPriority(6); - t.setUncaughtExceptionHandler((et, e) -> - { - Iris.info("Exception encountered in " + et.getName()); - e.printStackTrace(); - }); - return t; - } + public MultiBurst(int tc) { + this("Iris Generator", 6, tc); + } + public MultiBurst(String name, int priority, int tc) { + service = Executors.newFixedThreadPool(tc, r -> { + tid++; + Thread t = new Thread(r); + t.setName(name + " " + tid); + t.setPriority(6); + t.setUncaughtExceptionHandler((et, e) -> + { + Iris.info("Exception encountered in " + et.getName()); + e.printStackTrace(); + }); + + return t; }); } diff --git a/src/main/java/com/volmit/iris/scaffold/stream/ArraySignificance.java b/src/main/java/com/volmit/iris/scaffold/stream/ArraySignificance.java index f209f5c15..c9b69eda4 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/ArraySignificance.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/ArraySignificance.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/BasicLayer.java b/src/main/java/com/volmit/iris/scaffold/stream/BasicLayer.java index f3f6b71a2..6d9441a7a 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/BasicLayer.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/BasicLayer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/BasicStream.java b/src/main/java/com/volmit/iris/scaffold/stream/BasicStream.java index 3d489ed79..3ed8e420f 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/BasicStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/BasicStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream; public abstract class BasicStream extends BasicLayer implements ProceduralStream { diff --git a/src/main/java/com/volmit/iris/scaffold/stream/ProceduralLayer.java b/src/main/java/com/volmit/iris/scaffold/stream/ProceduralLayer.java index 1ea581be9..918ed1aea 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/ProceduralLayer.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/ProceduralLayer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream; public interface ProceduralLayer { diff --git a/src/main/java/com/volmit/iris/scaffold/stream/ProceduralStream.java b/src/main/java/com/volmit/iris/scaffold/stream/ProceduralStream.java index d8c33ae25..67ed40bf8 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/ProceduralStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/ProceduralStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream; import com.volmit.iris.Iris; @@ -12,6 +30,7 @@ import com.volmit.iris.util.*; import java.util.List; import java.util.function.Function; +@SuppressWarnings("ALL") public interface ProceduralStream extends ProceduralLayer, Interpolated { static ProceduralStream ofDouble(Function2 f) { try { diff --git a/src/main/java/com/volmit/iris/scaffold/stream/Significance.java b/src/main/java/com/volmit/iris/scaffold/stream/Significance.java index 6794f776d..8d625b073 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/Significance.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/Significance.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/AddingStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/AddingStream.java index 1d8aa2ee3..6ea437fea 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/AddingStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/AddingStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.arithmetic; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ClampedStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ClampedStream.java index 855ac0a7b..1d38adacd 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ClampedStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ClampedStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.arithmetic; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/CoordinateBitShiftLeftStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/CoordinateBitShiftLeftStream.java index 98d10d8d6..1a8fca0b1 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/CoordinateBitShiftLeftStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/CoordinateBitShiftLeftStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.arithmetic; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/CoordinateBitShiftRightStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/CoordinateBitShiftRightStream.java index 8ea7bac4d..29ea125dc 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/CoordinateBitShiftRightStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/CoordinateBitShiftRightStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.arithmetic; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/DividingStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/DividingStream.java index 7f4bc887a..5847698ea 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/DividingStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/DividingStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.arithmetic; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/FittedStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/FittedStream.java index efd7006a1..d2014c3ab 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/FittedStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/FittedStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.arithmetic; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MaxingStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MaxingStream.java index fa70e71e4..6269492f9 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MaxingStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MaxingStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.arithmetic; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MinningStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MinningStream.java index 4e5b9a540..4b741e802 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MinningStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MinningStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.arithmetic; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ModuloStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ModuloStream.java index f3f9aa51c..93895d48c 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ModuloStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ModuloStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.arithmetic; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MultiplyingStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MultiplyingStream.java index 7d6f5596b..db2a4b79f 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MultiplyingStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MultiplyingStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.arithmetic; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/OffsetStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/OffsetStream.java index 09dc64513..712b5ff56 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/OffsetStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/OffsetStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.arithmetic; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/RadialStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/RadialStream.java index 1f403c483..dfa5f6570 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/RadialStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/RadialStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.arithmetic; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/RoundingDoubleStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/RoundingDoubleStream.java index 5550b6b12..5fde57af2 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/RoundingDoubleStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/RoundingDoubleStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.arithmetic; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/SlopeStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/SlopeStream.java index 450b4ecfd..3081c7b4b 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/SlopeStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/SlopeStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.arithmetic; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/SubtractingStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/SubtractingStream.java index 3770f805f..0124e92ac 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/SubtractingStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/SubtractingStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.arithmetic; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ZoomStream.java b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ZoomStream.java index 3ff7aaec6..48d9ca0c9 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ZoomStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ZoomStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.arithmetic; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/convert/AwareConversionStream2D.java b/src/main/java/com/volmit/iris/scaffold/stream/convert/AwareConversionStream2D.java index 4b2e4a42d..f763e87eb 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/convert/AwareConversionStream2D.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/convert/AwareConversionStream2D.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.convert; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/convert/AwareConversionStream3D.java b/src/main/java/com/volmit/iris/scaffold/stream/convert/AwareConversionStream3D.java index 9fdf0d5ed..abb4bfdb0 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/convert/AwareConversionStream3D.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/convert/AwareConversionStream3D.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.convert; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/convert/CachedConversionStream.java b/src/main/java/com/volmit/iris/scaffold/stream/convert/CachedConversionStream.java index da74da1f1..d605c47a0 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/convert/CachedConversionStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/convert/CachedConversionStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.convert; import com.volmit.iris.scaffold.stream.BasicLayer; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/convert/ConversionStream.java b/src/main/java/com/volmit/iris/scaffold/stream/convert/ConversionStream.java index 80d0bbdb7..dd6e20fae 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/convert/ConversionStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/convert/ConversionStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.convert; import com.volmit.iris.scaffold.stream.BasicLayer; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/convert/ForceDoubleStream.java b/src/main/java/com/volmit/iris/scaffold/stream/convert/ForceDoubleStream.java index d5171ff2e..5fb56893e 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/convert/ForceDoubleStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/convert/ForceDoubleStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.convert; import com.volmit.iris.scaffold.stream.BasicStream; @@ -15,7 +33,6 @@ public class ForceDoubleStream extends BasicStream { return t; } - @SuppressWarnings("unchecked") @Override public Double fromDouble(double d) { return d; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/convert/RoundingStream.java b/src/main/java/com/volmit/iris/scaffold/stream/convert/RoundingStream.java index 2ce110f61..739c0eb9b 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/convert/RoundingStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/convert/RoundingStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.convert; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/convert/SelectionStream.java b/src/main/java/com/volmit/iris/scaffold/stream/convert/SelectionStream.java index 6f9d51e0e..5495dc872 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/convert/SelectionStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/convert/SelectionStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.convert; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/convert/SignificanceStream.java b/src/main/java/com/volmit/iris/scaffold/stream/convert/SignificanceStream.java index 26dbebe66..92d5e761b 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/convert/SignificanceStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/convert/SignificanceStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.convert; import com.volmit.iris.scaffold.stream.ArraySignificance; @@ -32,9 +50,9 @@ public class SignificanceStream, T> extends BasicStrea @Override public K get(double x, double z) { KList ke = new KList<>(8); - KList va = new KList(8); + KList va = new KList<>(8); - double m = (360 / checks); + double m = (360d / checks); double v = 0; for (int i = 0; i < 360; i += m) { @@ -57,7 +75,7 @@ public class SignificanceStream, T> extends BasicStrea va.set(i, va.get(i) / v); } - return (K) new ArraySignificance(ke, va); + return (K) new ArraySignificance<>(ke, va); } @Override diff --git a/src/main/java/com/volmit/iris/scaffold/stream/convert/To3DStream.java b/src/main/java/com/volmit/iris/scaffold/stream/convert/To3DStream.java index c38160e89..869639b8d 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/convert/To3DStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/convert/To3DStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.convert; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BiHermiteStream.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BiHermiteStream.java index 24970842b..17838bd5d 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BiHermiteStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BiHermiteStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.interpolation; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BiStarcastStream.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BiStarcastStream.java index 8f9ab720e..cf49695da 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BiStarcastStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BiStarcastStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.interpolation; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BicubicStream.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BicubicStream.java index 29a8f5cef..415149a04 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BicubicStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BicubicStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.interpolation; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BilinearStream.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BilinearStream.java index 391819d82..2240c6d1e 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BilinearStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BilinearStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.interpolation; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/Interpolated.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/Interpolated.java index 8bd102f78..621d46ee9 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/Interpolated.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/Interpolated.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.interpolation; import com.volmit.iris.scaffold.stream.ProceduralStream; @@ -22,14 +40,14 @@ public interface Interpolated { default InterpolatorFactory interpolate() { if (this instanceof ProceduralStream) { - return new InterpolatorFactory((ProceduralStream) this); + return new InterpolatorFactory<>((ProceduralStream) this); } return null; } static Interpolated of(Function a, Function b) { - return new Interpolated() { + return new Interpolated<>() { @Override public double toDouble(T t) { return a.apply(t); diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/InterpolatingStream.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/InterpolatingStream.java index 94ddebeda..84952479c 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/InterpolatingStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/InterpolatingStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.interpolation; import com.volmit.iris.object.InterpolationMethod; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/Interpolator.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/Interpolator.java index 96cad3cfc..b42e96d9b 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/Interpolator.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/Interpolator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.interpolation; import com.volmit.iris.scaffold.stream.ProceduralStream; @@ -6,7 +24,7 @@ public interface Interpolator { @SuppressWarnings("unchecked") default InterpolatorFactory into() { if (this instanceof ProceduralStream) { - return new InterpolatorFactory((ProceduralStream) this); + return new InterpolatorFactory<>((ProceduralStream) this); } return null; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/InterpolatorFactory.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/InterpolatorFactory.java index 75c90b42e..b1c9e5cfd 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/InterpolatorFactory.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/InterpolatorFactory.java @@ -1,8 +1,27 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.interpolation; import com.volmit.iris.object.InterpolationMethod; import com.volmit.iris.scaffold.stream.ProceduralStream; +@SuppressWarnings("ClassCanBeRecord") public class InterpolatorFactory { private final ProceduralStream stream; @@ -11,7 +30,7 @@ public class InterpolatorFactory { } public InterpolatingStream with(InterpolationMethod t, int rx) { - return new InterpolatingStream(stream, rx, t); + return new InterpolatingStream<>(stream, rx, t); } public TrilinearStream trilinear(int rx, int ry, int rz) { diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TriHermiteStream.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TriHermiteStream.java index 5936e176a..eb2c26767 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TriHermiteStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TriHermiteStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.interpolation; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TriStarcastStream.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TriStarcastStream.java index 9a1c47a46..7b1a60bfd 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TriStarcastStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TriStarcastStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.interpolation; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TricubicStream.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TricubicStream.java index 12acbb2e2..e1a102855 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TricubicStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TricubicStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.interpolation; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TrilinearStream.java b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TrilinearStream.java index 276521eec..c353939cf 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TrilinearStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TrilinearStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.interpolation; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/sources/CNGStream.java b/src/main/java/com/volmit/iris/scaffold/stream/sources/CNGStream.java index 38116dea2..1840ecaa4 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/sources/CNGStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/sources/CNGStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.sources; import com.volmit.iris.generator.noise.CNG; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/sources/FunctionStream.java b/src/main/java/com/volmit/iris/scaffold/stream/sources/FunctionStream.java index ffdf63b6a..9124f3301 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/sources/FunctionStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/sources/FunctionStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.sources; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/utility/CachedStream2D.java b/src/main/java/com/volmit/iris/scaffold/stream/utility/CachedStream2D.java index 28ad81a98..d039fd463 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/utility/CachedStream2D.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/utility/CachedStream2D.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.utility; import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/utility/NullSafeStream.java b/src/main/java/com/volmit/iris/scaffold/stream/utility/NullSafeStream.java index 7c7dce361..bce365f65 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/utility/NullSafeStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/utility/NullSafeStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.utility; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/utility/ProfiledStream.java b/src/main/java/com/volmit/iris/scaffold/stream/utility/ProfiledStream.java index 40f11a5fb..6a235035a 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/utility/ProfiledStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/utility/ProfiledStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.utility; import com.volmit.iris.scaffold.stream.BasicStream; @@ -42,7 +60,7 @@ public class ProfiledStream extends BasicStream { T t = getTypedSource().get(x, z); try { metrics.put(p.getMilliseconds()); - } catch (Throwable e) { + } catch (Throwable ignored) { } return t; @@ -54,7 +72,7 @@ public class ProfiledStream extends BasicStream { T t = getTypedSource().get(x, y, z); try { metrics.put(p.getMilliseconds()); - } catch (Throwable e) { + } catch (Throwable ignored) { } return t; @@ -95,8 +113,7 @@ public class ProfiledStream extends BasicStream { } private static ProfiledTail getTail(ProceduralStream t) { - if (t instanceof ProfiledStream) { - ProfiledStream s = ((ProfiledStream) t); + if (t instanceof ProfiledStream s) { return new ProfiledTail(s.getId(), s.getMetrics(), s.getClass().getSimpleName().replaceAll("\\QStream\\E", "")); } diff --git a/src/main/java/com/volmit/iris/scaffold/stream/utility/SemaphoreStream.java b/src/main/java/com/volmit/iris/scaffold/stream/utility/SemaphoreStream.java index 1db48c933..4c3ebf328 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/utility/SemaphoreStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/utility/SemaphoreStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.utility; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/utility/SynchronizedStream.java b/src/main/java/com/volmit/iris/scaffold/stream/utility/SynchronizedStream.java index da830f79b..31c5ff931 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/utility/SynchronizedStream.java +++ b/src/main/java/com/volmit/iris/scaffold/stream/utility/SynchronizedStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.scaffold.stream.utility; import com.volmit.iris.scaffold.stream.BasicStream; diff --git a/src/main/java/com/volmit/iris/util/AR.java b/src/main/java/com/volmit/iris/util/AR.java index f156e2ec4..574721304 100644 --- a/src/main/java/com/volmit/iris/util/AR.java +++ b/src/main/java/com/volmit/iris/util/AR.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public abstract class AR implements Runnable, CancellableTask { diff --git a/src/main/java/com/volmit/iris/util/AlignedPoint.java b/src/main/java/com/volmit/iris/util/AlignedPoint.java index 61373533d..177d18367 100644 --- a/src/main/java/com/volmit/iris/util/AlignedPoint.java +++ b/src/main/java/com/volmit/iris/util/AlignedPoint.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public class AlignedPoint { diff --git a/src/main/java/com/volmit/iris/util/ArrayType.java b/src/main/java/com/volmit/iris/util/ArrayType.java index 441f29168..9b78b79ed 100644 --- a/src/main/java/com/volmit/iris/util/ArrayType.java +++ b/src/main/java/com/volmit/iris/util/ArrayType.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/AtomicAverage.java b/src/main/java/com/volmit/iris/util/AtomicAverage.java index e3d95ba06..009e84c19 100644 --- a/src/main/java/com/volmit/iris/util/AtomicAverage.java +++ b/src/main/java/com/volmit/iris/util/AtomicAverage.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.google.common.util.concurrent.AtomicDoubleArray; @@ -10,7 +28,7 @@ import com.google.common.util.concurrent.AtomicDoubleArray; * @author cyberpwn */ public class AtomicAverage { - protected AtomicDoubleArray values; + protected final AtomicDoubleArray values; private double average; private double lastSum; private boolean dirty; @@ -53,7 +71,7 @@ public class AtomicAverage { lastSum = (lastSum - current) + i; values.set(cursor, i); cursor = cursor + 1 < size() ? cursor + 1 : 0; - } catch (Throwable e) { + } catch (Throwable ignored) { } } diff --git a/src/main/java/com/volmit/iris/util/AtomicRollingSequence.java b/src/main/java/com/volmit/iris/util/AtomicRollingSequence.java index 5660fe7f5..91f30d39c 100644 --- a/src/main/java/com/volmit/iris/util/AtomicRollingSequence.java +++ b/src/main/java/com/volmit/iris/util/AtomicRollingSequence.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public class AtomicRollingSequence extends AtomicAverage { diff --git a/src/main/java/com/volmit/iris/util/Average.java b/src/main/java/com/volmit/iris/util/Average.java index 8cf8dcccb..e0ccd95b9 100644 --- a/src/main/java/com/volmit/iris/util/Average.java +++ b/src/main/java/com/volmit/iris/util/Average.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; /** @@ -8,7 +26,7 @@ package com.volmit.iris.util; * @author cyberpwn */ public class Average { - protected double[] values; + protected final double[] values; private double average; private double lastSum; private boolean dirty; diff --git a/src/main/java/com/volmit/iris/util/AxisAlignedBB.java b/src/main/java/com/volmit/iris/util/AxisAlignedBB.java index 605468023..8a8522d6f 100644 --- a/src/main/java/com/volmit/iris/util/AxisAlignedBB.java +++ b/src/main/java/com/volmit/iris/util/AxisAlignedBB.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.volmit.iris.object.IrisPosition; diff --git a/src/main/java/com/volmit/iris/util/B.java b/src/main/java/com/volmit/iris/util/B.java index d9adca2cb..bfae2e51e 100644 --- a/src/main/java/com/volmit/iris/util/B.java +++ b/src/main/java/com/volmit/iris/util/B.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.volmit.iris.Iris; @@ -122,7 +140,7 @@ public class B { BlockData bx = Bukkit.createBlockData(ix); blockDataCache.put(ix, bx); return bx; - } catch (Throwable e) { + } catch (Throwable ignored) { } @@ -133,7 +151,7 @@ public class B { try { BlockData bd = Material.valueOf(i).createBlockData(); blockDataCache.put(ix, bd); - } catch (Throwable e) { + } catch (Throwable ignored) { } @@ -467,7 +485,7 @@ public class B { public static String[] getBlockTypes() { - KList bt = new KList(); + KList bt = new KList<>(); for (Material i : Material.values()) { if (i.isBlock()) { @@ -485,17 +503,17 @@ public class B { } } - return bt.toArray(new String[bt.size()]); + return bt.toArray(new String[0]); } public static String[] getItemTypes() { - KList bt = new KList(); + KList bt = new KList<>(); for (Material i : Material.values()) { String v = i.name().toLowerCase().trim(); bt.add(v); } - return bt.toArray(new String[bt.size()]); + return bt.toArray(new String[0]); } } diff --git a/src/main/java/com/volmit/iris/util/BiomeMap.java b/src/main/java/com/volmit/iris/util/BiomeMap.java index b433ca70c..a8c73082c 100644 --- a/src/main/java/com/volmit/iris/util/BiomeMap.java +++ b/src/main/java/com/volmit/iris/util/BiomeMap.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.volmit.iris.object.IrisBiome; diff --git a/src/main/java/com/volmit/iris/util/BlockPosition.java b/src/main/java/com/volmit/iris/util/BlockPosition.java index 25ae65cd3..1a29c8b0d 100644 --- a/src/main/java/com/volmit/iris/util/BlockPosition.java +++ b/src/main/java/com/volmit/iris/util/BlockPosition.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import lombok.Data; @@ -35,8 +53,7 @@ public class BlockPosition { return false; } - if (o instanceof BlockPosition) { - BlockPosition ot = (BlockPosition) o; + if (o instanceof BlockPosition ot) { return ot.x == x && ot.y == y && ot.z == z; } @@ -67,7 +84,7 @@ public class BlockPosition { public static long toLong(int x, int y, int z) { long var3 = 0L; var3 |= (x & m4) << m3; - var3 |= (y & m5) << 0L; + var3 |= (y & m5); var3 |= (z & m6) << m2; return var3; } diff --git a/src/main/java/com/volmit/iris/util/Board.java b/src/main/java/com/volmit/iris/util/Board.java index af39b1dd2..14f9b94b4 100644 --- a/src/main/java/com/volmit/iris/util/Board.java +++ b/src/main/java/com/volmit/iris/util/Board.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import lombok.NonNull; @@ -109,12 +127,8 @@ public class Board { team.setSuffix(entry.getSuffix()); switch (boardSettings.getScoreDirection()) { - case UP: - objective.getScore(team.getName()).setScore(1 + i); - break; - case DOWN: - objective.getScore(team.getName()).setScore(15 - i); - break; + case UP -> objective.getScore(team.getName()).setScore(1 + i); + case DOWN -> objective.getScore(team.getName()).setScore(15 - i); } } } diff --git a/src/main/java/com/volmit/iris/util/BoardEntry.java b/src/main/java/com/volmit/iris/util/BoardEntry.java index ec0f9ad7d..c19000269 100644 --- a/src/main/java/com/volmit/iris/util/BoardEntry.java +++ b/src/main/java/com/volmit/iris/util/BoardEntry.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import lombok.Getter; @@ -7,6 +25,7 @@ import org.apache.commons.lang.StringUtils; * @author Missionary (missionarymc@gmail.com) * @since 3/29/2018 */ +@SuppressWarnings("ClassCanBeRecord") public class BoardEntry { @Getter diff --git a/src/main/java/com/volmit/iris/util/BoardManager.java b/src/main/java/com/volmit/iris/util/BoardManager.java index ac1013d55..496eb62cc 100644 --- a/src/main/java/com/volmit/iris/util/BoardManager.java +++ b/src/main/java/com/volmit/iris/util/BoardManager.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.Bukkit; @@ -11,21 +29,21 @@ import java.util.Optional; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -@DontObfuscate + public class BoardManager { - @DontObfuscate + private final JavaPlugin plugin; - @DontObfuscate + private BoardSettings boardSettings; - @DontObfuscate + private final Map scoreboards; - @DontObfuscate + private final BukkitTask updateTask; - @DontObfuscate + public BoardManager(JavaPlugin plugin, BoardSettings boardSettings) { this.plugin = plugin; this.boardSettings = boardSettings; @@ -34,23 +52,23 @@ public class BoardManager { plugin.getServer().getOnlinePlayers().forEach(this::setup); } - @DontObfuscate + public void setBoardSettings(BoardSettings boardSettings) { this.boardSettings = boardSettings; scoreboards.values().forEach(board -> board.setBoardSettings(boardSettings)); } - @DontObfuscate + public boolean hasBoard(Player player) { return scoreboards.containsKey(player.getUniqueId()); } - @DontObfuscate + public Optional getBoard(Player player) { return Optional.ofNullable(scoreboards.get(player.getUniqueId())); } - @DontObfuscate + public void setup(Player player) { Optional.ofNullable(scoreboards.remove(player.getUniqueId())).ifPresent(Board::resetScoreboard); if (player.getScoreboard().equals(Bukkit.getScoreboardManager().getMainScoreboard())) { @@ -59,17 +77,17 @@ public class BoardManager { scoreboards.put(player.getUniqueId(), new Board(player, boardSettings)); } - @DontObfuscate + public void remove(Player player) { Optional.ofNullable(scoreboards.remove(player.getUniqueId())).ifPresent(Board::remove); } - @DontObfuscate + public Map getScoreboards() { return Collections.unmodifiableMap(scoreboards); } - @DontObfuscate + public void onDisable() { updateTask.cancel(); plugin.getServer().getOnlinePlayers().forEach(this::remove); diff --git a/src/main/java/com/volmit/iris/util/BoardProvider.java b/src/main/java/com/volmit/iris/util/BoardProvider.java index d9445f47e..d33a437c8 100644 --- a/src/main/java/com/volmit/iris/util/BoardProvider.java +++ b/src/main/java/com/volmit/iris/util/BoardProvider.java @@ -1,14 +1,32 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.entity.Player; import java.util.List; -@DontObfuscate + public interface BoardProvider { - @DontObfuscate + String getTitle(Player player); - @DontObfuscate + List getLines(Player player); } diff --git a/src/main/java/com/volmit/iris/util/BoardSettings.java b/src/main/java/com/volmit/iris/util/BoardSettings.java index 692ec79c7..ca0e0abeb 100644 --- a/src/main/java/com/volmit/iris/util/BoardSettings.java +++ b/src/main/java/com/volmit/iris/util/BoardSettings.java @@ -1,15 +1,34 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import lombok.Builder; import lombok.Getter; -@DontObfuscate + +@SuppressWarnings("ClassCanBeRecord") @Getter @Builder public class BoardSettings { - @DontObfuscate + private final BoardProvider boardProvider; - @DontObfuscate + private final ScoreDirection scoreDirection; } diff --git a/src/main/java/com/volmit/iris/util/BoardUpdateTask.java b/src/main/java/com/volmit/iris/util/BoardUpdateTask.java index ec1c8cc21..3d421c726 100644 --- a/src/main/java/com/volmit/iris/util/BoardUpdateTask.java +++ b/src/main/java/com/volmit/iris/util/BoardUpdateTask.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/volmit/iris/util/ByteArrayTag.java b/src/main/java/com/volmit/iris/util/ByteArrayTag.java index ec60b805c..06bf09734 100644 --- a/src/main/java/com/volmit/iris/util/ByteArrayTag.java +++ b/src/main/java/com/volmit/iris/util/ByteArrayTag.java @@ -1,38 +1,23 @@ -package com.volmit.iris.util; - /* - * JNBT License + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright (c) 2010 Graham Edgecombe - * All rights reserved. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the JNBT team nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ +package com.volmit.iris.util; + /** * The TAG_Byte_Array tag. * diff --git a/src/main/java/com/volmit/iris/util/ByteTag.java b/src/main/java/com/volmit/iris/util/ByteTag.java index 328b255a3..5eb9f5a3c 100644 --- a/src/main/java/com/volmit/iris/util/ByteTag.java +++ b/src/main/java/com/volmit/iris/util/ByteTag.java @@ -1,38 +1,23 @@ -package com.volmit.iris.util; - /* - * JNBT License + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright (c) 2010 Graham Edgecombe - * All rights reserved. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the JNBT team nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ +package com.volmit.iris.util; + /** * The TAG_Byte tag. * diff --git a/src/main/java/com/volmit/iris/util/C.java b/src/main/java/com/volmit/iris/util/C.java index 66fb0994b..0050348a4 100644 --- a/src/main/java/com/volmit/iris/util/C.java +++ b/src/main/java/com/volmit/iris/util/C.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.apache.commons.lang.Validate; @@ -227,11 +245,12 @@ public enum C { private final char code; private final boolean isFormat; private final String toString; - private final static Map BY_ID = new HashMap(); - private final static Map BY_CHAR = new HashMap(); - private final static Map dyeChatMap = new HashMap(); - private final static Map chatHexMap = new HashMap(); - private final static Map dyeHexMap = new HashMap(); + @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") + private final static Map BY_ID = new HashMap<>(); + private final static Map BY_CHAR = new HashMap<>(); + private final static Map dyeChatMap = new HashMap<>(); + private final static Map chatHexMap = new HashMap<>(); + private final static Map dyeHexMap = new HashMap<>(); static { chatHexMap.put(C.BLACK, "#000"); @@ -316,7 +335,6 @@ public enum C { /** * get the dye color for the chatcolor * - * @return */ public DyeColor dye() { return chatToDye(chatColor()); @@ -406,9 +424,9 @@ public enum C { } public static DyeColor chatToDye(ChatColor color) { - for (DyeColor i : dyeChatMap.keySet()) { - if (dyeChatMap.get(i).toString().equals(color.toString())) { - return i; + for (Map.Entry entry : dyeChatMap.entrySet()) { + if (entry.getValue().toString().equals(color.toString())) { + return entry.getKey(); } } @@ -437,7 +455,7 @@ public enum C { hex = hex.substring(1); } - if (hex.indexOf("x") != -1) { + if (hex.contains("x")) { hex = hex.substring(hex.indexOf("x")); } @@ -491,7 +509,6 @@ public enum C { /** * Get the ChatColor enum instance instead of C * - * @return */ public ChatColor chatColor() { return ChatColor.getByChar(code); @@ -533,105 +550,43 @@ public enum C { } public byte getMeta() { - switch (this) { - case AQUA: - return 11; - case BLACK: - return 0; - case BLUE: - return 9; - case BOLD: - return -1; - case DARK_AQUA: - return 9; - case DARK_BLUE: - return 1; - case DARK_GRAY: - return 8; - case DARK_GREEN: - return 2; - case DARK_PURPLE: - return 5; - case DARK_RED: - return 4; - case GOLD: - return 6; - case GRAY: - return 7; - case GREEN: - return 10; - case ITALIC: - return -1; - case LIGHT_PURPLE: - return 13; - case MAGIC: - return -1; - case RED: - return 12; - case RESET: - return -1; - case STRIKETHROUGH: - return -1; - case UNDERLINE: - return -1; - case WHITE: - return 15; - case YELLOW: - return 14; - default: - return -1; - } + return switch (this) { + case AQUA -> (byte)11; + case BLACK -> (byte)0; + case BLUE, DARK_AQUA -> (byte)9; + case BOLD, UNDERLINE, STRIKETHROUGH, RESET, MAGIC, ITALIC -> (byte)-1; + case DARK_BLUE -> (byte)1; + case DARK_GRAY -> (byte)8; + case DARK_GREEN -> (byte)2; + case DARK_PURPLE -> (byte)5; + case DARK_RED -> (byte)4; + case GOLD -> (byte)6; + case GRAY -> (byte)7; + case GREEN -> (byte)10; + case LIGHT_PURPLE -> (byte)13; + case RED -> (byte)12; + case WHITE -> (byte)15; + case YELLOW -> (byte)14; + }; } public byte getItemMeta() { - switch (this) { - case AQUA: - return 9; - case BLACK: - return 15; - case BLUE: - return 3; - case BOLD: - return -1; - case DARK_AQUA: - return 9; - case DARK_BLUE: - return 11; - case DARK_GRAY: - return 7; - case DARK_GREEN: - return 13; - case DARK_PURPLE: - return 10; - case DARK_RED: - return 14; - case GOLD: - return 4; - case GRAY: - return 8; - case GREEN: - return 5; - case ITALIC: - return -1; - case LIGHT_PURPLE: - return 2; - case MAGIC: - return -1; - case RED: - return 14; - case RESET: - return -1; - case STRIKETHROUGH: - return -1; - case UNDERLINE: - return -1; - case WHITE: - return 0; - case YELLOW: - return 4; - default: - return -1; - } + return switch (this) { + case AQUA, DARK_AQUA -> (byte)9; + case BLACK -> (byte)15; + case BLUE -> (byte)3; + case BOLD, UNDERLINE, RESET, STRIKETHROUGH, MAGIC, ITALIC -> (byte)-1; + case DARK_BLUE -> (byte)11; + case DARK_GRAY -> (byte)7; + case DARK_GREEN -> (byte)13; + case DARK_PURPLE -> (byte)10; + case DARK_RED, RED -> (byte)14; + case GOLD, YELLOW -> (byte)4; + case GRAY -> (byte)8; + case GREEN -> (byte)5; + case LIGHT_PURPLE -> (byte)2; + case WHITE -> (byte)0; + }; } public static C randomColor() { @@ -645,7 +600,7 @@ public enum C { * @return Any remaining ChatColors to pass onto the next line. */ public static String getLastColors(String input) { - String result = ""; + StringBuilder result = new StringBuilder(); int length = input.length(); // Search backwards from the end as it is faster @@ -656,7 +611,7 @@ public enum C { C color = getByChar(c); if (color != null) { - result = color + result; + result.insert(0, color); // Once we find a color or reset we can stop searching if (color.isColor() || color.equals(RESET)) { @@ -666,7 +621,7 @@ public enum C { } } - return result; + return result.toString(); } static { diff --git a/src/main/java/com/volmit/iris/util/CDou.java b/src/main/java/com/volmit/iris/util/CDou.java index 5b807e726..53ca67f80 100644 --- a/src/main/java/com/volmit/iris/util/CDou.java +++ b/src/main/java/com/volmit/iris/util/CDou.java @@ -1,5 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; +@SuppressWarnings("ALL") public class CDou { private double number; private final double max; diff --git a/src/main/java/com/volmit/iris/util/Callback.java b/src/main/java/com/volmit/iris/util/Callback.java index 9e19acd3b..93ec71017 100644 --- a/src/main/java/com/volmit/iris/util/Callback.java +++ b/src/main/java/com/volmit/iris/util/Callback.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; /** diff --git a/src/main/java/com/volmit/iris/util/CallbackCV.java b/src/main/java/com/volmit/iris/util/CallbackCV.java index 3cd8add39..715e13c91 100644 --- a/src/main/java/com/volmit/iris/util/CallbackCV.java +++ b/src/main/java/com/volmit/iris/util/CallbackCV.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public interface CallbackCV { diff --git a/src/main/java/com/volmit/iris/util/CancellableTask.java b/src/main/java/com/volmit/iris/util/CancellableTask.java index b1e4ef735..cde8aaf13 100644 --- a/src/main/java/com/volmit/iris/util/CancellableTask.java +++ b/src/main/java/com/volmit/iris/util/CancellableTask.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public interface CancellableTask { diff --git a/src/main/java/com/volmit/iris/util/CarveResult.java b/src/main/java/com/volmit/iris/util/CarveResult.java index 246ae5c7a..bcadddeef 100644 --- a/src/main/java/com/volmit/iris/util/CarveResult.java +++ b/src/main/java/com/volmit/iris/util/CarveResult.java @@ -1,10 +1,31 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import lombok.Value; +@SuppressWarnings("ClassCanBeRecord") @Value public class CarveResult { + @SuppressWarnings("RedundantModifiersValueLombok") private final int surface; + @SuppressWarnings("RedundantModifiersValueLombok") private final int ceiling; public int getHeight() { diff --git a/src/main/java/com/volmit/iris/util/CaveResult.java b/src/main/java/com/volmit/iris/util/CaveResult.java index 8dc21145c..89075aee0 100644 --- a/src/main/java/com/volmit/iris/util/CaveResult.java +++ b/src/main/java/com/volmit/iris/util/CaveResult.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/util/ChronoLatch.java b/src/main/java/com/volmit/iris/util/ChronoLatch.java index e2df10015..d1e30d121 100644 --- a/src/main/java/com/volmit/iris/util/ChronoLatch.java +++ b/src/main/java/com/volmit/iris/util/ChronoLatch.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public class ChronoLatch { diff --git a/src/main/java/com/volmit/iris/util/ChunkPosition.java b/src/main/java/com/volmit/iris/util/ChunkPosition.java index 9463244f7..f3b4935aa 100644 --- a/src/main/java/com/volmit/iris/util/ChunkPosition.java +++ b/src/main/java/com/volmit/iris/util/ChunkPosition.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public class ChunkPosition { @@ -39,10 +57,9 @@ public class ChunkPosition { if (this == obj) { return true; } - if (!(obj instanceof ChunkPosition)) { + if (!(obj instanceof ChunkPosition other)) { return false; } - ChunkPosition other = (ChunkPosition) obj; return x == other.x && z == other.z; } diff --git a/src/main/java/com/volmit/iris/util/Chunker.java b/src/main/java/com/volmit/iris/util/Chunker.java index 1b06fdebd..e2007fde5 100644 --- a/src/main/java/com/volmit/iris/util/Chunker.java +++ b/src/main/java/com/volmit/iris/util/Chunker.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.util.concurrent.ExecutorService; @@ -27,14 +45,14 @@ public class Chunker { public void execute(Consumer consumer, Callback progress, int progressInterval) { ChronoLatch cl = new ChronoLatch(progressInterval); - Contained consumed = new Contained(0); + Contained consumed = new Contained<>(0); executor = Executors.newFixedThreadPool(threads); int length = q.size(); int remaining = length; while (remaining > 0) { int at = remaining; - remaining -= (remaining > workload ? workload : remaining); + remaining -= (Math.min(remaining, workload)); int to = remaining; executor.submit(() -> diff --git a/src/main/java/com/volmit/iris/util/Command.java b/src/main/java/com/volmit/iris/util/Command.java index 91c1c4dff..b242ffed1 100644 --- a/src/main/java/com/volmit/iris/util/Command.java +++ b/src/main/java/com/volmit/iris/util/Command.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/CompoundTag.java b/src/main/java/com/volmit/iris/util/CompoundTag.java index 7d73e5a92..4b5cce527 100644 --- a/src/main/java/com/volmit/iris/util/CompoundTag.java +++ b/src/main/java/com/volmit/iris/util/CompoundTag.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.util.Map; @@ -38,9 +56,9 @@ public final class CompoundTag extends Tag { append = "(\"" + this.getName() + "\")"; } StringBuilder bldr = new StringBuilder(); - bldr.append("TAG_Compound" + append + ": " + value.size() + " entries\r\n{\r\n"); + bldr.append("TAG_Compound").append(append).append(": ").append(value.size()).append(" entries\r\n{\r\n"); for (Map.Entry entry : value.entrySet()) { - bldr.append(" " + entry.getValue().toString().replaceAll("\r\n", "\r\n ") + "\r\n"); + bldr.append(" ").append(entry.getValue().toString().replaceAll("\r\n", "\r\n ")).append("\r\n"); } bldr.append("}"); return bldr.toString(); diff --git a/src/main/java/com/volmit/iris/util/Consumer2.java b/src/main/java/com/volmit/iris/util/Consumer2.java index 67a5c81a8..f911d4f18 100644 --- a/src/main/java/com/volmit/iris/util/Consumer2.java +++ b/src/main/java/com/volmit/iris/util/Consumer2.java @@ -1,6 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; -@SuppressWarnings("hiding") +@SuppressWarnings({"hiding", "RedundantSuppression"}) @FunctionalInterface public interface Consumer2 { void accept(A a, B b); diff --git a/src/main/java/com/volmit/iris/util/Consumer3.java b/src/main/java/com/volmit/iris/util/Consumer3.java index 2e0d90ee0..36d36021e 100644 --- a/src/main/java/com/volmit/iris/util/Consumer3.java +++ b/src/main/java/com/volmit/iris/util/Consumer3.java @@ -1,6 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; -@SuppressWarnings("hiding") +@SuppressWarnings("ALL") @FunctionalInterface public interface Consumer3 { void accept(A a, B b, C c); diff --git a/src/main/java/com/volmit/iris/util/Consumer4.java b/src/main/java/com/volmit/iris/util/Consumer4.java index 38fcb5cd1..b80c64c67 100644 --- a/src/main/java/com/volmit/iris/util/Consumer4.java +++ b/src/main/java/com/volmit/iris/util/Consumer4.java @@ -1,6 +1,23 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; -@SuppressWarnings("hiding") @FunctionalInterface public interface Consumer4 { void accept(A a, B b, C c, D d); diff --git a/src/main/java/com/volmit/iris/util/Consumer5.java b/src/main/java/com/volmit/iris/util/Consumer5.java index 393d0216b..fa23c0055 100644 --- a/src/main/java/com/volmit/iris/util/Consumer5.java +++ b/src/main/java/com/volmit/iris/util/Consumer5.java @@ -1,6 +1,23 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; -@SuppressWarnings("hiding") @FunctionalInterface public interface Consumer5 { void accept(A a, B b, C c, D d, E e); diff --git a/src/main/java/com/volmit/iris/util/Consumer6.java b/src/main/java/com/volmit/iris/util/Consumer6.java index e833f2244..8a75d353d 100644 --- a/src/main/java/com/volmit/iris/util/Consumer6.java +++ b/src/main/java/com/volmit/iris/util/Consumer6.java @@ -1,6 +1,23 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; -@SuppressWarnings("hiding") @FunctionalInterface public interface Consumer6 { void accept(A a, B b, C c, D d, E e, F f); diff --git a/src/main/java/com/volmit/iris/util/Consumer7.java b/src/main/java/com/volmit/iris/util/Consumer7.java index 36cfcf4aa..a1f216a9f 100644 --- a/src/main/java/com/volmit/iris/util/Consumer7.java +++ b/src/main/java/com/volmit/iris/util/Consumer7.java @@ -1,6 +1,23 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; -@SuppressWarnings("hiding") @FunctionalInterface public interface Consumer7 { void accept(A a, B b, C c, D d, E e, F f, G g); diff --git a/src/main/java/com/volmit/iris/util/Consumer8.java b/src/main/java/com/volmit/iris/util/Consumer8.java index 03d5081c0..6c95faf19 100644 --- a/src/main/java/com/volmit/iris/util/Consumer8.java +++ b/src/main/java/com/volmit/iris/util/Consumer8.java @@ -1,6 +1,23 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; -@SuppressWarnings("hiding") @FunctionalInterface public interface Consumer8 { void accept(A a, B b, C c, D d, E e, F f, G g, H h); diff --git a/src/main/java/com/volmit/iris/util/Contained.java b/src/main/java/com/volmit/iris/util/Contained.java index 928b7b0fc..af19a67f3 100644 --- a/src/main/java/com/volmit/iris/util/Contained.java +++ b/src/main/java/com/volmit/iris/util/Contained.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.util.function.Function; diff --git a/src/main/java/com/volmit/iris/util/Control.java b/src/main/java/com/volmit/iris/util/Control.java index fc0df07b9..142253578 100644 --- a/src/main/java/com/volmit/iris/util/Control.java +++ b/src/main/java/com/volmit/iris/util/Control.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/Controller.java b/src/main/java/com/volmit/iris/util/Controller.java index dcea5c940..e651b0874 100644 --- a/src/main/java/com/volmit/iris/util/Controller.java +++ b/src/main/java/com/volmit/iris/util/Controller.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.volmit.iris.Iris; @@ -11,7 +29,7 @@ public abstract class Controller implements IController { tickRate = -1; } - protected void setTickRate(int rate) { + protected void setTickRate(@SuppressWarnings("SameParameterValue") int rate) { this.tickRate = rate; } diff --git a/src/main/java/com/volmit/iris/util/Converter.java b/src/main/java/com/volmit/iris/util/Converter.java index e753d16ee..6f0779cdd 100644 --- a/src/main/java/com/volmit/iris/util/Converter.java +++ b/src/main/java/com/volmit/iris/util/Converter.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.io.File; @@ -5,6 +23,7 @@ import java.io.File; public interface Converter { String getInExtension(); + @SuppressWarnings("SameReturnValue") String getOutExtension(); void convert(File in, File out); diff --git a/src/main/java/com/volmit/iris/util/Cuboid.java b/src/main/java/com/volmit/iris/util/Cuboid.java index be75777a7..fa9c1131e 100644 --- a/src/main/java/com/volmit/iris/util/Cuboid.java +++ b/src/main/java/com/volmit/iris/util/Cuboid.java @@ -1,9 +1,28 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.entity.Entity; +import org.jetbrains.annotations.NotNull; import java.util.*; @@ -39,7 +58,7 @@ public class Cuboid implements Iterable, Cloneable, ConfigurationSerializ } public KList getEntities() { - KList en = new KList(); + KList en = new KList<>(); for (Chunk i : getChunks()) { for (Entity j : i.getEntities()) { @@ -137,9 +156,10 @@ public class Cuboid implements Iterable, Cloneable, ConfigurationSerializ z2 = (Integer) map.get("z2"); } + @NotNull @Override public Map serialize() { - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("worldName", worldName); map.put("x1", x1); map.put("y1", y1); @@ -319,22 +339,15 @@ public class Cuboid implements Iterable, Cloneable, ConfigurationSerializ * @return a new Cuboid expanded by the given direction and amount */ public Cuboid expand(CuboidDirection dir, int amount) { - switch (dir) { - case North: - return new Cuboid(worldName, x1 - amount, y1, z1, x2, y2, z2); - case South: - return new Cuboid(worldName, x1, y1, z1, x2 + amount, y2, z2); - case East: - return new Cuboid(worldName, x1, y1, z1 - amount, x2, y2, z2); - case West: - return new Cuboid(worldName, x1, y1, z1, x2, y2, z2 + amount); - case Down: - return new Cuboid(worldName, x1, y1 - amount, z1, x2, y2, z2); - case Up: - return new Cuboid(worldName, x1, y1, z1, x2, y2 + amount, z2); - default: - throw new IllegalArgumentException("invalid direction " + dir); - } + return switch (dir) { + case North -> new Cuboid(worldName, x1 - amount, y1, z1, x2, y2, z2); + case South -> new Cuboid(worldName, x1, y1, z1, x2 + amount, y2, z2); + case East -> new Cuboid(worldName, x1, y1, z1 - amount, x2, y2, z2); + case West -> new Cuboid(worldName, x1, y1, z1, x2, y2, z2 + amount); + case Down -> new Cuboid(worldName, x1, y1 - amount, z1, x2, y2, z2); + case Up -> new Cuboid(worldName, x1, y1, z1, x2, y2 + amount, z2); + default -> throw new IllegalArgumentException("invalid direction " + dir); + }; } public Cuboid expand(Direction dir, int amount) { @@ -367,20 +380,12 @@ public class Cuboid implements Iterable, Cloneable, ConfigurationSerializ * @return a new Cuboid outset by the given direction and amount */ public Cuboid outset(CuboidDirection dir, int amount) { - Cuboid c; - switch (dir) { - case Horizontal: - c = expand(CuboidDirection.North, amount).expand(CuboidDirection.South, amount).expand(CuboidDirection.East, amount).expand(CuboidDirection.West, amount); - break; - case Vertical: - c = expand(CuboidDirection.Down, amount).expand(CuboidDirection.Up, amount); - break; - case Both: - c = outset(CuboidDirection.Horizontal, amount).outset(CuboidDirection.Vertical, amount); - break; - default: - throw new IllegalArgumentException("invalid direction " + dir); - } + Cuboid c = switch (dir) { + case Horizontal -> expand(CuboidDirection.North, amount).expand(CuboidDirection.South, amount).expand(CuboidDirection.East, amount).expand(CuboidDirection.West, amount); + case Vertical -> expand(CuboidDirection.Down, amount).expand(CuboidDirection.Up, amount); + case Both -> outset(CuboidDirection.Horizontal, amount).outset(CuboidDirection.Vertical, amount); + default -> throw new IllegalArgumentException("invalid direction " + dir); + }; return c; } @@ -477,38 +482,43 @@ public class Cuboid implements Iterable, Cloneable, ConfigurationSerializ public Cuboid contract(CuboidDirection dir) { Cuboid face = getFace(dir.opposite()); switch (dir) { - case Down: + case Down -> { while (face.containsOnly(Material.AIR) && face.getLowerY() > this.getLowerY()) { face = face.shift(CuboidDirection.Down, 1); } return new Cuboid(worldName, x1, y1, z1, x2, face.getUpperY(), z2); - case Up: + } + case Up -> { while (face.containsOnly(Material.AIR) && face.getUpperY() < this.getUpperY()) { face = face.shift(CuboidDirection.Up, 1); } return new Cuboid(worldName, x1, face.getLowerY(), z1, x2, y2, z2); - case North: + } + case North -> { while (face.containsOnly(Material.AIR) && face.getLowerX() > this.getLowerX()) { face = face.shift(CuboidDirection.North, 1); } return new Cuboid(worldName, x1, y1, z1, face.getUpperX(), y2, z2); - case South: + } + case South -> { while (face.containsOnly(Material.AIR) && face.getUpperX() < this.getUpperX()) { face = face.shift(CuboidDirection.South, 1); } return new Cuboid(worldName, face.getLowerX(), y1, z1, x2, y2, z2); - case East: + } + case East -> { while (face.containsOnly(Material.AIR) && face.getLowerZ() > this.getLowerZ()) { face = face.shift(CuboidDirection.East, 1); } return new Cuboid(worldName, x1, y1, z1, x2, y2, face.getUpperZ()); - case West: + } + case West -> { while (face.containsOnly(Material.AIR) && face.getUpperZ() < this.getUpperZ()) { face = face.shift(CuboidDirection.West, 1); } return new Cuboid(worldName, x1, y1, face.getLowerZ(), x2, y2, z2); - default: - throw new IllegalArgumentException("Invalid direction " + dir); + } + default -> throw new IllegalArgumentException("Invalid direction " + dir); } } @@ -520,22 +530,15 @@ public class Cuboid implements Iterable, Cloneable, ConfigurationSerializ * @return the Cuboid representing this Cuboid's requested face */ public Cuboid getFace(CuboidDirection dir) { - switch (dir) { - case Down: - return new Cuboid(worldName, x1, y1, z1, x2, y1, z2); - case Up: - return new Cuboid(worldName, x1, y2, z1, x2, y2, z2); - case North: - return new Cuboid(worldName, x1, y1, z1, x1, y2, z2); - case South: - return new Cuboid(worldName, x2, y1, z1, x2, y2, z2); - case East: - return new Cuboid(worldName, x1, y1, z1, x2, y2, z1); - case West: - return new Cuboid(worldName, x1, y1, z2, x2, y2, z2); - default: - throw new IllegalArgumentException("Invalid direction " + dir); - } + return switch (dir) { + case Down -> new Cuboid(worldName, x1, y1, z1, x2, y1, z2); + case Up -> new Cuboid(worldName, x1, y2, z1, x2, y2, z2); + case North -> new Cuboid(worldName, x1, y1, z1, x1, y2, z2); + case South -> new Cuboid(worldName, x2, y1, z1, x2, y2, z2); + case East -> new Cuboid(worldName, x1, y1, z1, x2, y2, z1); + case West -> new Cuboid(worldName, x1, y1, z2, x2, y2, z2); + default -> throw new IllegalArgumentException("Invalid direction " + dir); + }; } /** @@ -608,7 +611,7 @@ public class Cuboid implements Iterable, Cloneable, ConfigurationSerializ * @return a list of Chunk objects */ public List getChunks() { - List res = new ArrayList(); + List res = new ArrayList<>(); World w = getWorld(); int x1 = getLowerX() & ~0xf; @@ -623,11 +626,11 @@ public class Cuboid implements Iterable, Cloneable, ConfigurationSerializ return res; } - /** - * Set all the blocks within the Cuboid to the given MaterialData, using a - * MassBlockUpdate object for fast updates. - * - * @param mat + /* + Set all the blocks within the Cuboid to the given MaterialData, using a + MassBlockUpdate object for fast updates. + + @param mat * the MaterialData to set * @param mbu * the MassBlockUpdate object @@ -652,8 +655,9 @@ public class Cuboid implements Iterable, Cloneable, ConfigurationSerializ * * @see java.lang.Object#clone() */ + @SuppressWarnings("MethodDoesntCallSuperMethod") @Override - public Cuboid clone() throws CloneNotSupportedException { + public Cuboid clone() { return new Cuboid(this); } @@ -667,7 +671,7 @@ public class Cuboid implements Iterable, Cloneable, ConfigurationSerializ return "Cuboid: " + worldName + "," + x1 + "," + y1 + "," + z1 + "=>" + x2 + "," + y2 + "," + z2; } - public class CuboidIterator implements Iterator { + public static class CuboidIterator implements Iterator { private final World w; private final int baseX; private final int baseY; @@ -726,28 +730,18 @@ public class Cuboid implements Iterable, Cloneable, ConfigurationSerializ Unknown; public CuboidDirection opposite() { - switch (this) { - case North: - return South; - case East: - return West; - case South: - return North; - case West: - return East; - case Horizontal: - return Vertical; - case Vertical: - return Horizontal; - case Up: - return Down; - case Down: - return Up; - case Both: - return Both; - default: - return Unknown; - } + return switch (this) { + case North -> South; + case East -> West; + case South -> North; + case West -> East; + case Horizontal -> Vertical; + case Vertical -> Horizontal; + case Up -> Down; + case Down -> Up; + case Both -> Both; + default -> Unknown; + }; } } diff --git a/src/main/java/com/volmit/iris/util/CuboidException.java b/src/main/java/com/volmit/iris/util/CuboidException.java index 3bcfa7a61..c950d00dd 100644 --- a/src/main/java/com/volmit/iris/util/CuboidException.java +++ b/src/main/java/com/volmit/iris/util/CuboidException.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; /** diff --git a/src/main/java/com/volmit/iris/util/CustomOutputStream.java b/src/main/java/com/volmit/iris/util/CustomOutputStream.java index e03beaa14..217fb6f4e 100644 --- a/src/main/java/com/volmit/iris/util/CustomOutputStream.java +++ b/src/main/java/com/volmit/iris/util/CustomOutputStream.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.io.IOException; diff --git a/src/main/java/com/volmit/iris/util/DOP.java b/src/main/java/com/volmit/iris/util/DOP.java index 7dfe0ad41..cbeacb41f 100644 --- a/src/main/java/com/volmit/iris/util/DOP.java +++ b/src/main/java/com/volmit/iris/util/DOP.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.util.Vector; diff --git a/src/main/java/com/volmit/iris/util/DataPalette.java b/src/main/java/com/volmit/iris/util/DataPalette.java index d95bf8fe8..b14262904 100644 --- a/src/main/java/com/volmit/iris/util/DataPalette.java +++ b/src/main/java/com/volmit/iris/util/DataPalette.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.io.DataInputStream; @@ -19,9 +37,9 @@ public abstract class DataPalette implements Writable { getPaletteId(defaultValue); } - public abstract T readType(DataInputStream i) throws IOException; + public abstract T readType(DataInputStream i); - public abstract void writeType(T t, DataOutputStream o) throws IOException; + public abstract void writeType(T t, DataOutputStream o); @Override public void write(DataOutputStream o) throws IOException { diff --git a/src/main/java/com/volmit/iris/util/Denv.java b/src/main/java/com/volmit/iris/util/Denv.java index 549134125..fb09dd475 100644 --- a/src/main/java/com/volmit/iris/util/Denv.java +++ b/src/main/java/com/volmit/iris/util/Denv.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public class Denv { diff --git a/src/main/java/com/volmit/iris/util/DependsOn.java b/src/main/java/com/volmit/iris/util/DependsOn.java index 01bd60143..3bb4933c0 100644 --- a/src/main/java/com/volmit/iris/util/DependsOn.java +++ b/src/main/java/com/volmit/iris/util/DependsOn.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/Desc.java b/src/main/java/com/volmit/iris/util/Desc.java index fb60ec757..2fb6f9b62 100644 --- a/src/main/java/com/volmit/iris/util/Desc.java +++ b/src/main/java/com/volmit/iris/util/Desc.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/Dimension.java b/src/main/java/com/volmit/iris/util/Dimension.java index 77520cf94..7b30f3654 100644 --- a/src/main/java/com/volmit/iris/util/Dimension.java +++ b/src/main/java/com/volmit/iris/util/Dimension.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; /** diff --git a/src/main/java/com/volmit/iris/util/DimensionFace.java b/src/main/java/com/volmit/iris/util/DimensionFace.java index f537fe5ee..ba232d0a4 100644 --- a/src/main/java/com/volmit/iris/util/DimensionFace.java +++ b/src/main/java/com/volmit/iris/util/DimensionFace.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; /** diff --git a/src/main/java/com/volmit/iris/util/Direction.java b/src/main/java/com/volmit/iris/util/Direction.java index 5c00663c4..507fc3650 100644 --- a/src/main/java/com/volmit/iris/util/Direction.java +++ b/src/main/java/com/volmit/iris/util/Direction.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.volmit.iris.util.Cuboid.CuboidDirection; @@ -5,6 +23,8 @@ import org.bukkit.Axis; import org.bukkit.block.BlockFace; import org.bukkit.util.Vector; +import java.util.Map; + /** * Directions * @@ -26,68 +46,28 @@ public enum Direction { private final CuboidDirection f; public static Direction getDirection(BlockFace f) { - switch (f) { - case DOWN: - return D; - case EAST: - return E; - case EAST_NORTH_EAST: - return E; - case EAST_SOUTH_EAST: - return E; - case NORTH: - return N; - case NORTH_EAST: - return N; - case NORTH_NORTH_EAST: - return N; - case NORTH_NORTH_WEST: - return N; - case NORTH_WEST: - return N; - case SELF: - return U; - case SOUTH: - return S; - case SOUTH_EAST: - return S; - case SOUTH_SOUTH_EAST: - return S; - case SOUTH_SOUTH_WEST: - return S; - case SOUTH_WEST: - return S; - case UP: - return U; - case WEST: - return W; - case WEST_NORTH_WEST: - return W; - case WEST_SOUTH_WEST: - return W; - } + return switch (f) { + case DOWN -> D; + case EAST, EAST_SOUTH_EAST, EAST_NORTH_EAST -> E; + case NORTH, NORTH_WEST, NORTH_NORTH_WEST, NORTH_NORTH_EAST, NORTH_EAST -> N; + case SELF, UP -> U; + case SOUTH, SOUTH_WEST, SOUTH_SOUTH_WEST, SOUTH_SOUTH_EAST, SOUTH_EAST -> S; + case WEST, WEST_SOUTH_WEST, WEST_NORTH_WEST -> W; + }; - return D; } @Override public String toString() { - switch (this) { - case D: - return "Down"; - case E: - return "East"; - case N: - return "North"; - case S: - return "South"; - case U: - return "Up"; - case W: - return "West"; - } + return switch (this) { + case D -> "Down"; + case E -> "East"; + case N -> "North"; + case S -> "South"; + case U -> "Up"; + case W -> "West"; + }; - return "?"; } public boolean isVertical() { @@ -167,9 +147,10 @@ public enum Direction { public Vector angle(Vector initial, Direction d) { calculatePermutations(); - for (GBiset i : permute.keySet()) { + for (Map.Entry, DOP> entry : permute.entrySet()) { + GBiset i = entry.getKey(); if (i.getA().equals(this) && i.getB().equals(d)) { - return permute.get(i).op(initial); + return entry.getValue().op(initial); } } @@ -292,11 +273,11 @@ public enum Direction { return; } - permute = new KMap, DOP>(); + permute = new KMap<>(); for (Direction i : udnews()) { for (Direction j : udnews()) { - GBiset b = new GBiset(i, j); + GBiset b = new GBiset<>(i, j); if (i.equals(j)) { permute.put(b, new DOP("DIRECT") { @@ -376,40 +357,23 @@ public enum Direction { } public BlockFace getFace() { - switch (this) { - case D: - return BlockFace.DOWN; - case E: - return BlockFace.EAST; - case N: - return BlockFace.NORTH; - case S: - return BlockFace.SOUTH; - case U: - return BlockFace.UP; - case W: - return BlockFace.WEST; - } + return switch (this) { + case D -> BlockFace.DOWN; + case E -> BlockFace.EAST; + case N -> BlockFace.NORTH; + case S -> BlockFace.SOUTH; + case U -> BlockFace.UP; + case W -> BlockFace.WEST; + }; - return null; } public Axis getAxis() { - switch (this) { - case D: - return Axis.Y; - case E: - return Axis.X; - case N: - return Axis.Z; - case S: - return Axis.Z; - case U: - return Axis.Y; - case W: - return Axis.X; - } + return switch (this) { + case D, U -> Axis.Y; + case E, W -> Axis.X; + case N, S -> Axis.Z; + }; - return null; } } diff --git a/src/main/java/com/volmit/iris/util/DontObfuscate.java b/src/main/java/com/volmit/iris/util/DontObfuscate.java deleted file mode 100644 index 4055d41ca..000000000 --- a/src/main/java/com/volmit/iris/util/DontObfuscate.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.volmit.iris.util; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -@Retention(RUNTIME) -@Target({FIELD, TYPE, CONSTRUCTOR, METHOD}) -public @interface DontObfuscate { - -} diff --git a/src/main/java/com/volmit/iris/util/DoubleArrayUtils.java b/src/main/java/com/volmit/iris/util/DoubleArrayUtils.java index 461553438..d89e9d8d3 100644 --- a/src/main/java/com/volmit/iris/util/DoubleArrayUtils.java +++ b/src/main/java/com/volmit/iris/util/DoubleArrayUtils.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; @@ -7,9 +25,7 @@ import java.util.Arrays; public class DoubleArrayUtils { public static void shiftRight(double[] values, double push) { - for (int index = values.length - 2; index >= 0; index--) { - values[index + 1] = values[index]; - } + if (values.length - 2 + 1 >= 0) System.arraycopy(values, 0, values, 1, values.length - 2 + 1); values[0] = push; } diff --git a/src/main/java/com/volmit/iris/util/DoubleTag.java b/src/main/java/com/volmit/iris/util/DoubleTag.java index c4bd090f4..f92794c48 100644 --- a/src/main/java/com/volmit/iris/util/DoubleTag.java +++ b/src/main/java/com/volmit/iris/util/DoubleTag.java @@ -1,38 +1,23 @@ -package com.volmit.iris.util; - /* - * JNBT License + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright (c) 2010 Graham Edgecombe - * All rights reserved. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the JNBT team nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ +package com.volmit.iris.util; + /** * The TAG_Double tag. * diff --git a/src/main/java/com/volmit/iris/util/Element.java b/src/main/java/com/volmit/iris/util/Element.java index d4c5c0425..1f0a8fc78 100644 --- a/src/main/java/com/volmit/iris/util/Element.java +++ b/src/main/java/com/volmit/iris/util/Element.java @@ -1,7 +1,26 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.inventory.ItemStack; +@SuppressWarnings("ALL") public interface Element { MaterialBlock getMaterial(); diff --git a/src/main/java/com/volmit/iris/util/ElementEvent.java b/src/main/java/com/volmit/iris/util/ElementEvent.java index 691fb84cf..2de71bbb9 100644 --- a/src/main/java/com/volmit/iris/util/ElementEvent.java +++ b/src/main/java/com/volmit/iris/util/ElementEvent.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; /** diff --git a/src/main/java/com/volmit/iris/util/EndTag.java b/src/main/java/com/volmit/iris/util/EndTag.java index 00ef6e163..e022d61b8 100644 --- a/src/main/java/com/volmit/iris/util/EndTag.java +++ b/src/main/java/com/volmit/iris/util/EndTag.java @@ -1,38 +1,23 @@ -package com.volmit.iris.util; - /* - * JNBT License + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright (c) 2010 Graham Edgecombe - * All rights reserved. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the JNBT team nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ +package com.volmit.iris.util; + /** * The TAG_End tag. * diff --git a/src/main/java/com/volmit/iris/util/FakeWorld.java b/src/main/java/com/volmit/iris/util/FakeWorld.java index ddec84287..df1d94994 100644 --- a/src/main/java/com/volmit/iris/util/FakeWorld.java +++ b/src/main/java/com/volmit/iris/util/FakeWorld.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import lombok.Setter; @@ -46,10 +64,11 @@ public class FakeWorld implements World { } @Override - public void sendPluginMessage(Plugin source, String channel, byte[] message) { + public void sendPluginMessage(@NotNull Plugin source, @NotNull String channel, @NotNull byte[] message) { } + @NotNull @Override public Set getListeningPluginChannels() { @@ -57,35 +76,38 @@ public class FakeWorld implements World { } @Override - public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { + public void setMetadata(@NotNull String metadataKey, @NotNull MetadataValue newMetadataValue) { } + @NotNull @Override - public List getMetadata(String metadataKey) { + public List getMetadata(@NotNull String metadataKey) { return null; } @Override - public boolean hasMetadata(String metadataKey) { + public boolean hasMetadata(@NotNull String metadataKey) { return false; } @Override - public void removeMetadata(String metadataKey, Plugin owningPlugin) { + public void removeMetadata(@NotNull String metadataKey, @NotNull Plugin owningPlugin) { } + @NotNull @Override public Block getBlockAt(int x, int y, int z) { return null; } + @NotNull @Override - public Block getBlockAt(Location location) { + public Block getBlockAt(@NotNull Location location) { return null; } @@ -97,71 +119,79 @@ public class FakeWorld implements World { } @Override - public int getHighestBlockYAt(Location location) { + public int getHighestBlockYAt(@NotNull Location location) { return 0; } + @NotNull @Override public Block getHighestBlockAt(int x, int z) { return null; } + @NotNull @Override - public Block getHighestBlockAt(Location location) { + public Block getHighestBlockAt(@NotNull Location location) { return null; } @Override - public int getHighestBlockYAt(int x, int z, HeightMap heightMap) { + public int getHighestBlockYAt(int x, int z, @NotNull HeightMap heightMap) { return 0; } @Override - public int getHighestBlockYAt(Location location, HeightMap heightMap) { + public int getHighestBlockYAt(@NotNull Location location, @NotNull HeightMap heightMap) { return 0; } + @NotNull @Override - public Block getHighestBlockAt(int x, int z, HeightMap heightMap) { + public Block getHighestBlockAt(int x, int z, @NotNull HeightMap heightMap) { return null; } + @NotNull @Override - public Block getHighestBlockAt(Location location, HeightMap heightMap) { + public Block getHighestBlockAt(@NotNull Location location, @NotNull HeightMap heightMap) { return null; } + @NotNull @Override public Chunk getChunkAt(int x, int z) { return null; } + @NotNull @Override - public Chunk getChunkAt(Location location) { + public Chunk getChunkAt(@NotNull Location location) { + + return null; + } + + @NotNull + @Override + public Chunk getChunkAt(@NotNull Block block) { return null; } @Override - public Chunk getChunkAt(Block block) { - - return null; - } - - @Override - public boolean isChunkLoaded(Chunk chunk) { + public boolean isChunkLoaded(@NotNull Chunk chunk) { return false; } + @NotNull @Override public Chunk[] getLoadedChunks() { @@ -169,7 +199,7 @@ public class FakeWorld implements World { } @Override - public void loadChunk(Chunk chunk) { + public void loadChunk(@NotNull Chunk chunk) { } @@ -203,7 +233,7 @@ public class FakeWorld implements World { } @Override - public boolean unloadChunk(Chunk chunk) { + public boolean unloadChunk(@NotNull Chunk chunk) { return false; } @@ -249,6 +279,7 @@ public class FakeWorld implements World { } + @NotNull @Override public Collection getForceLoadedChunks() { @@ -256,36 +287,39 @@ public class FakeWorld implements World { } @Override - public boolean addPluginChunkTicket(int x, int z, Plugin plugin) { + public boolean addPluginChunkTicket(int x, int z, @NotNull Plugin plugin) { return false; } @Override - public boolean removePluginChunkTicket(int x, int z, Plugin plugin) { + public boolean removePluginChunkTicket(int x, int z, @NotNull Plugin plugin) { return false; } @Override - public void removePluginChunkTickets(Plugin plugin) { + public void removePluginChunkTickets(@NotNull Plugin plugin) { } + @NotNull @Override public Collection getPluginChunkTickets(int x, int z) { return null; } + @NotNull @Override public Map> getPluginChunkTickets() { return null; } + @NotNull @Override - public Item dropItem(Location location, ItemStack item) { + public Item dropItem(@NotNull Location location, @NotNull ItemStack item) { return null; } @@ -296,8 +330,9 @@ public class FakeWorld implements World { return null; } + @NotNull @Override - public Item dropItemNaturally(Location location, ItemStack item) { + public Item dropItemNaturally(@NotNull Location location, @NotNull ItemStack item) { return null; } @@ -308,168 +343,187 @@ public class FakeWorld implements World { return null; } + @NotNull @Override - public Arrow spawnArrow(Location location, Vector direction, float speed, float spread) { + public Arrow spawnArrow(@NotNull Location location, @NotNull Vector direction, float speed, float spread) { + + return null; + } + + @NotNull + @Override + public T spawnArrow(@NotNull Location location, @NotNull Vector direction, float speed, float spread, @NotNull Class clazz) { return null; } @Override - public T spawnArrow(Location location, Vector direction, float speed, float spread, Class clazz) { - - return null; - } - - @Override - public boolean generateTree(Location location, TreeType type) { + public boolean generateTree(@NotNull Location location, @NotNull TreeType type) { return false; } @Override - public boolean generateTree(Location loc, TreeType type, BlockChangeDelegate delegate) { + public boolean generateTree(@NotNull Location loc, @NotNull TreeType type, @NotNull BlockChangeDelegate delegate) { return false; } + @NotNull @Override - public Entity spawnEntity(Location loc, EntityType type) { + public Entity spawnEntity(@NotNull Location loc, @NotNull EntityType type) { return null; } + @NotNull @Override - public LightningStrike strikeLightning(Location loc) { + public LightningStrike strikeLightning(@NotNull Location loc) { return null; } + @NotNull @Override - public LightningStrike strikeLightningEffect(Location loc) { + public LightningStrike strikeLightningEffect(@NotNull Location loc) { return null; } + @NotNull @Override public List getEntities() { return null; } + @NotNull @Override public List getLivingEntities() { return null; } + @NotNull + @SuppressWarnings({"RedundantSuppression", "unchecked"}) @Override - public Collection getEntitiesByClass(@SuppressWarnings("unchecked") Class... classes) { + public Collection getEntitiesByClass(@NotNull @SuppressWarnings("unchecked") Class... classes) { return null; } + @NotNull @Override - public Collection getEntitiesByClass(Class cls) { + public Collection getEntitiesByClass(@NotNull Class cls) { return null; } + @NotNull @Override - public Collection getEntitiesByClasses(Class... classes) { + public Collection getEntitiesByClasses(@NotNull Class... classes) { return null; } + @NotNull @Override public List getPlayers() { return null; } + @NotNull @Override - public Collection getNearbyEntities(Location location, double x, double y, double z) { + public Collection getNearbyEntities(@NotNull Location location, double x, double y, double z) { + + return null; + } + + @NotNull + @Override + public Collection getNearbyEntities(@NotNull Location location, double x, double y, double z, Predicate filter) { + + return null; + } + + @NotNull + @Override + public Collection getNearbyEntities(@NotNull BoundingBox boundingBox) { + + return null; + } + + @NotNull + @Override + public Collection getNearbyEntities(@NotNull BoundingBox boundingBox, Predicate filter) { return null; } @Override - public Collection getNearbyEntities(Location location, double x, double y, double z, Predicate filter) { + public RayTraceResult rayTraceEntities(@NotNull Location start, @NotNull Vector direction, double maxDistance) { return null; } @Override - public Collection getNearbyEntities(BoundingBox boundingBox) { + public RayTraceResult rayTraceEntities(@NotNull Location start, @NotNull Vector direction, double maxDistance, double raySize) { return null; } @Override - public Collection getNearbyEntities(BoundingBox boundingBox, Predicate filter) { + public RayTraceResult rayTraceEntities(@NotNull Location start, @NotNull Vector direction, double maxDistance, Predicate filter) { return null; } @Override - public RayTraceResult rayTraceEntities(Location start, Vector direction, double maxDistance) { + public RayTraceResult rayTraceEntities(@NotNull Location start, @NotNull Vector direction, double maxDistance, double raySize, Predicate filter) { return null; } @Override - public RayTraceResult rayTraceEntities(Location start, Vector direction, double maxDistance, double raySize) { + public RayTraceResult rayTraceBlocks(@NotNull Location start, @NotNull Vector direction, double maxDistance) { return null; } @Override - public RayTraceResult rayTraceEntities(Location start, Vector direction, double maxDistance, Predicate filter) { + public RayTraceResult rayTraceBlocks(@NotNull Location start, @NotNull Vector direction, double maxDistance, @NotNull FluidCollisionMode fluidCollisionMode) { return null; } @Override - public RayTraceResult rayTraceEntities(Location start, Vector direction, double maxDistance, double raySize, Predicate filter) { + public RayTraceResult rayTraceBlocks(@NotNull Location start, @NotNull Vector direction, double maxDistance, @NotNull FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks) { return null; } @Override - public RayTraceResult rayTraceBlocks(Location start, Vector direction, double maxDistance) { - - return null; - } - - @Override - public RayTraceResult rayTraceBlocks(Location start, Vector direction, double maxDistance, FluidCollisionMode fluidCollisionMode) { - - return null; - } - - @Override - public RayTraceResult rayTraceBlocks(Location start, Vector direction, double maxDistance, FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks) { - - return null; - } - - @Override - public RayTraceResult rayTrace(Location start, Vector direction, double maxDistance, FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks, double raySize, Predicate filter) { + public RayTraceResult rayTrace(@NotNull Location start, @NotNull Vector direction, double maxDistance, @NotNull FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks, double raySize, Predicate filter) { return null; } + @NotNull @Override public String getName() { return worldName; } + @NotNull @Override public UUID getUID() { return null; } + @NotNull @Override public Location getSpawnLocation() { @@ -477,7 +531,7 @@ public class FakeWorld implements World { } @Override - public boolean setSpawnLocation(Location location) { + public boolean setSpawnLocation(@NotNull Location location) { return false; } @@ -604,29 +658,30 @@ public class FakeWorld implements World { } @Override - public boolean createExplosion(Location loc, float power) { + public boolean createExplosion(@NotNull Location loc, float power) { return false; } @Override - public boolean createExplosion(Location loc, float power, boolean setFire) { + public boolean createExplosion(@NotNull Location loc, float power, boolean setFire) { return false; } @Override - public boolean createExplosion(Location loc, float power, boolean setFire, boolean breakBlocks) { + public boolean createExplosion(@NotNull Location loc, float power, boolean setFire, boolean breakBlocks) { return false; } @Override - public boolean createExplosion(Location loc, float power, boolean setFire, boolean breakBlocks, Entity source) { + public boolean createExplosion(@NotNull Location loc, float power, boolean setFire, boolean breakBlocks, Entity source) { return false; } + @NotNull @Override public Environment getEnvironment() { @@ -661,62 +716,69 @@ public class FakeWorld implements World { } + @NotNull @Override public List getPopulators() { return null; } + @NotNull @Override - public T spawn(Location location, Class clazz) throws IllegalArgumentException { + public T spawn(@NotNull Location location, @NotNull Class clazz) throws IllegalArgumentException { + + return null; + } + + @NotNull + @Override + public T spawn(@NotNull Location location, @NotNull Class clazz, Consumer function) throws IllegalArgumentException { + + return null; + } + + @NotNull + @Override + public FallingBlock spawnFallingBlock(@NotNull Location location, @NotNull MaterialData data) throws IllegalArgumentException { + + return null; + } + + @NotNull + @Override + public FallingBlock spawnFallingBlock(@NotNull Location location, @NotNull BlockData data) throws IllegalArgumentException { + + return null; + } + + @NotNull + @Override + public FallingBlock spawnFallingBlock(@NotNull Location location, @NotNull Material material, byte data) throws IllegalArgumentException { return null; } @Override - public T spawn(Location location, Class clazz, Consumer function) throws IllegalArgumentException { - - return null; - } - - @Override - public FallingBlock spawnFallingBlock(Location location, MaterialData data) throws IllegalArgumentException { - - return null; - } - - @Override - public FallingBlock spawnFallingBlock(Location location, BlockData data) throws IllegalArgumentException { - - return null; - } - - @Override - public FallingBlock spawnFallingBlock(Location location, Material material, byte data) throws IllegalArgumentException { - - return null; - } - - @Override - public void playEffect(Location location, Effect effect, int data) { + public void playEffect(@NotNull Location location, @NotNull Effect effect, int data) { } @Override - public void playEffect(Location location, Effect effect, int data, int radius) { + public void playEffect(@NotNull Location location, @NotNull Effect effect, int data, int radius) { } @Override - public void playEffect(Location location, Effect effect, T data) { + public void playEffect(@NotNull Location location, @NotNull Effect effect, T data) { } @Override - public void playEffect(Location location, Effect effect, T data, int radius) { + public void playEffect(@NotNull Location location, @NotNull Effect effect, T data, int radius) { } + @NotNull @Override public ChunkSnapshot getEmptyChunkSnapshot(int x, int z, boolean includeBiome, boolean includeBiomeTemp) { @@ -740,12 +802,14 @@ public class FakeWorld implements World { return false; } + @NotNull @Override public Biome getBiome(int x, int z) { return null; } + @NotNull @Override public Biome getBiome(int x, int y, int z) { @@ -753,12 +817,12 @@ public class FakeWorld implements World { } @Override - public void setBiome(int x, int z, Biome bio) { + public void setBiome(int x, int z, @NotNull Biome bio) { } @Override - public void setBiome(int x, int y, int z, Biome bio) { + public void setBiome(int x, int y, int z, @NotNull Biome bio) { } @@ -826,16 +890,18 @@ public class FakeWorld implements World { } @Override - public void setDifficulty(Difficulty difficulty) { + public void setDifficulty(@NotNull Difficulty difficulty) { } + @NotNull @Override public Difficulty getDifficulty() { return null; } + @NotNull @Override public File getWorldFolder() { @@ -976,25 +1042,26 @@ public class FakeWorld implements World { } @Override - public void playSound(Location location, Sound sound, float volume, float pitch) { + public void playSound(@NotNull Location location, @NotNull Sound sound, float volume, float pitch) { } @Override - public void playSound(Location location, String sound, float volume, float pitch) { + public void playSound(@NotNull Location location, @NotNull String sound, float volume, float pitch) { } @Override - public void playSound(Location location, Sound sound, SoundCategory category, float volume, float pitch) { + public void playSound(@NotNull Location location, @NotNull Sound sound, @NotNull SoundCategory category, float volume, float pitch) { } @Override - public void playSound(Location location, String sound, SoundCategory category, float volume, float pitch) { + public void playSound(@NotNull Location location, @NotNull String sound, @NotNull SoundCategory category, float volume, float pitch) { } + @NotNull @Override public String[] getGameRules() { @@ -1008,35 +1075,36 @@ public class FakeWorld implements World { } @Override - public boolean setGameRuleValue(String rule, String value) { + public boolean setGameRuleValue(@NotNull String rule, @NotNull String value) { return false; } @Override - public boolean isGameRule(String rule) { + public boolean isGameRule(@NotNull String rule) { return false; } @Override - public T getGameRuleValue(GameRule rule) { + public T getGameRuleValue(@NotNull GameRule rule) { return null; } @Override - public T getGameRuleDefault(GameRule rule) { + public T getGameRuleDefault(@NotNull GameRule rule) { return null; } @Override - public boolean setGameRule(GameRule rule, T newValue) { + public boolean setGameRule(@NotNull GameRule rule, @NotNull T newValue) { return false; } + @NotNull @Override public WorldBorder getWorldBorder() { @@ -1044,77 +1112,77 @@ public class FakeWorld implements World { } @Override - public void spawnParticle(Particle particle, Location location, int count) { + public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count) { } @Override - public void spawnParticle(Particle particle, double x, double y, double z, int count) { + public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count) { } @Override - public void spawnParticle(Particle particle, Location location, int count, T data) { + public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, T data) { } @Override - public void spawnParticle(Particle particle, double x, double y, double z, int count, T data) { + public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, T data) { } @Override - public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ) { + public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ) { } @Override - public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ) { + public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ) { } @Override - public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data) { + public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, T data) { } @Override - public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data) { + public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data) { } @Override - public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra) { + public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra) { } @Override - public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra) { + public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra) { } @Override - public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data) { + public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data) { } @Override - public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data) { + public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data) { } @Override - public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) { + public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) { } @Override - public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) { + public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) { } @Override - public Location locateNearestStructure(Location origin, StructureType structureType, int radius, boolean findUnexplored) { + public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored) { return null; } @@ -1123,16 +1191,18 @@ public class FakeWorld implements World { return 0; } + @NotNull @Override public Spigot spigot() { return null; } @Override - public Raid locateNearestRaid(Location location, int radius) { + public Raid locateNearestRaid(@NotNull Location location, int radius) { return null; } + @NotNull @Override public List getRaids() { return null; diff --git a/src/main/java/com/volmit/iris/util/FastParticle.java b/src/main/java/com/volmit/iris/util/FastParticle.java index 24f4f3870..a7c34129b 100644 --- a/src/main/java/com/volmit/iris/util/FastParticle.java +++ b/src/main/java/com/volmit/iris/util/FastParticle.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/util/FastReflection.java b/src/main/java/com/volmit/iris/util/FastReflection.java index 87de8408e..600f72fd1 100644 --- a/src/main/java/com/volmit/iris/util/FastReflection.java +++ b/src/main/java/com/volmit/iris/util/FastReflection.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.Bukkit; diff --git a/src/main/java/com/volmit/iris/util/FileWatcher.java b/src/main/java/com/volmit/iris/util/FileWatcher.java index 009a3d1ff..47a65f55d 100644 --- a/src/main/java/com/volmit/iris/util/FileWatcher.java +++ b/src/main/java/com/volmit/iris/util/FileWatcher.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.io.File; diff --git a/src/main/java/com/volmit/iris/util/FinalInteger.java b/src/main/java/com/volmit/iris/util/FinalInteger.java index 093c95e38..c4a92b939 100644 --- a/src/main/java/com/volmit/iris/util/FinalInteger.java +++ b/src/main/java/com/volmit/iris/util/FinalInteger.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; /** diff --git a/src/main/java/com/volmit/iris/util/FloatTag.java b/src/main/java/com/volmit/iris/util/FloatTag.java index 236c484ee..cfa05db10 100644 --- a/src/main/java/com/volmit/iris/util/FloatTag.java +++ b/src/main/java/com/volmit/iris/util/FloatTag.java @@ -1,38 +1,23 @@ -package com.volmit.iris.util; - /* - * JNBT License + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright (c) 2010 Graham Edgecombe - * All rights reserved. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the JNBT team nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ +package com.volmit.iris.util; + /** * The TAG_Float tag. * diff --git a/src/main/java/com/volmit/iris/util/FolderWatcher.java b/src/main/java/com/volmit/iris/util/FolderWatcher.java index 6acdcf32c..7d85908a4 100644 --- a/src/main/java/com/volmit/iris/util/FolderWatcher.java +++ b/src/main/java/com/volmit/iris/util/FolderWatcher.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.io.File; diff --git a/src/main/java/com/volmit/iris/util/Form.java b/src/main/java/com/volmit/iris/util/Form.java index 4e879bda5..6ec1aef10 100644 --- a/src/main/java/com/volmit/iris/util/Form.java +++ b/src/main/java/com/volmit/iris/util/Form.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.math.BigInteger; @@ -18,7 +36,7 @@ public class Form { private static final NavigableMap MAP; static { - MAP = new TreeMap(); + MAP = new TreeMap<>(); for (int i = 0; i < NAMES.length; i++) { MAP.put(THOUSAND.pow(i + 1), NAMES[i]); } @@ -36,7 +54,6 @@ public class Form { * @param smx the text * @param viewport the viewport length * @param time the timeline value - * @return */ public static String scroll(String smx, int viewport, long time) { String src = Form.repeat(" ", viewport) + smx + Form.repeat(" ", viewport); @@ -55,19 +72,19 @@ public class Form { * @return the capitalized string */ public static String capitalize(String s) { - String roll = ""; + StringBuilder roll = new StringBuilder(); boolean f = true; for (Character i : s.trim().toCharArray()) { if (f) { - roll += Character.toUpperCase(i); + roll.append(Character.toUpperCase(i)); f = false; } else { - roll += i; + roll.append(i); } } - return roll; + return roll.toString(); } /** @@ -77,10 +94,10 @@ public class Form { * @return the capitalized string */ public static String capitalizeWords(String s) { - String rollx = ""; + StringBuilder rollx = new StringBuilder(); for (String i : s.trim().split(" ")) { - rollx += " " + capitalize(i.trim()); + rollx.append(" ").append(capitalize(i.trim())); } return rollx.substring(1); @@ -205,7 +222,6 @@ public class Form { /** * Returns a fancy duration up to Years * - * @param rollingSequence * @param duration the duration in ms * @return the fancy duration */ @@ -323,72 +339,33 @@ public class Form { } else { int h = c.get(Calendar.HOUR); h = h == 0 ? 12 : h; - String dow = "Error Day"; - - switch (c.get(Calendar.DAY_OF_WEEK)) { - case Calendar.SUNDAY: - dow = "Sunday"; - break; - case Calendar.MONDAY: - dow = "Monday"; - break; - case Calendar.TUESDAY: - dow = "Tuesday"; - break; - case Calendar.WEDNESDAY: - dow = "Wednesday"; - break; - case Calendar.THURSDAY: - dow = "Thursday"; - break; - case Calendar.FRIDAY: - dow = "Friday"; - break; - case Calendar.SATURDAY: - dow = "Saturday"; - break; - } + String dow = switch (c.get(Calendar.DAY_OF_WEEK)) { + case Calendar.SUNDAY -> "Sunday"; + case Calendar.MONDAY -> "Monday"; + case Calendar.TUESDAY -> "Tuesday"; + case Calendar.WEDNESDAY -> "Wednesday"; + case Calendar.THURSDAY -> "Thursday"; + case Calendar.FRIDAY -> "Friday"; + case Calendar.SATURDAY -> "Saturday"; + default -> "Error Day"; + }; String monthName = "Error Month"; int month = c.get(Calendar.MONTH); switch (month) { - case Calendar.JANUARY: - monthName = "Jan"; - break; - case Calendar.FEBRUARY: - monthName = "Feb"; - break; - case Calendar.MARCH: - monthName = "Mar"; - break; - case Calendar.APRIL: - monthName = "Apr"; - break; - case Calendar.MAY: - monthName = "May"; - break; - case Calendar.JUNE: - monthName = "Jun"; - break; - case Calendar.JULY: - monthName = "Jul"; - break; - case Calendar.AUGUST: - monthName = "Aug"; - break; - case Calendar.SEPTEMBER: - monthName = "Sep"; - break; - case Calendar.OCTOBER: - monthName = "Oct"; - break; - case Calendar.NOVEMBER: - monthName = "Nov"; - break; - case Calendar.DECEMBER: - monthName = "Dec"; - break; + case Calendar.JANUARY -> monthName = "Jan"; + case Calendar.FEBRUARY -> monthName = "Feb"; + case Calendar.MARCH -> monthName = "Mar"; + case Calendar.APRIL -> monthName = "Apr"; + case Calendar.MAY -> monthName = "May"; + case Calendar.JUNE -> monthName = "Jun"; + case Calendar.JULY -> monthName = "Jul"; + case Calendar.AUGUST -> monthName = "Aug"; + case Calendar.SEPTEMBER -> monthName = "Sep"; + case Calendar.OCTOBER -> monthName = "Oct"; + case Calendar.NOVEMBER -> monthName = "Nov"; + case Calendar.DECEMBER -> monthName = "Dec"; } int dayOfMonth = c.get(Calendar.DAY_OF_MONTH); @@ -399,72 +376,33 @@ public class Form { } else { int h = c.get(Calendar.HOUR); h = h == 0 ? 12 : h; - String dow = "Error Day"; - - switch (c.get(Calendar.DAY_OF_WEEK)) { - case Calendar.SUNDAY: - dow = "Sunday"; - break; - case Calendar.MONDAY: - dow = "Monday"; - break; - case Calendar.TUESDAY: - dow = "Tuesday"; - break; - case Calendar.WEDNESDAY: - dow = "Wednesday"; - break; - case Calendar.THURSDAY: - dow = "Thursday"; - break; - case Calendar.FRIDAY: - dow = "Friday"; - break; - case Calendar.SATURDAY: - dow = "Saturday"; - break; - } + String dow = switch (c.get(Calendar.DAY_OF_WEEK)) { + case Calendar.SUNDAY -> "Sunday"; + case Calendar.MONDAY -> "Monday"; + case Calendar.TUESDAY -> "Tuesday"; + case Calendar.WEDNESDAY -> "Wednesday"; + case Calendar.THURSDAY -> "Thursday"; + case Calendar.FRIDAY -> "Friday"; + case Calendar.SATURDAY -> "Saturday"; + default -> "Error Day"; + }; String monthName = "Error Month"; int month = c.get(Calendar.MONTH); switch (month) { - case Calendar.JANUARY: - monthName = "Jan"; - break; - case Calendar.FEBRUARY: - monthName = "Feb"; - break; - case Calendar.MARCH: - monthName = "Mar"; - break; - case Calendar.APRIL: - monthName = "Apr"; - break; - case Calendar.MAY: - monthName = "May"; - break; - case Calendar.JUNE: - monthName = "Jun"; - break; - case Calendar.JULY: - monthName = "Jul"; - break; - case Calendar.AUGUST: - monthName = "Aug"; - break; - case Calendar.SEPTEMBER: - monthName = "Sep"; - break; - case Calendar.OCTOBER: - monthName = "Oct"; - break; - case Calendar.NOVEMBER: - monthName = "Nov"; - break; - case Calendar.DECEMBER: - monthName = "Dec"; - break; + case Calendar.JANUARY -> monthName = "Jan"; + case Calendar.FEBRUARY -> monthName = "Feb"; + case Calendar.MARCH -> monthName = "Mar"; + case Calendar.APRIL -> monthName = "Apr"; + case Calendar.MAY -> monthName = "May"; + case Calendar.JUNE -> monthName = "Jun"; + case Calendar.JULY -> monthName = "Jul"; + case Calendar.AUGUST -> monthName = "Aug"; + case Calendar.SEPTEMBER -> monthName = "Sep"; + case Calendar.OCTOBER -> monthName = "Oct"; + case Calendar.NOVEMBER -> monthName = "Nov"; + case Calendar.DECEMBER -> monthName = "Dec"; } int dayOfMonth = c.get(Calendar.DAY_OF_MONTH); @@ -484,15 +422,10 @@ public class Form { */ public static String numberSuffix(int i) { String[] sufixes = new String[]{"th", "st", "nd", "rd", "th", "th", "th", "th", "th", "th"}; - switch (i % 100) { - case 11: - case 12: - case 13: - return i + "th"; - default: - return i + sufixes[i % 10]; - - } + return switch (i % 100) { + case 11, 12, 13 -> i + "th"; + default -> i + sufixes[i % 10]; + }; } /** @@ -704,7 +637,7 @@ public class Form { * @return the string */ public static String ofSize(long s, int div) { - Double d = (double) s; + double d = (double) s; String sub = "Bytes"; if (d > div - 1) { @@ -745,7 +678,7 @@ public class Form { * @return the string */ public static String ofSize(long s, int div, int dec) { - Double d = (double) s; + double d = (double) s; String sub = "Bytes"; if (d > div - 1) { @@ -786,7 +719,7 @@ public class Form { if (neg) { s = -s; } - Double d = (double) s; + double d = (double) s; String sub = "Grams"; if (d > div - 1) { @@ -835,21 +768,21 @@ public class Form { * @return the string representation */ public static String cname(String clazz) { - String codeName = ""; + StringBuilder codeName = new StringBuilder(); for (Character i : clazz.toCharArray()) { if (Character.isUpperCase(i)) { - codeName = codeName + "-" + Character.toLowerCase(i); + codeName.append("-").append(Character.toLowerCase(i)); } else { - codeName = codeName + i; + codeName.append(i); } } - if (codeName.startsWith("-")) { - codeName = codeName.substring(1); + if (codeName.toString().startsWith("-")) { + codeName = new StringBuilder(codeName.substring(1)); } - return codeName; + return codeName.toString(); } /** @@ -869,7 +802,6 @@ public class Form { /** * Get a formatted representation of the memory given in kilobytes * - * @param mb the kilobytes * @return the string representation with suffixes */ public static String memx(long kb) { @@ -1103,7 +1035,6 @@ public class Form { /** * nanoseconds to seconds (double) * - * @param ms the nanoseconds * @return a formatted string to nanoseconds */ public static String nsMs(long ns) { @@ -1113,7 +1044,6 @@ public class Form { /** * nanoseconds to seconds (double) custom decimals * - * @param ms the nanoseconds * @param p number of decimal points * @return a formatted string to nanoseconds */ @@ -1124,7 +1054,6 @@ public class Form { /** * nanoseconds to seconds (double) custom decimals * - * @param ms the nanoseconds * @param p number of decimal points * @return a formatted string to nanoseconds */ @@ -1139,7 +1068,7 @@ public class Form { * @return the numerals */ public static String toRoman(int num) { - LinkedHashMap roman_numerals = new LinkedHashMap(); + LinkedHashMap roman_numerals = new LinkedHashMap<>(); roman_numerals.put("M", 1000); roman_numerals.put("CM", 900); @@ -1155,16 +1084,16 @@ public class Form { roman_numerals.put("IV", 4); roman_numerals.put("I", 1); - String res = ""; + StringBuilder res = new StringBuilder(); for (Map.Entry entry : roman_numerals.entrySet()) { int matches = num / entry.getValue(); - res += repeat(entry.getKey(), matches); + res.append(repeat(entry.getKey(), matches)); num = num % entry.getValue(); } - return res; + return res.toString(); } /** @@ -1242,6 +1171,7 @@ public class Form { * @param n the amount of times to repeat * @return the repeated string */ + @SuppressWarnings("StringRepeatCanBeUsed") public static String repeat(String s, int n) { if (s == null) { return null; diff --git a/src/main/java/com/volmit/iris/util/Function2.java b/src/main/java/com/volmit/iris/util/Function2.java index 55f7b1df3..4bae100b5 100644 --- a/src/main/java/com/volmit/iris/util/Function2.java +++ b/src/main/java/com/volmit/iris/util/Function2.java @@ -1,6 +1,23 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; -@SuppressWarnings("hiding") @FunctionalInterface public interface Function2 { R apply(A a, B b); diff --git a/src/main/java/com/volmit/iris/util/Function3.java b/src/main/java/com/volmit/iris/util/Function3.java index 41723d93d..927026d22 100644 --- a/src/main/java/com/volmit/iris/util/Function3.java +++ b/src/main/java/com/volmit/iris/util/Function3.java @@ -1,6 +1,23 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; -@SuppressWarnings("hiding") @FunctionalInterface public interface Function3 { R apply(A a, B b, C c); diff --git a/src/main/java/com/volmit/iris/util/Function4.java b/src/main/java/com/volmit/iris/util/Function4.java index 5478f6fc1..a931736d7 100644 --- a/src/main/java/com/volmit/iris/util/Function4.java +++ b/src/main/java/com/volmit/iris/util/Function4.java @@ -1,6 +1,23 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; -@SuppressWarnings("hiding") @FunctionalInterface public interface Function4 { R apply(A a, B b, C c, D d); diff --git a/src/main/java/com/volmit/iris/util/GBiset.java b/src/main/java/com/volmit/iris/util/GBiset.java index eb5ba37e8..ff97046d5 100644 --- a/src/main/java/com/volmit/iris/util/GBiset.java +++ b/src/main/java/com/volmit/iris/util/GBiset.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; @@ -57,7 +75,6 @@ public class GBiset implements Serializable { /** * Set the second object * - * @param b */ public void setB(B b) { this.b = b; diff --git a/src/main/java/com/volmit/iris/util/GListAdapter.java b/src/main/java/com/volmit/iris/util/GListAdapter.java index b77167e3d..636cfe51d 100644 --- a/src/main/java/com/volmit/iris/util/GListAdapter.java +++ b/src/main/java/com/volmit/iris/util/GListAdapter.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; @@ -18,7 +36,7 @@ public abstract class GListAdapter { * @return the to list */ public List adapt(List from) { - List adapted = new KList(); + List adapted = new KList<>(); for (FROM i : from) { TO t = onAdapt(i); diff --git a/src/main/java/com/volmit/iris/util/GroupedExecutor.java b/src/main/java/com/volmit/iris/util/GroupedExecutor.java index c844ca4ea..cad181d22 100644 --- a/src/main/java/com/volmit/iris/util/GroupedExecutor.java +++ b/src/main/java/com/volmit/iris/util/GroupedExecutor.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.util.concurrent.ExecutorService; @@ -13,7 +31,7 @@ public class GroupedExecutor { public GroupedExecutor(int threadLimit, int priority, String name) { xc = 1; - mirror = new KMap(); + mirror = new KMap<>(); if (threadLimit == 1) { service = Executors.newSingleThreadExecutor((r) -> @@ -25,14 +43,11 @@ public class GroupedExecutor { return t; }); } else if (threadLimit > 1) { - final ForkJoinWorkerThreadFactory factory = new ForkJoinWorkerThreadFactory() { - @Override - public ForkJoinWorkerThread newThread(ForkJoinPool pool) { - final ForkJoinWorkerThread worker = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool); - worker.setName(name + " " + xc++); - worker.setPriority(priority); - return worker; - } + final ForkJoinWorkerThreadFactory factory = pool -> { + final ForkJoinWorkerThread worker = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool); + worker.setName(name + " " + xc++); + worker.setPriority(priority); + return worker; }; service = new ForkJoinPool(threadLimit, factory, null, false); diff --git a/src/main/java/com/volmit/iris/util/HTTP.java b/src/main/java/com/volmit/iris/util/HTTP.java index 3cc19f0d4..21faf68cf 100644 --- a/src/main/java/com/volmit/iris/util/HTTP.java +++ b/src/main/java/com/volmit/iris/util/HTTP.java @@ -1,30 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; -/* -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - import java.util.Iterator; /** @@ -87,7 +81,6 @@ public class HTTP { * @param string An HTTP header string. * @return A JSONObject containing the elements and attributes of the XML * string. - * @throws JSONException */ public static JSONObject toJSONObject(String string) throws JSONException { JSONObject jo = new JSONObject(); diff --git a/src/main/java/com/volmit/iris/util/HTTPTokener.java b/src/main/java/com/volmit/iris/util/HTTPTokener.java index 4da1c5176..19164cc82 100644 --- a/src/main/java/com/volmit/iris/util/HTTPTokener.java +++ b/src/main/java/com/volmit/iris/util/HTTPTokener.java @@ -1,30 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; -/* -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - /** * The HTTPTokener extends the JSONTokener to provide additional methods for the * parsing of HTTP headers. @@ -47,7 +41,6 @@ public class HTTPTokener extends JSONTokener { * Get the next token or string. This is used in parsing HTTP headers. * * @return A String. - * @throws JSONException */ public String nextToken() throws JSONException { char c; diff --git a/src/main/java/com/volmit/iris/util/HeightMap.java b/src/main/java/com/volmit/iris/util/HeightMap.java index b9f6b1a78..fe47ed6c0 100644 --- a/src/main/java/com/volmit/iris/util/HeightMap.java +++ b/src/main/java/com/volmit/iris/util/HeightMap.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.util.Arrays; diff --git a/src/main/java/com/volmit/iris/util/HeightedFakeWorld.java b/src/main/java/com/volmit/iris/util/HeightedFakeWorld.java index 4c8ec100c..2d02b0d4c 100644 --- a/src/main/java/com/volmit/iris/util/HeightedFakeWorld.java +++ b/src/main/java/com/volmit/iris/util/HeightedFakeWorld.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.HeightMap; @@ -24,7 +42,7 @@ import java.io.File; import java.util.*; import java.util.function.Predicate; -@SuppressWarnings("deprecation") +@SuppressWarnings({"deprecation", "ClassCanBeRecord", "unchecked"}) public class HeightedFakeWorld implements World { private final int height; @@ -33,10 +51,11 @@ public class HeightedFakeWorld implements World { } @Override - public void sendPluginMessage(Plugin source, String channel, byte[] message) { + public void sendPluginMessage(@NotNull Plugin source, @NotNull String channel, @NotNull byte[] message) { } + @NotNull @Override public Set getListeningPluginChannels() { @@ -44,35 +63,38 @@ public class HeightedFakeWorld implements World { } @Override - public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { + public void setMetadata(@NotNull String metadataKey, @NotNull MetadataValue newMetadataValue) { } + @NotNull @Override - public List getMetadata(String metadataKey) { + public List getMetadata(@NotNull String metadataKey) { return null; } @Override - public boolean hasMetadata(String metadataKey) { + public boolean hasMetadata(@NotNull String metadataKey) { return false; } @Override - public void removeMetadata(String metadataKey, Plugin owningPlugin) { + public void removeMetadata(@NotNull String metadataKey, @NotNull Plugin owningPlugin) { } + @NotNull @Override public Block getBlockAt(int x, int y, int z) { return null; } + @NotNull @Override - public Block getBlockAt(Location location) { + public Block getBlockAt(@NotNull Location location) { return null; } @@ -84,71 +106,79 @@ public class HeightedFakeWorld implements World { } @Override - public int getHighestBlockYAt(Location location) { + public int getHighestBlockYAt(@NotNull Location location) { return 0; } + @NotNull @Override public Block getHighestBlockAt(int x, int z) { return null; } + @NotNull @Override - public Block getHighestBlockAt(Location location) { + public Block getHighestBlockAt(@NotNull Location location) { return null; } @Override - public int getHighestBlockYAt(int x, int z, HeightMap heightMap) { + public int getHighestBlockYAt(int x, int z, @NotNull HeightMap heightMap) { return 0; } @Override - public int getHighestBlockYAt(Location location, HeightMap heightMap) { + public int getHighestBlockYAt(@NotNull Location location, @NotNull HeightMap heightMap) { return 0; } + @NotNull @Override - public Block getHighestBlockAt(int x, int z, HeightMap heightMap) { + public Block getHighestBlockAt(int x, int z, @NotNull HeightMap heightMap) { return null; } + @NotNull @Override - public Block getHighestBlockAt(Location location, HeightMap heightMap) { + public Block getHighestBlockAt(@NotNull Location location, @NotNull HeightMap heightMap) { return null; } + @NotNull @Override public Chunk getChunkAt(int x, int z) { return null; } + @NotNull @Override - public Chunk getChunkAt(Location location) { + public Chunk getChunkAt(@NotNull Location location) { + + return null; + } + + @NotNull + @Override + public Chunk getChunkAt(@NotNull Block block) { return null; } @Override - public Chunk getChunkAt(Block block) { - - return null; - } - - @Override - public boolean isChunkLoaded(Chunk chunk) { + public boolean isChunkLoaded(@NotNull Chunk chunk) { return false; } + @NotNull @Override public Chunk[] getLoadedChunks() { @@ -156,7 +186,7 @@ public class HeightedFakeWorld implements World { } @Override - public void loadChunk(Chunk chunk) { + public void loadChunk(@NotNull Chunk chunk) { } @@ -190,7 +220,7 @@ public class HeightedFakeWorld implements World { } @Override - public boolean unloadChunk(Chunk chunk) { + public boolean unloadChunk(@NotNull Chunk chunk) { return false; } @@ -236,6 +266,7 @@ public class HeightedFakeWorld implements World { } + @NotNull @Override public Collection getForceLoadedChunks() { @@ -243,36 +274,39 @@ public class HeightedFakeWorld implements World { } @Override - public boolean addPluginChunkTicket(int x, int z, Plugin plugin) { + public boolean addPluginChunkTicket(int x, int z, @NotNull Plugin plugin) { return false; } @Override - public boolean removePluginChunkTicket(int x, int z, Plugin plugin) { + public boolean removePluginChunkTicket(int x, int z, @NotNull Plugin plugin) { return false; } @Override - public void removePluginChunkTickets(Plugin plugin) { + public void removePluginChunkTickets(@NotNull Plugin plugin) { } + @NotNull @Override public Collection getPluginChunkTickets(int x, int z) { return null; } + @NotNull @Override public Map> getPluginChunkTickets() { return null; } + @NotNull @Override - public Item dropItem(Location location, ItemStack item) { + public Item dropItem(@NotNull Location location, @NotNull ItemStack item) { return null; } @@ -283,8 +317,9 @@ public class HeightedFakeWorld implements World { return null; } + @NotNull @Override - public Item dropItemNaturally(Location location, ItemStack item) { + public Item dropItemNaturally(@NotNull Location location, @NotNull ItemStack item) { return null; } @@ -295,168 +330,186 @@ public class HeightedFakeWorld implements World { return null; } + @NotNull @Override - public Arrow spawnArrow(Location location, Vector direction, float speed, float spread) { + public Arrow spawnArrow(@NotNull Location location, @NotNull Vector direction, float speed, float spread) { + + return null; + } + + @NotNull + @Override + public T spawnArrow(@NotNull Location location, @NotNull Vector direction, float speed, float spread, @NotNull Class clazz) { return null; } @Override - public T spawnArrow(Location location, Vector direction, float speed, float spread, Class clazz) { - - return null; - } - - @Override - public boolean generateTree(Location location, TreeType type) { + public boolean generateTree(@NotNull Location location, @NotNull TreeType type) { return false; } @Override - public boolean generateTree(Location loc, TreeType type, BlockChangeDelegate delegate) { + public boolean generateTree(@NotNull Location loc, @NotNull TreeType type, @NotNull BlockChangeDelegate delegate) { return false; } + @NotNull @Override - public Entity spawnEntity(Location loc, EntityType type) { + public Entity spawnEntity(@NotNull Location loc, @NotNull EntityType type) { return null; } + @NotNull @Override - public LightningStrike strikeLightning(Location loc) { + public LightningStrike strikeLightning(@NotNull Location loc) { return null; } + @NotNull @Override - public LightningStrike strikeLightningEffect(Location loc) { + public LightningStrike strikeLightningEffect(@NotNull Location loc) { return null; } + @NotNull @Override public List getEntities() { return null; } + @NotNull @Override public List getLivingEntities() { return null; } + @NotNull @Override - public Collection getEntitiesByClass(@SuppressWarnings("unchecked") Class... classes) { + public Collection getEntitiesByClass(@NotNull Class... classes) { return null; } + @NotNull @Override - public Collection getEntitiesByClass(Class cls) { + public Collection getEntitiesByClass(@NotNull Class cls) { return null; } + @NotNull @Override - public Collection getEntitiesByClasses(Class... classes) { + public Collection getEntitiesByClasses(@NotNull Class... classes) { return null; } + @NotNull @Override public List getPlayers() { return null; } + @NotNull @Override - public Collection getNearbyEntities(Location location, double x, double y, double z) { + public Collection getNearbyEntities(@NotNull Location location, double x, double y, double z) { + + return null; + } + + @NotNull + @Override + public Collection getNearbyEntities(@NotNull Location location, double x, double y, double z, Predicate filter) { + + return null; + } + + @NotNull + @Override + public Collection getNearbyEntities(@NotNull BoundingBox boundingBox) { + + return null; + } + + @NotNull + @Override + public Collection getNearbyEntities(@NotNull BoundingBox boundingBox, Predicate filter) { return null; } @Override - public Collection getNearbyEntities(Location location, double x, double y, double z, Predicate filter) { + public RayTraceResult rayTraceEntities(@NotNull Location start, @NotNull Vector direction, double maxDistance) { return null; } @Override - public Collection getNearbyEntities(BoundingBox boundingBox) { + public RayTraceResult rayTraceEntities(@NotNull Location start, @NotNull Vector direction, double maxDistance, double raySize) { return null; } @Override - public Collection getNearbyEntities(BoundingBox boundingBox, Predicate filter) { + public RayTraceResult rayTraceEntities(@NotNull Location start, @NotNull Vector direction, double maxDistance, Predicate filter) { return null; } @Override - public RayTraceResult rayTraceEntities(Location start, Vector direction, double maxDistance) { + public RayTraceResult rayTraceEntities(@NotNull Location start, @NotNull Vector direction, double maxDistance, double raySize, Predicate filter) { return null; } @Override - public RayTraceResult rayTraceEntities(Location start, Vector direction, double maxDistance, double raySize) { + public RayTraceResult rayTraceBlocks(@NotNull Location start, @NotNull Vector direction, double maxDistance) { return null; } @Override - public RayTraceResult rayTraceEntities(Location start, Vector direction, double maxDistance, Predicate filter) { + public RayTraceResult rayTraceBlocks(@NotNull Location start, @NotNull Vector direction, double maxDistance, @NotNull FluidCollisionMode fluidCollisionMode) { return null; } @Override - public RayTraceResult rayTraceEntities(Location start, Vector direction, double maxDistance, double raySize, Predicate filter) { + public RayTraceResult rayTraceBlocks(@NotNull Location start, @NotNull Vector direction, double maxDistance, @NotNull FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks) { return null; } @Override - public RayTraceResult rayTraceBlocks(Location start, Vector direction, double maxDistance) { - - return null; - } - - @Override - public RayTraceResult rayTraceBlocks(Location start, Vector direction, double maxDistance, FluidCollisionMode fluidCollisionMode) { - - return null; - } - - @Override - public RayTraceResult rayTraceBlocks(Location start, Vector direction, double maxDistance, FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks) { - - return null; - } - - @Override - public RayTraceResult rayTrace(Location start, Vector direction, double maxDistance, FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks, double raySize, Predicate filter) { + public RayTraceResult rayTrace(@NotNull Location start, @NotNull Vector direction, double maxDistance, @NotNull FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks, double raySize, Predicate filter) { return null; } + @NotNull @Override public String getName() { return null; } + @NotNull @Override public UUID getUID() { return null; } + @NotNull @Override public Location getSpawnLocation() { @@ -464,7 +517,7 @@ public class HeightedFakeWorld implements World { } @Override - public boolean setSpawnLocation(Location location) { + public boolean setSpawnLocation(@NotNull Location location) { return false; } @@ -591,29 +644,30 @@ public class HeightedFakeWorld implements World { } @Override - public boolean createExplosion(Location loc, float power) { + public boolean createExplosion(@NotNull Location loc, float power) { return false; } @Override - public boolean createExplosion(Location loc, float power, boolean setFire) { + public boolean createExplosion(@NotNull Location loc, float power, boolean setFire) { return false; } @Override - public boolean createExplosion(Location loc, float power, boolean setFire, boolean breakBlocks) { + public boolean createExplosion(@NotNull Location loc, float power, boolean setFire, boolean breakBlocks) { return false; } @Override - public boolean createExplosion(Location loc, float power, boolean setFire, boolean breakBlocks, Entity source) { + public boolean createExplosion(@NotNull Location loc, float power, boolean setFire, boolean breakBlocks, Entity source) { return false; } + @NotNull @Override public Environment getEnvironment() { @@ -648,62 +702,69 @@ public class HeightedFakeWorld implements World { } + @NotNull @Override public List getPopulators() { return null; } + @NotNull @Override - public T spawn(Location location, Class clazz) throws IllegalArgumentException { + public T spawn(@NotNull Location location, @NotNull Class clazz) throws IllegalArgumentException { + + return null; + } + + @NotNull + @Override + public T spawn(@NotNull Location location, @NotNull Class clazz, Consumer function) throws IllegalArgumentException { + + return null; + } + + @NotNull + @Override + public FallingBlock spawnFallingBlock(@NotNull Location location, @NotNull MaterialData data) throws IllegalArgumentException { + + return null; + } + + @NotNull + @Override + public FallingBlock spawnFallingBlock(@NotNull Location location, @NotNull BlockData data) throws IllegalArgumentException { + + return null; + } + + @NotNull + @Override + public FallingBlock spawnFallingBlock(@NotNull Location location, @NotNull Material material, byte data) throws IllegalArgumentException { return null; } @Override - public T spawn(Location location, Class clazz, Consumer function) throws IllegalArgumentException { - - return null; - } - - @Override - public FallingBlock spawnFallingBlock(Location location, MaterialData data) throws IllegalArgumentException { - - return null; - } - - @Override - public FallingBlock spawnFallingBlock(Location location, BlockData data) throws IllegalArgumentException { - - return null; - } - - @Override - public FallingBlock spawnFallingBlock(Location location, Material material, byte data) throws IllegalArgumentException { - - return null; - } - - @Override - public void playEffect(Location location, Effect effect, int data) { + public void playEffect(@NotNull Location location, @NotNull Effect effect, int data) { } @Override - public void playEffect(Location location, Effect effect, int data, int radius) { + public void playEffect(@NotNull Location location, @NotNull Effect effect, int data, int radius) { } @Override - public void playEffect(Location location, Effect effect, T data) { + public void playEffect(@NotNull Location location, @NotNull Effect effect, T data) { } @Override - public void playEffect(Location location, Effect effect, T data, int radius) { + public void playEffect(@NotNull Location location, @NotNull Effect effect, T data, int radius) { } + @NotNull @Override public ChunkSnapshot getEmptyChunkSnapshot(int x, int z, boolean includeBiome, boolean includeBiomeTemp) { @@ -727,12 +788,14 @@ public class HeightedFakeWorld implements World { return false; } + @NotNull @Override public Biome getBiome(int x, int z) { return null; } + @NotNull @Override public Biome getBiome(int x, int y, int z) { @@ -740,12 +803,12 @@ public class HeightedFakeWorld implements World { } @Override - public void setBiome(int x, int z, Biome bio) { + public void setBiome(int x, int z, @NotNull Biome bio) { } @Override - public void setBiome(int x, int y, int z, Biome bio) { + public void setBiome(int x, int y, int z, @NotNull Biome bio) { } @@ -813,16 +876,18 @@ public class HeightedFakeWorld implements World { } @Override - public void setDifficulty(Difficulty difficulty) { + public void setDifficulty(@NotNull Difficulty difficulty) { } + @NotNull @Override public Difficulty getDifficulty() { return null; } + @NotNull @Override public File getWorldFolder() { @@ -963,25 +1028,26 @@ public class HeightedFakeWorld implements World { } @Override - public void playSound(Location location, Sound sound, float volume, float pitch) { + public void playSound(@NotNull Location location, @NotNull Sound sound, float volume, float pitch) { } @Override - public void playSound(Location location, String sound, float volume, float pitch) { + public void playSound(@NotNull Location location, @NotNull String sound, float volume, float pitch) { } @Override - public void playSound(Location location, Sound sound, SoundCategory category, float volume, float pitch) { + public void playSound(@NotNull Location location, @NotNull Sound sound, @NotNull SoundCategory category, float volume, float pitch) { } @Override - public void playSound(Location location, String sound, SoundCategory category, float volume, float pitch) { + public void playSound(@NotNull Location location, @NotNull String sound, @NotNull SoundCategory category, float volume, float pitch) { } + @NotNull @Override public String[] getGameRules() { @@ -995,35 +1061,36 @@ public class HeightedFakeWorld implements World { } @Override - public boolean setGameRuleValue(String rule, String value) { + public boolean setGameRuleValue(@NotNull String rule, @NotNull String value) { return false; } @Override - public boolean isGameRule(String rule) { + public boolean isGameRule(@NotNull String rule) { return false; } @Override - public T getGameRuleValue(GameRule rule) { + public T getGameRuleValue(@NotNull GameRule rule) { return null; } @Override - public T getGameRuleDefault(GameRule rule) { + public T getGameRuleDefault(@NotNull GameRule rule) { return null; } @Override - public boolean setGameRule(GameRule rule, T newValue) { + public boolean setGameRule(@NotNull GameRule rule, @NotNull T newValue) { return false; } + @NotNull @Override public WorldBorder getWorldBorder() { @@ -1031,77 +1098,77 @@ public class HeightedFakeWorld implements World { } @Override - public void spawnParticle(Particle particle, Location location, int count) { + public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count) { } @Override - public void spawnParticle(Particle particle, double x, double y, double z, int count) { + public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count) { } @Override - public void spawnParticle(Particle particle, Location location, int count, T data) { + public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, T data) { } @Override - public void spawnParticle(Particle particle, double x, double y, double z, int count, T data) { + public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, T data) { } @Override - public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ) { + public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ) { } @Override - public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ) { + public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ) { } @Override - public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data) { + public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, T data) { } @Override - public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data) { + public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data) { } @Override - public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra) { + public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra) { } @Override - public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra) { + public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra) { } @Override - public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data) { + public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data) { } @Override - public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data) { + public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data) { } @Override - public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) { + public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) { } @Override - public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) { + public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) { } @Override - public Location locateNearestStructure(Location origin, StructureType structureType, int radius, boolean findUnexplored) { + public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored) { return null; } @@ -1110,16 +1177,18 @@ public class HeightedFakeWorld implements World { return 0; } + @NotNull @Override public Spigot spigot() { return null; } @Override - public Raid locateNearestRaid(Location location, int radius) { + public Raid locateNearestRaid(@NotNull Location location, int radius) { return null; } + @NotNull @Override public List getRaids() { return null; diff --git a/src/main/java/com/volmit/iris/util/IActivator.java b/src/main/java/com/volmit/iris/util/IActivator.java index 434d5ef0e..3d485cc8b 100644 --- a/src/main/java/com/volmit/iris/util/IActivator.java +++ b/src/main/java/com/volmit/iris/util/IActivator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public interface IActivator { diff --git a/src/main/java/com/volmit/iris/util/ICommand.java b/src/main/java/com/volmit/iris/util/ICommand.java index f2b207973..b91ec8e86 100644 --- a/src/main/java/com/volmit/iris/util/ICommand.java +++ b/src/main/java/com/volmit/iris/util/ICommand.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; /** diff --git a/src/main/java/com/volmit/iris/util/IController.java b/src/main/java/com/volmit/iris/util/IController.java index 9f1e3133e..fb59649b3 100644 --- a/src/main/java/com/volmit/iris/util/IController.java +++ b/src/main/java/com/volmit/iris/util/IController.java @@ -1,7 +1,26 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.event.Listener; +@SuppressWarnings("EmptyMethod") public interface IController extends Listener { String getName(); diff --git a/src/main/java/com/volmit/iris/util/ING.java b/src/main/java/com/volmit/iris/util/ING.java index 8fe0930a9..c937e25cd 100644 --- a/src/main/java/com/volmit/iris/util/ING.java +++ b/src/main/java/com/volmit/iris/util/ING.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public class ING { diff --git a/src/main/java/com/volmit/iris/util/IO.java b/src/main/java/com/volmit/iris/util/IO.java index 212cbb5d4..253b87487 100644 --- a/src/main/java/com/volmit/iris/util/IO.java +++ b/src/main/java/com/volmit/iris/util/IO.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.io.*; @@ -9,9 +27,9 @@ import java.util.*; import java.util.function.Consumer; import java.util.zip.GZIPInputStream; import java.util.zip.ZipEntry; -import java.util.zip.ZipException; import java.util.zip.ZipFile; +@SuppressWarnings("ALL") public class IO { /** * The Unix directory separator character. @@ -51,7 +69,7 @@ public class IO { IO.fullTransfer(gzi, boas, 256); gzi.close(); - return boas.toString(StandardCharsets.UTF_8); + return boas.toString(); } public static byte[] sdecompress(String compressed) throws IOException { @@ -114,7 +132,6 @@ public class IO { * * @param in the input * @param out the output - * @param amount the buffer and size to use * @return the actual transfered amount * @throws IOException shit happens */ @@ -313,30 +330,30 @@ public class IO { throw e; } BufferedReader bu = new BufferedReader(fr); - String c = ""; + StringBuilder c = new StringBuilder(); String l = ""; while ((l = bu.readLine()) != null) { - c += l + "\n"; + c.append(l).append("\n"); } bu.close(); - return c; + return c.toString(); } public static String readAll(InputStream in) throws IOException { BufferedReader bu = new BufferedReader(new InputStreamReader(in)); - String c = ""; + StringBuilder c = new StringBuilder(); String l = ""; while ((l = bu.readLine()) != null) { - c += l + "\n"; + c.append(l).append("\n"); } bu.close(); - return c; + return c.toString(); } /** @@ -368,7 +385,6 @@ public class IO { * @throws NullPointerException if source or destination is null * @throws IOException if source or destination is invalid * @throws IOException if an IO error occurs during copying - * @see #copyFileToDirectory */ public static void copyFile(File srcFile, File destFile) throws IOException { copyFile(srcFile, destFile, true); @@ -389,7 +405,6 @@ public class IO { * @throws NullPointerException if source or destination is null * @throws IOException if source or destination is invalid * @throws IOException if an IO error occurs during copying - * @see #copyFileToDirectory */ public static void copyFile(File srcFile, File destFile, boolean preserveFileDate) throws IOException { if (srcFile == null) { @@ -398,7 +413,7 @@ public class IO { if (destFile == null) { throw new NullPointerException("Destination must not be null"); } - if (srcFile.exists() == false) { + if (!srcFile.exists()) { throw new FileNotFoundException("Source '" + srcFile + "' does not exist"); } if (srcFile.isDirectory()) { @@ -407,12 +422,12 @@ public class IO { if (srcFile.getCanonicalPath().equals(destFile.getCanonicalPath())) { throw new IOException("Source '" + srcFile + "' and destination '" + destFile + "' are the same"); } - if (destFile.getParentFile() != null && destFile.getParentFile().exists() == false) { - if (destFile.getParentFile().mkdirs() == false) { + if (destFile.getParentFile() != null && !destFile.getParentFile().exists()) { + if (!destFile.getParentFile().mkdirs()) { throw new IOException("Destination '" + destFile + "' directory cannot be created"); } } - if (destFile.exists() && destFile.canWrite() == false) { + if (destFile.exists() && !destFile.canWrite()) { throw new IOException("Destination '" + destFile + "' exists but is read-only"); } doCopyFile(srcFile, destFile, preserveFileDate); @@ -594,11 +609,9 @@ public class IO { * * @param input the String to convert * @return the requested byte array - * @throws NullPointerException if the input is null - * @throws IOException if an I/O error occurs (never occurs) * @deprecated Use {@link String#getBytes()} */ - public static byte[] toByteArray(String input) throws IOException { + public static byte[] toByteArray(String input) { return input.getBytes(); } @@ -731,11 +744,9 @@ public class IO { * * @param input the byte array to read from * @return the requested String - * @throws NullPointerException if the input is null - * @throws IOException if an I/O error occurs (never occurs) * @deprecated Use {@link String#String(byte[])} */ - public static String toString(byte[] input) throws IOException { + public static String toString(byte[] input) { return new String(input); } diff --git a/src/main/java/com/volmit/iris/util/IORunnable.java b/src/main/java/com/volmit/iris/util/IORunnable.java index e51fc8a3e..79893a3b5 100644 --- a/src/main/java/com/volmit/iris/util/IORunnable.java +++ b/src/main/java/com/volmit/iris/util/IORunnable.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.io.IOException; diff --git a/src/main/java/com/volmit/iris/util/IObjectPlacer.java b/src/main/java/com/volmit/iris/util/IObjectPlacer.java index f6e6cbb24..2e15fd206 100644 --- a/src/main/java/com/volmit/iris/util/IObjectPlacer.java +++ b/src/main/java/com/volmit/iris/util/IObjectPlacer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.volmit.iris.object.tile.TileData; diff --git a/src/main/java/com/volmit/iris/util/IPostBlockAccess.java b/src/main/java/com/volmit/iris/util/IPostBlockAccess.java index 04a5ac71d..1448cf034 100644 --- a/src/main/java/com/volmit/iris/util/IPostBlockAccess.java +++ b/src/main/java/com/volmit/iris/util/IPostBlockAccess.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/util/IRare.java b/src/main/java/com/volmit/iris/util/IRare.java index 25ea8f112..5a90168c2 100644 --- a/src/main/java/com/volmit/iris/util/IRare.java +++ b/src/main/java/com/volmit/iris/util/IRare.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public interface IRare { diff --git a/src/main/java/com/volmit/iris/util/Info.java b/src/main/java/com/volmit/iris/util/Info.java index 6012e269b..c7ef99d7d 100644 --- a/src/main/java/com/volmit/iris/util/Info.java +++ b/src/main/java/com/volmit/iris/util/Info.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.Bukkit; diff --git a/src/main/java/com/volmit/iris/util/Instance.java b/src/main/java/com/volmit/iris/util/Instance.java index cc9bb9340..f3c59deb6 100644 --- a/src/main/java/com/volmit/iris/util/Instance.java +++ b/src/main/java/com/volmit/iris/util/Instance.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/IntArrayTag.java b/src/main/java/com/volmit/iris/util/IntArrayTag.java index 8e17906ba..a7a2c415b 100644 --- a/src/main/java/com/volmit/iris/util/IntArrayTag.java +++ b/src/main/java/com/volmit/iris/util/IntArrayTag.java @@ -1,40 +1,25 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.util.Arrays; -/* - * JNBT License - * - * Copyright (c) 2015 Neil Wightman - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the JNBT team nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - /** * The TAG_Int_Array tag. * diff --git a/src/main/java/com/volmit/iris/util/IntTag.java b/src/main/java/com/volmit/iris/util/IntTag.java index 88fb30452..e5d8b25d1 100644 --- a/src/main/java/com/volmit/iris/util/IntTag.java +++ b/src/main/java/com/volmit/iris/util/IntTag.java @@ -1,38 +1,23 @@ -package com.volmit.iris.util; - /* - * JNBT License + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright (c) 2010 Graham Edgecombe - * All rights reserved. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the JNBT team nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ +package com.volmit.iris.util; + /** * The TAG_Int tag. * diff --git a/src/main/java/com/volmit/iris/util/InterpolationType.java b/src/main/java/com/volmit/iris/util/InterpolationType.java index cf4ca0aa1..5564d5ddd 100644 --- a/src/main/java/com/volmit/iris/util/InterpolationType.java +++ b/src/main/java/com/volmit/iris/util/InterpolationType.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public enum InterpolationType { diff --git a/src/main/java/com/volmit/iris/util/InvertedBiomeGrid.java b/src/main/java/com/volmit/iris/util/InvertedBiomeGrid.java index ea1fcf044..4cfb64cab 100644 --- a/src/main/java/com/volmit/iris/util/InvertedBiomeGrid.java +++ b/src/main/java/com/volmit/iris/util/InvertedBiomeGrid.java @@ -1,8 +1,27 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.volmit.iris.Iris; import org.bukkit.block.Biome; import org.bukkit.generator.ChunkGenerator.BiomeGrid; +import org.jetbrains.annotations.NotNull; public class InvertedBiomeGrid implements BiomeGrid { private final BiomeGrid grid; @@ -11,12 +30,14 @@ public class InvertedBiomeGrid implements BiomeGrid { this.grid = real; } + @NotNull @SuppressWarnings("deprecation") @Override public Biome getBiome(int arg0, int arg1) { return grid.getBiome(arg0, arg1); } + @NotNull @Override public Biome getBiome(int arg0, int arg1, int arg2) { if (!Iris.biome3d) { @@ -28,12 +49,12 @@ public class InvertedBiomeGrid implements BiomeGrid { @SuppressWarnings("deprecation") @Override - public void setBiome(int arg0, int arg1, Biome arg2) { + public void setBiome(int arg0, int arg1, @NotNull Biome arg2) { grid.setBiome(arg0, arg1, arg2); } @Override - public void setBiome(int arg0, int arg1, int arg2, Biome arg3) { + public void setBiome(int arg0, int arg1, int arg2, @NotNull Biome arg3) { if (!Iris.biome3d) { setBiome(arg0, arg2, arg3); return; diff --git a/src/main/java/com/volmit/iris/util/IrisBiomeStorage.java b/src/main/java/com/volmit/iris/util/IrisBiomeStorage.java index 18cc80b1e..38f9a1eb1 100644 --- a/src/main/java/com/volmit/iris/util/IrisBiomeStorage.java +++ b/src/main/java/com/volmit/iris/util/IrisBiomeStorage.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/util/IrisInterpolation.java b/src/main/java/com/volmit/iris/util/IrisInterpolation.java index 5da27c7f6..6dc9af108 100644 --- a/src/main/java/com/volmit/iris/util/IrisInterpolation.java +++ b/src/main/java/com/volmit/iris/util/IrisInterpolation.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.google.common.util.concurrent.AtomicDouble; @@ -830,8 +848,6 @@ public class IrisInterpolation { return getStarcast(x, z, h, 9D, (xx, zz) -> getHermiteNoise((int) xx, (int) zz, h, n, 0D, 0D)); } else if (method.equals(InterpolationMethod.HERMITE_STARCAST_12)) { return getStarcast(x, z, h, 12D, (xx, zz) -> getHermiteNoise((int) xx, (int) zz, h, n, 0D, 0D)); - } else if (method.equals(InterpolationMethod.BICUBIC)) { - return getBicubicNoise(x, z, h, n); } else if (method.equals(InterpolationMethod.BILINEAR_BEZIER)) { return getBilinearBezierNoise(x, z, h, n); } else if (method.equals(InterpolationMethod.BILINEAR_PARAMETRIC_2)) { diff --git a/src/main/java/com/volmit/iris/util/IrisLock.java b/src/main/java/com/volmit/iris/util/IrisLock.java index 58777d935..d0e75330d 100644 --- a/src/main/java/com/volmit/iris/util/IrisLock.java +++ b/src/main/java/com/volmit/iris/util/IrisLock.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import lombok.Data; @@ -29,7 +47,7 @@ public class IrisLock { } try { lock.unlock(); - } catch (Throwable e) { + } catch (Throwable ignored) { } } diff --git a/src/main/java/com/volmit/iris/util/IrisMathHelper.java b/src/main/java/com/volmit/iris/util/IrisMathHelper.java index 554767bb4..ccc32dc03 100644 --- a/src/main/java/com/volmit/iris/util/IrisMathHelper.java +++ b/src/main/java/com/volmit/iris/util/IrisMathHelper.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.util.Random; @@ -57,30 +75,21 @@ public class IrisMathHelper { if (var0 < var1) { return var1; } - if (var0 > var2) { - return var2; - } - return var0; + return Math.min(var0, var2); } public static float a(final float var0, final float var1, final float var2) { if (var0 < var1) { return var1; } - if (var0 > var2) { - return var2; - } - return var0; + return Math.min(var0, var2); } public static double a(final double var0, final double var2, final double var4) { if (var0 < var2) { return var2; } - if (var0 > var4) { - return var4; - } - return var0; + return Math.min(var0, var4); } public static double b(final double var0, final double var2, final double var4) { @@ -100,7 +109,7 @@ public class IrisMathHelper { if (var2 < 0.0) { var2 = -var2; } - return (var0 > var2) ? var0 : var2; + return Math.max(var0, var2); } public static int a(final int var0, final int var1) { @@ -242,7 +251,7 @@ public class IrisMathHelper { } public static long c(final int var0, final int var1, final int var2) { - long var3 = (long) (var0 * 3129871) ^ var2 * 116129781L ^ (long) var1; + long var3 = (long) (var0 * 3129871L) ^ var2 * 116129781L ^ (long) var1; var3 = var3 * var3 * 42317861L + var3 * 11L; return var3 >> 16; } @@ -322,43 +331,37 @@ public class IrisMathHelper { float var9 = 0.0f; float var10 = 0.0f; switch (var3) { - case 0: { + case 0 -> { var8 = var2; var9 = var7; var10 = var5; - break; } - case 1: { + case 1 -> { var8 = var6; var9 = var2; var10 = var5; - break; } - case 2: { + case 2 -> { var8 = var5; var9 = var2; var10 = var7; - break; } - case 3: { + case 3 -> { var8 = var5; var9 = var6; var10 = var2; - break; } - case 4: { + case 4 -> { var8 = var7; var9 = var5; var10 = var2; - break; } - case 5: { + case 5 -> { var8 = var2; var9 = var5; var10 = var6; - break; } - default: { + default -> { throw new RuntimeException("Something went wrong when converting from HSV to RGB. Input was " + var0 + ", " + var1 + ", " + var2); } } diff --git a/src/main/java/com/volmit/iris/util/J.java b/src/main/java/com/volmit/iris/util/J.java index e7648c3e2..36948193f 100644 --- a/src/main/java/com/volmit/iris/util/J.java +++ b/src/main/java/com/volmit/iris/util/J.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.volmit.iris.Iris; @@ -8,6 +26,7 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; +@SuppressWarnings("ALL") public class J { private static int tid = 0; private static final ExecutorService e = Executors.newCachedThreadPool(new ThreadFactory() { diff --git a/src/main/java/com/volmit/iris/util/JSONArray.java b/src/main/java/com/volmit/iris/util/JSONArray.java index 78a8038eb..5695464f1 100644 --- a/src/main/java/com/volmit/iris/util/JSONArray.java +++ b/src/main/java/com/volmit/iris/util/JSONArray.java @@ -1,30 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; -/* - Copyright (c) 2002 JSON.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - The Software shall be used for Good, not Evil. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - */ - import java.io.IOException; import java.io.StringWriter; import java.io.Writer; @@ -80,6 +74,7 @@ import java.util.Map; * @author JSON.org * @version 2015-07-22 */ +@SuppressWarnings("ALL") public class JSONArray implements Iterable { /** @@ -876,6 +871,7 @@ public class JSONArray implements Iterable { * @param other The other JSONArray * @return true if they are equal */ + @SuppressWarnings("BooleanMethodIsAlwaysInverted") public boolean similar(Object other) { if (!(other instanceof JSONArray)) { return false; diff --git a/src/main/java/com/volmit/iris/util/JSONException.java b/src/main/java/com/volmit/iris/util/JSONException.java index 5d5ec5f5e..aab6db342 100644 --- a/src/main/java/com/volmit/iris/util/JSONException.java +++ b/src/main/java/com/volmit/iris/util/JSONException.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; diff --git a/src/main/java/com/volmit/iris/util/JSONML.java b/src/main/java/com/volmit/iris/util/JSONML.java index 6520980cf..0372ed510 100644 --- a/src/main/java/com/volmit/iris/util/JSONML.java +++ b/src/main/java/com/volmit/iris/util/JSONML.java @@ -1,30 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; -/* -Copyright (c) 2008 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - import java.util.Iterator; /** @@ -45,7 +39,6 @@ public class JSONML { * @param ja The JSONArray that is containing the current tag or null if we * are at the outermost level. * @return A JSONArray if the value is the outermost tag, otherwise null. - * @throws JSONException */ private static Object parse(XMLTokener x, boolean arrayForm, JSONArray ja) throws JSONException { String attribute; @@ -237,7 +230,6 @@ public class JSONML { * * @param string The source string. * @return A JSONArray containing the structured data from the XML string. - * @throws JSONException */ public static JSONArray toJSONArray(String string) throws JSONException { return toJSONArray(new XMLTokener(string)); @@ -254,7 +246,6 @@ public class JSONML { * * @param x An XMLTokener. * @return A JSONArray containing the structured data from the XML string. - * @throws JSONException */ public static JSONArray toJSONArray(XMLTokener x) throws JSONException { return (JSONArray) parse(x, true, null); @@ -272,7 +263,6 @@ public class JSONML { * * @param x An XMLTokener of the XML source text. * @return A JSONObject containing the structured data from the XML string. - * @throws JSONException */ public static JSONObject toJSONObject(XMLTokener x) throws JSONException { return (JSONObject) parse(x, false, null); @@ -290,7 +280,6 @@ public class JSONML { * * @param string The XML source text. * @return A JSONObject containing the structured data from the XML string. - * @throws JSONException */ public static JSONObject toJSONObject(String string) throws JSONException { return toJSONObject(new XMLTokener(string)); @@ -301,7 +290,6 @@ public class JSONML { * * @param ja A JSONArray. * @return An XML string. - * @throws JSONException */ public static String toString(JSONArray ja) throws JSONException { int i; @@ -352,7 +340,6 @@ public class JSONML { length = ja.length(); if (i >= length) { sb.append('/'); - sb.append('>'); } else { sb.append('>'); do { @@ -373,8 +360,8 @@ public class JSONML { sb.append('<'); sb.append('/'); sb.append(tagName); - sb.append('>'); } + sb.append('>'); return sb.toString(); } @@ -386,7 +373,6 @@ public class JSONML { * * @param jo A JSONObject. * @return An XML string. - * @throws JSONException */ public static String toString(JSONObject jo) throws JSONException { StringBuilder sb = new StringBuilder(); @@ -434,7 +420,6 @@ public class JSONML { ja = jo.optJSONArray("childNodes"); if (ja == null) { sb.append('/'); - sb.append('>'); } else { sb.append('>'); length = ja.length(); @@ -455,8 +440,8 @@ public class JSONML { sb.append('<'); sb.append('/'); sb.append(tagName); - sb.append('>'); } + sb.append('>'); return sb.toString(); } } diff --git a/src/main/java/com/volmit/iris/util/JSONObject.java b/src/main/java/com/volmit/iris/util/JSONObject.java index ec9ef642c..8e7f7845a 100644 --- a/src/main/java/com/volmit/iris/util/JSONObject.java +++ b/src/main/java/com/volmit/iris/util/JSONObject.java @@ -1,29 +1,23 @@ -package com.volmit.iris.util; - /* - Copyright (c) 2002 JSON.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - The Software shall be used for Good, not Evil. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ +package com.volmit.iris.util; + import java.io.IOException; import java.io.StringWriter; import java.io.Writer; @@ -85,6 +79,7 @@ import java.util.Map.Entry; * @author JSON.org * @version 2015-07-22 */ +@SuppressWarnings("ALL") public class JSONObject { /** * JSONObject.NULL is equivalent to the value that JavaScript calls null, @@ -1305,6 +1300,7 @@ public class JSONObject { * @param other The other JSONObject * @return true if they are equal */ + @SuppressWarnings("BooleanMethodIsAlwaysInverted") public boolean similar(Object other) { try { if (!(other instanceof JSONObject)) { diff --git a/src/main/java/com/volmit/iris/util/JSONString.java b/src/main/java/com/volmit/iris/util/JSONString.java index 7017e441c..2e54883af 100644 --- a/src/main/java/com/volmit/iris/util/JSONString.java +++ b/src/main/java/com/volmit/iris/util/JSONString.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; diff --git a/src/main/java/com/volmit/iris/util/JSONStringer.java b/src/main/java/com/volmit/iris/util/JSONStringer.java index 7a6ef3556..e3f5e9c19 100644 --- a/src/main/java/com/volmit/iris/util/JSONStringer.java +++ b/src/main/java/com/volmit/iris/util/JSONStringer.java @@ -1,30 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; -/* -Copyright (c) 2006 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - import java.io.StringWriter; /** diff --git a/src/main/java/com/volmit/iris/util/JSONTokener.java b/src/main/java/com/volmit/iris/util/JSONTokener.java index 01f3e4482..210a4f4b8 100644 --- a/src/main/java/com/volmit/iris/util/JSONTokener.java +++ b/src/main/java/com/volmit/iris/util/JSONTokener.java @@ -1,32 +1,26 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.io.*; -/* -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - /** * A JSONTokener takes a source string and extracts characters and tokens from * it. It is used by the JSONObject and JSONArray constructors to parse JSON @@ -35,6 +29,7 @@ SOFTWARE. * @author JSON.org * @version 2014-05-03 */ +@SuppressWarnings("ALL") public class JSONTokener { private long character; diff --git a/src/main/java/com/volmit/iris/util/JSONWriter.java b/src/main/java/com/volmit/iris/util/JSONWriter.java index 5b372dd34..bde202b2a 100644 --- a/src/main/java/com/volmit/iris/util/JSONWriter.java +++ b/src/main/java/com/volmit/iris/util/JSONWriter.java @@ -1,33 +1,27 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.io.IOException; import java.io.Writer; -/* -Copyright (c) 2006 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - /** * JSONWriter provides a quick and convenient way of producing JSON text. The * texts produced strictly conform to JSON syntax rules. No whitespace is added, @@ -89,7 +83,7 @@ public class JSONWriter { /** * The writer that will receive the output. */ - protected Writer writer; + protected final Writer writer; /** * Make a fresh JSONWriter. It can be used to build one JSON text. @@ -289,7 +283,6 @@ public class JSONWriter { * * @param b A boolean. * @return this - * @throws JSONException */ public JSONWriter value(boolean b) throws JSONException { return this.append(b ? "true" : "false"); @@ -311,7 +304,6 @@ public class JSONWriter { * * @param l A long. * @return this - * @throws JSONException */ public JSONWriter value(long l) throws JSONException { return this.append(Long.toString(l)); diff --git a/src/main/java/com/volmit/iris/util/JarScanner.java b/src/main/java/com/volmit/iris/util/JarScanner.java index 7579a3493..b560bc18f 100644 --- a/src/main/java/com/volmit/iris/util/JarScanner.java +++ b/src/main/java/com/volmit/iris/util/JarScanner.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.io.File; @@ -18,7 +36,7 @@ public class JarScanner { */ public JarScanner(File jar, String superPackage) { this.jar = jar; - this.classes = new KSet>(); + this.classes = new KSet<>(); this.superPackage = superPackage; } diff --git a/src/main/java/com/volmit/iris/util/KList.java b/src/main/java/com/volmit/iris/util/KList.java index b3e78b136..bbda280e3 100644 --- a/src/main/java/com/volmit/iris/util/KList.java +++ b/src/main/java/com/volmit/iris/util/KList.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.google.common.util.concurrent.AtomicDoubleArray; @@ -6,6 +24,7 @@ import java.util.*; import java.util.function.Function; import java.util.function.Predicate; +@SuppressWarnings("ALL") public class KList extends ArrayList implements List { private static final long serialVersionUID = -2892550695744823337L; @@ -90,7 +109,6 @@ public class KList extends ArrayList implements List { * @param f the function * @return the new map */ - @SuppressWarnings("hiding") public KMap asKeys(Function f) { KMap m = new KMap(); forEach((i) -> m.putNonNull(i, f.apply(i))); @@ -231,7 +249,7 @@ public class KList extends ArrayList implements List { StringBuilder b = new StringBuilder(); for (String i : toStringList()) { - b.append(split + i); + b.append(split).append(i); } return b.substring(split.length()); @@ -254,7 +272,6 @@ public class KList extends ArrayList implements List { * @param converter the converter that converts the forign type into this list type * @return this list (builder) */ - @SuppressWarnings("hiding") public KList addFrom(List v, Function converter) { v.forEach((g) -> add(converter.apply(g))); return this; @@ -268,7 +285,6 @@ public class KList extends ArrayList implements List { * @param converter * @return */ - @SuppressWarnings("hiding") public KList convert(Function converter) { KList v = new KList(); forEach((t) -> v.addNonNull(converter.apply(t))); diff --git a/src/main/java/com/volmit/iris/util/KMap.java b/src/main/java/com/volmit/iris/util/KMap.java index e313d2121..624fd662b 100644 --- a/src/main/java/com/volmit/iris/util/KMap.java +++ b/src/main/java/com/volmit/iris/util/KMap.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.util.Collections; @@ -6,7 +24,7 @@ import java.util.Enumeration; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -@SuppressWarnings("hiding") +@SuppressWarnings("ALL") public class KMap extends ConcurrentHashMap { private static final long serialVersionUID = 7288942695300448163L; diff --git a/src/main/java/com/volmit/iris/util/KSet.java b/src/main/java/com/volmit/iris/util/KSet.java index aa2acf9f1..92bff8aa3 100644 --- a/src/main/java/com/volmit/iris/util/KSet.java +++ b/src/main/java/com/volmit/iris/util/KSet.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.util.Collection; diff --git a/src/main/java/com/volmit/iris/util/KeyPair.java b/src/main/java/com/volmit/iris/util/KeyPair.java index 73b6fee99..115517a17 100644 --- a/src/main/java/com/volmit/iris/util/KeyPair.java +++ b/src/main/java/com/volmit/iris/util/KeyPair.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; /** diff --git a/src/main/java/com/volmit/iris/util/LinkedTerrainChunk.java b/src/main/java/com/volmit/iris/util/LinkedTerrainChunk.java index c348369ce..77d66b6ef 100644 --- a/src/main/java/com/volmit/iris/util/LinkedTerrainChunk.java +++ b/src/main/java/com/volmit/iris/util/LinkedTerrainChunk.java @@ -1,6 +1,26 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.volmit.iris.Iris; +import com.volmit.iris.nms.BiomeBaseInjector; +import com.volmit.iris.nms.INMS; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.Biome; @@ -8,6 +28,7 @@ import org.bukkit.block.data.BlockData; import org.bukkit.generator.ChunkGenerator.BiomeGrid; import org.bukkit.generator.ChunkGenerator.ChunkData; import org.bukkit.material.MaterialData; +import org.jetbrains.annotations.NotNull; @SuppressWarnings("deprecation") public class LinkedTerrainChunk implements TerrainChunk { @@ -44,6 +65,12 @@ public class LinkedTerrainChunk implements TerrainChunk { return null; } + @Override + public BiomeBaseInjector getBiomeBaseInjector() { + return (x, y, z, bb) -> INMS.get().forceBiomeInto(x, y, z, bb, storage); + } + + @NotNull @Override public Biome getBiome(int x, int z) { if (storage != null) { @@ -57,6 +84,7 @@ public class LinkedTerrainChunk implements TerrainChunk { return biome3D.getBiome(x, 0, z); } + @NotNull @Override public Biome getBiome(int x, int y, int z) { if (storage != null) { @@ -85,8 +113,7 @@ public class LinkedTerrainChunk implements TerrainChunk { biome3D.setBiome(x, 0, z, bio); } - public BiomeGrid getRawBiome() - { + public BiomeGrid getRawBiome() { return storage; } @@ -120,6 +147,7 @@ public class LinkedTerrainChunk implements TerrainChunk { rawChunkData.setBlock(x, y, z, blockData); } + @NotNull @Override public BlockData getBlockData(int x, int y, int z) { return rawChunkData.getBlockData(x, y, z); @@ -127,39 +155,41 @@ public class LinkedTerrainChunk implements TerrainChunk { @Deprecated @Override - public void setBlock(int x, int y, int z, Material material) { + public void setBlock(int x, int y, int z, @NotNull Material material) { rawChunkData.setBlock(x, y, z, material); } @Deprecated @Override - public void setBlock(int x, int y, int z, MaterialData material) { + public void setBlock(int x, int y, int z, @NotNull MaterialData material) { rawChunkData.setBlock(x, y, z, material); } @Deprecated @Override - public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, Material material) { + public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, @NotNull Material material) { rawChunkData.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, material); } @Deprecated @Override - public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, MaterialData material) { + public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, @NotNull MaterialData material) { rawChunkData.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, material); } @Override - public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, BlockData blockData) { + public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, @NotNull BlockData blockData) { rawChunkData.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, blockData); } + @NotNull @Deprecated @Override public Material getType(int x, int y, int z) { return rawChunkData.getType(x, y, z); } + @NotNull @Deprecated @Override public MaterialData getTypeAndData(int x, int y, int z) { diff --git a/src/main/java/com/volmit/iris/util/ListTag.java b/src/main/java/com/volmit/iris/util/ListTag.java index a0d917798..7b48d0e9f 100644 --- a/src/main/java/com/volmit/iris/util/ListTag.java +++ b/src/main/java/com/volmit/iris/util/ListTag.java @@ -1,38 +1,23 @@ -package com.volmit.iris.util; - /* - * JNBT License + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright (c) 2010 Graham Edgecombe - * All rights reserved. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the JNBT team nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ +package com.volmit.iris.util; + import java.util.Collections; import java.util.List; @@ -88,9 +73,9 @@ public final class ListTag extends Tag { append = "(\"" + this.getName() + "\")"; } StringBuilder bldr = new StringBuilder(); - bldr.append("TAG_List" + append + ": " + value.size() + " entries of type " + NBTUtils.getTypeName(type) + "\r\n{\r\n"); + bldr.append("TAG_List").append(append).append(": ").append(value.size()).append(" entries of type ").append(NBTUtils.getTypeName(type)).append("\r\n{\r\n"); for (Tag t : value) { - bldr.append(" " + t.toString().replaceAll("\r\n", "\r\n ") + "\r\n"); + bldr.append(" ").append(t.toString().replaceAll("\r\n", "\r\n ")).append("\r\n"); } bldr.append("}"); return bldr.toString(); diff --git a/src/main/java/com/volmit/iris/util/LongTag.java b/src/main/java/com/volmit/iris/util/LongTag.java index 19d1dc54e..be131aed0 100644 --- a/src/main/java/com/volmit/iris/util/LongTag.java +++ b/src/main/java/com/volmit/iris/util/LongTag.java @@ -1,38 +1,23 @@ -package com.volmit.iris.util; - /* - * JNBT License + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright (c) 2010 Graham Edgecombe - * All rights reserved. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the JNBT team nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ +package com.volmit.iris.util; + /** * The TAG_Long tag. * diff --git a/src/main/java/com/volmit/iris/util/Looper.java b/src/main/java/com/volmit/iris/util/Looper.java index 84abbd74e..b1690627f 100644 --- a/src/main/java/com/volmit/iris/util/Looper.java +++ b/src/main/java/com/volmit/iris/util/Looper.java @@ -1,8 +1,27 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.volmit.iris.Iris; public abstract class Looper extends Thread { + @SuppressWarnings("BusyWait") public void run() { while (!interrupted()) { try { @@ -12,6 +31,7 @@ public abstract class Looper extends Thread { break; } + //noinspection BusyWait Thread.sleep(m); } catch (InterruptedException e) { break; diff --git a/src/main/java/com/volmit/iris/util/M.java b/src/main/java/com/volmit/iris/util/M.java index c245d869c..8074d683d 100644 --- a/src/main/java/com/volmit/iris/util/M.java +++ b/src/main/java/com/volmit/iris/util/M.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import javax.script.ScriptEngine; @@ -72,8 +90,6 @@ public class M { * @param b the second point (1, 0) * @param c the third point (0, 1) * @param d the fourth point (1, 1) - * @param tx the x - * @param ty the y * @return the bilerped value */ public static double bilerp(double a, double b, double c, double d, double x, double y) { @@ -120,6 +136,7 @@ public class M { * @return true if true */ public static boolean r(Double d) { + //noinspection ReplaceNullCheck if (d == null) { return Math.random() < 0.5; } @@ -234,7 +251,6 @@ public class M { /** * Biggest number * - * @param numbers the numbers * @return the biggest one */ @SuppressWarnings("unchecked") @@ -305,7 +321,7 @@ public class M { ScriptEngineManager mgr = new ScriptEngineManager(); ScriptEngine scriptEngine = mgr.getEngineByName("JavaScript"); - return Double.valueOf(scriptEngine.eval(expression).toString()); + return Double.parseDouble(scriptEngine.eval(expression).toString()); } /** diff --git a/src/main/java/com/volmit/iris/util/MaterialBlock.java b/src/main/java/com/volmit/iris/util/MaterialBlock.java index f9712cec1..bc85e43ec 100644 --- a/src/main/java/com/volmit/iris/util/MaterialBlock.java +++ b/src/main/java/com/volmit/iris/util/MaterialBlock.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/util/MathHelper.java b/src/main/java/com/volmit/iris/util/MathHelper.java index d45dd2bfa..d6bd8ebdd 100644 --- a/src/main/java/com/volmit/iris/util/MathHelper.java +++ b/src/main/java/com/volmit/iris/util/MathHelper.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.util.Random; @@ -78,30 +96,21 @@ public class MathHelper { if (var0 < var1) { return var1; } - if (var0 > var2) { - return var2; - } - return var0; + return Math.min(var0, var2); } public static float a(float var0, float var1, float var2) { if (var0 < var1) { return var1; } - if (var0 > var2) { - return var2; - } - return var0; + return Math.min(var0, var2); } public static double a(double var0, double var2, double var4) { if (var0 < var2) { return var2; } - if (var0 > var4) { - return var4; - } - return var0; + return Math.min(var0, var4); } public static double b(double var0, double var2, double var4) { @@ -121,7 +130,7 @@ public class MathHelper { if (var2 < 0.0) { var2 = -var2; } - return var0 > var2 ? var0 : var2; + return Math.max(var0, var2); } public static int a(int var0, int var1) { @@ -267,7 +276,7 @@ public class MathHelper { } public static long c(int var0, int var1, int var2) { - long var3 = (long) (var0 * 3129871) ^ (long) var2 * 116129781L ^ (long) var1; + long var3 = (var0 * 3129871L) ^ (long) var2 * 116129781L ^ (long) var1; var3 = var3 * var3 * 42317861L + var3 * 11L; return var3 >> 16; } @@ -352,43 +361,37 @@ public class MathHelper { float var6 = var2 * (1.0f - var4 * var1); float var7 = var2 * (1.0f - (1.0f - var4) * var1); switch (var3) { - case 0: { + case 0 -> { var8 = var2; var9 = var7; var10 = var5; - break; } - case 1: { + case 1 -> { var8 = var6; var9 = var2; var10 = var5; - break; } - case 2: { + case 2 -> { var8 = var5; var9 = var2; var10 = var7; - break; } - case 3: { + case 3 -> { var8 = var5; var9 = var6; var10 = var2; - break; } - case 4: { + case 4 -> { var8 = var7; var9 = var5; var10 = var2; - break; } - case 5: { + case 5 -> { var8 = var2; var9 = var5; var10 = var6; - break; } - default: { + default -> { throw new RuntimeException("Something went wrong when converting from HSV to RGB. Input was " + var0 + ", " + var1 + ", " + var2); } } diff --git a/src/main/java/com/volmit/iris/util/MaxNumber.java b/src/main/java/com/volmit/iris/util/MaxNumber.java index 55b35c8b1..34c4e5fd2 100644 --- a/src/main/java/com/volmit/iris/util/MaxNumber.java +++ b/src/main/java/com/volmit/iris/util/MaxNumber.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/Metrics.java b/src/main/java/com/volmit/iris/util/Metrics.java index 011188570..9d8779c50 100644 --- a/src/main/java/com/volmit/iris/util/Metrics.java +++ b/src/main/java/com/volmit/iris/util/Metrics.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.google.gson.JsonArray; @@ -109,10 +127,11 @@ public class Metrics { // Inform the server owners about bStats config.options().header( - "bStats collects some data for plugin authors like how many servers are using their plugins.\n" + - "To honor their work, you should not disable it.\n" + - "This has nearly no effect on the server performance!\n" + - "Check out https://bStats.org/ to learn more :)" + """ + bStats collects some data for plugin authors like how many servers are using their plugins. + To honor their work, you should not disable it. + This has nearly no effect on the server performance! + Check out https://bStats.org/ to learn more :)""" ).copyDefaults(true); try { config.save(configFile); diff --git a/src/main/java/com/volmit/iris/util/MetricsLite.java b/src/main/java/com/volmit/iris/util/MetricsLite.java index ae01d86ac..e84c3ff36 100644 --- a/src/main/java/com/volmit/iris/util/MetricsLite.java +++ b/src/main/java/com/volmit/iris/util/MetricsLite.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.google.gson.JsonArray; @@ -107,7 +125,11 @@ public class MetricsLite { config.addDefault("logResponseStatusText", false); // Inform the server owners about bStats - config.options().header("bStats collects some data for plugin authors like how many servers are using their plugins.\n" + "To honor their work, you should not disable it.\n" + "This has nearly no effect on the server performance!\n" + "Check out https://bStats.org/ to learn more :)").copyDefaults(true); + config.options().header(""" + bStats collects some data for plugin authors like how many servers are using their plugins. + To honor their work, you should not disable it. + This has nearly no effect on the server performance! + Check out https://bStats.org/ to learn more :)""").copyDefaults(true); try { config.save(configFile); } catch (IOException ignored) { diff --git a/src/main/java/com/volmit/iris/util/MinNumber.java b/src/main/java/com/volmit/iris/util/MinNumber.java index 15877b1ec..4729cc0ed 100644 --- a/src/main/java/com/volmit/iris/util/MinNumber.java +++ b/src/main/java/com/volmit/iris/util/MinNumber.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/MortarCommand.java b/src/main/java/com/volmit/iris/util/MortarCommand.java index fa856e749..6c0e0b7ce 100644 --- a/src/main/java/com/volmit/iris/util/MortarCommand.java +++ b/src/main/java/com/volmit/iris/util/MortarCommand.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.volmit.iris.IrisSettings; @@ -29,7 +47,7 @@ public abstract class MortarCommand implements ICommand { public MortarCommand(String node, String... nodes) { category = ""; this.node = node; - this.nodes = new KList(nodes); + this.nodes = new KList<>(nodes); requiredPermissions = new KList<>(); children = buildChildren(); description = "No Description"; @@ -65,7 +83,6 @@ public abstract class MortarCommand implements ICommand { for (MortarCommand i : getChildren()) { for (String j : i.getRequiredPermissions()) { if (!sender.hasPermission(j)) { - continue; } } @@ -114,16 +131,16 @@ public abstract class MortarCommand implements ICommand { if (a.length > past) { int p = past; - String m = ""; + StringBuilder m = new StringBuilder(); for (String i : a) { p--; if (p < 0) { - m += i + ", "; + m.append(i).append(", "); } } - if (!m.trim().isEmpty()) { + if (!m.toString().trim().isEmpty()) { sender.sendMessage("Parameters Ignored: " + m); } } diff --git a/src/main/java/com/volmit/iris/util/MortarPermission.java b/src/main/java/com/volmit/iris/util/MortarPermission.java index 934b6e36a..cfc2ee27d 100644 --- a/src/main/java/com/volmit/iris/util/MortarPermission.java +++ b/src/main/java/com/volmit/iris/util/MortarPermission.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/volmit/iris/util/MortarSender.java b/src/main/java/com/volmit/iris/util/MortarSender.java index 25ff933a8..470ea9541 100644 --- a/src/main/java/com/volmit/iris/util/MortarSender.java +++ b/src/main/java/com/volmit/iris/util/MortarSender.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import lombok.Getter; @@ -89,47 +107,49 @@ public class MortarSender implements CommandSender { } @Override - public boolean isPermissionSet(String name) { + public boolean isPermissionSet(@NotNull String name) { return s.isPermissionSet(name); } @Override - public boolean isPermissionSet(Permission perm) { + public boolean isPermissionSet(@NotNull Permission perm) { return s.isPermissionSet(perm); } @Override - public boolean hasPermission(String name) { + public boolean hasPermission(@NotNull String name) { return s.hasPermission(name); } @Override - public boolean hasPermission(Permission perm) { + public boolean hasPermission(@NotNull Permission perm) { return s.hasPermission(perm); } + @NotNull @Override - public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value) { + public PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value) { return s.addAttachment(plugin, name, value); } + @NotNull @Override - public PermissionAttachment addAttachment(Plugin plugin) { + public PermissionAttachment addAttachment(@NotNull Plugin plugin) { return s.addAttachment(plugin); } @Override - public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value, int ticks) { + public PermissionAttachment addAttachment(@NotNull Plugin plugin, @NotNull String name, boolean value, int ticks) { return s.addAttachment(plugin, name, value, ticks); } @Override - public PermissionAttachment addAttachment(Plugin plugin, int ticks) { + public PermissionAttachment addAttachment(@NotNull Plugin plugin, int ticks) { return s.addAttachment(plugin, ticks); } @Override - public void removeAttachment(PermissionAttachment attachment) { + public void removeAttachment(@NotNull PermissionAttachment attachment) { s.removeAttachment(attachment); } @@ -138,6 +158,7 @@ public class MortarSender implements CommandSender { s.recalculatePermissions(); } + @NotNull @Override public Set getEffectivePermissions() { return s.getEffectivePermissions(); @@ -158,7 +179,7 @@ public class MortarSender implements CommandSender { } @Override - public void sendMessage(String message) { + public void sendMessage(@NotNull String message) { s.sendMessage(C.translateAlternateColorCodes('&', getTag()) + message); } @@ -178,16 +199,19 @@ public class MortarSender implements CommandSender { sendMessage(messages); } + @NotNull @Override public Server getServer() { return s.getServer(); } + @NotNull @Override public String getName() { return s.getName(); } + @NotNull @Override public Spigot spigot() { return s.spigot(); diff --git a/src/main/java/com/volmit/iris/util/NBTConstants.java b/src/main/java/com/volmit/iris/util/NBTConstants.java index f1789065a..0e8300f5b 100644 --- a/src/main/java/com/volmit/iris/util/NBTConstants.java +++ b/src/main/java/com/volmit/iris/util/NBTConstants.java @@ -1,44 +1,28 @@ -package com.volmit.iris.util; - /* - * JNBT License + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright (c) 2015 Neil Wightman - * Copyright (c) 2010 Graham Edgecombe - * All rights reserved. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the JNBT team nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ +package com.volmit.iris.util; + import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -/** - * Changes : Neil Wightman - Support 19133 Tag_Int_Array tag +/* + Changes : Neil Wightman - Support 19133 Tag_Int_Array tag */ /** diff --git a/src/main/java/com/volmit/iris/util/NBTInputStream.java b/src/main/java/com/volmit/iris/util/NBTInputStream.java index 562c94b41..95e4d2fab 100644 --- a/src/main/java/com/volmit/iris/util/NBTInputStream.java +++ b/src/main/java/com/volmit/iris/util/NBTInputStream.java @@ -1,39 +1,23 @@ -package com.volmit.iris.util; - /* - * JNBT License + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright (c) 2015 Neil Wightman - * Copyright (c) 2010 Graham Edgecombe - * All rights reserved. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the JNBT team nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ +package com.volmit.iris.util; + import java.io.Closeable; import java.io.DataInputStream; import java.io.IOException; @@ -44,9 +28,9 @@ import java.util.List; import java.util.Map; import java.util.zip.GZIPInputStream; -/** - * Changes : - * Neil Wightman - Support 19133 Tag_Int_Array tag +/* + Changes : + Neil Wightman - Support 19133 Tag_Int_Array tag */ /** @@ -59,7 +43,6 @@ import java.util.zip.GZIPInputStream; * http://www.minecraft.net/docs/NBT.txt.

* * @author Graham Edgecombe - * */ public final class NBTInputStream implements Closeable { @@ -70,6 +53,7 @@ public final class NBTInputStream implements Closeable { /** * Create a new NBTInputStream, which will source its data from the specified input stream. + * * @param is The output stream */ public NBTInputStream(DataInputStream is) { @@ -123,8 +107,8 @@ public final class NBTInputStream implements Closeable { /** * Reads the payload of a tag, given the name and type. * - * @param type The type. - * @param name The name. + * @param type The type. + * @param name The name. * @param depth The depth. * @return The tag. * @throws IOException if an I/O error occurs. @@ -163,7 +147,7 @@ public final class NBTInputStream implements Closeable { int childType = is.readByte(); length = is.readInt(); - List tagList = new ArrayList(); + List tagList = new ArrayList<>(); for (int i = 0; i < length; i++) { Tag tag = readTagPayload(childType, "", depth + 1); if (tag instanceof EndTag) { @@ -174,7 +158,7 @@ public final class NBTInputStream implements Closeable { return new ListTag(name, NBTUtils.getTypeClass(childType), tagList); case NBTConstants.TYPE_COMPOUND: - Map tagMap = new HashMap(); + Map tagMap = new HashMap<>(); while (true) { Tag tag = readTag(depth + 1); if (tag instanceof EndTag) { diff --git a/src/main/java/com/volmit/iris/util/NBTOutputStream.java b/src/main/java/com/volmit/iris/util/NBTOutputStream.java index c3163ae99..8ca1d05b7 100644 --- a/src/main/java/com/volmit/iris/util/NBTOutputStream.java +++ b/src/main/java/com/volmit/iris/util/NBTOutputStream.java @@ -1,47 +1,31 @@ -package com.volmit.iris.util; - /* - * JNBT License + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright (c) 2015 Neil Wightman - * Copyright (c) 2010 Graham Edgecombe - * All rights reserved. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the JNBT team nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ +package com.volmit.iris.util; + import java.io.Closeable; import java.io.DataOutputStream; import java.io.IOException; import java.io.OutputStream; import java.util.List; import java.util.zip.GZIPOutputStream; -/** - * Changes : Neil Wightman - Support 19133 Tag_Int_Array tag +/* + Changes : Neil Wightman - Support 19133 Tag_Int_Array tag */ /** @@ -55,6 +39,7 @@ import java.util.zip.GZIPOutputStream; * * @author Graham Edgecombe */ +@SuppressWarnings({"EmptyMethod", "JavaDoc"}) public final class NBTOutputStream implements Closeable { /** @@ -113,44 +98,19 @@ public final class NBTOutputStream implements Closeable { private void writeTagPayload(Tag tag) throws IOException { int type = NBTUtils.getTypeCode(tag.getClass()); switch (type) { - case NBTConstants.TYPE_END: - writeEndTagPayload((EndTag) tag); - break; - case NBTConstants.TYPE_BYTE: - writeByteTagPayload((ByteTag) tag); - break; - case NBTConstants.TYPE_SHORT: - writeShortTagPayload((ShortTag) tag); - break; - case NBTConstants.TYPE_INT: - writeIntTagPayload((IntTag) tag); - break; - case NBTConstants.TYPE_LONG: - writeLongTagPayload((LongTag) tag); - break; - case NBTConstants.TYPE_FLOAT: - writeFloatTagPayload((FloatTag) tag); - break; - case NBTConstants.TYPE_DOUBLE: - writeDoubleTagPayload((DoubleTag) tag); - break; - case NBTConstants.TYPE_BYTE_ARRAY: - writeByteArrayTagPayload((ByteArrayTag) tag); - break; - case NBTConstants.TYPE_STRING: - writeStringTagPayload((StringTag) tag); - break; - case NBTConstants.TYPE_LIST: - writeListTagPayload((ListTag) tag); - break; - case NBTConstants.TYPE_COMPOUND: - writeCompoundTagPayload((CompoundTag) tag); - break; - case NBTConstants.TYPE_INT_ARRAY: - writeIntArrayTagPayload((IntArrayTag) tag); - break; - default: - throw new IOException("Invalid tag type: " + type + "."); + case NBTConstants.TYPE_END -> writeEndTagPayload((EndTag) tag); + case NBTConstants.TYPE_BYTE -> writeByteTagPayload((ByteTag) tag); + case NBTConstants.TYPE_SHORT -> writeShortTagPayload((ShortTag) tag); + case NBTConstants.TYPE_INT -> writeIntTagPayload((IntTag) tag); + case NBTConstants.TYPE_LONG -> writeLongTagPayload((LongTag) tag); + case NBTConstants.TYPE_FLOAT -> writeFloatTagPayload((FloatTag) tag); + case NBTConstants.TYPE_DOUBLE -> writeDoubleTagPayload((DoubleTag) tag); + case NBTConstants.TYPE_BYTE_ARRAY -> writeByteArrayTagPayload((ByteArrayTag) tag); + case NBTConstants.TYPE_STRING -> writeStringTagPayload((StringTag) tag); + case NBTConstants.TYPE_LIST -> writeListTagPayload((ListTag) tag); + case NBTConstants.TYPE_COMPOUND -> writeCompoundTagPayload((CompoundTag) tag); + case NBTConstants.TYPE_INT_ARRAY -> writeIntArrayTagPayload((IntArrayTag) tag); + default -> throw new IOException("Invalid tag type: " + type + "."); } } @@ -203,8 +163,8 @@ public final class NBTOutputStream implements Closeable { os.writeByte(NBTUtils.getTypeCode(clazz)); os.writeInt(size); - for (int i = 0; i < size; i++) { - writeTagPayload(tags.get(i)); + for (Tag value : tags) { + writeTagPayload(value); } } diff --git a/src/main/java/com/volmit/iris/util/NBTUtils.java b/src/main/java/com/volmit/iris/util/NBTUtils.java index b11b7290e..08ff8d664 100644 --- a/src/main/java/com/volmit/iris/util/NBTUtils.java +++ b/src/main/java/com/volmit/iris/util/NBTUtils.java @@ -1,40 +1,25 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; /* - * JNBT License - * - * Copyright (c) 2015 Neil Wightman - * Copyright (c) 2010 Graham Edgecombe - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the JNBT team nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ -/** - * Changes : Neil Wightman - Support 19133 Tag_Int_Array tag + Changes : Neil Wightman - Support 19133 Tag_Int_Array tag */ /** @@ -125,34 +110,21 @@ public final class NBTUtils { * @throws IllegalArgumentException if the tag type is invalid. */ public static Class getTypeClass(int type) { - switch (type) { - case NBTConstants.TYPE_END: - return EndTag.class; - case NBTConstants.TYPE_BYTE: - return ByteTag.class; - case NBTConstants.TYPE_SHORT: - return ShortTag.class; - case NBTConstants.TYPE_INT: - return IntTag.class; - case NBTConstants.TYPE_LONG: - return LongTag.class; - case NBTConstants.TYPE_FLOAT: - return FloatTag.class; - case NBTConstants.TYPE_DOUBLE: - return DoubleTag.class; - case NBTConstants.TYPE_BYTE_ARRAY: - return ByteArrayTag.class; - case NBTConstants.TYPE_STRING: - return StringTag.class; - case NBTConstants.TYPE_LIST: - return ListTag.class; - case NBTConstants.TYPE_COMPOUND: - return CompoundTag.class; - case NBTConstants.TYPE_INT_ARRAY: - return IntArrayTag.class; - default: - throw new IllegalArgumentException("Invalid tag type : " + type + "."); - } + return switch (type) { + case NBTConstants.TYPE_END -> EndTag.class; + case NBTConstants.TYPE_BYTE -> ByteTag.class; + case NBTConstants.TYPE_SHORT -> ShortTag.class; + case NBTConstants.TYPE_INT -> IntTag.class; + case NBTConstants.TYPE_LONG -> LongTag.class; + case NBTConstants.TYPE_FLOAT -> FloatTag.class; + case NBTConstants.TYPE_DOUBLE -> DoubleTag.class; + case NBTConstants.TYPE_BYTE_ARRAY -> ByteArrayTag.class; + case NBTConstants.TYPE_STRING -> StringTag.class; + case NBTConstants.TYPE_LIST -> ListTag.class; + case NBTConstants.TYPE_COMPOUND -> CompoundTag.class; + case NBTConstants.TYPE_INT_ARRAY -> IntArrayTag.class; + default -> throw new IllegalArgumentException("Invalid tag type : " + type + "."); + }; } /** diff --git a/src/main/java/com/volmit/iris/util/NMSVersion.java b/src/main/java/com/volmit/iris/util/NMSVersion.java index 10e42e62b..b1a96acfb 100644 --- a/src/main/java/com/volmit/iris/util/NMSVersion.java +++ b/src/main/java/com/volmit/iris/util/NMSVersion.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.util.ArrayList; @@ -111,7 +129,7 @@ public enum NMSVersion { try { Class.forName("org.bukkit.craftbukkit.v" + v + ".CraftWorld"); return true; - } catch (Throwable e) { + } catch (Throwable ignored) { } diff --git a/src/main/java/com/volmit/iris/util/NastyFunction.java b/src/main/java/com/volmit/iris/util/NastyFunction.java index d59423acc..c62568d3e 100644 --- a/src/main/java/com/volmit/iris/util/NastyFunction.java +++ b/src/main/java/com/volmit/iris/util/NastyFunction.java @@ -1,5 +1,23 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public interface NastyFunction { - R run(T t) throws Throwable; + R run(T t); } diff --git a/src/main/java/com/volmit/iris/util/NastyFuture.java b/src/main/java/com/volmit/iris/util/NastyFuture.java index 263d36968..77ae7ccd6 100644 --- a/src/main/java/com/volmit/iris/util/NastyFuture.java +++ b/src/main/java/com/volmit/iris/util/NastyFuture.java @@ -1,5 +1,23 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public interface NastyFuture { - R run() throws Throwable; + R run(); } diff --git a/src/main/java/com/volmit/iris/util/NastyRunnable.java b/src/main/java/com/volmit/iris/util/NastyRunnable.java index 8b8328792..178bfb9c5 100644 --- a/src/main/java/com/volmit/iris/util/NastyRunnable.java +++ b/src/main/java/com/volmit/iris/util/NastyRunnable.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public interface NastyRunnable { diff --git a/src/main/java/com/volmit/iris/util/NibbleArray.java b/src/main/java/com/volmit/iris/util/NibbleArray.java index a5ccaaedf..153179e04 100644 --- a/src/main/java/com/volmit/iris/util/NibbleArray.java +++ b/src/main/java/com/volmit/iris/util/NibbleArray.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.io.DataInputStream; @@ -121,8 +139,8 @@ public class NibbleArray implements Writable { public String toBitsString(ByteOrder byteOrder) { StringJoiner joiner = new StringJoiner(" "); - for (int i = 0; i < data.length; i++) { - joiner.add(binaryString(data[i], byteOrder)); + for (byte datum : data) { + joiner.add(binaryString(datum, byteOrder)); } return joiner.toString(); diff --git a/src/main/java/com/volmit/iris/util/NoiseInjector.java b/src/main/java/com/volmit/iris/util/NoiseInjector.java index 261a29363..332bc1032 100644 --- a/src/main/java/com/volmit/iris/util/NoiseInjector.java +++ b/src/main/java/com/volmit/iris/util/NoiseInjector.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; @FunctionalInterface diff --git a/src/main/java/com/volmit/iris/util/NoiseProvider.java b/src/main/java/com/volmit/iris/util/NoiseProvider.java index 8fb360cdb..8a1910d0f 100644 --- a/src/main/java/com/volmit/iris/util/NoiseProvider.java +++ b/src/main/java/com/volmit/iris/util/NoiseProvider.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; @FunctionalInterface diff --git a/src/main/java/com/volmit/iris/util/NoiseProvider3.java b/src/main/java/com/volmit/iris/util/NoiseProvider3.java index e7019d35b..ac27c3423 100644 --- a/src/main/java/com/volmit/iris/util/NoiseProvider3.java +++ b/src/main/java/com/volmit/iris/util/NoiseProvider3.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; @FunctionalInterface diff --git a/src/main/java/com/volmit/iris/util/O.java b/src/main/java/com/volmit/iris/util/O.java index e8613039b..e2e2f9974 100644 --- a/src/main/java/com/volmit/iris/util/O.java +++ b/src/main/java/com/volmit/iris/util/O.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public class O implements Observable { @@ -11,11 +29,10 @@ public class O implements Observable { @Override public O set(T t) { - T x = t; this.t = t; if (observers != null && observers.hasElements()) { - observers.forEach((o) -> o.onChanged(x, t)); + observers.forEach((o) -> o.onChanged(t, t)); } return this; diff --git a/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java b/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java index f1013fbcb..65d481d27 100644 --- a/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java +++ b/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.volmit.iris.Iris; @@ -133,7 +151,7 @@ public class ObjectResourceLoader extends ResourceLoader { } KList v = new KList<>(m); - possibleKeys = v.toArray(new String[v.size()]); + possibleKeys = v.toArray(new String[0]); return possibleKeys; } diff --git a/src/main/java/com/volmit/iris/util/Observable.java b/src/main/java/com/volmit/iris/util/Observable.java index 2c900b78d..439f00bd4 100644 --- a/src/main/java/com/volmit/iris/util/Observable.java +++ b/src/main/java/com/volmit/iris/util/Observable.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public interface Observable { diff --git a/src/main/java/com/volmit/iris/util/Observer.java b/src/main/java/com/volmit/iris/util/Observer.java index d7b0af06d..8b986a909 100644 --- a/src/main/java/com/volmit/iris/util/Observer.java +++ b/src/main/java/com/volmit/iris/util/Observer.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; @FunctionalInterface diff --git a/src/main/java/com/volmit/iris/util/ParticleSender.java b/src/main/java/com/volmit/iris/util/ParticleSender.java index e69ee53ac..9a4e084a3 100644 --- a/src/main/java/com/volmit/iris/util/ParticleSender.java +++ b/src/main/java/com/volmit/iris/util/ParticleSender.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.Bukkit; diff --git a/src/main/java/com/volmit/iris/util/ParticleSenderLegacy.java b/src/main/java/com/volmit/iris/util/ParticleSenderLegacy.java index 738c4d589..ca08d5a9a 100644 --- a/src/main/java/com/volmit/iris/util/ParticleSenderLegacy.java +++ b/src/main/java/com/volmit/iris/util/ParticleSenderLegacy.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.Color; @@ -15,7 +33,7 @@ import java.lang.reflect.Method; * * @author MrMicky */ -@SuppressWarnings("deprecation") +@SuppressWarnings({"deprecation", "JavaReflectionInvocation"}) class ParticleSenderLegacy implements ParticleSender { private static final boolean SERVER_IS_1_8; @@ -140,20 +158,18 @@ class ParticleSenderLegacy implements ParticleSender { private int[] toData(ParticleType particle, Object data) { Class dataType = particle.getDataType(); if (dataType == ItemStack.class) { - if (!(data instanceof ItemStack)) { + if (!(data instanceof ItemStack itemStack)) { return SERVER_IS_1_8 ? new int[2] : new int[]{1, 0}; } - ItemStack itemStack = (ItemStack) data; return new int[]{itemStack.getType().getId(), itemStack.getDurability()}; } if (dataType == MaterialData.class) { - if (!(data instanceof MaterialData)) { + if (!(data instanceof MaterialData materialData)) { return SERVER_IS_1_8 ? new int[1] : new int[]{1, 0}; } - MaterialData materialData = (MaterialData) data; if (SERVER_IS_1_8) { return new int[]{materialData.getItemType().getId() + (materialData.getData() << 12)}; } else { diff --git a/src/main/java/com/volmit/iris/util/ParticleType.java b/src/main/java/com/volmit/iris/util/ParticleType.java index 5c999630e..b4ce9430a 100644 --- a/src/main/java/com/volmit/iris/util/ParticleType.java +++ b/src/main/java/com/volmit/iris/util/ParticleType.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.Color; @@ -143,19 +161,14 @@ public enum ParticleType { } public Class getDataType() { - switch (this) { - case ITEM_CRACK: - return ItemStack.class; - case BLOCK_CRACK: - case BLOCK_DUST: - case FALLING_DUST: - //noinspection deprecation - return MaterialData.class; - case REDSTONE: - return Color.class; - default: - return Void.class; - } + return switch (this) { + case ITEM_CRACK -> ItemStack.class; + case BLOCK_CRACK, BLOCK_DUST, FALLING_DUST -> + //noinspection deprecation + MaterialData.class; + case REDSTONE -> Color.class; + default -> Void.class; + }; } public static ParticleType getParticle(String particleName) { diff --git a/src/main/java/com/volmit/iris/util/Permission.java b/src/main/java/com/volmit/iris/util/Permission.java index 185bd5ed0..4f728dacd 100644 --- a/src/main/java/com/volmit/iris/util/Permission.java +++ b/src/main/java/com/volmit/iris/util/Permission.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/Point3d.java b/src/main/java/com/volmit/iris/util/Point3d.java index 539fbf41f..e6f02402b 100644 --- a/src/main/java/com/volmit/iris/util/Point3d.java +++ b/src/main/java/com/volmit/iris/util/Point3d.java @@ -1,32 +1,19 @@ /* - * $RCSfile$ + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * $Revision: 127 $ - * $Date: 2008-02-28 21:18:51 +0100 (Thu, 28 Feb 2008) $ - * $State$ + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.volmit.iris.util; diff --git a/src/main/java/com/volmit/iris/util/Point3f.java b/src/main/java/com/volmit/iris/util/Point3f.java index cd3dc20a1..4fd5cb491 100644 --- a/src/main/java/com/volmit/iris/util/Point3f.java +++ b/src/main/java/com/volmit/iris/util/Point3f.java @@ -1,32 +1,19 @@ /* - * $RCSfile$ + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * $Revision: 127 $ - * $Date: 2008-02-28 21:18:51 +0100 (Thu, 28 Feb 2008) $ - * $State$ + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.volmit.iris.util; diff --git a/src/main/java/com/volmit/iris/util/Point4d.java b/src/main/java/com/volmit/iris/util/Point4d.java index 970db5b44..0733cf481 100644 --- a/src/main/java/com/volmit/iris/util/Point4d.java +++ b/src/main/java/com/volmit/iris/util/Point4d.java @@ -1,32 +1,19 @@ /* - * $RCSfile$ + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * $Revision: 127 $ - * $Date: 2008-02-28 21:18:51 +0100 (Thu, 28 Feb 2008) $ - * $State$ + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.volmit.iris.util; diff --git a/src/main/java/com/volmit/iris/util/Point4f.java b/src/main/java/com/volmit/iris/util/Point4f.java index 8e9d79f58..1da7af3f4 100644 --- a/src/main/java/com/volmit/iris/util/Point4f.java +++ b/src/main/java/com/volmit/iris/util/Point4f.java @@ -1,32 +1,19 @@ /* - * $RCSfile$ + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * $Revision: 127 $ - * $Date: 2008-02-28 21:18:51 +0100 (Thu, 28 Feb 2008) $ - * $State$ + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.volmit.iris.util; diff --git a/src/main/java/com/volmit/iris/util/PrecisionStopwatch.java b/src/main/java/com/volmit/iris/util/PrecisionStopwatch.java index 1024ae2f2..2fcaa0dc4 100644 --- a/src/main/java/com/volmit/iris/util/PrecisionStopwatch.java +++ b/src/main/java/com/volmit/iris/util/PrecisionStopwatch.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public class PrecisionStopwatch { diff --git a/src/main/java/com/volmit/iris/util/Queue.java b/src/main/java/com/volmit/iris/util/Queue.java index 012d587b9..17310f457 100644 --- a/src/main/java/com/volmit/iris/util/Queue.java +++ b/src/main/java/com/volmit/iris/util/Queue.java @@ -1,5 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; +@SuppressWarnings("ALL") public interface Queue { Queue queue(T t); diff --git a/src/main/java/com/volmit/iris/util/QueueExecutor.java b/src/main/java/com/volmit/iris/util/QueueExecutor.java index 9d4b1cc35..bfc2d5307 100644 --- a/src/main/java/com/volmit/iris/util/QueueExecutor.java +++ b/src/main/java/com/volmit/iris/util/QueueExecutor.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public class QueueExecutor extends Looper { @@ -5,7 +23,7 @@ public class QueueExecutor extends Looper { private boolean shutdown; public QueueExecutor() { - queue = new ShurikenQueue(); + queue = new ShurikenQueue<>(); shutdown = false; } diff --git a/src/main/java/com/volmit/iris/util/RNG.java b/src/main/java/com/volmit/iris/util/RNG.java index b096df76c..2616fdfc7 100644 --- a/src/main/java/com/volmit/iris/util/RNG.java +++ b/src/main/java/com/volmit/iris/util/RNG.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.nio.charset.StandardCharsets; @@ -27,7 +45,7 @@ public class RNG extends Random { * @param seed the seed (string) */ public RNG(String seed) { - this(UUID.nameUUIDFromBytes(seed.getBytes(StandardCharsets.UTF_8)).getLeastSignificantBits() + UUID.nameUUIDFromBytes(seed.getBytes(StandardCharsets.UTF_8)).getMostSignificantBits() + (seed.length() * 32564)); + this(UUID.nameUUIDFromBytes(seed.getBytes(StandardCharsets.UTF_8)).getLeastSignificantBits() + UUID.nameUUIDFromBytes(seed.getBytes(StandardCharsets.UTF_8)).getMostSignificantBits() + (seed.length() * 32564L)); } public RNG nextParallelRNG(int signature) { diff --git a/src/main/java/com/volmit/iris/util/ReactiveFolder.java b/src/main/java/com/volmit/iris/util/ReactiveFolder.java index 00f632ae1..244843757 100644 --- a/src/main/java/com/volmit/iris/util/ReactiveFolder.java +++ b/src/main/java/com/volmit/iris/util/ReactiveFolder.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.io.File; diff --git a/src/main/java/com/volmit/iris/util/RegistryListBiome.java b/src/main/java/com/volmit/iris/util/RegistryListBiome.java index 2e7ba549e..80d595112 100644 --- a/src/main/java/com/volmit/iris/util/RegistryListBiome.java +++ b/src/main/java/com/volmit/iris/util/RegistryListBiome.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/RegistryListBiomeDownfallType.java b/src/main/java/com/volmit/iris/util/RegistryListBiomeDownfallType.java index 402a1670f..31e782bd7 100644 --- a/src/main/java/com/volmit/iris/util/RegistryListBiomeDownfallType.java +++ b/src/main/java/com/volmit/iris/util/RegistryListBiomeDownfallType.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/RegistryListBlockType.java b/src/main/java/com/volmit/iris/util/RegistryListBlockType.java index 4a1b56dbf..dd4888779 100644 --- a/src/main/java/com/volmit/iris/util/RegistryListBlockType.java +++ b/src/main/java/com/volmit/iris/util/RegistryListBlockType.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/RegistryListDimension.java b/src/main/java/com/volmit/iris/util/RegistryListDimension.java index c53aac8ef..1cfb6d571 100644 --- a/src/main/java/com/volmit/iris/util/RegistryListDimension.java +++ b/src/main/java/com/volmit/iris/util/RegistryListDimension.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/RegistryListEntity.java b/src/main/java/com/volmit/iris/util/RegistryListEntity.java index 189f0da76..cf44ee2d7 100644 --- a/src/main/java/com/volmit/iris/util/RegistryListEntity.java +++ b/src/main/java/com/volmit/iris/util/RegistryListEntity.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/RegistryListFont.java b/src/main/java/com/volmit/iris/util/RegistryListFont.java index 3ff432db3..c579fddd4 100644 --- a/src/main/java/com/volmit/iris/util/RegistryListFont.java +++ b/src/main/java/com/volmit/iris/util/RegistryListFont.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/RegistryListGenerator.java b/src/main/java/com/volmit/iris/util/RegistryListGenerator.java index c114b30b6..5d10c403d 100644 --- a/src/main/java/com/volmit/iris/util/RegistryListGenerator.java +++ b/src/main/java/com/volmit/iris/util/RegistryListGenerator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/RegistryListItemType.java b/src/main/java/com/volmit/iris/util/RegistryListItemType.java index a2940fc2b..4cc80e615 100644 --- a/src/main/java/com/volmit/iris/util/RegistryListItemType.java +++ b/src/main/java/com/volmit/iris/util/RegistryListItemType.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/RegistryListJigsaw.java b/src/main/java/com/volmit/iris/util/RegistryListJigsaw.java index 41d0358b5..8e724d6cb 100644 --- a/src/main/java/com/volmit/iris/util/RegistryListJigsaw.java +++ b/src/main/java/com/volmit/iris/util/RegistryListJigsaw.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/RegistryListJigsawPiece.java b/src/main/java/com/volmit/iris/util/RegistryListJigsawPiece.java index cc440d16c..b66678c7e 100644 --- a/src/main/java/com/volmit/iris/util/RegistryListJigsawPiece.java +++ b/src/main/java/com/volmit/iris/util/RegistryListJigsawPiece.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/RegistryListJigsawPool.java b/src/main/java/com/volmit/iris/util/RegistryListJigsawPool.java index 98e5c70fe..810ab9c19 100644 --- a/src/main/java/com/volmit/iris/util/RegistryListJigsawPool.java +++ b/src/main/java/com/volmit/iris/util/RegistryListJigsawPool.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/RegistryListLoot.java b/src/main/java/com/volmit/iris/util/RegistryListLoot.java index 5f1e7b7cb..6719778ac 100644 --- a/src/main/java/com/volmit/iris/util/RegistryListLoot.java +++ b/src/main/java/com/volmit/iris/util/RegistryListLoot.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/RegistryListMythical.java b/src/main/java/com/volmit/iris/util/RegistryListMythical.java index c7c5927b5..600313c52 100644 --- a/src/main/java/com/volmit/iris/util/RegistryListMythical.java +++ b/src/main/java/com/volmit/iris/util/RegistryListMythical.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/RegistryListObject.java b/src/main/java/com/volmit/iris/util/RegistryListObject.java index 6c7965c19..d2c2e3ba7 100644 --- a/src/main/java/com/volmit/iris/util/RegistryListObject.java +++ b/src/main/java/com/volmit/iris/util/RegistryListObject.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/RegistryListRegion.java b/src/main/java/com/volmit/iris/util/RegistryListRegion.java index 509f61bdb..8e0398a49 100644 --- a/src/main/java/com/volmit/iris/util/RegistryListRegion.java +++ b/src/main/java/com/volmit/iris/util/RegistryListRegion.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/Required.java b/src/main/java/com/volmit/iris/util/Required.java index e76be4556..98b107e30 100644 --- a/src/main/java/com/volmit/iris/util/Required.java +++ b/src/main/java/com/volmit/iris/util/Required.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Retention; diff --git a/src/main/java/com/volmit/iris/util/ResourceLoader.java b/src/main/java/com/volmit/iris/util/ResourceLoader.java index 2f4c21f7d..ea11748c7 100644 --- a/src/main/java/com/volmit/iris/util/ResourceLoader.java +++ b/src/main/java/com/volmit/iris/util/ResourceLoader.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.google.gson.Gson; @@ -81,7 +99,7 @@ public class ResourceLoader { } KList v = new KList<>(m); - possibleKeys = v.toArray(new String[v.size()]); + possibleKeys = v.toArray(new String[0]); return possibleKeys; } @@ -122,8 +140,7 @@ public class ResourceLoader { String key = name + "-" + cname; if (loadCache.containsKey(key)) { - T t = loadCache.get(key); - return t; + return loadCache.get(key); } lock.lock(); diff --git a/src/main/java/com/volmit/iris/util/RollingSequence.java b/src/main/java/com/volmit/iris/util/RollingSequence.java index 543843e43..4a75ed470 100644 --- a/src/main/java/com/volmit/iris/util/RollingSequence.java +++ b/src/main/java/com/volmit/iris/util/RollingSequence.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public class RollingSequence extends Average { diff --git a/src/main/java/com/volmit/iris/util/RouterCommand.java b/src/main/java/com/volmit/iris/util/RouterCommand.java index ce45130a7..df4fa1eb0 100644 --- a/src/main/java/com/volmit/iris/util/RouterCommand.java +++ b/src/main/java/com/volmit/iris/util/RouterCommand.java @@ -1,8 +1,27 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; +import org.jetbrains.annotations.NotNull; /** * Assistive command router @@ -26,19 +45,21 @@ public class RouterCommand extends org.bukkit.command.Command { this.ex = ex; } + @NotNull @Override - public Command setUsage(String u) { + public Command setUsage(@NotNull String u) { this.usage = u; return this; } + @NotNull @Override public String getUsage() { return usage; } @Override - public boolean execute(CommandSender sender, String commandLabel, String[] args) { + public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) { return ex.onCommand(sender, this, commandLabel, args); } } diff --git a/src/main/java/com/volmit/iris/util/S.java b/src/main/java/com/volmit/iris/util/S.java index ccd271025..42e51a322 100644 --- a/src/main/java/com/volmit/iris/util/S.java +++ b/src/main/java/com/volmit/iris/util/S.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public abstract class S implements Runnable { diff --git a/src/main/java/com/volmit/iris/util/SKConversion.java b/src/main/java/com/volmit/iris/util/SKConversion.java index 5f9570259..bfa553576 100644 --- a/src/main/java/com/volmit/iris/util/SKConversion.java +++ b/src/main/java/com/volmit/iris/util/SKConversion.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.sk89q.worldedit.bukkit.BukkitAdapter; @@ -10,7 +28,6 @@ import com.volmit.iris.object.IrisObject; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; public class SKConversion { @@ -30,8 +47,6 @@ public class SKConversion { } o.write(out); - } catch (FileNotFoundException e) { - e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } diff --git a/src/main/java/com/volmit/iris/util/SR.java b/src/main/java/com/volmit/iris/util/SR.java index 617a01b79..b15d32b1e 100644 --- a/src/main/java/com/volmit/iris/util/SR.java +++ b/src/main/java/com/volmit/iris/util/SR.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public abstract class SR implements Runnable, CancellableTask { diff --git a/src/main/java/com/volmit/iris/util/ScoreDirection.java b/src/main/java/com/volmit/iris/util/ScoreDirection.java index bc9ba3fd6..df1576159 100644 --- a/src/main/java/com/volmit/iris/util/ScoreDirection.java +++ b/src/main/java/com/volmit/iris/util/ScoreDirection.java @@ -1,14 +1,32 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; /** * @author Missionary (missionarymc@gmail.com) * @since 5/31/2018 */ -@DontObfuscate + public enum ScoreDirection { - @DontObfuscate + UP, - @DontObfuscate + DOWN } diff --git a/src/main/java/com/volmit/iris/util/ShortTag.java b/src/main/java/com/volmit/iris/util/ShortTag.java index cf1e40762..0e7702883 100644 --- a/src/main/java/com/volmit/iris/util/ShortTag.java +++ b/src/main/java/com/volmit/iris/util/ShortTag.java @@ -1,38 +1,23 @@ -package com.volmit.iris.util; - /* - * JNBT License + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright (c) 2010 Graham Edgecombe - * All rights reserved. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the JNBT team nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ +package com.volmit.iris.util; + /** * The TAG_Short tag. * diff --git a/src/main/java/com/volmit/iris/util/Shrinkwrap.java b/src/main/java/com/volmit/iris/util/Shrinkwrap.java index b492b5a5a..0b09de1cb 100644 --- a/src/main/java/com/volmit/iris/util/Shrinkwrap.java +++ b/src/main/java/com/volmit/iris/util/Shrinkwrap.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public class Shrinkwrap { diff --git a/src/main/java/com/volmit/iris/util/ShurikenQueue.java b/src/main/java/com/volmit/iris/util/ShurikenQueue.java index 26fef16d7..ce0589b13 100644 --- a/src/main/java/com/volmit/iris/util/ShurikenQueue.java +++ b/src/main/java/com/volmit/iris/util/ShurikenQueue.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public class ShurikenQueue implements Queue { @@ -63,7 +81,7 @@ public class ShurikenQueue implements Queue { @Override public ShurikenQueue clear() { - queue = new KList(); + queue = new KList<>(); return this; } diff --git a/src/main/java/com/volmit/iris/util/Spiraled.java b/src/main/java/com/volmit/iris/util/Spiraled.java index a11bcde95..01848d042 100644 --- a/src/main/java/com/volmit/iris/util/Spiraled.java +++ b/src/main/java/com/volmit/iris/util/Spiraled.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; @FunctionalInterface diff --git a/src/main/java/com/volmit/iris/util/Spiraler.java b/src/main/java/com/volmit/iris/util/Spiraler.java index 5e3aad6f1..58036d898 100644 --- a/src/main/java/com/volmit/iris/util/Spiraler.java +++ b/src/main/java/com/volmit/iris/util/Spiraler.java @@ -1,5 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; +@SuppressWarnings("EmptyMethod") public class Spiraler { int x, z, dx, dz, sizeX, sizeZ, t, maxI, i; int ox, oz; diff --git a/src/main/java/com/volmit/iris/util/StringTag.java b/src/main/java/com/volmit/iris/util/StringTag.java index 10ad9105e..df518463a 100644 --- a/src/main/java/com/volmit/iris/util/StringTag.java +++ b/src/main/java/com/volmit/iris/util/StringTag.java @@ -1,38 +1,23 @@ -package com.volmit.iris.util; - /* - * JNBT License + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright (c) 2010 Graham Edgecombe - * All rights reserved. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the JNBT team nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ +package com.volmit.iris.util; + /** * The TAG_String tag. * diff --git a/src/main/java/com/volmit/iris/util/Supplier2.java b/src/main/java/com/volmit/iris/util/Supplier2.java index ba0b2009b..693d5238f 100644 --- a/src/main/java/com/volmit/iris/util/Supplier2.java +++ b/src/main/java/com/volmit/iris/util/Supplier2.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public interface Supplier2 { diff --git a/src/main/java/com/volmit/iris/util/Supplier3.java b/src/main/java/com/volmit/iris/util/Supplier3.java index e85c7b30c..e259ebb3d 100644 --- a/src/main/java/com/volmit/iris/util/Supplier3.java +++ b/src/main/java/com/volmit/iris/util/Supplier3.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public interface Supplier3 { diff --git a/src/main/java/com/volmit/iris/util/Switch.java b/src/main/java/com/volmit/iris/util/Switch.java index eb9512f36..fc18e56f0 100644 --- a/src/main/java/com/volmit/iris/util/Switch.java +++ b/src/main/java/com/volmit/iris/util/Switch.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public class Switch { diff --git a/src/main/java/com/volmit/iris/util/Tag.java b/src/main/java/com/volmit/iris/util/Tag.java index bda2b6637..4b76dd6bb 100644 --- a/src/main/java/com/volmit/iris/util/Tag.java +++ b/src/main/java/com/volmit/iris/util/Tag.java @@ -1,38 +1,23 @@ -package com.volmit.iris.util; - /* - * JNBT License + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright (c) 2010 Graham Edgecombe - * All rights reserved. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the JNBT team nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ +package com.volmit.iris.util; + /** * Represents a single NBT tag. * diff --git a/src/main/java/com/volmit/iris/util/TaskExecutor.java b/src/main/java/com/volmit/iris/util/TaskExecutor.java index bc91550f5..c6717ec61 100644 --- a/src/main/java/com/volmit/iris/util/TaskExecutor.java +++ b/src/main/java/com/volmit/iris/util/TaskExecutor.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import lombok.Getter; @@ -27,14 +45,11 @@ public class TaskExecutor { return t; }); } else if (threadLimit > 1) { - final ForkJoinWorkerThreadFactory factory = new ForkJoinWorkerThreadFactory() { - @Override - public ForkJoinWorkerThread newThread(ForkJoinPool pool) { - final ForkJoinWorkerThread worker = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool); - worker.setName(name + " " + xc++); - worker.setPriority(priority); - return worker; - } + final ForkJoinWorkerThreadFactory factory = pool -> { + final ForkJoinWorkerThread worker = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool); + worker.setName(name + " " + xc++); + worker.setPriority(priority); + return worker; }; service = new ForkJoinPool(threadLimit, factory, null, false); @@ -102,8 +117,9 @@ public class TaskExecutor { waiting: while (true) { try { + //noinspection BusyWait Thread.sleep(0); - } catch (InterruptedException e1) { + } catch (InterruptedException ignored) { } @@ -132,6 +148,7 @@ public class TaskExecutor { } } + @SuppressWarnings("ClassCanBeRecord") @ToString public static class TaskResult { public TaskResult(double timeElapsed, int tasksExecuted, int tasksFailed, int tasksCompleted) { diff --git a/src/main/java/com/volmit/iris/util/TerrainChunk.java b/src/main/java/com/volmit/iris/util/TerrainChunk.java index bd0b129c2..038ccab9d 100644 --- a/src/main/java/com/volmit/iris/util/TerrainChunk.java +++ b/src/main/java/com/volmit/iris/util/TerrainChunk.java @@ -1,10 +1,30 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; +import com.volmit.iris.nms.BiomeBaseInjector; import org.bukkit.World; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; import org.bukkit.generator.ChunkGenerator.BiomeGrid; import org.bukkit.generator.ChunkGenerator.ChunkData; +import org.jetbrains.annotations.NotNull; public interface TerrainChunk extends BiomeGrid, ChunkData { static TerrainChunk create(World world) { @@ -27,6 +47,8 @@ public interface TerrainChunk extends BiomeGrid, ChunkData { return new LinkedTerrainChunk(grid, maxHeight); } + BiomeBaseInjector getBiomeBaseInjector(); + void setRaw(ChunkData data); /** @@ -37,6 +59,7 @@ public interface TerrainChunk extends BiomeGrid, ChunkData { * @return Biome value * @deprecated biomes are now 3-dimensional */ + @NotNull @Deprecated Biome getBiome(int x, int z); @@ -48,6 +71,7 @@ public interface TerrainChunk extends BiomeGrid, ChunkData { * @param z - 0-15 * @return Biome value */ + @NotNull Biome getBiome(int x, int y, int z); /** @@ -59,7 +83,7 @@ public interface TerrainChunk extends BiomeGrid, ChunkData { * @deprecated biomes are now 3-dimensional */ @Deprecated - void setBiome(int x, int z, Biome bio); + void setBiome(int x, int z, @NotNull Biome bio); /** * Set biome at x, z within chunk being generated @@ -69,7 +93,7 @@ public interface TerrainChunk extends BiomeGrid, ChunkData { * @param z - 0-15 * @param bio - Biome value */ - void setBiome(int x, int y, int z, Biome bio); + void setBiome(int x, int y, int z, @NotNull Biome bio); /** * Get the maximum height for the chunk. @@ -91,7 +115,7 @@ public interface TerrainChunk extends BiomeGrid, ChunkData { * @param z the z location in the chunk from 0-15 inclusive * @param blockData the type to set the block to */ - void setBlock(int x, int y, int z, BlockData blockData); + void setBlock(int x, int y, int z, @NotNull BlockData blockData); /** * Get the type and data of the block at x, y, z. @@ -105,6 +129,7 @@ public interface TerrainChunk extends BiomeGrid, ChunkData { * @return the data of the block or the BlockData for air if x, y or z are * outside the chunk's bounds */ + @NotNull BlockData getBlockData(int x, int y, int z); ChunkData getRaw(); diff --git a/src/main/java/com/volmit/iris/util/ThreadMonitor.java b/src/main/java/com/volmit/iris/util/ThreadMonitor.java index dbf013b8c..30a98b020 100644 --- a/src/main/java/com/volmit/iris/util/ThreadMonitor.java +++ b/src/main/java/com/volmit/iris/util/ThreadMonitor.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.volmit.iris.Iris; @@ -29,6 +47,7 @@ public class ThreadMonitor extends Thread { public void run() { while (running) { try { + //noinspection BusyWait Thread.sleep(0); State s = monitor.getState(); if (lastState != s) { diff --git a/src/main/java/com/volmit/iris/util/Tuple2d.java b/src/main/java/com/volmit/iris/util/Tuple2d.java index a90e9976b..e4a0ebd54 100644 --- a/src/main/java/com/volmit/iris/util/Tuple2d.java +++ b/src/main/java/com/volmit/iris/util/Tuple2d.java @@ -1,32 +1,19 @@ /* - * $RCSfile$ + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * $Revision: 127 $ - * $Date: 2008-02-28 21:18:51 +0100 (Thu, 28 Feb 2008) $ - * $State$ + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.volmit.iris.util; @@ -324,9 +311,7 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { try { Tuple2d t2 = (Tuple2d) t1; return (this.x == t2.x && this.y == t2.y); - } catch (NullPointerException e2) { - return false; - } catch (ClassCastException e1) { + } catch (NullPointerException | ClassCastException e2) { return false; } @@ -376,19 +361,11 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { public final void clamp(double min, double max, Tuple2d t) { if (t.x > max) { x = max; - } else if (t.x < min) { - x = min; - } else { - x = t.x; - } + } else x = Math.max(t.x, min); if (t.y > max) { y = max; - } else if (t.y < min) { - y = min; - } else { - y = t.y; - } + } else y = Math.max(t.y, min); } @@ -401,17 +378,9 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { * @param t the source tuple, which will not be modified */ public final void clampMin(double min, Tuple2d t) { - if (t.x < min) { - x = min; - } else { - x = t.x; - } + x = Math.max(t.x, min); - if (t.y < min) { - y = min; - } else { - y = t.y; - } + y = Math.max(t.y, min); } @@ -424,17 +393,9 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { * @param t the source tuple, which will not be modified */ public final void clampMax(double max, Tuple2d t) { - if (t.x > max) { - x = max; - } else { - x = t.x; - } + x = Math.min(t.x, max); - if (t.y > max) { - y = max; - } else { - y = t.y; - } + y = Math.min(t.y, max); } diff --git a/src/main/java/com/volmit/iris/util/Tuple2f.java b/src/main/java/com/volmit/iris/util/Tuple2f.java index 5adf18e44..91cc48409 100644 --- a/src/main/java/com/volmit/iris/util/Tuple2f.java +++ b/src/main/java/com/volmit/iris/util/Tuple2f.java @@ -1,32 +1,19 @@ /* - * $RCSfile$ + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * $Revision: 127 $ - * $Date: 2008-02-28 21:18:51 +0100 (Thu, 28 Feb 2008) $ - * $State$ + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.volmit.iris.util; @@ -326,9 +313,7 @@ public abstract class Tuple2f implements java.io.Serializable, Cloneable { try { Tuple2f t2 = (Tuple2f) t1; return (this.x == t2.x && this.y == t2.y); - } catch (NullPointerException e2) { - return false; - } catch (ClassCastException e1) { + } catch (NullPointerException | ClassCastException e2) { return false; } @@ -378,19 +363,11 @@ public abstract class Tuple2f implements java.io.Serializable, Cloneable { public final void clamp(float min, float max, Tuple2f t) { if (t.x > max) { x = max; - } else if (t.x < min) { - x = min; - } else { - x = t.x; - } + } else x = Math.max(t.x, min); if (t.y > max) { y = max; - } else if (t.y < min) { - y = min; - } else { - y = t.y; - } + } else y = Math.max(t.y, min); } @@ -403,17 +380,9 @@ public abstract class Tuple2f implements java.io.Serializable, Cloneable { * @param t the source tuple, which will not be modified */ public final void clampMin(float min, Tuple2f t) { - if (t.x < min) { - x = min; - } else { - x = t.x; - } + x = Math.max(t.x, min); - if (t.y < min) { - y = min; - } else { - y = t.y; - } + y = Math.max(t.y, min); } @@ -426,17 +395,9 @@ public abstract class Tuple2f implements java.io.Serializable, Cloneable { * @param t the source tuple, which will not be modified */ public final void clampMax(float max, Tuple2f t) { - if (t.x > max) { - x = max; - } else { - x = t.x; - } + x = Math.min(t.x, max); - if (t.y > max) { - y = max; - } else { - y = t.y; - } + y = Math.min(t.y, max); } diff --git a/src/main/java/com/volmit/iris/util/Tuple3d.java b/src/main/java/com/volmit/iris/util/Tuple3d.java index b64f1e56f..a7842a21f 100644 --- a/src/main/java/com/volmit/iris/util/Tuple3d.java +++ b/src/main/java/com/volmit/iris/util/Tuple3d.java @@ -1,32 +1,19 @@ /* - * $RCSfile$ + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * $Revision: 127 $ - * $Date: 2008-02-28 21:18:51 +0100 (Thu, 28 Feb 2008) $ - * $State$ + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.volmit.iris.util; @@ -374,9 +361,7 @@ public abstract class Tuple3d implements java.io.Serializable, Cloneable { try { Tuple3d t2 = (Tuple3d) t1; return (this.x == t2.x && this.y == t2.y && this.z == t2.z); - } catch (ClassCastException e1) { - return false; - } catch (NullPointerException e2) { + } catch (ClassCastException | NullPointerException e1) { return false; } @@ -429,27 +414,15 @@ public abstract class Tuple3d implements java.io.Serializable, Cloneable { public final void clamp(double min, double max, Tuple3d t) { if (t.x > max) { x = max; - } else if (t.x < min) { - x = min; - } else { - x = t.x; - } + } else x = Math.max(t.x, min); if (t.y > max) { y = max; - } else if (t.y < min) { - y = min; - } else { - y = t.y; - } + } else y = Math.max(t.y, min); if (t.z > max) { z = max; - } else if (t.z < min) { - z = min; - } else { - z = t.z; - } + } else z = Math.max(t.z, min); } @@ -470,23 +443,11 @@ public abstract class Tuple3d implements java.io.Serializable, Cloneable { * @param t the source tuple, which will not be modified */ public final void clampMin(double min, Tuple3d t) { - if (t.x < min) { - x = min; - } else { - x = t.x; - } + x = Math.max(t.x, min); - if (t.y < min) { - y = min; - } else { - y = t.y; - } + y = Math.max(t.y, min); - if (t.z < min) { - z = min; - } else { - z = t.z; - } + z = Math.max(t.z, min); } @@ -507,23 +468,11 @@ public abstract class Tuple3d implements java.io.Serializable, Cloneable { * @param t the source tuple, which will not be modified */ public final void clampMax(double max, Tuple3d t) { - if (t.x > max) { - x = max; - } else { - x = t.x; - } + x = Math.min(t.x, max); - if (t.y > max) { - y = max; - } else { - y = t.y; - } + y = Math.min(t.y, max); - if (t.z > max) { - z = max; - } else { - z = t.z; - } + z = Math.min(t.z, max); } diff --git a/src/main/java/com/volmit/iris/util/Tuple3f.java b/src/main/java/com/volmit/iris/util/Tuple3f.java index 8eb603c48..d038b0b3b 100644 --- a/src/main/java/com/volmit/iris/util/Tuple3f.java +++ b/src/main/java/com/volmit/iris/util/Tuple3f.java @@ -1,32 +1,19 @@ /* - * $RCSfile$ + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * $Revision: 127 $ - * $Date: 2008-02-28 21:18:51 +0100 (Thu, 28 Feb 2008) $ - * $State$ + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.volmit.iris.util; @@ -359,9 +346,7 @@ public abstract class Tuple3f implements java.io.Serializable, Cloneable { try { Tuple3f t2 = (Tuple3f) t1; return (this.x == t2.x && this.y == t2.y && this.z == t2.z); - } catch (NullPointerException e2) { - return false; - } catch (ClassCastException e1) { + } catch (NullPointerException | ClassCastException e2) { return false; } } @@ -424,27 +409,15 @@ public abstract class Tuple3f implements java.io.Serializable, Cloneable { public final void clamp(float min, float max, Tuple3f t) { if (t.x > max) { x = max; - } else if (t.x < min) { - x = min; - } else { - x = t.x; - } + } else x = Math.max(t.x, min); if (t.y > max) { y = max; - } else if (t.y < min) { - y = min; - } else { - y = t.y; - } + } else y = Math.max(t.y, min); if (t.z > max) { z = max; - } else if (t.z < min) { - z = min; - } else { - z = t.z; - } + } else z = Math.max(t.z, min); } @@ -457,23 +430,11 @@ public abstract class Tuple3f implements java.io.Serializable, Cloneable { * @param t the source tuple, which will not be modified */ public final void clampMin(float min, Tuple3f t) { - if (t.x < min) { - x = min; - } else { - x = t.x; - } + x = Math.max(t.x, min); - if (t.y < min) { - y = min; - } else { - y = t.y; - } + y = Math.max(t.y, min); - if (t.z < min) { - z = min; - } else { - z = t.z; - } + z = Math.max(t.z, min); } @@ -486,23 +447,11 @@ public abstract class Tuple3f implements java.io.Serializable, Cloneable { * @param t the source tuple, which will not be modified */ public final void clampMax(float max, Tuple3f t) { - if (t.x > max) { - x = max; - } else { - x = t.x; - } + x = Math.min(t.x, max); - if (t.y > max) { - y = max; - } else { - y = t.y; - } + y = Math.min(t.y, max); - if (t.z > max) { - z = max; - } else { - z = t.z; - } + z = Math.min(t.z, max); } diff --git a/src/main/java/com/volmit/iris/util/Tuple4d.java b/src/main/java/com/volmit/iris/util/Tuple4d.java index 5bb5c85da..64ffed5d0 100644 --- a/src/main/java/com/volmit/iris/util/Tuple4d.java +++ b/src/main/java/com/volmit/iris/util/Tuple4d.java @@ -1,32 +1,19 @@ /* - * $RCSfile$ + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * $Revision: 127 $ - * $Date: 2008-02-28 21:18:51 +0100 (Thu, 28 Feb 2008) $ - * $State$ + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.volmit.iris.util; @@ -400,9 +387,7 @@ public abstract class Tuple4d implements java.io.Serializable, Cloneable { Tuple4d t2 = (Tuple4d) t1; return (this.x == t2.x && this.y == t2.y && this.z == t2.z && this.w == t2.w); - } catch (NullPointerException e2) { - return false; - } catch (ClassCastException e1) { + } catch (NullPointerException | ClassCastException e2) { return false; } } @@ -479,35 +464,19 @@ public abstract class Tuple4d implements java.io.Serializable, Cloneable { public final void clamp(double min, double max, Tuple4d t) { if (t.x > max) { x = max; - } else if (t.x < min) { - x = min; - } else { - x = t.x; - } + } else x = Math.max(t.x, min); if (t.y > max) { y = max; - } else if (t.y < min) { - y = min; - } else { - y = t.y; - } + } else y = Math.max(t.y, min); if (t.z > max) { z = max; - } else if (t.z < min) { - z = min; - } else { - z = t.z; - } + } else z = Math.max(t.z, min); if (t.w > max) { w = max; - } else if (t.w < min) { - w = min; - } else { - w = t.w; - } + } else w = Math.max(t.w, min); } @@ -528,29 +497,13 @@ public abstract class Tuple4d implements java.io.Serializable, Cloneable { * @param t the source tuple, which will not be modified */ public final void clampMin(double min, Tuple4d t) { - if (t.x < min) { - x = min; - } else { - x = t.x; - } + x = Math.max(t.x, min); - if (t.y < min) { - y = min; - } else { - y = t.y; - } + y = Math.max(t.y, min); - if (t.z < min) { - z = min; - } else { - z = t.z; - } + z = Math.max(t.z, min); - if (t.w < min) { - w = min; - } else { - w = t.w; - } + w = Math.max(t.w, min); } @@ -571,23 +524,11 @@ public abstract class Tuple4d implements java.io.Serializable, Cloneable { * @param t the source tuple, which will not be modified */ public final void clampMax(double max, Tuple4d t) { - if (t.x > max) { - x = max; - } else { - x = t.x; - } + x = Math.min(t.x, max); - if (t.y > max) { - y = max; - } else { - y = t.y; - } + y = Math.min(t.y, max); - if (t.z > max) { - z = max; - } else { - z = t.z; - } + z = Math.min(t.z, max); if (t.w > max) { w = max; diff --git a/src/main/java/com/volmit/iris/util/Tuple4f.java b/src/main/java/com/volmit/iris/util/Tuple4f.java index d31b34a66..41ddcf3ea 100644 --- a/src/main/java/com/volmit/iris/util/Tuple4f.java +++ b/src/main/java/com/volmit/iris/util/Tuple4f.java @@ -1,32 +1,19 @@ /* - * $RCSfile$ + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * $Revision: 127 $ - * $Date: 2008-02-28 21:18:51 +0100 (Thu, 28 Feb 2008) $ - * $State$ + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.volmit.iris.util; @@ -387,9 +374,7 @@ public abstract class Tuple4f implements java.io.Serializable, Cloneable { Tuple4f t2 = (Tuple4f) t1; return (this.x == t2.x && this.y == t2.y && this.z == t2.z && this.w == t2.w); - } catch (NullPointerException e2) { - return false; - } catch (ClassCastException e1) { + } catch (NullPointerException | ClassCastException e2) { return false; } } @@ -457,35 +442,19 @@ public abstract class Tuple4f implements java.io.Serializable, Cloneable { public final void clamp(float min, float max, Tuple4f t) { if (t.x > max) { x = max; - } else if (t.x < min) { - x = min; - } else { - x = t.x; - } + } else x = Math.max(t.x, min); if (t.y > max) { y = max; - } else if (t.y < min) { - y = min; - } else { - y = t.y; - } + } else y = Math.max(t.y, min); if (t.z > max) { z = max; - } else if (t.z < min) { - z = min; - } else { - z = t.z; - } + } else z = Math.max(t.z, min); if (t.w > max) { w = max; - } else if (t.w < min) { - w = min; - } else { - w = t.w; - } + } else w = Math.max(t.w, min); } @@ -498,29 +467,13 @@ public abstract class Tuple4f implements java.io.Serializable, Cloneable { * @param t the source tuple, which will not be modified */ public final void clampMin(float min, Tuple4f t) { - if (t.x < min) { - x = min; - } else { - x = t.x; - } + x = Math.max(t.x, min); - if (t.y < min) { - y = min; - } else { - y = t.y; - } + y = Math.max(t.y, min); - if (t.z < min) { - z = min; - } else { - z = t.z; - } + z = Math.max(t.z, min); - if (t.w < min) { - w = min; - } else { - w = t.w; - } + w = Math.max(t.w, min); } @@ -534,23 +487,11 @@ public abstract class Tuple4f implements java.io.Serializable, Cloneable { * @param t the source tuple, which will not be modified */ public final void clampMax(float max, Tuple4f t) { - if (t.x > max) { - x = max; - } else { - x = t.x; - } + x = Math.min(t.x, max); - if (t.y > max) { - y = max; - } else { - y = t.y; - } + y = Math.min(t.y, max); - if (t.z > max) { - z = max; - } else { - z = t.z; - } + z = Math.min(t.z, max); if (t.w > max) { w = max; diff --git a/src/main/java/com/volmit/iris/util/UIElement.java b/src/main/java/com/volmit/iris/util/UIElement.java index 033031cc0..7b756474c 100644 --- a/src/main/java/com/volmit/iris/util/UIElement.java +++ b/src/main/java/com/volmit/iris/util/UIElement.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.Material; @@ -35,7 +53,7 @@ public class UIElement implements Element { } public Double clip(double value, double min, double max) { - return Double.valueOf(Math.min(max, Math.max(min, value))); + return Math.min(max, Math.max(min, value)); } @Override @@ -116,26 +134,32 @@ public class UIElement implements Element { public Element call(ElementEvent event, Element context) { try { switch (event) { - case DRAG_INTO: + case DRAG_INTO -> { eDraggedInto.run(context); return this; - case LEFT: + } + case LEFT -> { eLeft.run(context); return this; - case OTHER_DRAG_INTO: + } + case OTHER_DRAG_INTO -> { eOtherDraggedInto.run(context); return this; - case RIGHT: + } + case RIGHT -> { eRight.run(context); return this; - case SHIFT_LEFT: + } + case SHIFT_LEFT -> { eShiftLeft.run(context); return this; - case SHIFT_RIGHT: + } + case SHIFT_RIGHT -> { eShiftRight.run(context); return this; + } } - } catch (NullPointerException e) { + } catch (NullPointerException ignored) { } catch (Throwable e) { e.printStackTrace(); diff --git a/src/main/java/com/volmit/iris/util/UIStaticDecorator.java b/src/main/java/com/volmit/iris/util/UIStaticDecorator.java index 125c5e321..edfd1707c 100644 --- a/src/main/java/com/volmit/iris/util/UIStaticDecorator.java +++ b/src/main/java/com/volmit/iris/util/UIStaticDecorator.java @@ -1,7 +1,26 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.Material; +@SuppressWarnings("ClassCanBeRecord") public class UIStaticDecorator implements WindowDecorator { private final Element element; diff --git a/src/main/java/com/volmit/iris/util/UIVoidDecorator.java b/src/main/java/com/volmit/iris/util/UIVoidDecorator.java index f69c6d7fc..4ed155247 100644 --- a/src/main/java/com/volmit/iris/util/UIVoidDecorator.java +++ b/src/main/java/com/volmit/iris/util/UIVoidDecorator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public class UIVoidDecorator implements WindowDecorator { diff --git a/src/main/java/com/volmit/iris/util/UIWindow.java b/src/main/java/com/volmit/iris/util/UIWindow.java index bde0854db..d879ee38f 100644 --- a/src/main/java/com/volmit/iris/util/UIWindow.java +++ b/src/main/java/com/volmit/iris/util/UIWindow.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.volmit.iris.Iris; @@ -67,55 +85,31 @@ public class UIWindow implements Window, Listener { switch (e.getAction()) { case CLONE_STACK: - break; - case COLLECT_TO_CURSOR: - break; - case DROP_ALL_CURSOR: - break; - case DROP_ALL_SLOT: - break; - case DROP_ONE_CURSOR: - break; - case DROP_ONE_SLOT: - break; - case HOTBAR_MOVE_AND_READD: - break; - case HOTBAR_SWAP: - break; - case MOVE_TO_OTHER_INVENTORY: - break; - case NOTHING: - break; - case PICKUP_ALL: - break; - case PICKUP_HALF: - break; - case PICKUP_ONE: - break; - case PICKUP_SOME: - break; - case PLACE_ALL: - break; - case PLACE_ONE: - break; - case PLACE_SOME: - break; - case SWAP_WITH_CURSOR: - break; case UNKNOWN: + case SWAP_WITH_CURSOR: + case PLACE_SOME: + case PLACE_ONE: + case PLACE_ALL: + case PICKUP_SOME: + case PICKUP_ONE: + case PICKUP_HALF: + case PICKUP_ALL: + case NOTHING: + case MOVE_TO_OTHER_INVENTORY: + case HOTBAR_SWAP: + case HOTBAR_MOVE_AND_READD: + case DROP_ONE_SLOT: + case DROP_ONE_CURSOR: + case DROP_ALL_SLOT: + case DROP_ALL_CURSOR: + case COLLECT_TO_CURSOR: break; } switch (e.getClick()) { - case CONTROL_DROP: - break; - case CREATIVE: - break; case DOUBLE_CLICK: doubleclicked = true; break; - case DROP: - break; case LEFT: clickcheck++; @@ -144,10 +138,6 @@ public class UIWindow implements Window, Listener { }); } - break; - case MIDDLE: - break; - case NUMBER_KEY: break; case RIGHT: if (element != null) { @@ -166,14 +156,15 @@ public class UIWindow implements Window, Listener { element.call(ElementEvent.SHIFT_RIGHT, element); } break; - case WINDOW_BORDER_LEFT: - break; - case WINDOW_BORDER_RIGHT: - break; - case UNKNOWN: - break; case SWAP_OFFHAND: - break; + case UNKNOWN: + case WINDOW_BORDER_RIGHT: + case WINDOW_BORDER_LEFT: + case NUMBER_KEY: + case MIDDLE: + case DROP: + case CREATIVE: + case CONTROL_DROP: default: break; } @@ -396,7 +387,7 @@ public class UIWindow implements Window, Listener { } public Double clip(double value, double min, double max) { - return Double.valueOf(Math.min(max, Math.max(min, value))); + return Math.min(max, Math.max(min, value)); } @Override @@ -419,7 +410,7 @@ public class UIWindow implements Window, Listener { public Window updateInventory() { if (isVisible()) { ItemStack[] is = inventory.getContents(); - KSet isf = new KSet(); + @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") KSet isf = new KSet<>(); for (int i = 0; i < is.length; i++) { ItemStack isc = is[i]; diff --git a/src/main/java/com/volmit/iris/util/V.java b/src/main/java/com/volmit/iris/util/V.java index db7584c1b..73e499a63 100644 --- a/src/main/java/com/volmit/iris/util/V.java +++ b/src/main/java/com/volmit/iris/util/V.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Annotation; @@ -82,14 +100,14 @@ public class V { } public Object invoke(String method, Object... parameters) { - KList> par = new KList>(); + KList> par = new KList<>(); for (Object i : parameters) { par.add(i.getClass()); } try { - return (local ? Violator.getDeclaredMethod(o.getClass(), method, par.toArray(new Class[par.size()])) : Violator.getMethod(o.getClass(), method, par.toArray(new Class[par.size()]))).invoke(o, parameters); + return (local ? Violator.getDeclaredMethod(o.getClass(), method, par.toArray(new Class[0])) : Violator.getMethod(o.getClass(), method, par.toArray(new Class[0]))).invoke(o, parameters); } catch (Throwable e) { if (!suppress) { e.printStackTrace(); diff --git a/src/main/java/com/volmit/iris/util/VecMathUtil.java b/src/main/java/com/volmit/iris/util/VecMathUtil.java index 7843bcf43..13b94d9bc 100644 --- a/src/main/java/com/volmit/iris/util/VecMathUtil.java +++ b/src/main/java/com/volmit/iris/util/VecMathUtil.java @@ -1,32 +1,19 @@ /* - * $RCSfile$ + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright 2004-2008 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * $Revision: 127 $ - * $Date: 2008-02-28 21:18:51 +0100 (Thu, 28 Feb 2008) $ - * $State$ + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.volmit.iris.util; diff --git a/src/main/java/com/volmit/iris/util/Vector2d.java b/src/main/java/com/volmit/iris/util/Vector2d.java index 28832de38..9caa0210f 100644 --- a/src/main/java/com/volmit/iris/util/Vector2d.java +++ b/src/main/java/com/volmit/iris/util/Vector2d.java @@ -1,32 +1,19 @@ /* - * $RCSfile$ + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * $Revision: 127 $ - * $Date: 2008-02-28 21:18:51 +0100 (Thu, 28 Feb 2008) $ - * $State$ + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.volmit.iris.util; diff --git a/src/main/java/com/volmit/iris/util/Vector2f.java b/src/main/java/com/volmit/iris/util/Vector2f.java index c148580c1..8756d2823 100644 --- a/src/main/java/com/volmit/iris/util/Vector2f.java +++ b/src/main/java/com/volmit/iris/util/Vector2f.java @@ -1,32 +1,19 @@ /* - * $RCSfile$ + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * $Revision: 127 $ - * $Date: 2008-02-28 21:18:51 +0100 (Thu, 28 Feb 2008) $ - * $State$ + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.volmit.iris.util; diff --git a/src/main/java/com/volmit/iris/util/Vector3d.java b/src/main/java/com/volmit/iris/util/Vector3d.java index 584d729bf..41119561e 100644 --- a/src/main/java/com/volmit/iris/util/Vector3d.java +++ b/src/main/java/com/volmit/iris/util/Vector3d.java @@ -1,32 +1,19 @@ /* - * $RCSfile$ + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * $Revision: 127 $ - * $Date: 2008-02-28 21:18:51 +0100 (Thu, 28 Feb 2008) $ - * $State$ + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.volmit.iris.util; diff --git a/src/main/java/com/volmit/iris/util/Vector3f.java b/src/main/java/com/volmit/iris/util/Vector3f.java index 329b6959e..e43299aad 100644 --- a/src/main/java/com/volmit/iris/util/Vector3f.java +++ b/src/main/java/com/volmit/iris/util/Vector3f.java @@ -1,32 +1,19 @@ /* - * $RCSfile$ + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) * - * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - * - * $Revision: 127 $ - * $Date: 2008-02-28 21:18:51 +0100 (Thu, 28 Feb 2008) $ - * $State$ + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ package com.volmit.iris.util; diff --git a/src/main/java/com/volmit/iris/util/VectorMath.java b/src/main/java/com/volmit/iris/util/VectorMath.java index cd587f343..068944b07 100644 --- a/src/main/java/com/volmit/iris/util/VectorMath.java +++ b/src/main/java/com/volmit/iris/util/VectorMath.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.Axis; @@ -14,16 +32,12 @@ import org.bukkit.util.Vector; */ public class VectorMath { public static Vector scaleStatic(Axis x, Vector v, double amt) { - switch (x) { - case X: - return scaleX(v, amt); - case Y: - return scaleY(v, amt); - case Z: - return scaleZ(v, amt); - } + return switch (x) { + case X -> scaleX(v, amt); + case Y -> scaleY(v, amt); + case Z -> scaleZ(v, amt); + }; - return null; } public static Vector scaleX(Vector v, double amt) { @@ -209,7 +223,7 @@ public class VectorMath { } private static double round(double value, int precision) { - return Double.valueOf(Form.f(value, precision)); + return Double.parseDouble(Form.f(value, precision)); } public static Vector clip(Vector v, int decimals) { @@ -229,9 +243,10 @@ public class VectorMath { u = axis.getX(); v = axis.getY(); w = axis.getZ(); - double xPrime = u * (u * x + v * y + w * z) * (1d - Math.cos(theta)) + x * Math.cos(theta) + (-w * y + v * z) * Math.sin(theta); - double yPrime = v * (u * x + v * y + w * z) * (1d - Math.cos(theta)) + y * Math.cos(theta) + (w * x - u * z) * Math.sin(theta); - double zPrime = w * (u * x + v * y + w * z) * (1d - Math.cos(theta)) + z * Math.cos(theta) + (-v * x + u * y) * Math.sin(theta); + double f = u * x + v * y + w * z; + double xPrime = u * (f) * (1d - Math.cos(theta)) + x * Math.cos(theta) + (-w * y + v * z) * Math.sin(theta); + double yPrime = v * (f) * (1d - Math.cos(theta)) + y * Math.cos(theta) + (w * x - u * z) * Math.sin(theta); + double zPrime = w * (f) * (1d - Math.cos(theta)) + z * Math.cos(theta) + (-v * x + u * y) * Math.sin(theta); return clip(new Vector(xPrime, yPrime, zPrime), 4); } @@ -244,7 +259,7 @@ public class VectorMath { * @return multiple faces, or one if the face is already simple */ public static KList split(BlockFace f) { - KList faces = new KList(); + KList faces = new KList<>(); switch (f) { case DOWN: @@ -423,7 +438,7 @@ public class VectorMath { * @return the shifted vectors */ public static KList shift(Vector vector, KList vectors) { - return new KList(new GListAdapter() { + return new KList<>(new GListAdapter() { @Override public Vector onAdapt(Vector from) { return from.add(vector); diff --git a/src/main/java/com/volmit/iris/util/Violator.java b/src/main/java/com/volmit/iris/util/Violator.java index e4a7c240e..b00923800 100644 --- a/src/main/java/com/volmit/iris/util/Violator.java +++ b/src/main/java/com/volmit/iris/util/Violator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.lang.annotation.Annotation; @@ -7,7 +25,7 @@ import java.lang.reflect.Method; import java.util.concurrent.ConcurrentSkipListMap; public class Violator { - protected static ConcurrentSkipListMap nodes = new ConcurrentSkipListMap(); + protected static final ConcurrentSkipListMap nodes = new ConcurrentSkipListMap<>(); private static String id(Object o, Object h) { if (o instanceof Field) { @@ -22,34 +40,32 @@ public class Violator { return ((Class) o).getCanonicalName(); } - if (o instanceof Constructor) { - Constructor co = (Constructor) o; + if (o instanceof Constructor co) { - String mx = ""; + StringBuilder mx = new StringBuilder(); for (Class i : co.getParameterTypes()) { - mx += "," + i.getCanonicalName(); + mx.append(",").append(i.getCanonicalName()); } - mx = mx.length() >= 1 ? mx.substring(1) : mx; + mx = new StringBuilder(mx.length() >= 1 ? mx.substring(1) : mx.toString()); return id(co.getDeclaringClass(), null) + "(" + mx + ")"; } if (o instanceof Method) { - String mx = ""; + StringBuilder mx = new StringBuilder(); for (Class i : ((Method) o).getParameterTypes()) { - mx += "," + i.getCanonicalName(); + mx.append(",").append(i.getCanonicalName()); } - mx = mx.length() >= 1 ? mx.substring(1) : mx; + mx = new StringBuilder(mx.length() >= 1 ? mx.substring(1) : mx.toString()); return id(((Method) o).getDeclaringClass(), null) + "." + ((Method) o).getName() + "(" + mx + ")"; } - if (o instanceof Annotation) { - Annotation a = (Annotation) o; + if (o instanceof Annotation a) { return "@" + a.annotationType().getCanonicalName() + "[" + id(h, null) + "]"; } @@ -60,6 +76,7 @@ public class Violator { nodes.put(n, o); } + @SuppressWarnings("BooleanMethodIsAlwaysInverted") private static boolean h(String n) { return nodes.containsKey(n); } @@ -69,13 +86,13 @@ public class Violator { } public static Constructor getConstructor(Class c, Class... params) throws NoSuchMethodException, SecurityException { - String mx = ""; + StringBuilder mx = new StringBuilder(); for (Class i : params) { - mx += "," + i.getCanonicalName(); + mx.append(",").append(i.getCanonicalName()); } - mx = mx.length() >= 1 ? mx.substring(1) : mx; + mx = new StringBuilder(mx.length() >= 1 ? mx.substring(1) : mx.toString()); if (!h(id(c, null) + "(" + mx + ")")) { Constructor co = c.getConstructor(params); @@ -130,13 +147,13 @@ public class Violator { public static Method getMethod(Class c, String name, Class... pars) throws Throwable { String iv = ""; - String mx = ""; + StringBuilder mx = new StringBuilder(); for (Class i : pars) { - mx += "," + i.getCanonicalName(); + mx.append(",").append(i.getCanonicalName()); } - mx = mx.length() >= 1 ? mx.substring(1) : mx; + mx = new StringBuilder(mx.length() >= 1 ? mx.substring(1) : mx.toString()); iv = id(c, null) + "." + name + "(" + mx + ")"; if (!h(iv)) { @@ -150,14 +167,14 @@ public class Violator { @SuppressWarnings("unchecked") public static T construct(Class c, Object... parameters) { - KList> cv = new KList>(); + KList> cv = new KList<>(); for (Object i : parameters) { cv.add(i.getClass()); } try { - Constructor co = getConstructor(c, cv.toArray(new Class[cv.size()])); + Constructor co = getConstructor(c, cv.toArray(new Class[0])); return (T) co.newInstance(parameters); } catch (Exception e) { e.printStackTrace(); @@ -168,13 +185,13 @@ public class Violator { public static Method getDeclaredMethod(Class c, String name, Class... pars) throws Throwable { String iv = ""; - String mx = ""; + StringBuilder mx = new StringBuilder(); for (Class i : pars) { - mx += "," + i.getCanonicalName(); + mx.append(",").append(i.getCanonicalName()); } - mx = mx.length() >= 1 ? mx.substring(1) : mx; + mx = new StringBuilder(mx.length() >= 1 ? mx.substring(1) : mx.toString()); iv = id(c, null) + "." + name + "(" + mx + ")"; if (!h(iv)) { @@ -187,7 +204,7 @@ public class Violator { } @SuppressWarnings("unchecked") - public static T getAnnotation(Class c, Class a) throws Throwable { + public static T getAnnotation(Class c, Class a) { if (!h("@" + a.getCanonicalName() + "[" + c.getCanonicalName() + "]")) { T f = c.getAnnotation(a); p(id(f, c), f); @@ -197,7 +214,7 @@ public class Violator { } @SuppressWarnings("unchecked") - public static T getDeclaredAnnotation(Class c, Class a) throws Throwable { + public static T getDeclaredAnnotation(Class c, Class a) { if (!h("@" + a.getCanonicalName() + "[" + c.getCanonicalName() + "]")) { T f = c.getDeclaredAnnotation(a); p(id(f, c), f); @@ -207,7 +224,7 @@ public class Violator { } @SuppressWarnings("unchecked") - public static T getAnnotation(Field c, Class a) throws Throwable { + public static T getAnnotation(Field c, Class a) { if (!h("@" + a.getCanonicalName() + "[" + id(c, null) + "]")) { T f = c.getAnnotation(a); p(id(f, c), f); @@ -217,7 +234,7 @@ public class Violator { } @SuppressWarnings("unchecked") - public static T getDeclaredAnnotation(Field c, Class a) throws Throwable { + public static T getDeclaredAnnotation(Field c, Class a) { if (!h("@" + a.getCanonicalName() + "[" + id(c, null) + "]")) { T f = c.getDeclaredAnnotation(a); p(id(f, c), f); @@ -227,7 +244,7 @@ public class Violator { } @SuppressWarnings("unchecked") - public static T getAnnotation(Method c, Class a) throws Throwable { + public static T getAnnotation(Method c, Class a) { if (!h("@" + a.getCanonicalName() + "[" + id(c, null) + "]")) { T f = c.getAnnotation(a); p(id(f, c), f); @@ -237,7 +254,7 @@ public class Violator { } @SuppressWarnings("unchecked") - public static T getDeclaredAnnotation(Method c, Class a) throws Throwable { + public static T getDeclaredAnnotation(Method c, Class a) { if (!h("@" + a.getCanonicalName() + "[" + id(c, null) + "]")) { T f = c.getDeclaredAnnotation(a); p(id(f, c), f); diff --git a/src/main/java/com/volmit/iris/util/VirtualCommand.java b/src/main/java/com/volmit/iris/util/VirtualCommand.java index 08604881d..776cc1492 100644 --- a/src/main/java/com/volmit/iris/util/VirtualCommand.java +++ b/src/main/java/com/volmit/iris/util/VirtualCommand.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.volmit.iris.Iris; @@ -26,7 +44,7 @@ public class VirtualCommand { public VirtualCommand(ICommand command, String tag) { this.command = command; - children = new KMap, VirtualCommand>(); + children = new KMap<>(); this.tag = tag; for (Field i : command.getClass().getDeclaredFields()) { @@ -99,7 +117,7 @@ public class VirtualCommand { return true; } - return command.handle(vs, chain.toArray(new String[chain.size()])); + return command.handle(vs, chain.toArray(new String[0])); } public KList hitTab(CommandSender sender, KList chain, String label) { @@ -138,9 +156,10 @@ public class VirtualCommand { return null; } - return command.handleTab(vs, chain.toArray(new String[chain.size()])); + return command.handleTab(vs, chain.toArray(new String[0])); } + @SuppressWarnings("BooleanMethodIsAlwaysInverted") private boolean checkPermissions(CommandSender sender, ICommand command2) { boolean failed = false; diff --git a/src/main/java/com/volmit/iris/util/VoidOutputStream.java b/src/main/java/com/volmit/iris/util/VoidOutputStream.java index 9bf19202d..05b2bd0be 100644 --- a/src/main/java/com/volmit/iris/util/VoidOutputStream.java +++ b/src/main/java/com/volmit/iris/util/VoidOutputStream.java @@ -1,11 +1,28 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; -import java.io.IOException; import java.io.OutputStream; public class VoidOutputStream extends OutputStream { @Override - public void write(int b) throws IOException { + public void write(int b) { // poof } } diff --git a/src/main/java/com/volmit/iris/util/VolmitPlugin.java b/src/main/java/com/volmit/iris/util/VolmitPlugin.java index aa89f29b3..d8b00ff1e 100644 --- a/src/main/java/com/volmit/iris/util/VolmitPlugin.java +++ b/src/main/java/com/volmit/iris/util/VolmitPlugin.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import com.volmit.iris.Iris; @@ -27,8 +45,9 @@ import java.util.List; import java.util.Map; import java.util.SortedSet; +@SuppressWarnings("EmptyMethod") public abstract class VolmitPlugin extends JavaPlugin implements Listener { - public static boolean bad = false; + public static final boolean bad = false; private KMap, VirtualCommand> commands; private KList commandCache; private KList permissionCache; @@ -52,14 +71,17 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { Field pluginsField = Bukkit.getPluginManager().getClass().getDeclaredField("plugins"); pluginsField.setAccessible(true); + //noinspection unchecked plugins = (List) pluginsField.get(getServer().getPluginManager()); Field lookupNamesField = Bukkit.getPluginManager().getClass().getDeclaredField("lookupNames"); lookupNamesField.setAccessible(true); + //noinspection unchecked names = (Map) lookupNamesField.get(getServer().getPluginManager()); try { Field listenersField = Bukkit.getPluginManager().getClass().getDeclaredField("listeners"); listenersField.setAccessible(true); + //noinspection unchecked listeners = (Map>) listenersField.get(getServer().getPluginManager()); } catch (Throwable ignored) { @@ -70,9 +92,10 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { commandMap = (SimpleCommandMap) commandMapField.get(getServer().getPluginManager()); Field knownCommandsField = SimpleCommandMap.class.getDeclaredField("knownCommands"); knownCommandsField.setAccessible(true); + //noinspection unchecked commands = (Map) knownCommandsField.get(commandMap); - } catch (Throwable e) { + } catch (Throwable ignored) { } @@ -88,8 +111,7 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { for (Iterator> it = commands.entrySet().iterator(); it.hasNext(); ) { Map.Entry entry = it.next(); - if (entry.getValue() instanceof PluginCommand) { - PluginCommand c = (PluginCommand) entry.getValue(); + if (entry.getValue() instanceof PluginCommand c) { if (c.getPlugin() == plugin) { c.unregister(commandMap); it.remove(); @@ -145,7 +167,7 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { registerCommands(); registerControllers(); Bukkit.getScheduler().scheduleSyncRepeatingTask(this, this::tickControllers, 0, 0); - J.a(() -> outputInfo()); + J.a(this::outputInfo); registerListener(this); start(); } @@ -165,7 +187,7 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { outputPluginInfo(); outputCommandInfo(); outputPermissionInfo(); - } catch (Throwable e) { + } catch (Throwable ignored) { } } @@ -181,7 +203,7 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { } private void chain(MortarPermission i, FileConfiguration fc) { - KList ff = new KList(); + KList ff = new KList<>(); for (MortarPermission j : i.getChildren()) { ff.add(j.getFullNode()); @@ -246,7 +268,7 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { for (org.bukkit.permissions.Permission i : computePermissions()) { try { Bukkit.getPluginManager().addPermission(i); - } catch (Throwable e) { + } catch (Throwable ignored) { } } @@ -464,7 +486,7 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { @Override public List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) { - KList chain = new KList(); + KList chain = new KList<>(); for (String i : args) { if (i.trim().isEmpty()) { @@ -491,12 +513,12 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { } @Override - public boolean onCommand(CommandSender sender, org.bukkit.command.Command command, String label, String[] args) { + public boolean onCommand(@NotNull CommandSender sender, @NotNull org.bukkit.command.Command command, @NotNull String label, @NotNull String[] args) { if (bad) { return false; } - KList chain = new KList(); + KList chain = new KList<>(); chain.add(args); for (KList i : commands.k()) { @@ -601,7 +623,7 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { for (VirtualCommand i : commands.v()) { try { unregisterCommand(i.getCommand()); - } catch (Throwable e) { + } catch (Throwable ignored) { } } @@ -634,13 +656,13 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { } public File getDataFile(String... strings) { - File f = new File(getDataFolder(), new KList(strings).toString(File.separator)); + File f = new File(getDataFolder(), new KList<>(strings).toString(File.separator)); f.getParentFile().mkdirs(); return f; } public File getDataFileList(String pre, String[] strings) { - KList v = new KList(strings); + KList v = new KList<>(strings); v.add(0, pre); File f = new File(getDataFolder(), v.toString(File.separator)); f.getParentFile().mkdirs(); @@ -652,7 +674,7 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { return super.getDataFolder(); } - File f = new File(getDataFolder(), new KList(strings).toString(File.separator)); + File f = new File(getDataFolder(), new KList<>(strings).toString(File.separator)); f.mkdirs(); return f; diff --git a/src/main/java/com/volmit/iris/util/WeightMap.java b/src/main/java/com/volmit/iris/util/WeightMap.java index 13964f2dc..1dda57598 100644 --- a/src/main/java/com/volmit/iris/util/WeightMap.java +++ b/src/main/java/com/volmit/iris/util/WeightMap.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public class WeightMap extends KMap { @@ -34,7 +52,7 @@ public class WeightMap extends KMap { } modified = false; - Shrinkwrap s = new Shrinkwrap(0D); + Shrinkwrap s = new Shrinkwrap<>(0D); forEachKey(Integer.MAX_VALUE, (d) -> s.set(s.get() + 1)); lastWeight = s.get(); diff --git a/src/main/java/com/volmit/iris/util/WeightedRandom.java b/src/main/java/com/volmit/iris/util/WeightedRandom.java index ed6a8a312..6c271f657 100644 --- a/src/main/java/com/volmit/iris/util/WeightedRandom.java +++ b/src/main/java/com/volmit/iris/util/WeightedRandom.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.util.Random; diff --git a/src/main/java/com/volmit/iris/util/Window.java b/src/main/java/com/volmit/iris/util/Window.java index f31741dfe..a86298286 100644 --- a/src/main/java/com/volmit/iris/util/Window.java +++ b/src/main/java/com/volmit/iris/util/Window.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.entity.Player; diff --git a/src/main/java/com/volmit/iris/util/WindowDecorator.java b/src/main/java/com/volmit/iris/util/WindowDecorator.java index cd56a8979..34a7fa2f7 100644 --- a/src/main/java/com/volmit/iris/util/WindowDecorator.java +++ b/src/main/java/com/volmit/iris/util/WindowDecorator.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public interface WindowDecorator { diff --git a/src/main/java/com/volmit/iris/util/WindowResolution.java b/src/main/java/com/volmit/iris/util/WindowResolution.java index dc1ed50bd..4b370aaeb 100644 --- a/src/main/java/com/volmit/iris/util/WindowResolution.java +++ b/src/main/java/com/volmit/iris/util/WindowResolution.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import org.bukkit.event.inventory.InventoryType; diff --git a/src/main/java/com/volmit/iris/util/Wrapper.java b/src/main/java/com/volmit/iris/util/Wrapper.java index 9bf532a2c..7cc405a75 100644 --- a/src/main/java/com/volmit/iris/util/Wrapper.java +++ b/src/main/java/com/volmit/iris/util/Wrapper.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; public class Wrapper { @@ -31,11 +49,10 @@ public class Wrapper { if (obj == null) { return false; } - if (!(obj instanceof Wrapper)) { + if (!(obj instanceof Wrapper other)) { return false; } - Wrapper other = (Wrapper) obj; if (t == null) { return other.t == null; } else return t.equals(other.t); diff --git a/src/main/java/com/volmit/iris/util/Writable.java b/src/main/java/com/volmit/iris/util/Writable.java index 79d550b43..7d8075594 100644 --- a/src/main/java/com/volmit/iris/util/Writable.java +++ b/src/main/java/com/volmit/iris/util/Writable.java @@ -1,3 +1,21 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; import java.io.DataInputStream; diff --git a/src/main/java/com/volmit/iris/util/XML.java b/src/main/java/com/volmit/iris/util/XML.java index 167635284..86c5eb232 100644 --- a/src/main/java/com/volmit/iris/util/XML.java +++ b/src/main/java/com/volmit/iris/util/XML.java @@ -1,30 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; -/* -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - import java.util.Iterator; /** @@ -99,23 +93,12 @@ public class XML { for (int i = 0, length = string.length(); i < length; i++) { char c = string.charAt(i); switch (c) { - case '&': - sb.append("&"); - break; - case '<': - sb.append("<"); - break; - case '>': - sb.append(">"); - break; - case '"': - sb.append("""); - break; - case '\'': - sb.append("'"); - break; - default: - sb.append(c); + case '&' -> sb.append("&"); + case '<' -> sb.append("<"); + case '>' -> sb.append(">"); + case '"' -> sb.append("""); + case '\'' -> sb.append("'"); + default -> sb.append(c); } } return sb.toString(); @@ -126,7 +109,6 @@ public class XML { * allowed in tagNames and attributes. * * @param string A string. - * @throws JSONException */ public static void noSpace(String string) throws JSONException { int i, length = string.length(); @@ -147,7 +129,6 @@ public class XML { * @param context The JSONObject that will include the new material. * @param name The tag name. * @return true if the close tag is processed. - * @throws JSONException */ private static boolean parse(XMLTokener x, JSONObject context, String name) throws JSONException { char c; @@ -346,7 +327,7 @@ public class XML { if (value.toString().equals(string)) { return value; } - } catch (Exception ignoreAlso) { + } catch (Exception ignored) { } } return string; @@ -365,7 +346,6 @@ public class XML { * * @param string The source string. * @return A JSONObject containing the structured data from the XML string. - * @throws JSONException */ public static JSONObject toJSONObject(String string) throws JSONException { JSONObject jo = new JSONObject(); @@ -381,7 +361,6 @@ public class XML { * * @param object A JSONObject. * @return A string. - * @throws JSONException */ public static String toString(Object object) throws JSONException { return toString(object, null); @@ -393,7 +372,6 @@ public class XML { * @param object A JSONObject. * @param tagName The optional name of the enclosing tag. * @return A string. - * @throws JSONException */ public static String toString(Object object, String tagName) throws JSONException { StringBuilder sb = new StringBuilder(); diff --git a/src/main/java/com/volmit/iris/util/XMLTokener.java b/src/main/java/com/volmit/iris/util/XMLTokener.java index 0498bfc36..02cb2e735 100644 --- a/src/main/java/com/volmit/iris/util/XMLTokener.java +++ b/src/main/java/com/volmit/iris/util/XMLTokener.java @@ -1,30 +1,24 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package com.volmit.iris.util; -/* -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - /** * The XMLTokener extends the JSONTokener to provide additional methods for the * parsing of XML texts. @@ -41,7 +35,7 @@ public class XMLTokener extends JSONTokener { public static final java.util.HashMap entity; static { - entity = new java.util.HashMap(8); + entity = new java.util.HashMap<>(8); entity.put("amp", XML.AMP); entity.put("apos", XML.APOS); entity.put("gt", XML.GT); @@ -89,7 +83,6 @@ public class XMLTokener extends JSONTokener { * * @return A string, or a '<' Character, or null if there is no more source * text. - * @throws JSONException */ public Object nextContent() throws JSONException { char c; @@ -193,17 +186,10 @@ public class XMLTokener extends JSONTokener { return Boolean.TRUE; } switch (c) { - case 0: - case '<': - case '>': - case '/': - case '=': - case '!': - case '?': - case '"': - case '\'': + case 0, '<', '>', '/', '=', '!', '?', '"', '\'' -> { back(); return Boolean.TRUE; + } } } } @@ -297,7 +283,6 @@ public class XMLTokener extends JSONTokener { * are left at the end of the source with a result of false. * * @param to A string to skip past. - * @throws JSONException */ public boolean skipPast(String to) throws JSONException { boolean b;