mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-23 00:29:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into ver/6.0.0

Browse Source 
# Conflicts:
#	build.gradle.kts
#	common/src/main/java/com/dfsek/terra/api/world/palette/holder/PaletteHolder.java
#	common/src/main/java/com/dfsek/terra/api/world/palette/holder/PaletteHolderBuilder.java
#	common/src/main/java/com/dfsek/terra/config/builder/GeneratorBuilder.java
#	common/src/main/java/com/dfsek/terra/config/pack/ConfigPack.java
#	common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java
#	common/src/main/java/com/dfsek/terra/config/templates/OreTemplate.java
#	gradle.properties
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java
#	platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java
This commit is contained in:
dfsek
2021-06-22 21:59:27 -07:00
parent 444324e7c6 efd1665c1d
commit 43aa3fc086
181 changed files with 4163 additions and 2247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
View File

@@ -84,7 +84,8 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
static {
String ver = Bukkit.getServer().getClass().getPackage().getName();
if(ver.contains("1_16")) BUKKIT_VERSION = BukkitVersion.V1_16;
if(ver.contains("1_17")) BUKKIT_VERSION = BukkitVersion.V1_17;
else if(ver.contains("1_16")) BUKKIT_VERSION = BukkitVersion.V1_16;
else if(ver.contains("1_15")) BUKKIT_VERSION = BukkitVersion.V1_15;
else if(ver.contains("1_14")) BUKKIT_VERSION = BukkitVersion.V1_14;
else if(ver.contains("1_13")) BUKKIT_VERSION = BukkitVersion.V1_13;
@@ -316,6 +317,8 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
V1_16(16),
V1_17(17),
UNKNOWN(Integer.MAX_VALUE); // Assume unknown version is latest.
private final int index;

7
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/PaperListener.java
View File

@@ -19,7 +19,6 @@ public class PaperListener implements Listener {
@EventHandler
public void onStructureLocate(StructureLocateEvent e) {
if(!BukkitAdapter.adapt(e.getWorld()).isTerraWorld()) return;
e.setResult(null); // Assume no result.
String name = "minecraft:" + e.getType().getName();
main.getDebugLogger().info("Overriding structure location for \"" + name + "\"");
TerraWorld tw = main.getWorld(BukkitAdapter.adapt(e.getWorld()));
@@ -32,10 +31,8 @@ public class PaperListener implements Listener {
}, main);
finder.run(); // Do this synchronously.
} else {
main.logger().warning("No overrides are defined for \"" + name + "\"");
e.setResult(e.getOrigin());
main.logger().warning("No overrides are defined for \"" + name + "\". Locating this structure will NOT work properly!");
}
}
}

2
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java
View File

@@ -70,7 +70,7 @@ public class BukkitWorld implements World {
@Override
public int getMinHeight() {
return 0;
return delegate.getMinHeight();
}
@Override

9
platforms/bukkit/src/main/resources/plugin.yml
View File

@@ -3,16 +3,13 @@ main: "com.dfsek.terra.bukkit.TerraBukkitPlugin"
version: "@VERSION@"
load: "STARTUP"
author: dfsek
website: "@WIKI@"
api-version: "1.13"
description: "An insanely powerful free & open-source data-driven world generator."
description: "@DESCRIPTION@"
softdepend: [ "WorldEdit" ]
commands:
terra:
description: "Terra base command"
usage: "/terra "
aliases: [ "te" ]
permission: "terra.command"
locate:
description: "Locate a Terra Structure"
usage: "/locate <STRUCTURE_ID> <radius>"
permission: "terra.locate"
permission: "terra.command"