diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 67989e57a..d05d6ff8c 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -6,6 +6,11 @@
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 3bf17e955..806ee36fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,10 @@
parsii
com.dfsek.terra.lib.parsii
+
+ io.papermc.lib
+ com.dfsek.terra.lib.paperlib
+
@@ -88,6 +92,10 @@
CodeMC
https://repo.codemc.org/repository/maven-public
+
+ papermc
+ https://papermc.io/repo/repository/maven-public/
+
@@ -149,6 +157,12 @@
parsii
1.2
+
+ io.papermc
+ paperlib
+ 1.0.5
+ compile
+
\ No newline at end of file
diff --git a/src/main/java/com/dfsek/terra/Terra.java b/src/main/java/com/dfsek/terra/Terra.java
index 8adab9176..9660ca720 100644
--- a/src/main/java/com/dfsek/terra/Terra.java
+++ b/src/main/java/com/dfsek/terra/Terra.java
@@ -5,6 +5,7 @@ import com.dfsek.terra.config.base.ConfigUtil;
import com.dfsek.terra.config.base.WorldConfig;
import com.dfsek.terra.config.lang.LangUtil;
import com.dfsek.terra.generation.TerraChunkGenerator;
+import com.dfsek.terra.util.PaperUtil;
import org.bstats.bukkit.Metrics;
import org.bukkit.Bukkit;
import org.bukkit.World;
@@ -52,6 +53,7 @@ public class Terra extends GaeaPlugin {
saveDefaultConfig();
Bukkit.getScheduler().scheduleAsyncRepeatingTask(this, TerraChunkGenerator::saveAll, ConfigUtil.dataSave, ConfigUtil.dataSave);
Bukkit.getPluginManager().registerEvents(new EventListener(this), this);
+ PaperUtil.checkPaper(this);
}
@Override
diff --git a/src/main/java/com/dfsek/terra/event/OreVeinGenerateEvent.java b/src/main/java/com/dfsek/terra/event/OreVeinGenerateEvent.java
new file mode 100644
index 000000000..fce87d295
--- /dev/null
+++ b/src/main/java/com/dfsek/terra/event/OreVeinGenerateEvent.java
@@ -0,0 +1,34 @@
+package com.dfsek.terra.event;
+
+import com.dfsek.terra.TerraWorld;
+import com.dfsek.terra.config.genconfig.OreConfig;
+import org.bukkit.Location;
+import org.bukkit.event.Cancellable;
+
+public class OreVeinGenerateEvent extends TerraWorldEvent implements Cancellable {
+ private boolean cancelled;
+ private OreConfig config;
+
+ public OreVeinGenerateEvent(TerraWorld tw, Location l, OreConfig config) {
+ super(tw, l);
+ this.config = config;
+ }
+
+ public void setConfig(OreConfig config) {
+ this.config = config;
+ }
+
+ public OreConfig getConfig() {
+ return config;
+ }
+
+ @Override
+ public boolean isCancelled() {
+ return cancelled;
+ }
+
+ @Override
+ public void setCancelled(boolean cancel) {
+ this.cancelled = cancel;
+ }
+}
diff --git a/src/main/java/com/dfsek/terra/event/TerraWorldEvent.java b/src/main/java/com/dfsek/terra/event/TerraWorldEvent.java
new file mode 100644
index 000000000..4c42c5331
--- /dev/null
+++ b/src/main/java/com/dfsek/terra/event/TerraWorldEvent.java
@@ -0,0 +1,37 @@
+package com.dfsek.terra.event;
+
+import com.dfsek.terra.TerraWorld;
+import org.bukkit.Location;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+public abstract class TerraWorldEvent extends Event {
+ private static final HandlerList HANDLERS = new HandlerList();
+ private final TerraWorld world;
+ private final Location location;
+
+ public TerraWorldEvent(TerraWorld tw, Location l) {
+ this.world = tw;
+ this.location = l.clone();
+ }
+
+ @Override
+ @NotNull
+ public HandlerList getHandlers() {
+ return HANDLERS;
+ }
+
+ @NotNull
+ public static HandlerList getHandlerList() {
+ return HANDLERS;
+ }
+
+ public TerraWorld getWorld() {
+ return world;
+ }
+
+ public Location getLocation() {
+ return location;
+ }
+}
diff --git a/src/main/java/com/dfsek/terra/event/TreeGenerateEvent.java b/src/main/java/com/dfsek/terra/event/TreeGenerateEvent.java
new file mode 100644
index 000000000..ee03c2298
--- /dev/null
+++ b/src/main/java/com/dfsek/terra/event/TreeGenerateEvent.java
@@ -0,0 +1,35 @@
+package com.dfsek.terra.event;
+
+import com.dfsek.terra.TerraWorld;
+import com.dfsek.terra.config.genconfig.TreeConfig;
+import org.bukkit.Location;
+import org.bukkit.event.Cancellable;
+import org.polydev.gaea.tree.Tree;
+
+public class TreeGenerateEvent extends TerraWorldEvent implements Cancellable {
+ private boolean cancelled;
+ private Tree tree;
+
+ public TreeGenerateEvent(TerraWorld tw, Location l, Tree tree) {
+ super(tw, l);
+ this.tree = tree;
+ }
+
+ public void setTree(Tree tree) {
+ this.tree = tree;
+ }
+
+ public Tree getTree() {
+ return tree;
+ }
+
+ @Override
+ public boolean isCancelled() {
+ return cancelled;
+ }
+
+ @Override
+ public void setCancelled(boolean cancel) {
+ this.cancelled = cancel;
+ }
+}
diff --git a/src/main/java/com/dfsek/terra/events/OreVeinGenerateEvent.java b/src/main/java/com/dfsek/terra/events/OreVeinGenerateEvent.java
deleted file mode 100644
index 04ba5ee44..000000000
--- a/src/main/java/com/dfsek/terra/events/OreVeinGenerateEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.dfsek.terra.events;
-
-public class OreVeinGenerateEvent {
-}
diff --git a/src/main/java/com/dfsek/terra/events/TerraStructureLocateEvent.java b/src/main/java/com/dfsek/terra/events/TerraStructureLocateEvent.java
deleted file mode 100644
index 6b25e85a5..000000000
--- a/src/main/java/com/dfsek/terra/events/TerraStructureLocateEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.dfsek.terra.events;
-
-public class TerraStructureLocateEvent {
-}
diff --git a/src/main/java/com/dfsek/terra/events/TreeGenerateEvent.java b/src/main/java/com/dfsek/terra/events/TreeGenerateEvent.java
deleted file mode 100644
index d2875f5fa..000000000
--- a/src/main/java/com/dfsek/terra/events/TreeGenerateEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.dfsek.terra.events;
-
-public class TreeGenerateEvent {
-}
diff --git a/src/main/java/com/dfsek/terra/population/FloraPopulator.java b/src/main/java/com/dfsek/terra/population/FloraPopulator.java
index fc3e93c37..23784da97 100644
--- a/src/main/java/com/dfsek/terra/population/FloraPopulator.java
+++ b/src/main/java/com/dfsek/terra/population/FloraPopulator.java
@@ -8,8 +8,11 @@ import com.dfsek.terra.biome.UserDefinedBiome;
import com.dfsek.terra.config.base.ConfigPack;
import com.dfsek.terra.config.genconfig.biome.BiomeConfig;
import com.dfsek.terra.config.genconfig.biome.BiomeFloraConfig;
+import com.dfsek.terra.event.TreeGenerateEvent;
import com.dfsek.terra.generation.UserDefinedDecorator;
+import org.bukkit.Bukkit;
import org.bukkit.Chunk;
+import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.jetbrains.annotations.NotNull;
@@ -34,6 +37,8 @@ public class FloraPopulator extends GaeaBlockPopulator {
try (ProfileFuture ignored = TerraProfiler.fromWorld(world).measure("FloraTime")) {
TerraWorld tw = TerraWorld.getWorld(world);
if(!tw.isSafe()) return;
+ int originX = chunk.getX() << 4;
+ int originZ = chunk.getZ() << 4;
TerraBiomeGrid grid = tw.getGrid();
ConfigPack config = tw.getConfig();
for(int x = 0; x < 16; x++) {
@@ -42,7 +47,9 @@ public class FloraPopulator extends GaeaBlockPopulator {
if((x & 1) == 0 && (z & 1) == 0) {
int treeChance = biome.getDecorator().getTreeDensity();
if(random.nextInt(1000) < treeChance) {
- if(doTrees(biome, tw, random, chunk, offset(random, x), offset(random, z))) continue;
+ int xt = offset(random, x);
+ int zt = offset(random, z);
+ if(doTrees(biome, tw, random, chunk, xt, zt)) continue;
}
}
if(biome.getDecorator().getFloraChance() <= 0) continue;
@@ -51,7 +58,7 @@ public class FloraPopulator extends GaeaBlockPopulator {
BiomeFloraConfig f = c.getFlora();
for(int i = 0; i < f.getFloraAttempts(); i++) {
Flora item;
- if(f.isFloraSimplex()) item = biome.getDecorator().getFlora().get(f.getFloraNoise(), (chunk.getX() << 4) + x, (chunk.getZ() << 4) + z);
+ if(f.isFloraSimplex()) item = biome.getDecorator().getFlora().get(f.getFloraNoise(), originX + x, originZ + z);
else item = biome.getDecorator().getFlora().get(random);
for(Block highest : item.getValidSpawnsAt(chunk, x, z, c.getFloraHeights(item))) {
if(random.nextInt(100) < biome.getDecorator().getFloraChance())
@@ -69,7 +76,10 @@ public class FloraPopulator extends GaeaBlockPopulator {
Range range = world.getConfig().getBiome(biome).getTreeRange(tree);
if(!range.isInRange(block.getY())) continue;
try {
- return tree.plant(block.getLocation(), random, Terra.getInstance());
+ Location l = block.getLocation();
+ TreeGenerateEvent event = new TreeGenerateEvent(world, l, tree);
+ Bukkit.getPluginManager().callEvent(event);
+ if(!event.isCancelled()) tree.plant(l, random, Terra.getInstance());
} catch(NullPointerException ignore) {}
}
return false;
diff --git a/src/main/java/com/dfsek/terra/population/OrePopulator.java b/src/main/java/com/dfsek/terra/population/OrePopulator.java
index 1bbc6feeb..dfa22d891 100644
--- a/src/main/java/com/dfsek/terra/population/OrePopulator.java
+++ b/src/main/java/com/dfsek/terra/population/OrePopulator.java
@@ -3,6 +3,8 @@ package com.dfsek.terra.population;
import com.dfsek.terra.TerraWorld;
import com.dfsek.terra.config.base.ConfigPack;
import com.dfsek.terra.config.genconfig.biome.BiomeOreConfig;
+import com.dfsek.terra.event.OreVeinGenerateEvent;
+import org.bukkit.Bukkit;
import org.bukkit.util.Vector;
import org.polydev.gaea.math.Range;
import com.dfsek.terra.TerraProfiler;
@@ -30,13 +32,20 @@ public class OrePopulator extends GaeaBlockPopulator {
BiomeOreConfig ores = config.getBiome((UserDefinedBiome) b).getOres();
for(Map.Entry e : ores.getOres().entrySet()) {
int num = e.getValue().get(random);
- int edgeOffset = e.getKey().getChunkEdgeOffset();
+ OreConfig ore = e.getKey();
+ int edgeOffset = ore.getChunkEdgeOffset();
for(int i = 0; i < num; i++) {
int x = random.nextInt(16 - edgeOffset*2) + edgeOffset;
int z = random.nextInt(16 - edgeOffset*2) + edgeOffset;
- int y = ores.getOreHeights().get(e.getKey()).get(random);
- if(e.getKey().crossChunks()) e.getKey().doVein(new Vector(x, y, z), chunk, random);
- else e.getKey().doVeinSingle(new Vector(x, y, z), chunk, random);
+ int y = ores.getOreHeights().get(ore).get(random);
+
+ Vector v = new Vector(x, y, z);
+ OreVeinGenerateEvent event = new OreVeinGenerateEvent(tw, v.toLocation(world), ore);
+ Bukkit.getPluginManager().callEvent(event);
+ if(! event.isCancelled()) {
+ if(ore.crossChunks()) ore.doVein(v, chunk, random);
+ else ore.doVeinSingle(new Vector(x, y, z), chunk, random);
+ }
}
}
}
diff --git a/src/main/java/com/dfsek/terra/util/DataUtil.java b/src/main/java/com/dfsek/terra/util/DataUtil.java
index 05c617379..546acbad3 100644
--- a/src/main/java/com/dfsek/terra/util/DataUtil.java
+++ b/src/main/java/com/dfsek/terra/util/DataUtil.java
@@ -7,7 +7,7 @@ import org.polydev.gaea.world.palette.RandomPalette;
import java.util.Random;
-public class DataUtil {
+public final class DataUtil {
public static final BlockData STONE = Material.STONE.createBlockData();
public static final BlockData SNOW = Material.SNOW.createBlockData();
public static final BlockData WATER = Material.WATER.createBlockData();
diff --git a/src/main/java/com/dfsek/terra/util/PaperUtil.java b/src/main/java/com/dfsek/terra/util/PaperUtil.java
new file mode 100644
index 000000000..55fafc07f
--- /dev/null
+++ b/src/main/java/com/dfsek/terra/util/PaperUtil.java
@@ -0,0 +1,18 @@
+package com.dfsek.terra.util;
+
+import com.dfsek.terra.config.lang.LangUtil;
+import io.papermc.lib.PaperLib;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.util.logging.Level;
+
+public final class PaperUtil {
+ public static void checkPaper(JavaPlugin main) {
+ Bukkit.getScheduler().scheduleSyncDelayedTask(main, () -> {
+ if(!PaperLib.isPaper()) {
+ LangUtil.log("use-paper", Level.WARNING);
+ }
+ }, 100L);
+ }
+}
diff --git a/src/main/java/com/dfsek/terra/util/structure/RotationUtil.java b/src/main/java/com/dfsek/terra/util/structure/RotationUtil.java
index df089662f..421cc707a 100644
--- a/src/main/java/com/dfsek/terra/util/structure/RotationUtil.java
+++ b/src/main/java/com/dfsek/terra/util/structure/RotationUtil.java
@@ -5,10 +5,10 @@ import com.dfsek.terra.structure.Structure;
import org.bukkit.block.BlockFace;
import org.bukkit.block.data.Rail;
-public class RotationUtil {
+public final class RotationUtil {
/**
* Rotate and mirror a coordinate pair.
- * @param arr Array containing X and Z coordinates.
+ * @param orig Vector to rotate.
* @param r Rotation
* @return Rotated coordinate pair
*/
diff --git a/src/main/java/com/dfsek/terra/util/structure/WorldEditUtil.java b/src/main/java/com/dfsek/terra/util/structure/WorldEditUtil.java
index af3928368..97e9fe151 100644
--- a/src/main/java/com/dfsek/terra/util/structure/WorldEditUtil.java
+++ b/src/main/java/com/dfsek/terra/util/structure/WorldEditUtil.java
@@ -11,7 +11,7 @@ import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
-public class WorldEditUtil {
+public final class WorldEditUtil {
public static WorldEditPlugin getWorldEdit() {
Plugin p = Bukkit.getServer().getPluginManager().getPlugin("WorldEdit");
if (p instanceof WorldEditPlugin) return (WorldEditPlugin) p;
diff --git a/src/main/resources/lang/en_us.yml b/src/main/resources/lang/en_us.yml
index f5de07a94..403598e1a 100644
--- a/src/main/resources/lang/en_us.yml
+++ b/src/main/resources/lang/en_us.yml
@@ -106,4 +106,11 @@ warning:
error:
severe-config: "A severe configuration error has prevented Terra from properly generating terrain at coordinates: %1$s, %2$s. Please check your configuration for errors. Any config errors will have been reported above."
debug:
- data-save: "Saved population data for world \"%s\""
\ No newline at end of file
+ data-save: "Saved population data for world \"%s\""
+use-paper:
+ - "You appear to be using Spigot/CraftBukkit."
+ - "While Terra &odoes&r work on Spigot, some functionality will be lost. (Terra is untested on CraftBukkit; no support will be given for CraftBukkit)."
+ - "To get the most out of Terra, please switch to Paper."
+ - "Plus, Paper offers immense performance improvements over Spigot, and all Spigot plugins should work with Paper!"
+ - "To have the best experience with Terra, and all your plugins, please use Paper."
+ - "Find out more on Paper's website: https://papermc.io/"
\ No newline at end of file