From 5eeb5af6c40d70182f6dbdce2663a797904b3b6d Mon Sep 17 00:00:00 2001 From: David W Date: Fri, 22 Sep 2023 00:23:49 +0200 Subject: [PATCH 01/34] Add cell center offset return to CELLULAR sampler (#407) * Add offset lookup return to cellular sampler * bump noise function plugin version * revert version to 1.1.0 * rename OffsetNoiseLookup, switch axis orientation * rename return type aswell in cellcampler --- .../terra/addons/noise/samplers/noise/CellularSampler.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java index f31f81a3f..603722420 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java @@ -351,6 +351,7 @@ public class CellularSampler extends NoiseFunction { case Distance2Mul -> distance1 * distance0 * 0.5 - 1; case Distance2Div -> distance0 / distance1 - 1; case NoiseLookup -> noiseLookup.noise(sl, centerX, centerY); + case LocalNoiseLookup -> noiseLookup.noise(sl, x / frequency - centerX, y / frequency - centerY); case Distance3 -> distance2 - 1; case Distance3Add -> (distance2 + distance0) * 0.5 - 1; case Distance3Sub -> distance2 - distance0 - 1; @@ -514,6 +515,7 @@ public class CellularSampler extends NoiseFunction { case Distance2Mul -> distance1 * distance0 * 0.5 - 1; case Distance2Div -> distance0 / distance1 - 1; case NoiseLookup -> noiseLookup.noise(sl, centerX, centerY, centerZ); + case LocalNoiseLookup -> noiseLookup.noise(sl, x / frequency - centerX, y / frequency - centerY, z / frequency - centerZ); case Distance3 -> distance2 - 1; case Distance3Add -> (distance2 + distance0) * 0.5 - 1; case Distance3Sub -> distance2 - distance0 - 1; @@ -540,6 +542,7 @@ public class CellularSampler extends NoiseFunction { Distance2Mul, Distance2Div, NoiseLookup, + LocalNoiseLookup, Distance3, Distance3Add, Distance3Sub, From 3f9ead0d6661ff871b28ff711b32036e8781c3ad Mon Sep 17 00:00:00 2001 From: Astrash Date: Wed, 27 Sep 2023 13:39:51 +1000 Subject: [PATCH 02/34] Remove repeated code in cellular sampler --- .../noise/samplers/noise/CellularSampler.java | 265 +++++------------- 1 file changed, 65 insertions(+), 200 deletions(-) diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java index 603722420..cdd40990d 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java @@ -240,99 +240,37 @@ public class CellularSampler extends NoiseFunction { double centerX = x; double centerY = y; - switch(distanceFunction) { - default: - case Euclidean: - case EuclideanSq: - for(int xi = xr - 1; xi <= xr + 1; xi++) { - int yPrimed = yPrimedBase; - - for(int yi = yr - 1; yi <= yr + 1; yi++) { - int hash = hash(seed, xPrimed, yPrimed); - int idx = hash & (255 << 1); - - double vecX = (xi - x) + RAND_VECS_2D[idx] * cellularJitter; - double vecY = (yi - y) + RAND_VECS_2D[idx | 1] * cellularJitter; - - double newDistance = vecX * vecX + vecY * vecY; - - distance1 = fastMax(fastMin(distance1, newDistance), distance0); - if(newDistance < distance0) { - distance0 = newDistance; - closestHash = hash; - centerX = ((xi + RAND_VECS_2D[idx] * cellularJitter) / frequency); - centerY = ((yi + RAND_VECS_2D[idx | 1] * cellularJitter) / frequency); - } else if(newDistance < distance1) { - distance2 = distance1; - distance1 = newDistance; - } else if(newDistance < distance2) { - distance2 = newDistance; - } - yPrimed += PRIME_Y; - } - xPrimed += PRIME_X; + for(int xi = xr - 1; xi <= xr + 1; xi++) { + int yPrimed = yPrimedBase; + + for(int yi = yr - 1; yi <= yr + 1; yi++) { + int hash = hash(seed, xPrimed, yPrimed); + int idx = hash & (255 << 1); + + double vecX = (xi - x) + RAND_VECS_2D[idx] * cellularJitter; + double vecY = (yi - y) + RAND_VECS_2D[idx | 1] * cellularJitter; + + double newDistance = switch(distanceFunction) { + case Manhattan -> fastAbs(vecX) + fastAbs(vecY); + case Hybrid -> (fastAbs(vecX) + fastAbs(vecY)) + (vecX * vecX + vecY * vecY); + default -> vecX * vecX + vecY * vecY; + }; + + distance1 = fastMax(fastMin(distance1, newDistance), distance0); + if(newDistance < distance0) { + distance0 = newDistance; + closestHash = hash; + centerX = ((xi + RAND_VECS_2D[idx] * cellularJitter) / frequency); + centerY = ((yi + RAND_VECS_2D[idx | 1] * cellularJitter) / frequency); + } else if(newDistance < distance1) { + distance2 = distance1; + distance1 = newDistance; + } else if(newDistance < distance2) { + distance2 = newDistance; } - break; - case Manhattan: - for(int xi = xr - 1; xi <= xr + 1; xi++) { - int yPrimed = yPrimedBase; - - for(int yi = yr - 1; yi <= yr + 1; yi++) { - int hash = hash(seed, xPrimed, yPrimed); - int idx = hash & (255 << 1); - - double vecX = (xi - x) + RAND_VECS_2D[idx] * cellularJitter; - double vecY = (yi - y) + RAND_VECS_2D[idx | 1] * cellularJitter; - - double newDistance = fastAbs(vecX) + fastAbs(vecY); - - distance1 = fastMax(fastMin(distance1, newDistance), distance0); - if(newDistance < distance0) { - distance0 = newDistance; - closestHash = hash; - centerX = ((xi + RAND_VECS_2D[idx] * cellularJitter) / frequency); - centerY = ((yi + RAND_VECS_2D[idx | 1] * cellularJitter) / frequency); - } else if(newDistance < distance1) { - distance2 = distance1; - distance1 = newDistance; - } else if(newDistance < distance2) { - distance2 = newDistance; - } - yPrimed += PRIME_Y; - } - xPrimed += PRIME_X; - } - break; - case Hybrid: - for(int xi = xr - 1; xi <= xr + 1; xi++) { - int yPrimed = yPrimedBase; - - for(int yi = yr - 1; yi <= yr + 1; yi++) { - int hash = hash(seed, xPrimed, yPrimed); - int idx = hash & (255 << 1); - - double vecX = (xi - x) + RAND_VECS_2D[idx] * cellularJitter; - double vecY = (yi - y) + RAND_VECS_2D[idx | 1] * cellularJitter; - - double newDistance = (fastAbs(vecX) + fastAbs(vecY)) + (vecX * vecX + vecY * vecY); - - distance1 = fastMax(fastMin(distance1, newDistance), distance0); - if(newDistance < distance0) { - distance0 = newDistance; - closestHash = hash; - centerX = ((xi + RAND_VECS_2D[idx] * cellularJitter) / frequency); - centerY = ((yi + RAND_VECS_2D[idx | 1] * cellularJitter) / frequency); - } else if(newDistance < distance1) { - distance2 = distance1; - distance1 = newDistance; - } else if(newDistance < distance2) { - distance2 = newDistance; - } - yPrimed += PRIME_Y; - } - xPrimed += PRIME_X; - } - break; + yPrimed += PRIME_Y; + } + xPrimed += PRIME_X; } if(distanceFunction == DistanceFunction.Euclidean && returnType != ReturnType.CellValue) { @@ -383,120 +321,47 @@ public class CellularSampler extends NoiseFunction { double centerY = y; double centerZ = z; - switch(distanceFunction) { - case Euclidean: - case EuclideanSq: - for(int xi = xr - 1; xi <= xr + 1; xi++) { - int yPrimed = yPrimedBase; + for(int xi = xr - 1; xi <= xr + 1; xi++) { + int yPrimed = yPrimedBase; + + for(int yi = yr - 1; yi <= yr + 1; yi++) { + int zPrimed = zPrimedBase; + + for(int zi = zr - 1; zi <= zr + 1; zi++) { + int hash = hash(seed, xPrimed, yPrimed, zPrimed); + int idx = hash & (255 << 2); - for(int yi = yr - 1; yi <= yr + 1; yi++) { - int zPrimed = zPrimedBase; - - for(int zi = zr - 1; zi <= zr + 1; zi++) { - int hash = hash(seed, xPrimed, yPrimed, zPrimed); - int idx = hash & (255 << 2); - - double vecX = (xi - x) + RAND_VECS_3D[idx] * cellularJitter; - double vecY = (yi - y) + RAND_VECS_3D[idx | 1] * cellularJitter; - double vecZ = (zi - z) + RAND_VECS_3D[idx | 2] * cellularJitter; - - double newDistance = vecX * vecX + vecY * vecY + vecZ * vecZ; - - if(newDistance < distance0) { - distance0 = newDistance; - closestHash = hash; - centerX = ((xi + RAND_VECS_3D[idx] * cellularJitter) / frequency); - centerY = ((yi + RAND_VECS_3D[idx | 1] * cellularJitter) / frequency); - centerZ = ((zi + RAND_VECS_3D[idx | 2] * cellularJitter) / frequency); - } else if(newDistance < distance1) { - distance2 = distance1; - distance1 = newDistance; - } else if(newDistance < distance2) { - distance2 = newDistance; - } - zPrimed += PRIME_Z; - } - yPrimed += PRIME_Y; - } - xPrimed += PRIME_X; - } - break; - case Manhattan: - for(int xi = xr - 1; xi <= xr + 1; xi++) { - int yPrimed = yPrimedBase; + double vecX = (xi - x) + RAND_VECS_3D[idx] * cellularJitter; + double vecY = (yi - y) + RAND_VECS_3D[idx | 1] * cellularJitter; + double vecZ = (zi - z) + RAND_VECS_3D[idx | 2] * cellularJitter; - for(int yi = yr - 1; yi <= yr + 1; yi++) { - int zPrimed = zPrimedBase; - - for(int zi = zr - 1; zi <= zr + 1; zi++) { - int hash = hash(seed, xPrimed, yPrimed, zPrimed); - int idx = hash & (255 << 2); - - double vecX = (xi - x) + RAND_VECS_3D[idx] * cellularJitter; - double vecY = (yi - y) + RAND_VECS_3D[idx | 1] * cellularJitter; - double vecZ = (zi - z) + RAND_VECS_3D[idx | 2] * cellularJitter; - - double newDistance = fastAbs(vecX) + fastAbs(vecY) + fastAbs(vecZ); - - if(newDistance < distance0) { - distance0 = newDistance; - closestHash = hash; - centerX = ((xi + RAND_VECS_3D[idx] * cellularJitter) / frequency); - centerY = ((yi + RAND_VECS_3D[idx | 1] * cellularJitter) / frequency); - centerZ = ((zi + RAND_VECS_3D[idx | 2] * cellularJitter) / frequency); - } else if(newDistance < distance1) { - distance2 = distance1; - distance1 = newDistance; - } else if(newDistance < distance2) { - distance2 = newDistance; - } - zPrimed += PRIME_Z; - } - yPrimed += PRIME_Y; - } - xPrimed += PRIME_X; - } - break; - case Hybrid: - for(int xi = xr - 1; xi <= xr + 1; xi++) { - int yPrimed = yPrimedBase; - - for(int yi = yr - 1; yi <= yr + 1; yi++) { - int zPrimed = zPrimedBase; - - for(int zi = zr - 1; zi <= zr + 1; zi++) { - int hash = hash(seed, xPrimed, yPrimed, zPrimed); - int idx = hash & (255 << 2); - - double vecX = (xi - x) + RAND_VECS_3D[idx] * cellularJitter; - double vecY = (yi - y) + RAND_VECS_3D[idx | 1] * cellularJitter; - double vecZ = (zi - z) + RAND_VECS_3D[idx | 2] * cellularJitter; - - double newDistance = (fastAbs(vecX) + fastAbs(vecY) + fastAbs(vecZ)) + - (vecX * vecX + vecY * vecY + vecZ * vecZ); - + double newDistance = 0; + switch(distanceFunction) { + case Euclidean, EuclideanSq -> newDistance = vecX * vecX + vecY * vecY + vecZ * vecZ; + case Manhattan -> newDistance = fastAbs(vecX) + fastAbs(vecY) + fastAbs(vecZ); + case Hybrid -> { + newDistance = (fastAbs(vecX) + fastAbs(vecY) + fastAbs(vecZ)) + (vecX * vecX + vecY * vecY + vecZ * vecZ); distance1 = fastMax(fastMin(distance1, newDistance), distance0); - if(newDistance < distance0) { - distance0 = newDistance; - closestHash = hash; - centerX = ((xi + RAND_VECS_3D[idx] * cellularJitter) / frequency); - centerY = ((yi + RAND_VECS_3D[idx | 1] * cellularJitter) / frequency); - centerZ = ((zi + RAND_VECS_3D[idx | 2] * cellularJitter) / frequency); - } else if(newDistance < distance1) { - distance2 = distance1; - distance1 = newDistance; - } else if(newDistance < distance2) { - distance2 = newDistance; - } - zPrimed += PRIME_Z; } - yPrimed += PRIME_Y; } - xPrimed += PRIME_X; + + if(newDistance < distance0) { + distance0 = newDistance; + closestHash = hash; + centerX = ((xi + RAND_VECS_3D[idx] * cellularJitter) / frequency); + centerY = ((yi + RAND_VECS_3D[idx | 1] * cellularJitter) / frequency); + centerZ = ((zi + RAND_VECS_3D[idx | 2] * cellularJitter) / frequency); + } else if(newDistance < distance1) { + distance2 = distance1; + distance1 = newDistance; + } else if(newDistance < distance2) { + distance2 = newDistance; + } + zPrimed += PRIME_Z; } - break; - default: - break; + yPrimed += PRIME_Y; + } + xPrimed += PRIME_X; } if(distanceFunction == DistanceFunction.Euclidean && returnType != ReturnType.CellValue) { From 0e37a839fea80266288f07c784388bc118ab0915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Wed, 13 Sep 2023 16:03:15 -0600 Subject: [PATCH 03/34] We do a little commonifying --- gradle.properties | 1 - .../dfsek/terra/fabric/FabricEntryPoint.java | 25 ++------------ .../dfsek/terra/fabric/FabricPlatform.java | 25 ++------------ platforms/mixin-lifecycle/build.gradle.kts | 5 +++ .../terra/lifecycle/LifecycleEntryPoint.java | 34 +++++++++++++++++++ .../terra/lifecycle/LifecyclePlatform.java | 20 +++++++++-- .../dfsek/terra/quilt/QuiltEntryPoint.java | 27 +++------------ .../com/dfsek/terra/quilt/QuiltPlatform.java | 24 ++----------- 8 files changed, 69 insertions(+), 92 deletions(-) create mode 100644 platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecycleEntryPoint.java diff --git a/gradle.properties b/gradle.properties index 76e5fa68b..3e8017f71 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,5 +8,4 @@ terra.license=MIT # Gradle options org.gradle.jvmargs=-Xmx4096M -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC org.gradle.warning.mode=all -#org.gradle.parallel=true diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricEntryPoint.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricEntryPoint.java index 54d03961e..d316b1a3a 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricEntryPoint.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricEntryPoint.java @@ -17,35 +17,16 @@ package com.dfsek.terra.fabric; -import cloud.commandframework.execution.CommandExecutionCoordinator; -import cloud.commandframework.fabric.FabricServerCommandManager; import net.fabricmc.api.ModInitializer; -import net.minecraft.server.command.ServerCommandSource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import com.dfsek.terra.api.command.CommandSender; -import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent; +import com.dfsek.terra.lifecycle.LifecycleEntryPoint; -public class FabricEntryPoint implements ModInitializer { - private static final Logger logger = LoggerFactory.getLogger(FabricEntryPoint.class); - +public class FabricEntryPoint extends LifecycleEntryPoint implements ModInitializer { private static final FabricPlatform TERRA_PLUGIN = new FabricPlatform(); @Override public void onInitialize() { - logger.info("Initializing Terra Fabric mod..."); - - FabricServerCommandManager manager = new FabricServerCommandManager<>( - CommandExecutionCoordinator.simpleCoordinator(), - serverCommandSource -> (CommandSender) serverCommandSource, - commandSender -> (ServerCommandSource) commandSender - ); - - - manager.brigadierManager().setNativeNumberSuggestions(false); - - TERRA_PLUGIN.getEventManager().callEvent(new CommandRegistrationEvent(manager)); + initialize("Fabric", TERRA_PLUGIN); } } diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricPlatform.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricPlatform.java index 2c85b86ee..1501b736d 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricPlatform.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricPlatform.java @@ -17,43 +17,24 @@ package com.dfsek.terra.fabric; -import ca.solostudios.strata.Versions; -import ca.solostudios.strata.parser.tokenizer.ParseException; -import ca.solostudios.strata.version.Version; import net.fabricmc.loader.api.FabricLoader; import org.jetbrains.annotations.NotNull; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.File; import java.util.Collection; import java.util.stream.Collectors; -import java.util.stream.Stream; -import com.dfsek.terra.addon.EphemeralAddon; import com.dfsek.terra.api.addon.BaseAddon; import com.dfsek.terra.lifecycle.LifecyclePlatform; public class FabricPlatform extends LifecyclePlatform { - private static final Logger LOGGER = LoggerFactory.getLogger(FabricPlatform.class); @Override protected Collection getPlatformMods() { - return FabricLoader.getInstance().getAllMods().stream().flatMap(mod -> { - String id = mod.getMetadata().getId(); - if(id.equals("terra") || id.equals("minecraft") || id.equals("java")) return Stream.empty(); - try { - Version version = Versions.parseVersion(mod.getMetadata().getVersion().getFriendlyString()); - return Stream.of(new EphemeralAddon(version, "fabric:" + id)); - } catch(ParseException e) { - LOGGER.warn( - "Mod {}, version {} does not follow semantic versioning specification, Terra addons will be unable to depend on " + - "it.", - id, mod.getMetadata().getVersion().getFriendlyString()); - } - return Stream.empty(); - }).collect(Collectors.toList()); + return FabricLoader.getInstance().getAllMods().stream().flatMap( + mod -> parseModData(mod.getMetadata().getId(), mod.getMetadata().getVersion().getFriendlyString())).collect( + Collectors.toList()); } @Override diff --git a/platforms/mixin-lifecycle/build.gradle.kts b/platforms/mixin-lifecycle/build.gradle.kts index 0a9e71d7c..e8b852dc5 100644 --- a/platforms/mixin-lifecycle/build.gradle.kts +++ b/platforms/mixin-lifecycle/build.gradle.kts @@ -15,6 +15,11 @@ dependencies { minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}") mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2") + + modImplementation("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud) { + exclude("net.fabricmc") + exclude("net.fabricmc.fabric-api") + } } loom { diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecycleEntryPoint.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecycleEntryPoint.java new file mode 100644 index 000000000..12260088a --- /dev/null +++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecycleEntryPoint.java @@ -0,0 +1,34 @@ +package com.dfsek.terra.lifecycle; + +import cloud.commandframework.execution.CommandExecutionCoordinator; + +import cloud.commandframework.fabric.FabricServerCommandManager; + +import com.dfsek.terra.api.command.CommandSender; +import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent; + +import com.dfsek.terra.mod.MinecraftAddon; + +import net.minecraft.server.command.ServerCommandSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +public class LifecycleEntryPoint { + private static final Logger logger = LoggerFactory.getLogger(LifecycleEntryPoint.class); + + protected static void initialize(String modName, LifecyclePlatform platform) { + logger.info("Initializing Terra %s mod...", modName); + + FabricServerCommandManager manager = new FabricServerCommandManager<>( + CommandExecutionCoordinator.simpleCoordinator(), + serverCommandSource -> (CommandSender) serverCommandSource, + commandSender -> (ServerCommandSource) commandSender + ); + + + manager.brigadierManager().setNativeNumberSuggestions(false); + + platform.getEventManager().callEvent(new CommandRegistrationEvent(manager)); + } +} diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java index 81ebcae8a..bafd0a02e 100644 --- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java +++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java @@ -2,6 +2,7 @@ package com.dfsek.terra.lifecycle; import ca.solostudios.strata.Versions; import ca.solostudios.strata.parser.tokenizer.ParseException; +import ca.solostudios.strata.version.Version; import com.dfsek.terra.lifecycle.util.BiomeUtil; @@ -20,6 +21,7 @@ import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.stream.Stream; import java.util.concurrent.atomic.AtomicReference; import com.dfsek.terra.addon.EphemeralAddon; @@ -103,12 +105,26 @@ public abstract class LifecyclePlatform extends ModPlatform { LOGGER.warn("Failed to parse Minecraft version", e); } } - + addons.addAll(getPlatformMods()); - + return addons; } + protected Stream parseModData(String id, String modVersion) { + if(id.equals("terra") || id.equals("minecraft") || id.equals("java")) return Stream.empty(); + try { + Version version = Versions.parseVersion(modVersion); + return Stream.of(new EphemeralAddon(version, "quilt:" + id)); + } catch(ParseException e) { + LOGGER.warn( + "Mod {}, version {} does not follow semantic versioning specification, Terra addons will be unable to depend on " + + "it.", + id, modVersion); + } + return Stream.empty(); + } + @Override public Registry dimensionTypeRegistry() { return DIMENSIONS.get(); diff --git a/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltEntryPoint.java b/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltEntryPoint.java index 88f676daf..5b8688962 100644 --- a/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltEntryPoint.java +++ b/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltEntryPoint.java @@ -17,36 +17,17 @@ package com.dfsek.terra.quilt; -import cloud.commandframework.execution.CommandExecutionCoordinator; -import cloud.commandframework.fabric.FabricServerCommandManager; -import net.minecraft.server.command.ServerCommandSource; import org.quiltmc.loader.api.ModContainer; import org.quiltmc.qsl.base.api.entrypoint.ModInitializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import com.dfsek.terra.api.command.CommandSender; -import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent; +import com.dfsek.terra.lifecycle.LifecycleEntryPoint; -public class QuiltEntryPoint implements ModInitializer { - private static final Logger logger = LoggerFactory.getLogger(QuiltEntryPoint.class); - +public class QuiltEntryPoint extends LifecycleEntryPoint implements ModInitializer { private static final QuiltPlatform TERRA_PLUGIN = new QuiltPlatform(); - + @Override public void onInitialize(ModContainer container) { - logger.info("Initializing Terra Quilt mod..."); - - FabricServerCommandManager manager = new FabricServerCommandManager<>( - CommandExecutionCoordinator.simpleCoordinator(), - serverCommandSource -> (CommandSender) serverCommandSource, - commandSender -> (ServerCommandSource) commandSender - ); - - - manager.brigadierManager().setNativeNumberSuggestions(false); - - TERRA_PLUGIN.getEventManager().callEvent(new CommandRegistrationEvent(manager)); + initialize("Quilt", TERRA_PLUGIN); } } diff --git a/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPlatform.java b/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPlatform.java index dfc1a7a18..0aa2e4323 100644 --- a/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPlatform.java +++ b/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPlatform.java @@ -17,43 +17,23 @@ package com.dfsek.terra.quilt; -import ca.solostudios.strata.Versions; -import ca.solostudios.strata.parser.tokenizer.ParseException; -import ca.solostudios.strata.version.Version; import org.jetbrains.annotations.NotNull; import org.quiltmc.loader.api.QuiltLoader; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.File; import java.util.Collection; import java.util.stream.Collectors; -import java.util.stream.Stream; -import com.dfsek.terra.addon.EphemeralAddon; import com.dfsek.terra.api.addon.BaseAddon; import com.dfsek.terra.lifecycle.LifecyclePlatform; public class QuiltPlatform extends LifecyclePlatform { - private static final Logger LOGGER = LoggerFactory.getLogger(QuiltPlatform.class); @Override protected Collection getPlatformMods() { - return QuiltLoader.getAllMods().stream().flatMap(mod -> { - String id = mod.metadata().id(); - if(id.equals("terra") || id.equals("minecraft") || id.equals("java")) return Stream.empty(); - try { - Version version = Versions.parseVersion(mod.metadata().version().raw()); - return Stream.of(new EphemeralAddon(version, "quilt:" + id)); - } catch(ParseException e) { - LOGGER.warn( - "Mod {}, version {} does not follow semantic versioning specification, Terra addons will be unable to depend on " + - "it.", - id, mod.metadata().version().raw()); - } - return Stream.empty(); - }).collect(Collectors.toList()); + return QuiltLoader.getAllMods().stream().flatMap(mod -> parseModData(mod.metadata().id(), mod.metadata().version().raw())).collect( + Collectors.toList()); } @Override From f0c602d7e7e6fbb87db9ed7d50f051ad1c822d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Fri, 29 Sep 2023 22:10:03 -0600 Subject: [PATCH 04/34] implement physics on the api side we will see if platform changes are needed --- .../script/builders/BlockFunctionBuilder.java | 8 +++++--- .../terrascript/script/functions/BlockFunction.java | 10 ++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java index daa001ca9..7d3805f3d 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java @@ -30,12 +30,14 @@ public class BlockFunctionBuilder implements FunctionBuilder { @Override public BlockFunction build(List> argumentList, Position position) { if(argumentList.size() < 4) throw new ParseException("Expected data", position); - Returnable booleanReturnable = new BooleanConstant(true, position); - if(argumentList.size() == 5) booleanReturnable = (Returnable) argumentList.get(4); + Returnable overwrite = new BooleanConstant(true, position); + if(argumentList.size() >= 5) overwrite = (Returnable) argumentList.get(4); + Returnable physics = new BooleanConstant(true, position); + if(argumentList.size() == 6) physics = (Returnable) argumentList.get(5); if(argumentList.get(3) instanceof StringConstant) { return new BlockFunction.Constant((Returnable) argumentList.get(0), (Returnable) argumentList.get(1), (Returnable) argumentList.get(2), (StringConstant) argumentList.get(3), - booleanReturnable, platform, position); + overwrite, physics, platform, position); } return new BlockFunction((Returnable) argumentList.get(0), (Returnable) argumentList.get(1), (Returnable) argumentList.get(2), (Returnable) argumentList.get(3), booleanReturnable, diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java index 63d754975..7997a15aa 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java @@ -35,10 +35,11 @@ public class BlockFunction implements Function { protected final Platform platform; private final Map data = new HashMap<>(); private final Returnable overwrite; + private final Returnable physics; private final Position position; public BlockFunction(Returnable x, Returnable y, Returnable z, Returnable blockData, - Returnable overwrite, Platform platform, Position position) { + Returnable overwrite, Returnable physics, Platform platform, Position position) { this.x = x; this.y = y; this.z = z; @@ -46,6 +47,7 @@ public class BlockFunction implements Function { this.overwrite = overwrite; this.platform = platform; this.position = position; + this.physics = physics; } @Override @@ -76,7 +78,7 @@ public class BlockFunction implements Function { FastMath.roundToInt(xz.getZ())).mutable().add(arguments.getOrigin()); BlockState current = arguments.getWorld().getBlockState(set); if(overwrite.apply(implementationArguments, scope) || current.isAir()) { - arguments.getWorld().setBlockState(set, rot); + arguments.getWorld().setBlockState(set, rot, physics.apply(implementationArguments, scope)); } } catch(RuntimeException e) { logger.error("Failed to place block at location {}", arguments.getOrigin(), e); @@ -92,8 +94,8 @@ public class BlockFunction implements Function { private final BlockState state; public Constant(Returnable x, Returnable y, Returnable z, StringConstant blockData, - Returnable overwrite, Platform platform, Position position) { - super(x, y, z, blockData, overwrite, platform, position); + Returnable overwrite, Returnable physics, Platform platform, Position position) { + super(x, y, z, blockData, overwrite, physics, platform, position); this.state = platform.getWorldHandle().createBlockState(blockData.getConstant()); } From 33d654dc8eb5ad75a00926ecc0b2d9cb924f0152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Fri, 29 Sep 2023 23:05:05 -0600 Subject: [PATCH 05/34] impl fabric --- .../script/builders/BlockFunctionBuilder.java | 4 ++-- .../terra/chunk/WorldChunkMixin.java | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java index 7d3805f3d..7069b0b69 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java @@ -32,7 +32,7 @@ public class BlockFunctionBuilder implements FunctionBuilder { if(argumentList.size() < 4) throw new ParseException("Expected data", position); Returnable overwrite = new BooleanConstant(true, position); if(argumentList.size() >= 5) overwrite = (Returnable) argumentList.get(4); - Returnable physics = new BooleanConstant(true, position); + Returnable physics = new BooleanConstant(false, position); if(argumentList.size() == 6) physics = (Returnable) argumentList.get(5); if(argumentList.get(3) instanceof StringConstant) { return new BlockFunction.Constant((Returnable) argumentList.get(0), (Returnable) argumentList.get(1), @@ -40,7 +40,7 @@ public class BlockFunctionBuilder implements FunctionBuilder { overwrite, physics, platform, position); } return new BlockFunction((Returnable) argumentList.get(0), (Returnable) argumentList.get(1), - (Returnable) argumentList.get(2), (Returnable) argumentList.get(3), booleanReturnable, + (Returnable) argumentList.get(2), (Returnable) argumentList.get(3), overwrite, physics, platform, position); } diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/chunk/WorldChunkMixin.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/chunk/WorldChunkMixin.java index 3fb01104d..2cf8123ea 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/chunk/WorldChunkMixin.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/chunk/WorldChunkMixin.java @@ -17,8 +17,11 @@ package com.dfsek.terra.mod.mixin.implementations.terra.chunk; +import net.minecraft.block.Block; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.chunk.Chunk.TickSchedulers; import net.minecraft.world.chunk.WorldChunk; +import net.minecraft.world.tick.OrderedTick; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Final; @@ -47,8 +50,21 @@ public abstract class WorldChunkMixin { @Nullable public abstract net.minecraft.block.BlockState setBlockState(BlockPos pos, net.minecraft.block.BlockState state, boolean moved); + @Shadow + public abstract TickSchedulers getTickSchedulers(); + public void terra$setBlock(int x, int y, int z, BlockState data, boolean physics) { - setBlockState(new BlockPos(x, y, z), (net.minecraft.block.BlockState) data, false); + BlockPos blockPos = new BlockPos(x, y, z); + setBlockState(blockPos, (net.minecraft.block.BlockState) data, false); + if (physics) { + net.minecraft.block.BlockState state = ((net.minecraft.block.BlockState) data); + if (state.isLiquid()) { + world.getFluidTickScheduler().scheduleTick(OrderedTick.create(state.getFluidState().getFluid(), blockPos)); + } else { + world.getBlockTickScheduler().scheduleTick(OrderedTick.create(state.getBlock(), blockPos)); + } + + } } public void terra$setBlock(int x, int y, int z, @NotNull BlockState blockState) { From 5c0c833b70fa0b5de9e3d2d8785723285230413a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB?= Date: Thu, 14 Jul 2022 00:45:52 -0700 Subject: [PATCH 06/34] Update LifecycleEntryPoint.java --- .../java/com/dfsek/terra/lifecycle/LifecycleEntryPoint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecycleEntryPoint.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecycleEntryPoint.java index 12260088a..4350f31c0 100644 --- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecycleEntryPoint.java +++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecycleEntryPoint.java @@ -18,7 +18,7 @@ public class LifecycleEntryPoint { private static final Logger logger = LoggerFactory.getLogger(LifecycleEntryPoint.class); protected static void initialize(String modName, LifecyclePlatform platform) { - logger.info("Initializing Terra %s mod...", modName); + logger.info("Initializing Terra {} mod...", modName); FabricServerCommandManager manager = new FabricServerCommandManager<>( CommandExecutionCoordinator.simpleCoordinator(), From 89651597c289d71b758a672ce6c3c257d00d9c3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Fri, 29 Sep 2023 23:32:40 -0600 Subject: [PATCH 07/34] default to info logging --- platforms/fabric/build.gradle.kts | 4 ++-- platforms/forge/build.gradle.kts | 4 ++-- platforms/quilt/build.gradle.kts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platforms/fabric/build.gradle.kts b/platforms/fabric/build.gradle.kts index d8848e908..72abe20f9 100644 --- a/platforms/fabric/build.gradle.kts +++ b/platforms/fabric/build.gradle.kts @@ -50,10 +50,10 @@ loom { launches { named("client") { - property("fabric.log.level", "debug") + property("fabric.log.level", "info") } named("server") { - property("fabric.log.level", "debug") + property("fabric.log.level", "info") } } } diff --git a/platforms/forge/build.gradle.kts b/platforms/forge/build.gradle.kts index 7cfddab1d..328d9d481 100644 --- a/platforms/forge/build.gradle.kts +++ b/platforms/forge/build.gradle.kts @@ -39,11 +39,11 @@ loom { launches { named("client") { - property("fabric.log.level", "debug") + property("fabric.log.level", "info") property("mixin.env.disableRefMap", "true") } named("server") { - property("fabric.log.level", "debug") + property("fabric.log.level", "info") property("mixin.env.disableRefMap", "true") } } diff --git a/platforms/quilt/build.gradle.kts b/platforms/quilt/build.gradle.kts index 4cff5a427..b8933e76e 100644 --- a/platforms/quilt/build.gradle.kts +++ b/platforms/quilt/build.gradle.kts @@ -50,10 +50,10 @@ loom { launches { named("client") { - property("fabric.log.level", "debug") + property("fabric.log.level", "info") } named("server") { - property("fabric.log.level", "debug") + property("fabric.log.level", "info") } } } From 23f47de10a73e522df4c1c592bf122687f7ac590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Fri, 29 Sep 2023 23:35:17 -0600 Subject: [PATCH 08/34] fix pack loading error --- .../terrascript/script/builders/BlockFunctionBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java index 7069b0b69..c2b6dc965 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java @@ -54,7 +54,7 @@ public class BlockFunctionBuilder implements FunctionBuilder { return switch(position) { case 0, 1, 2 -> Returnable.ReturnType.NUMBER; case 3 -> Returnable.ReturnType.STRING; - case 4 -> Returnable.ReturnType.BOOLEAN; + case 4, 5 -> Returnable.ReturnType.BOOLEAN; default -> null; }; } From 8e0d64dccd89315de6ac6a709770a3857f8f13f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Sat, 30 Sep 2023 10:49:28 -0600 Subject: [PATCH 09/34] Make bukkit work --- .../com/dfsek/terra/bukkit/util/BukkitUtils.java | 12 ++++++++++++ .../dfsek/terra/bukkit/world/BukkitProtoWorld.java | 12 ++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/util/BukkitUtils.java diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/util/BukkitUtils.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/util/BukkitUtils.java new file mode 100644 index 000000000..cc2fa78ef --- /dev/null +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/util/BukkitUtils.java @@ -0,0 +1,12 @@ +package com.dfsek.terra.bukkit.util; + +import org.bukkit.Material; +import org.bukkit.block.data.BlockData; + + +public class BukkitUtils { + public static boolean isLiquid(BlockData blockState) { + Material material = blockState.getMaterial(); + return material == Material.WATER || material == Material.LAVA; + } +} diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitProtoWorld.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitProtoWorld.java index 52b3c5855..d6316325d 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitProtoWorld.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitProtoWorld.java @@ -1,6 +1,9 @@ package com.dfsek.terra.bukkit.world; +import com.dfsek.terra.bukkit.util.BukkitUtils; + import org.bukkit.Location; +import org.bukkit.block.data.BlockData; import org.bukkit.generator.LimitedRegion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,9 +50,14 @@ public class BukkitProtoWorld implements ProtoWorld { @Override public void setBlockState(int x, int y, int z, BlockState data, boolean physics) { access(x, y, z, () -> { - delegate.setBlockData(x, y, z, BukkitAdapter.adapt(data)); + BlockData bukkitData = BukkitAdapter.adapt(data); + delegate.setBlockData(x, y, z, bukkitData); if(physics) { - delegate.scheduleBlockUpdate(x, y, z); + if (BukkitUtils.isLiquid(bukkitData)) { + delegate.scheduleFluidUpdate(x, y, z); + } else { + delegate.scheduleBlockUpdate(x, y, z); + } } }); } From e51e025e9ca8b3c6662d5e87aaccd23d7b5a0c0f Mon Sep 17 00:00:00 2001 From: Astrash Date: Mon, 2 Oct 2023 11:14:43 +1100 Subject: [PATCH 10/34] Implement cubic spline sampler --- .../dfsek/terra/addons/noise/NoiseAddon.java | 7 +- .../config/CubicSplinePointTemplate.java | 25 ++++++ .../CubicSplineNormalizerTemplate.java | 23 +++++ .../terra/addons/noise/math/CubicSpline.java | 89 +++++++++++++++++++ .../normalizer/CubicSplineNoiseSampler.java | 20 +++++ 5 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/CubicSplinePointTemplate.java create mode 100644 common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/CubicSplineNormalizerTemplate.java create mode 100644 common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/math/CubicSpline.java create mode 100644 common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/CubicSplineNoiseSampler.java diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java index b002f29a4..7783ca5b7 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java @@ -14,6 +14,7 @@ import java.util.Map; import java.util.function.Supplier; import com.dfsek.terra.addons.manifest.api.AddonInitializer; +import com.dfsek.terra.addons.noise.config.CubicSplinePointTemplate; import com.dfsek.terra.addons.noise.config.DimensionApplicableNoiseSampler; import com.dfsek.terra.addons.noise.config.templates.BinaryArithmeticTemplate; import com.dfsek.terra.addons.noise.config.templates.DomainWarpTemplate; @@ -32,12 +33,14 @@ import com.dfsek.terra.addons.noise.config.templates.noise.fractal.BrownianMotio import com.dfsek.terra.addons.noise.config.templates.noise.fractal.PingPongTemplate; import com.dfsek.terra.addons.noise.config.templates.noise.fractal.RidgedFractalTemplate; import com.dfsek.terra.addons.noise.config.templates.normalizer.ClampNormalizerTemplate; +import com.dfsek.terra.addons.noise.config.templates.normalizer.CubicSplineNormalizerTemplate; import com.dfsek.terra.addons.noise.config.templates.normalizer.ExpressionNormalizerTemplate; import com.dfsek.terra.addons.noise.config.templates.normalizer.LinearNormalizerTemplate; import com.dfsek.terra.addons.noise.config.templates.normalizer.NormalNormalizerTemplate; import com.dfsek.terra.addons.noise.config.templates.normalizer.PosterizationNormalizerTemplate; import com.dfsek.terra.addons.noise.config.templates.normalizer.ProbabilityNormalizerTemplate; import com.dfsek.terra.addons.noise.config.templates.normalizer.ScaleNormalizerTemplate; +import com.dfsek.terra.addons.noise.math.CubicSpline; import com.dfsek.terra.addons.noise.samplers.arithmetic.AdditionSampler; import com.dfsek.terra.addons.noise.samplers.arithmetic.DivisionSampler; import com.dfsek.terra.addons.noise.samplers.arithmetic.MaxSampler; @@ -90,7 +93,8 @@ public class NoiseAddon implements AddonInitializer { .applyLoader(DistanceSampler.DistanceFunction.class, (type, o, loader, depthTracker) -> DistanceSampler.DistanceFunction.valueOf((String) o)) .applyLoader(DimensionApplicableNoiseSampler.class, DimensionApplicableNoiseSampler::new) - .applyLoader(FunctionTemplate.class, FunctionTemplate::new); + .applyLoader(FunctionTemplate.class, FunctionTemplate::new) + .applyLoader(CubicSpline.Point.class, CubicSplinePointTemplate::new); noiseRegistry.register(addon.key("LINEAR"), LinearNormalizerTemplate::new); noiseRegistry.register(addon.key("NORMAL"), NormalNormalizerTemplate::new); @@ -98,6 +102,7 @@ public class NoiseAddon implements AddonInitializer { noiseRegistry.register(addon.key("PROBABILITY"), ProbabilityNormalizerTemplate::new); noiseRegistry.register(addon.key("SCALE"), ScaleNormalizerTemplate::new); noiseRegistry.register(addon.key("POSTERIZATION"), PosterizationNormalizerTemplate::new); + noiseRegistry.register(addon.key("CUBIC_SPLINE"), CubicSplineNormalizerTemplate::new); noiseRegistry.register(addon.key("IMAGE"), ImageSamplerTemplate::new); diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/CubicSplinePointTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/CubicSplinePointTemplate.java new file mode 100644 index 000000000..d7dea18e5 --- /dev/null +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/CubicSplinePointTemplate.java @@ -0,0 +1,25 @@ +package com.dfsek.terra.addons.noise.config; + +import com.dfsek.tectonic.api.config.template.annotations.Value; +import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; + +import com.dfsek.terra.addons.noise.math.CubicSpline.Point; +import com.dfsek.terra.api.config.meta.Meta; + + +public class CubicSplinePointTemplate implements ObjectTemplate { + + @Value("from") + private @Meta double from; + + @Value("to") + private @Meta double to; + + @Value("gradient") + private @Meta double gradient; + + @Override + public Point get() { + return new Point(from, to, gradient); + } +} diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/CubicSplineNormalizerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/CubicSplineNormalizerTemplate.java new file mode 100644 index 000000000..7e70dcc3c --- /dev/null +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/CubicSplineNormalizerTemplate.java @@ -0,0 +1,23 @@ +package com.dfsek.terra.addons.noise.config.templates.normalizer; + +import com.dfsek.tectonic.api.config.template.annotations.Value; + +import com.dfsek.terra.addons.noise.math.CubicSpline; +import com.dfsek.terra.addons.noise.math.CubicSpline.Point; +import com.dfsek.terra.addons.noise.normalizer.CubicSplineNoiseSampler; +import com.dfsek.terra.api.config.meta.Meta; +import com.dfsek.terra.api.noise.NoiseSampler; + +import java.util.List; + + +public class CubicSplineNormalizerTemplate extends NormalizerTemplate { + + @Value("points") + private @Meta List<@Meta Point> points; + + @Override + public NoiseSampler get() { + return new CubicSplineNoiseSampler(function, new CubicSpline(points)); + } +} diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/math/CubicSpline.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/math/CubicSpline.java new file mode 100644 index 000000000..ff86bfa10 --- /dev/null +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/math/CubicSpline.java @@ -0,0 +1,89 @@ +package com.dfsek.terra.addons.noise.math; + +import org.jetbrains.annotations.NotNull; + +import java.util.Collections; +import java.util.List; + + +public class CubicSpline { + + private final double[] fromValues; + private final double[] toValues; + private final double[] gradients; + + public CubicSpline(List points) { + Collections.sort(points); + + this.fromValues = new double[points.size()]; + this.toValues = new double[points.size()]; + this.gradients = new double[points.size()]; + + for(int i = 0; i < points.size(); i++) { + fromValues[i] = points.get(i).from; + toValues[i] = points.get(i).to; + gradients[i] = points.get(i).gradient; + } + } + + public double apply(double in) { + return calculate(in, fromValues, toValues, gradients); + } + + public static double calculate(double in, double[] fromValues, double[] toValues, double[] gradients) { + int pointIdx = floorBinarySearch(in, fromValues) - 1; + + int pointIdxLast = fromValues.length - 1; + + if (pointIdx < 0) { // If to left of first point return linear function intersecting said point using point's gradient + return gradients[0] * (in - fromValues[0]) + toValues[0]; + } else if (pointIdx == pointIdxLast) { // Do same if to right of last point + return gradients[pointIdxLast] * (in - fromValues[pointIdxLast]) + toValues[pointIdxLast]; + } else { + double fromLeft = fromValues[pointIdx]; + double fromRight = fromValues[pointIdx + 1]; + + double toLeft = toValues[pointIdx]; + double toRight = toValues[pointIdx + 1]; + + double gradientLeft = gradients[pointIdx]; + double gradientRight = gradients[pointIdx + 1]; + + double fromDelta = fromRight - fromLeft; + double toDelta = toRight - toLeft; + + double t = (in - fromLeft) / fromDelta; + + return lerp(t, toLeft, toRight) + t * (1.0F - t) * lerp(t, gradientLeft * fromDelta - toDelta, -gradientRight * fromDelta + toDelta); + } + } + + private static int floorBinarySearch(double targetValue, double[] values) { + int left = 0; + int right = values.length; + int idx = right - left; + while (idx > 0) { + int halfDelta = idx / 2; + int mid = left + halfDelta; + if (targetValue < values[mid]) { + idx = halfDelta; + } else { + left = mid + 1; + idx -= halfDelta + 1; + } + } + return left; + } + + private static double lerp(double t, double a, double b) { + return a + t * (b - a); + } + + public record Point(double from, double to, double gradient) implements Comparable { + + @Override + public int compareTo(@NotNull CubicSpline.Point o) { + return Double.compare(from, o.from); + } + } +} diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/CubicSplineNoiseSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/CubicSplineNoiseSampler.java new file mode 100644 index 000000000..24af8e351 --- /dev/null +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/CubicSplineNoiseSampler.java @@ -0,0 +1,20 @@ +package com.dfsek.terra.addons.noise.normalizer; + +import com.dfsek.terra.addons.noise.math.CubicSpline; +import com.dfsek.terra.api.noise.NoiseSampler; + + +public class CubicSplineNoiseSampler extends Normalizer { + + private final CubicSpline spline; + + public CubicSplineNoiseSampler(NoiseSampler sampler, CubicSpline spline) { + super(sampler); + this.spline = spline; + } + + @Override + public double normalize(double in) { + return spline.apply(in); + } +} From 0a7cdb82a3b3cff852023c3ef183d1d6f0d2f496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Sun, 1 Oct 2023 22:18:54 -0600 Subject: [PATCH 11/34] update deps + 1.20.2 --- buildSrc/build.gradle.kts | 22 +- buildSrc/src/main/kotlin/Versions.kt | 48 +-- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 63721 bytes gradle/wrapper/gradle-wrapper.properties | 5 +- gradlew | 294 +++++++++++------- gradlew.bat | 15 +- platforms/bukkit/build.gradle.kts | 3 +- platforms/bukkit/common/build.gradle.kts | 8 +- .../bukkit/nms/v1_18_R2/build.gradle.kts | 2 +- .../bukkit/nms/v1_19_R1/build.gradle.kts | 2 +- .../bukkit/nms/v1_19_R2/build.gradle.kts | 2 +- .../bukkit/nms/v1_19_R3/build.gradle.kts | 2 +- .../bukkit/nms/v1_20_R1/build.gradle.kts | 4 +- .../bukkit/nms/v1_20_R2/build.gradle.kts | 17 + .../bukkit/nms/v1_20_R1/AwfulBukkitHacks.java | 101 ++++++ .../bukkit/nms/v1_20_R1/NMSBiomeInfo.java | 10 + .../bukkit/nms/v1_20_R1/NMSBiomeInjector.java | 83 +++++ .../bukkit/nms/v1_20_R1/NMSBiomeProvider.java | 47 +++ .../v1_20_R1/NMSChunkGeneratorDelegate.java | 170 ++++++++++ .../bukkit/nms/v1_20_R1/NMSInitializer.java | 15 + .../nms/v1_20_R1/NMSInjectListener.java | 48 +++ .../nms/v1_20_R1/NMSWorldProperties.java | 36 +++ .../terra/bukkit/nms/v1_20_R1/Reflection.java | 50 +++ .../bukkit/nms/v1_20_R1/RegistryFetcher.java | 24 ++ platforms/cli/build.gradle.kts | 4 +- platforms/fabric/build.gradle.kts | 14 +- platforms/forge/build.gradle.kts | 22 +- platforms/mixin-common/build.gradle.kts | 2 +- platforms/mixin-lifecycle/build.gradle.kts | 2 +- platforms/quilt/build.gradle.kts | 11 +- 30 files changed, 853 insertions(+), 210 deletions(-) create mode 100644 platforms/bukkit/nms/v1_20_R2/build.gradle.kts create mode 100644 platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/AwfulBukkitHacks.java create mode 100644 platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeInfo.java create mode 100644 platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeInjector.java create mode 100644 platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeProvider.java create mode 100644 platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSChunkGeneratorDelegate.java create mode 100644 platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSInitializer.java create mode 100644 platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSInjectListener.java create mode 100644 platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSWorldProperties.java create mode 100644 platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/Reflection.java create mode 100644 platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/RegistryFetcher.java diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index d6fbe2a8f..84d964d5c 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -3,15 +3,6 @@ plugins { kotlin("jvm") version embeddedKotlinVersion } -buildscript { - configurations.all { - resolutionStrategy { - force("org.ow2.asm:asm:9.3") // TODO: remove when ShadowJar updates ASM version - force("org.ow2.asm:asm-commons:9.3") - } - } -} - repositories { mavenCentral() gradlePluginPortal() @@ -24,11 +15,12 @@ repositories { } dependencies { - implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:+") - implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.3.5") + //TODO Allow pulling from Versions.kt + implementation("com.github.johnrengelman", "shadow", "8.1.1") + implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin","1.5.6") - implementation("org.ow2.asm:asm:9.3") - implementation("org.ow2.asm:asm-tree:9.3") - implementation("com.dfsek.tectonic:common:4.2.0") - implementation("org.yaml:snakeyaml:1.27") + implementation("org.ow2.asm", "asm", "9.5") + implementation("org.ow2.asm", "asm-tree", "9.5") + implementation("com.dfsek.tectonic", "common", "4.2.0") + implementation("org.yaml", "snakeyaml", "2.2") } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 6c9e8a888..529d15726 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -4,53 +4,57 @@ object Versions { const val paralithic = "0.7.0" const val strata = "1.1.1" - const val cloud = "1.8.0" + const val cloud = "1.8.4" - const val slf4j = "1.7.36" - const val log4j_slf4j_impl = "2.14.1" + const val slf4j = "2.0.9" + const val log4j_slf4j_impl = "2.20.0" object Internal { - const val apacheText = "1.9" + const val shadow = "8.1.1" + const val apacheText = "1.10.0" const val jafama = "2.3.2" - const val apacheIO = "2.6" - const val fastutil = "8.5.6" + const val apacheIO = "2.14.0" + const val guava = "32.1.2-jre" + const val asm = "9.5" + const val snakeYml = "2.2" } } object Fabric { - const val fabricLoader = "0.14.8" - const val fabricAPI = "0.83.1+1.20.1" + const val fabricAPI = "0.89.3+${Mod.minecraft}" } object Quilt { - const val quiltLoader = "0.17.0" - const val fabricApi = "6.0.0-beta.3+0.76.0-1.19.4" + const val quiltLoader = "0.20.2" + const val fabricApi = "7.3.1+0.89.3-1.20.1" } object Mod { - const val mixin = "0.11.2+mixin.0.8.5" + const val mixin = "0.12.5+mixin.0.8.5" - const val minecraft = "1.20.1" + const val minecraft = "1.20.2" const val yarn = "$minecraft+build.2" - const val fabricLoader = "0.14.21" + const val fabricLoader = "0.14.22" - const val architecuryLoom = "0.12.0.290" - const val architecturyPlugin = "3.4-SNAPSHOT" + const val architecuryLoom = "1.3.357" + const val architecturyPlugin = "3.4.146" - const val loomQuiltflower = "1.7.1" + const val loomVineflower = "1.11.0" } object Forge { - const val forge = "${Mod.minecraft}-47.0.3" - const val burningwave = "12.53.0" + const val forge = "${Mod.minecraft}-48.0.13" + const val burningwave = "12.63.0" } object Bukkit { const val paper = "1.18.2-R0.1-SNAPSHOT" const val paperLib = "1.0.5" - const val minecraft = "1.20.1" + const val minecraft = "1.20.2" const val reflectionRemapper = "0.1.0-SNAPSHOT" - const val paperDevBundle = "1.20.1-R0.1-SNAPSHOT" + const val paperDevBundle = "1.20.2-R0.1-SNAPSHOT" + const val runPaper = "2.2.0" + const val paperWeight = "1.5.6" } object Sponge { @@ -61,8 +65,6 @@ object Versions { object CLI { const val nbt = "6.1" - const val logback = "1.2.9" - const val commonsIO = "2.7" - const val guava = "31.0.1-jre" + const val logback = "1.4.11" } } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7f93135c49b765f8051ef9d0a6055ff8e46073d8 100644 GIT binary patch delta 44866 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 G^I3GVOfiq z>O7#jBHBCj{}Ot}d~ruvSeBCx3G?QrscLFs%C%D7$+&TF&a-?aFZx^9>wJKROdVoo zY>&5vm~=i%jAV2CO|wHiP@1@Np$b>SfY4hPdofjMqSQcBS*fqE#*z_cL%nXJYIA0% zlx%FLwcTZ-z8nTV^`M``q=FYwaruDGMv#IYoGTB{>F}^x4|^*@bKaRzizvM~3-vN+ z+DwVu>kYH(sZQwRUQ$MMxjvw(?D0Yro4rR#wnO7;WBssO(TaSZ4r<_#PbKHrVQlWl z3!d4Sg8NKlJdX`}`fmB~-kREx50V4?L5zD?KGFjM!j$_u2)5sp2XusK_7tWRGe@vI zzIbbzXFB9h(^Yyot*IDy zMOMq6z(=rQ3<+nj6dL^F_+xk7OFNl0kUM$F#*w-9V%@1=nv?c&bt{f%taV)AD!n)6 z$9B3smTnfa*#6$(z2YlChEPja4~p)97>KPJzrkIz$W0|TR&xuSoyg9fkNbPN)Vz@8 zmb7TbNqvXCZGVl6X`JD~HJtF!Ati59n;eI5O)JLtT? zhM{)g%O@{dIs+4kE@GB0xM;tu*!i4x{DkJ+S1G5==bVsOD!wX!mz>&=a)x9dX~`C5 z1U{oH73hyyzT4nW{8m7F#G6#>u7(T0d-nb8L)&C{yH0!j3>nd$E?#qu%o?S4$cJTa zAUd<(d}w2Bmm7P!V}~(Fm*jm%Q@hh?TRV^7rq|qLa35Y;dxSx*wBlR$fZ!mF7f3SrrPA3ZtqNGz$SVrjiq1#qeq{DcQ1BYN{9U(t-F0Tnda*S zUA}n-wKHJ43MmX*xFd`B&a}p?l;AtM74ig!_@hFq8QKwc5pj0c@{agiVg(3!7=D*r zH_trf)P)1LAgqjJ0Dytv8oxJZI23j(++nsqLr3|7{t;0U#5doX6&1((x>seJry-Zp zLR(f0w?l#i2$s(;Rd8SYAuSRkKVH?@aCHrM=ijmQ z^AlTJ#M2Xqk1eX_{=>`a43FHB^LNRF-aqxvXWZY|Ttm?zBj&7OxbhVb7EWR zTNkFHjJ5#c!?Nx5X~SCg8^361sch+Zw<0bg@5h5+rsoMf9t3ozYb$BuvT#JN;*Uu= zYyp^4lwIyH;6a5XuHqXU=;!eb5Cwz~~aSAa%@Snqoz@ zJ{3S{jCWL@?@&RdsQS9$Bu4S;=;Z3P_o9*0VBCVL4Shs)Pb|Vn?g*UNJ{}t74=E@r zqRlq|R|o!sH|`>oR!Db@BJ}GhU67R{LURY-sAMKSX=Le-SFc4rHA%R?ry=~rpH~Xy zU6|M(yel~;G$oV}6r(pf(%9fIeG;qmRj912?)&oeXBrs6A|$gH3!!K21~_I0Y+k1& zF4*#t8Bkl63#FGhHn%GsFI$?MpxO%MLQLB00OC-B*z(Dgw*`E7zHDq0$Nh~#rvv0a zAom~8qQ$XvhIFucLQjApYB0S**JpiHu_qXCfl&B)MC(BTg8hLJLDcso`t=90B&9}j zN+g!fB%qafBTB4>!RcIWxT6|9I|xUzF`F*&fe{V|!ckcU2Tvj*lp>O$%6+`Zu6F2l z0BMB3gawYsaJKtS;pfSnVwUaKfUx$*h6hngC=l~&J`FFYX4JY2c@Af9c%DI%@YDhv z?LwS95}p~#B~SEdxN&$1H+Dv-WS=CBrMU3mx$8<$Cc5;ogf_((G)L4_n6T_L5IxBf zf|K=y?SVu-qJ%bwJP{gae0COkk~YK*Kph@)PvZCudEyW`2B{?m&m(%$CkRVPc+4XS zU9feST!YjSg=ZK&$phl%1uYCYpO`y&j${%8F#*~_tSJ|orsT92Jp6ZwN)VS1D};tm zQk!HF9)BQY)IeCb)bv+$^rvu*0|K?%oBv2QW;n4!Um`%jLPX<2K+pplZAgIQ_UHhF z0BmcVpK49x4iO6EL@6owAJbvwc_}0&P|8#!lUO>YoI(-oaxYXuG zA`j@nJd#yWdQt6*iF%6k12xj!29gMX1bK89JS`Kd{g$9^)uD45;t?Y1)V+92+})@s zJ_Y?KDl2MVKEU==K}k1=^hbBN_YTuuoe$Au&sL)M^@Hm1*62I$N01Zg&S1g)lWW}Q zJ;&GY!e4{Q$PPh4KLW-Q(QY3weh}XuyhtRoT1y07K#Hl}@DHXk&%Txk*i3{2tZixq z1%w6)PESQXxEl-+Amm&t(26meVHWI*6r^9ni&E`r z_P}Q^8Si_P3&Qva|IR1a5?0+yb$@RkfB$Ct<~c)1&51d!YBM`K1M&Dv*O4Vm$L|7y zzQ!DMEmBHJ8#t|{x==S!7weaJakZseL#e9m*imyT-OIrVc;68XK7Ej_J^=n8A?m~ z(lHfwfPN}KYqS`ZvR~S6a_vyCm9pcRQSObO&v^osbu~p0zt-WG1MKwS_O#*4rU`Z?NU(M`9bO zYe&>+JGkoyT5R@N24L-&JMNU{dt~v@QH55K0vzm-T?uyjy=4N_M!++{ zakmeUwsBpA;*lx3R^O6n(DrEw#LQcKF~7$MFdU3BgRoxfc4Z|igtKOhnJD+`KB=}jG(rGwvt!3!@EN5Y$W7xQwq{yUxocJb4N zHXYWZI&wYSUWG@2{=ksX`P0Wz^XL?PN$b^f)*pbvLiHi}ZQe!2hsi*`=}CizPgkEI zD7qGeOROtS-0kyAikD5FMmov|@>_HT67 z#9eWFwde_Ein)jYxc32K{c>v-z` zEV0X6J}VqcpA9s+MiLCT>;G9Fg zN4UPJSWlL)+I_vgv>DP@OSV@>-Sr08r;xg4Qptv6E(qa4xfP?pN zQT9Qf1UkpK>zra^hL32=&IMmv!g*RpkJ@%XhT@o=@7_K7{%HsyDCS%IE}zyl>Mb~#~b)Q z@%07F!lj8h)%?p*?#r~X3utV1QvfT3eUzHB#%M^LG*c7Q9P>kE3}WC1YunmJD>uUL zKFP~__-C|mwr~_U8}ckB@}1}CCsd$|VQ!`-c4sek?_}=DjL7VBYgZASE9UhpHVD7b5TaaJIoDbx5Hd$VvZ#xQIh(3EH5wz>P8)h#4ZFMBXU_#1Plpt zPeB*FO)+Y{sBG_4!zU#rK|uH@ej`m;&9;-7_XUWF-phu8PX5u0ClP^`faP$dVscjR zPPbxFYo#8G*x(Gq8}Dy;>aa?XP}tDee`$LFO_wOZ@sS}*65zjoZGTuI{{0DYndmdtY>0sDv`$!arm|EF5gv)PGl5ZHo%Z0~xsM$pu8;h6Qu# z!G@oxU;_d0Vv7-Mz}u#RdW!|zOC<*CZ^)M+rX9QT(I zbq5oSq}ZW?x*!G{sDQRRD1RK%P&9>w68P8bdjtpwp}#8*UYCZflKg_d-y#14zQ&6r zSPTwvq6Obc{;L)KUP?p!DSpFYfM~HOIKPkTA8i!E&g5_3foi)rP)^jpfZyYZnEwkp zE)`c)0(-v#C*hU-+ckJy8Zu1(i*&oo^haf^@2HEA!4>hrfPfHr2KQhB!^MDVhp>OZ z9d6IMD!|_Fz~NcK&)^%Jzr3^M5@G+hO8s6Ki9pDGT&PW+Ul{QUSRi)+?tff=am>NW z0k@(8JOl*aGuM0k|Iq68aZ&&6OTD@o?}77R$MeGfAQZ|l{^JS8#J;eJ1 z{!C%|85~va7aY()`ky0trZD}CBCiOhPy!K;kpJrAM^sP*#=z?#dbqy_hCSFsYXwX? z;s%!wgEtgyfE07Wzq|VO{GS7k)DHN0Ug&obc+fNaCGhiq3p&K51jzo`@cSkA^Y?DR z=wEU_|Dq`z{ulkPhR^>E+kZOvf5m_P-fd}!!T;0EpHe_}&$NL4+ZF#SCGzhcUc3B1 zD*FE`EaCu!+{XFi3;iVm0ST5V0e9lR&TxM(r6JJnK+rM+uxAr_e!>4QNdM24eil>ujAByt z59MNw;E#iT7UB1dLRI^lf(5Q+h#mpZaUBuLc;uHcVIA{-rg9tBai9>!e-#TGp#V?U z|7_c56N=Avb2;&wg7r@u8E#NPNiX~|w^@+zU_L(p3)n6plO*r6;4c7k< lf8PcAznehMh%YvN6Y;QNz$bhN2!8M@7YlrTKKg6x{{#N5%QpZ3 delta 40255 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3e7c5fc21..ac72c34e8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -org.gradle.jvmargs=-Xmx4096m \ No newline at end of file diff --git a/gradlew b/gradlew index 4f906e0c8..0adc8e1a5 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,99 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd32c..93e3f59f1 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/platforms/bukkit/build.gradle.kts b/platforms/bukkit/build.gradle.kts index dbc2d4125..9238647fe 100644 --- a/platforms/bukkit/build.gradle.kts +++ b/platforms/bukkit/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("xyz.jpenilla.run-paper") version "1.0.6" + id("xyz.jpenilla.run-paper") version Versions.Bukkit.runPaper } repositories { @@ -13,6 +13,7 @@ dependencies { shaded(project(":platforms:bukkit:nms:v1_19_R2", configuration = "reobf")) shaded(project(":platforms:bukkit:nms:v1_19_R3", configuration = "reobf")) shaded(project(":platforms:bukkit:nms:v1_20_R1", configuration = "reobf")) + shaded(project(":platforms:bukkit:nms:v1_20_R2", configuration = "reobf")) shaded("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper) } diff --git a/platforms/bukkit/common/build.gradle.kts b/platforms/bukkit/common/build.gradle.kts index a806ce672..d8b1671ef 100644 --- a/platforms/bukkit/common/build.gradle.kts +++ b/platforms/bukkit/common/build.gradle.kts @@ -5,14 +5,10 @@ repositories { dependencies { shadedApi(project(":common:implementation:base")) - api("org.slf4j:slf4j-api:1.8.0-beta4") { - because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.") - } - - compileOnly("io.papermc.paper:paper-api:${Versions.Bukkit.paper}") + compileOnly("io.papermc.paper", "paper-api", Versions.Bukkit.paper) shadedApi("io.papermc", "paperlib", Versions.Bukkit.paperLib) - shadedApi("com.google.guava:guava:30.0-jre") + shadedApi("com.google.guava", "guava", Versions.Libraries.Internal.guava) shadedApi("cloud.commandframework", "cloud-paper", Versions.Libraries.cloud) } diff --git a/platforms/bukkit/nms/v1_18_R2/build.gradle.kts b/platforms/bukkit/nms/v1_18_R2/build.gradle.kts index 2fa163cee..e3fc99195 100644 --- a/platforms/bukkit/nms/v1_18_R2/build.gradle.kts +++ b/platforms/bukkit/nms/v1_18_R2/build.gradle.kts @@ -7,7 +7,7 @@ repositories { dependencies { api(project(":platforms:bukkit:common")) paperDevBundle("1.18.2-R0.1-SNAPSHOT") - implementation("xyz.jpenilla", "reflection-remapper", "0.1.0-SNAPSHOT") + implementation("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper) } tasks { diff --git a/platforms/bukkit/nms/v1_19_R1/build.gradle.kts b/platforms/bukkit/nms/v1_19_R1/build.gradle.kts index 27f3b157e..9b301aa70 100644 --- a/platforms/bukkit/nms/v1_19_R1/build.gradle.kts +++ b/platforms/bukkit/nms/v1_19_R1/build.gradle.kts @@ -7,7 +7,7 @@ repositories { dependencies { api(project(":platforms:bukkit:common")) paperDevBundle("1.19-R0.1-SNAPSHOT") - implementation("xyz.jpenilla", "reflection-remapper", "0.1.0-SNAPSHOT") + implementation("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper) } tasks { diff --git a/platforms/bukkit/nms/v1_19_R2/build.gradle.kts b/platforms/bukkit/nms/v1_19_R2/build.gradle.kts index 687d651b6..c6f6d8205 100644 --- a/platforms/bukkit/nms/v1_19_R2/build.gradle.kts +++ b/platforms/bukkit/nms/v1_19_R2/build.gradle.kts @@ -7,7 +7,7 @@ repositories { dependencies { api(project(":platforms:bukkit:common")) paperDevBundle("1.19.3-R0.1-SNAPSHOT") - implementation("xyz.jpenilla", "reflection-remapper", "0.1.0-SNAPSHOT") + implementation("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper) } tasks { diff --git a/platforms/bukkit/nms/v1_19_R3/build.gradle.kts b/platforms/bukkit/nms/v1_19_R3/build.gradle.kts index 5b92e7ab2..4b2ad7d63 100644 --- a/platforms/bukkit/nms/v1_19_R3/build.gradle.kts +++ b/platforms/bukkit/nms/v1_19_R3/build.gradle.kts @@ -7,7 +7,7 @@ repositories { dependencies { api(project(":platforms:bukkit:common")) paperDevBundle("1.19.4-R0.1-SNAPSHOT") - implementation("xyz.jpenilla", "reflection-remapper", "0.1.0-SNAPSHOT") + implementation("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper) } tasks { diff --git a/platforms/bukkit/nms/v1_20_R1/build.gradle.kts b/platforms/bukkit/nms/v1_20_R1/build.gradle.kts index 96f9038d8..c3c0d9809 100644 --- a/platforms/bukkit/nms/v1_20_R1/build.gradle.kts +++ b/platforms/bukkit/nms/v1_20_R1/build.gradle.kts @@ -6,8 +6,8 @@ repositories { dependencies { api(project(":platforms:bukkit:common")) - paperDevBundle(Versions.Bukkit.paperDevBundle) - implementation("xyz.jpenilla", "reflection-remapper", "0.1.0-SNAPSHOT") + paperDevBundle("1.20.1-R0.1-SNAPSHOT") + implementation("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper) } tasks { diff --git a/platforms/bukkit/nms/v1_20_R2/build.gradle.kts b/platforms/bukkit/nms/v1_20_R2/build.gradle.kts new file mode 100644 index 000000000..6881c96ca --- /dev/null +++ b/platforms/bukkit/nms/v1_20_R2/build.gradle.kts @@ -0,0 +1,17 @@ +apply(plugin = "io.papermc.paperweight.userdev") + +repositories { + maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") +} + +dependencies { + api(project(":platforms:bukkit:common")) + paperDevBundle(Versions.Bukkit.paperDevBundle) + implementation("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper) +} + +tasks { + assemble { + dependsOn("reobfJar") + } +} \ No newline at end of file diff --git a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/AwfulBukkitHacks.java b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/AwfulBukkitHacks.java new file mode 100644 index 000000000..c30882958 --- /dev/null +++ b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/AwfulBukkitHacks.java @@ -0,0 +1,101 @@ +package com.dfsek.terra.bukkit.nms.v1_20_R1; + +import com.google.common.collect.ImmutableMap; +import com.mojang.serialization.Lifecycle; +import net.minecraft.core.Holder; +import net.minecraft.core.Holder.Reference; +import net.minecraft.core.MappedRegistry; +import net.minecraft.core.WritableRegistry; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.biome.Biome; +import org.bukkit.NamespacedKey; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import com.dfsek.terra.bukkit.world.BukkitPlatformBiome; +import com.dfsek.terra.registry.master.ConfigRegistry; + + +public class AwfulBukkitHacks { + private static final Logger LOGGER = LoggerFactory.getLogger(AwfulBukkitHacks.class); + + private static final Map> terraBiomeMap = new HashMap<>(); + + public static void registerBiomes(ConfigRegistry configRegistry) { + try { + LOGGER.info("Hacking biome registry..."); + WritableRegistry biomeRegistry = (WritableRegistry) RegistryFetcher.biomeRegistry(); + + Reflection.MAPPED_REGISTRY.setFrozen((MappedRegistry) biomeRegistry, false); + + configRegistry.forEach(pack -> pack.getRegistry(com.dfsek.terra.api.world.biome.Biome.class).forEach((key, biome) -> { + try { + BukkitPlatformBiome platformBiome = (BukkitPlatformBiome) biome.getPlatformBiome(); + NamespacedKey vanillaBukkitKey = platformBiome.getHandle().getKey(); + ResourceLocation vanillaMinecraftKey = new ResourceLocation(vanillaBukkitKey.getNamespace(), vanillaBukkitKey.getKey()); + Biome platform = NMSBiomeInjector.createBiome(biome, Objects.requireNonNull(biomeRegistry.get(vanillaMinecraftKey))); + + ResourceKey delegateKey = ResourceKey.create( + Registries.BIOME, + new ResourceLocation("terra", NMSBiomeInjector.createBiomeID(pack, key)) + ); + + Reference holder = biomeRegistry.register(delegateKey, platform, Lifecycle.stable()); + Reflection.REFERENCE.invokeBindValue(holder, platform); // IMPORTANT: bind holder. + + platformBiome.getContext().put(new NMSBiomeInfo(delegateKey)); + + terraBiomeMap.computeIfAbsent(vanillaMinecraftKey, i -> new ArrayList<>()).add(delegateKey.location()); + + LOGGER.debug("Registered biome: " + delegateKey); + } catch(NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) { + throw new RuntimeException(e); + } + })); + + Reflection.MAPPED_REGISTRY.setFrozen((MappedRegistry) biomeRegistry, true); // freeze registry again :) + + LOGGER.info("Doing tag garbage...."); + Map, List>> collect = biomeRegistry + .getTags() // streamKeysAndEntries + .collect(HashMap::new, + (map, pair) -> + map.put(pair.getFirst(), new ArrayList<>(pair.getSecond().stream().toList())), + HashMap::putAll); + + terraBiomeMap + .forEach((vb, terraBiomes) -> + NMSBiomeInjector.getEntry(biomeRegistry, vb).ifPresentOrElse( + vanilla -> terraBiomes.forEach( + tb -> NMSBiomeInjector.getEntry(biomeRegistry, tb).ifPresentOrElse( + terra -> { + LOGGER.debug("{} (vanilla for {}): {}", + vanilla.unwrapKey().orElseThrow().location(), + terra.unwrapKey().orElseThrow().location(), + vanilla.tags().toList()); + vanilla.tags() + .forEach(tag -> collect + .computeIfAbsent(tag, t -> new ArrayList<>()) + .add(terra)); + }, + () -> LOGGER.error("No such biome: {}", tb))), + () -> LOGGER.error("No vanilla biome: {}", vb))); + + biomeRegistry.resetTags(); + biomeRegistry.bindTags(ImmutableMap.copyOf(collect)); + + } catch(SecurityException | IllegalArgumentException exception) { + throw new RuntimeException(exception); + } + } +} + diff --git a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeInfo.java b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeInfo.java new file mode 100644 index 000000000..7d8203ce3 --- /dev/null +++ b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeInfo.java @@ -0,0 +1,10 @@ +package com.dfsek.terra.bukkit.nms.v1_20_R1; + +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.level.biome.Biome; + +import com.dfsek.terra.api.properties.Properties; + + +public record NMSBiomeInfo(ResourceKey biomeKey) implements Properties { +} diff --git a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeInjector.java b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeInjector.java new file mode 100644 index 000000000..d0c32c7d5 --- /dev/null +++ b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeInjector.java @@ -0,0 +1,83 @@ +package com.dfsek.terra.bukkit.nms.v1_20_R1; + +import net.minecraft.core.Holder; +import java.util.stream.Stream; +import net.minecraft.core.Registry; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.biome.BiomeSpecialEffects; + +import java.util.Locale; +import java.util.Objects; +import java.util.Optional; +import java.util.function.Function; + +import com.dfsek.terra.api.config.ConfigPack; +import com.dfsek.terra.bukkit.config.VanillaBiomeProperties; + +import static net.minecraft.world.level.biome.Biome.ClimateSettings; +import static net.minecraft.world.level.biome.Biome.Precipitation; + +public class NMSBiomeInjector { + + public static Optional> getEntry(Registry registry, ResourceLocation identifier) { + return registry.getOptional(identifier) + .flatMap(registry::getResourceKey) + .flatMap(registry::getHolder); + } + + public static Biome createBiome(com.dfsek.terra.api.world.biome.Biome biome, Biome vanilla) + throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { + Biome.BiomeBuilder builder = new Biome.BiomeBuilder(); + + builder + .downfall(vanilla.climateSettings.downfall()) + .temperature(vanilla.getBaseTemperature()) + .mobSpawnSettings(vanilla.getMobSettings()) + .generationSettings(vanilla.getGenerationSettings()); + + + BiomeSpecialEffects.Builder effects = new BiomeSpecialEffects.Builder(); + + effects.grassColorModifier(vanilla.getSpecialEffects().getGrassColorModifier()); + + VanillaBiomeProperties vanillaBiomeProperties = biome.getContext().get(VanillaBiomeProperties.class); + + effects.fogColor(Objects.requireNonNullElse(vanillaBiomeProperties.getFogColor(), vanilla.getFogColor())) + + .waterColor(Objects.requireNonNullElse(vanillaBiomeProperties.getWaterColor(), vanilla.getWaterColor())) + + .waterFogColor(Objects.requireNonNullElse(vanillaBiomeProperties.getWaterFogColor(), vanilla.getWaterFogColor())) + + .skyColor(Objects.requireNonNullElse(vanillaBiomeProperties.getSkyColor(), vanilla.getSkyColor())); + + if(vanillaBiomeProperties.getFoliageColor() == null) { + vanilla.getSpecialEffects().getFoliageColorOverride().ifPresent(effects::foliageColorOverride); + } else { + effects.foliageColorOverride(vanillaBiomeProperties.getFoliageColor()); + } + + if(vanillaBiomeProperties.getGrassColor() == null) { + vanilla.getSpecialEffects().getGrassColorOverride().ifPresent(effects::grassColorOverride); + } else { + // grass + effects.grassColorOverride(vanillaBiomeProperties.getGrassColor()); + } + + vanilla.getAmbientLoop().ifPresent(effects::ambientLoopSound); + vanilla.getAmbientAdditions().ifPresent(effects::ambientAdditionsSound); + vanilla.getAmbientMood().ifPresent(effects::ambientMoodSound); + vanilla.getBackgroundMusic().ifPresent(effects::backgroundMusic); + vanilla.getAmbientParticle().ifPresent(effects::ambientParticle); + + builder.specialEffects(effects.build()); + + return builder.build(); + } + + public static String createBiomeID(ConfigPack pack, com.dfsek.terra.api.registry.key.RegistryKey biomeID) { + return pack.getID() + .toLowerCase() + "/" + biomeID.getNamespace().toLowerCase(Locale.ROOT) + "/" + biomeID.getID().toLowerCase(Locale.ROOT); + } +} diff --git a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeProvider.java b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeProvider.java new file mode 100644 index 000000000..2f29ac3ef --- /dev/null +++ b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeProvider.java @@ -0,0 +1,47 @@ +package com.dfsek.terra.bukkit.nms.v1_20_R1; + +import com.mojang.serialization.Codec; +import net.minecraft.core.Holder; +import java.util.stream.Stream; +import net.minecraft.core.Registry; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.biome.BiomeSource; +import net.minecraft.world.level.biome.Climate.Sampler; +import org.jetbrains.annotations.NotNull; + +import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.bukkit.world.BukkitPlatformBiome; + + +public class NMSBiomeProvider extends BiomeSource { + private final BiomeProvider delegate; + private final long seed; + private final Registry biomeRegistry = RegistryFetcher.biomeRegistry(); + + public NMSBiomeProvider(BiomeProvider delegate, long seed) { + super(); + this.delegate = delegate; + this.seed = seed; + } + @Override + protected Stream> collectPossibleBiomes() { + return delegate.stream() + .map(biome -> RegistryFetcher.biomeRegistry() + .getHolderOrThrow(((BukkitPlatformBiome) biome.getPlatformBiome()).getContext() + .get(NMSBiomeInfo.class) + .biomeKey())); + } + + @Override + protected @NotNull Codec codec() { + return BiomeSource.CODEC; + } + + @Override + public @NotNull Holder getNoiseBiome(int x, int y, int z, @NotNull Sampler sampler) { + return biomeRegistry.getHolderOrThrow(((BukkitPlatformBiome) delegate.getBiome(x << 2, y << 2, z << 2, seed) + .getPlatformBiome()).getContext() + .get(NMSBiomeInfo.class) + .biomeKey()); + } +} diff --git a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSChunkGeneratorDelegate.java b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSChunkGeneratorDelegate.java new file mode 100644 index 000000000..120e9c533 --- /dev/null +++ b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSChunkGeneratorDelegate.java @@ -0,0 +1,170 @@ +package com.dfsek.terra.bukkit.nms.v1_20_R1; + +import com.mojang.serialization.Codec; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.WorldGenRegion; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.LevelHeightAccessor; +import net.minecraft.world.level.NoiseColumn; +import net.minecraft.world.level.StructureManager; +import net.minecraft.world.level.WorldGenLevel; +import net.minecraft.world.level.biome.BiomeManager; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.chunk.ChunkAccess; +import net.minecraft.world.level.chunk.ChunkGenerator; +import net.minecraft.world.level.levelgen.Beardifier; +import net.minecraft.world.level.levelgen.DensityFunction.SinglePointContext; +import net.minecraft.world.level.levelgen.GenerationStep.Carving; +import net.minecraft.world.level.levelgen.Heightmap.Types; +import net.minecraft.world.level.levelgen.RandomState; +import net.minecraft.world.level.levelgen.blending.Blender; +import org.bukkit.craftbukkit.v1_20_R2.block.data.CraftBlockData; +import org.jetbrains.annotations.NotNull; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; + +import com.dfsek.terra.api.config.ConfigPack; +import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.api.world.info.WorldProperties; +import com.dfsek.terra.bukkit.config.PreLoadCompatibilityOptions; +import com.dfsek.terra.bukkit.world.BukkitWorldProperties; +import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState; + + +public class NMSChunkGeneratorDelegate extends ChunkGenerator { + private static final Logger LOGGER = LoggerFactory.getLogger(NMSChunkGeneratorDelegate.class); + private final com.dfsek.terra.api.world.chunk.generation.ChunkGenerator delegate; + + private final ChunkGenerator vanilla; + private final ConfigPack pack; + + private final long seed; + + public NMSChunkGeneratorDelegate(ChunkGenerator vanilla, ConfigPack pack, NMSBiomeProvider biomeProvider, long seed) { + super(biomeProvider); + this.delegate = pack.getGeneratorProvider().newInstance(pack); + this.vanilla = vanilla; + this.pack = pack; + this.seed = seed; + } + + @Override + protected @NotNull Codec codec() { + return ChunkGenerator.CODEC; + } + + @Override + public void applyCarvers(@NotNull WorldGenRegion chunkRegion, long seed, @NotNull RandomState noiseConfig, @NotNull BiomeManager world, + @NotNull StructureManager structureAccessor, @NotNull ChunkAccess chunk, @NotNull Carving carverStep) { + // no-op + } + + @Override + public void buildSurface(@NotNull WorldGenRegion region, @NotNull StructureManager structures, @NotNull RandomState noiseConfig, + @NotNull ChunkAccess chunk) { + // no-op + } + + @Override + public void applyBiomeDecoration(@NotNull WorldGenLevel world, @NotNull ChunkAccess chunk, + @NotNull StructureManager structureAccessor) { + vanilla.applyBiomeDecoration(world, chunk, structureAccessor); + } + + @Override + public void spawnOriginalMobs(@NotNull WorldGenRegion region) { + vanilla.spawnOriginalMobs(region); + } + + @Override + public int getGenDepth() { + return vanilla.getGenDepth(); + } + + @Override + public @NotNull CompletableFuture fillFromNoise(@NotNull Executor executor, @NotNull Blender blender, + @NotNull RandomState noiseConfig, + @NotNull StructureManager structureAccessor, @NotNull ChunkAccess chunk) { + return vanilla.fillFromNoise(executor, blender, noiseConfig, structureAccessor, chunk) + .thenApply(c -> { + LevelAccessor level = Reflection.STRUCTURE_MANAGER.getLevel(structureAccessor); + BiomeProvider biomeProvider = pack.getBiomeProvider(); + PreLoadCompatibilityOptions compatibilityOptions = pack.getContext().get(PreLoadCompatibilityOptions.class); + if(compatibilityOptions.isBeard()) { + beard(structureAccessor, chunk, new BukkitWorldProperties(level.getMinecraftWorld().getWorld()), biomeProvider, compatibilityOptions); + } + return c; + }); + } + + private void beard(StructureManager structureAccessor, ChunkAccess chunk, WorldProperties world, BiomeProvider biomeProvider, + PreLoadCompatibilityOptions compatibilityOptions) { + Beardifier structureWeightSampler = Beardifier.forStructuresInChunk(structureAccessor, chunk.getPos()); + double threshold = compatibilityOptions.getBeardThreshold(); + double airThreshold = compatibilityOptions.getAirThreshold(); + int xi = chunk.getPos().x << 4; + int zi = chunk.getPos().z << 4; + for(int x = 0; x < 16; x++) { + for(int z = 0; z < 16; z++) { + int depth = 0; + for(int y = world.getMaxHeight(); y >= world.getMinHeight(); y--) { + double noise = structureWeightSampler.compute(new SinglePointContext(x + xi, y, z + zi)); + if(noise > threshold) { + chunk.setBlockState(new BlockPos(x, y, z), ((CraftBlockData) ((BukkitBlockState) delegate + .getPalette(x + xi, y, z + zi, world, biomeProvider) + .get(depth, x + xi, y, z + zi, world.getSeed())).getHandle()).getState(), false); + depth++; + } else if(noise < airThreshold) { + chunk.setBlockState(new BlockPos(x, y, z), Blocks.AIR.defaultBlockState(), false); + } else { + depth = 0; + } + } + } + } + } + + @Override + public int getSeaLevel() { + return vanilla.getSeaLevel(); + } + + @Override + public int getMinY() { + return vanilla.getMinY(); + } + + @Override + public int getBaseHeight(int x, int z, @NotNull Types heightmap, @NotNull LevelHeightAccessor world, @NotNull RandomState noiseConfig) { + WorldProperties properties = new NMSWorldProperties(seed, world); + int y = properties.getMaxHeight(); + BiomeProvider biomeProvider = pack.getBiomeProvider(); + while(y >= getMinY() && !heightmap.isOpaque().test( + ((CraftBlockData) delegate.getBlock(properties, x, y - 1, z, biomeProvider).getHandle()).getState())) { + y--; + } + return y; + } + + @Override + public @NotNull NoiseColumn getBaseColumn(int x, int z, @NotNull LevelHeightAccessor world, @NotNull RandomState noiseConfig) { + BlockState[] array = new BlockState[world.getHeight()]; + WorldProperties properties = new NMSWorldProperties(seed, world); + BiomeProvider biomeProvider = pack.getBiomeProvider(); + for(int y = properties.getMaxHeight() - 1; y >= properties.getMinHeight(); y--) { + array[y - properties.getMinHeight()] = ((CraftBlockData) delegate.getBlock(properties, x, y, z, biomeProvider) + .getHandle()).getState(); + } + return new NoiseColumn(getMinY(), array); + } + + @Override + public void addDebugScreenInfo(@NotNull List text, @NotNull RandomState noiseConfig, @NotNull BlockPos pos) { + + } +} diff --git a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSInitializer.java b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSInitializer.java new file mode 100644 index 000000000..6fb689ee7 --- /dev/null +++ b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSInitializer.java @@ -0,0 +1,15 @@ +package com.dfsek.terra.bukkit.nms.v1_20_R1; + +import org.bukkit.Bukkit; + +import com.dfsek.terra.bukkit.PlatformImpl; +import com.dfsek.terra.bukkit.nms.Initializer; + + +public class NMSInitializer implements Initializer { + @Override + public void initialize(PlatformImpl platform) { + AwfulBukkitHacks.registerBiomes(platform.getRawConfigRegistry()); + Bukkit.getPluginManager().registerEvents(new NMSInjectListener(), platform.getPlugin()); + } +} diff --git a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSInjectListener.java b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSInjectListener.java new file mode 100644 index 000000000..da8363c69 --- /dev/null +++ b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSInjectListener.java @@ -0,0 +1,48 @@ +package com.dfsek.terra.bukkit.nms.v1_20_R1; + +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.level.chunk.ChunkGenerator; +import org.bukkit.World; +import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.world.WorldInitEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.locks.ReentrantLock; + +import com.dfsek.terra.api.config.ConfigPack; +import com.dfsek.terra.bukkit.generator.BukkitChunkGeneratorWrapper; + + +public class NMSInjectListener implements Listener { + private static final Logger LOGGER = LoggerFactory.getLogger(NMSInjectListener.class); + private static final Set INJECTED = new HashSet<>(); + private static final ReentrantLock INJECT_LOCK = new ReentrantLock(); + + @EventHandler + public void onWorldInit(WorldInitEvent event) { + if(!INJECTED.contains(event.getWorld()) && + event.getWorld().getGenerator() instanceof BukkitChunkGeneratorWrapper bukkitChunkGeneratorWrapper) { + INJECT_LOCK.lock(); + INJECTED.add(event.getWorld()); + LOGGER.info("Preparing to take over the world: {}", event.getWorld().getName()); + CraftWorld craftWorld = (CraftWorld) event.getWorld(); + ServerLevel serverWorld = craftWorld.getHandle(); + + ConfigPack pack = bukkitChunkGeneratorWrapper.getPack(); + + ChunkGenerator vanilla = serverWorld.getChunkSource().getGenerator(); + NMSBiomeProvider provider = new NMSBiomeProvider(pack.getBiomeProvider(), craftWorld.getSeed()); + + serverWorld.getChunkSource().chunkMap.generator = new NMSChunkGeneratorDelegate(vanilla, pack, provider, craftWorld.getSeed()); + + LOGGER.info("Successfully injected into world."); + + INJECT_LOCK.unlock(); + } + } +} diff --git a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSWorldProperties.java b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSWorldProperties.java new file mode 100644 index 000000000..9754c7627 --- /dev/null +++ b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSWorldProperties.java @@ -0,0 +1,36 @@ +package com.dfsek.terra.bukkit.nms.v1_20_R1; + +import net.minecraft.world.level.LevelHeightAccessor; + +import com.dfsek.terra.api.world.info.WorldProperties; + + +public class NMSWorldProperties implements WorldProperties { + private final long seed; + private final LevelHeightAccessor height; + + public NMSWorldProperties(long seed, LevelHeightAccessor height) { + this.seed = seed; + this.height = height; + } + + @Override + public Object getHandle() { + return height; + } + + @Override + public long getSeed() { + return seed; + } + + @Override + public int getMaxHeight() { + return height.getMaxBuildHeight(); + } + + @Override + public int getMinHeight() { + return height.getMinBuildHeight(); + } +} diff --git a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/Reflection.java b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/Reflection.java new file mode 100644 index 000000000..6197e6e01 --- /dev/null +++ b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/Reflection.java @@ -0,0 +1,50 @@ +package com.dfsek.terra.bukkit.nms.v1_20_R1; + +import net.minecraft.core.Holder; +import net.minecraft.core.Holder.Reference; +import net.minecraft.core.MappedRegistry; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.StructureManager; +import xyz.jpenilla.reflectionremapper.ReflectionRemapper; +import xyz.jpenilla.reflectionremapper.proxy.ReflectionProxyFactory; +import xyz.jpenilla.reflectionremapper.proxy.annotation.FieldGetter; +import xyz.jpenilla.reflectionremapper.proxy.annotation.FieldSetter; +import xyz.jpenilla.reflectionremapper.proxy.annotation.MethodName; +import xyz.jpenilla.reflectionremapper.proxy.annotation.Proxies; + + +public class Reflection { + public static final MappedRegistryProxy MAPPED_REGISTRY; + public static final StructureManagerProxy STRUCTURE_MANAGER; + + public static final ReferenceProxy REFERENCE; + + static { + ReflectionRemapper reflectionRemapper = ReflectionRemapper.forReobfMappingsInPaperJar(); + ReflectionProxyFactory reflectionProxyFactory = ReflectionProxyFactory.create(reflectionRemapper, + Reflection.class.getClassLoader()); + + MAPPED_REGISTRY = reflectionProxyFactory.reflectionProxy(MappedRegistryProxy.class); + STRUCTURE_MANAGER = reflectionProxyFactory.reflectionProxy(StructureManagerProxy.class); + REFERENCE = reflectionProxyFactory.reflectionProxy(ReferenceProxy.class); + } + + + @Proxies(MappedRegistry.class) + public interface MappedRegistryProxy { + @FieldSetter("frozen") + void setFrozen(MappedRegistry instance, boolean frozen); + } + + @Proxies(StructureManager.class) + public interface StructureManagerProxy { + @FieldGetter("level") + LevelAccessor getLevel(StructureManager instance); + } + + @Proxies(Holder.Reference.class) + public interface ReferenceProxy { + @MethodName("bindValue") + void invokeBindValue(Reference instance, T value); + } +} diff --git a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/RegistryFetcher.java b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/RegistryFetcher.java new file mode 100644 index 000000000..0fad80ec7 --- /dev/null +++ b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/RegistryFetcher.java @@ -0,0 +1,24 @@ +package com.dfsek.terra.bukkit.nms.v1_20_R1; + +import net.minecraft.core.Registry; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceKey; +import net.minecraft.server.dedicated.DedicatedServer; +import net.minecraft.world.level.biome.Biome; +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_20_R2.CraftServer; + + +public class RegistryFetcher { + private static Registry getRegistry(ResourceKey> key) { + CraftServer craftserver = (CraftServer) Bukkit.getServer(); + DedicatedServer dedicatedserver = craftserver.getServer(); + return dedicatedserver + .registryAccess() + .registryOrThrow(key); + } + + public static Registry biomeRegistry() { + return getRegistry(Registries.BIOME); + } +} diff --git a/platforms/cli/build.gradle.kts b/platforms/cli/build.gradle.kts index e273422af..945bfbc0e 100644 --- a/platforms/cli/build.gradle.kts +++ b/platforms/cli/build.gradle.kts @@ -7,10 +7,10 @@ val javaMainClass = "com.dfsek.terra.cli.TerraCLI" dependencies { shadedApi(project(":common:implementation:base")) - shadedApi("commons-io:commons-io:${Versions.CLI.commonsIO}") + shadedApi("commons-io:commons-io:${Versions.Libraries.Internal.apacheIO}") shadedApi("com.github.Querz:NBT:${Versions.CLI.nbt}") - shadedImplementation("com.google.guava:guava:${Versions.CLI.guava}") + shadedImplementation("com.google.guava:guava:${Versions.Libraries.Internal.guava}") shadedImplementation("ch.qos.logback:logback-classic:${Versions.CLI.logback}") diff --git a/platforms/fabric/build.gradle.kts b/platforms/fabric/build.gradle.kts index 72abe20f9..ef49ab714 100644 --- a/platforms/fabric/build.gradle.kts +++ b/platforms/fabric/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("dev.architectury.loom") version Versions.Mod.architecuryLoom id("architectury-plugin") version Versions.Mod.architecturyPlugin - id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower + id("io.github.juuxel.loom-vineflower") version Versions.Mod.loomVineflower } architectury { @@ -23,7 +23,7 @@ dependencies { minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}") mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2") - modImplementation("net.fabricmc:fabric-loader:${Versions.Fabric.fabricLoader}") + modImplementation("net.fabricmc:fabric-loader:${Versions.Mod.fabricLoader}") setOf( "fabric-lifecycle-events-v1", @@ -47,15 +47,7 @@ loom { mixin { defaultRefmapName.set("terra.fabric.refmap.json") } - - launches { - named("client") { - property("fabric.log.level", "info") - } - named("server") { - property("fabric.log.level", "info") - } - } + } diff --git a/platforms/forge/build.gradle.kts b/platforms/forge/build.gradle.kts index 328d9d481..947879bb1 100644 --- a/platforms/forge/build.gradle.kts +++ b/platforms/forge/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("dev.architectury.loom") version Versions.Mod.architecuryLoom id("architectury-plugin") version Versions.Mod.architecturyPlugin - id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower + id("io.github.juuxel.loom-vineflower") version Versions.Mod.loomVineflower } architectury { @@ -37,16 +37,16 @@ loom { defaultRefmapName.set("terra.forge.refmap.json") } - launches { - named("client") { - property("fabric.log.level", "info") - property("mixin.env.disableRefMap", "true") - } - named("server") { - property("fabric.log.level", "info") - property("mixin.env.disableRefMap", "true") - } - } +// launches { +// named("client") { +// property("fabric.log.level", "info") +// property("mixin.env.disableRefMap", "true") +// } +// named("server") { +// property("fabric.log.level", "info") +// property("mixin.env.disableRefMap", "true") +// } +// } forge { convertAccessWideners.set(true) diff --git a/platforms/mixin-common/build.gradle.kts b/platforms/mixin-common/build.gradle.kts index b293f3cfa..49c2f5188 100644 --- a/platforms/mixin-common/build.gradle.kts +++ b/platforms/mixin-common/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("dev.architectury.loom") version Versions.Mod.architecuryLoom id("architectury-plugin") version Versions.Mod.architecturyPlugin - id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower + id("io.github.juuxel.loom-vineflower") version Versions.Mod.loomVineflower } loom { diff --git a/platforms/mixin-lifecycle/build.gradle.kts b/platforms/mixin-lifecycle/build.gradle.kts index e8b852dc5..1108046f3 100644 --- a/platforms/mixin-lifecycle/build.gradle.kts +++ b/platforms/mixin-lifecycle/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("dev.architectury.loom") version Versions.Mod.architecuryLoom id("architectury-plugin") version Versions.Mod.architecturyPlugin - id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower + id("io.github.juuxel.loom-vineflower") version Versions.Mod.loomVineflower } dependencies { diff --git a/platforms/quilt/build.gradle.kts b/platforms/quilt/build.gradle.kts index b8933e76e..31b4589d2 100644 --- a/platforms/quilt/build.gradle.kts +++ b/platforms/quilt/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("dev.architectury.loom") version Versions.Mod.architecuryLoom id("architectury-plugin") version Versions.Mod.architecturyPlugin - id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower + id("io.github.juuxel.loom-vineflower") version Versions.Mod.loomVineflower } architectury { @@ -47,15 +47,6 @@ loom { mixin { defaultRefmapName.set("terra.quilt.refmap.json") } - - launches { - named("client") { - property("fabric.log.level", "info") - } - named("server") { - property("fabric.log.level", "info") - } - } } From eb3994005c9cb8fcf7f1ea0a9b86e94dba66a78b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Sun, 1 Oct 2023 22:46:41 -0600 Subject: [PATCH 12/34] fix me being fucking stupid --- .../nms/{v1_20_R1 => v1_20_R2}/AwfulBukkitHacks.java | 2 +- .../bukkit/nms/{v1_20_R1 => v1_20_R2}/NMSBiomeInfo.java | 2 +- .../nms/{v1_20_R1 => v1_20_R2}/NMSBiomeInjector.java | 7 +------ .../nms/{v1_20_R1 => v1_20_R2}/NMSBiomeProvider.java | 2 +- .../{v1_20_R1 => v1_20_R2}/NMSChunkGeneratorDelegate.java | 2 +- .../bukkit/nms/{v1_20_R1 => v1_20_R2}/NMSInitializer.java | 2 +- .../nms/{v1_20_R1 => v1_20_R2}/NMSInjectListener.java | 2 +- .../nms/{v1_20_R1 => v1_20_R2}/NMSWorldProperties.java | 2 +- .../bukkit/nms/{v1_20_R1 => v1_20_R2}/Reflection.java | 2 +- .../bukkit/nms/{v1_20_R1 => v1_20_R2}/RegistryFetcher.java | 2 +- 10 files changed, 10 insertions(+), 15 deletions(-) rename platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/{v1_20_R1 => v1_20_R2}/AwfulBukkitHacks.java (99%) rename platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/{v1_20_R1 => v1_20_R2}/NMSBiomeInfo.java (83%) rename platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/{v1_20_R1 => v1_20_R2}/NMSBiomeInjector.java (91%) rename platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/{v1_20_R1 => v1_20_R2}/NMSBiomeProvider.java (97%) rename platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/{v1_20_R1 => v1_20_R2}/NMSChunkGeneratorDelegate.java (99%) rename platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/{v1_20_R1 => v1_20_R2}/NMSInitializer.java (90%) rename platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/{v1_20_R1 => v1_20_R2}/NMSInjectListener.java (97%) rename platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/{v1_20_R1 => v1_20_R2}/NMSWorldProperties.java (94%) rename platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/{v1_20_R1 => v1_20_R2}/Reflection.java (97%) rename platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/{v1_20_R1 => v1_20_R2}/RegistryFetcher.java (94%) diff --git a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/AwfulBukkitHacks.java b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/AwfulBukkitHacks.java similarity index 99% rename from platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/AwfulBukkitHacks.java rename to platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/AwfulBukkitHacks.java index c30882958..98d031de2 100644 --- a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/AwfulBukkitHacks.java +++ b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/AwfulBukkitHacks.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_20_R1; +package com.dfsek.terra.bukkit.nms.v1_20_R2; import com.google.common.collect.ImmutableMap; import com.mojang.serialization.Lifecycle; diff --git a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeInfo.java b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSBiomeInfo.java similarity index 83% rename from platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeInfo.java rename to platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSBiomeInfo.java index 7d8203ce3..fd415fb20 100644 --- a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeInfo.java +++ b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSBiomeInfo.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_20_R1; +package com.dfsek.terra.bukkit.nms.v1_20_R2; import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.biome.Biome; diff --git a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeInjector.java b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSBiomeInjector.java similarity index 91% rename from platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeInjector.java rename to platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSBiomeInjector.java index d0c32c7d5..3db3fcd25 100644 --- a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeInjector.java +++ b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSBiomeInjector.java @@ -1,9 +1,7 @@ -package com.dfsek.terra.bukkit.nms.v1_20_R1; +package com.dfsek.terra.bukkit.nms.v1_20_R2; import net.minecraft.core.Holder; -import java.util.stream.Stream; import net.minecraft.core.Registry; -import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.BiomeSpecialEffects; @@ -11,13 +9,10 @@ import net.minecraft.world.level.biome.BiomeSpecialEffects; import java.util.Locale; import java.util.Objects; import java.util.Optional; -import java.util.function.Function; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.bukkit.config.VanillaBiomeProperties; -import static net.minecraft.world.level.biome.Biome.ClimateSettings; -import static net.minecraft.world.level.biome.Biome.Precipitation; public class NMSBiomeInjector { diff --git a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeProvider.java b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSBiomeProvider.java similarity index 97% rename from platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeProvider.java rename to platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSBiomeProvider.java index 2f29ac3ef..a6025e03f 100644 --- a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSBiomeProvider.java +++ b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSBiomeProvider.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_20_R1; +package com.dfsek.terra.bukkit.nms.v1_20_R2; import com.mojang.serialization.Codec; import net.minecraft.core.Holder; diff --git a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSChunkGeneratorDelegate.java b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSChunkGeneratorDelegate.java similarity index 99% rename from platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSChunkGeneratorDelegate.java rename to platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSChunkGeneratorDelegate.java index 120e9c533..7b10e9418 100644 --- a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSChunkGeneratorDelegate.java +++ b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSChunkGeneratorDelegate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_20_R1; +package com.dfsek.terra.bukkit.nms.v1_20_R2; import com.mojang.serialization.Codec; import net.minecraft.core.BlockPos; diff --git a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSInitializer.java b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSInitializer.java similarity index 90% rename from platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSInitializer.java rename to platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSInitializer.java index 6fb689ee7..89cf3b878 100644 --- a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSInitializer.java +++ b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSInitializer.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_20_R1; +package com.dfsek.terra.bukkit.nms.v1_20_R2; import org.bukkit.Bukkit; diff --git a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSInjectListener.java b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSInjectListener.java similarity index 97% rename from platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSInjectListener.java rename to platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSInjectListener.java index da8363c69..7fd566251 100644 --- a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSInjectListener.java +++ b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSInjectListener.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_20_R1; +package com.dfsek.terra.bukkit.nms.v1_20_R2; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.chunk.ChunkGenerator; diff --git a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSWorldProperties.java b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSWorldProperties.java similarity index 94% rename from platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSWorldProperties.java rename to platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSWorldProperties.java index 9754c7627..117bda467 100644 --- a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/NMSWorldProperties.java +++ b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/NMSWorldProperties.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_20_R1; +package com.dfsek.terra.bukkit.nms.v1_20_R2; import net.minecraft.world.level.LevelHeightAccessor; diff --git a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/Reflection.java b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/Reflection.java similarity index 97% rename from platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/Reflection.java rename to platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/Reflection.java index 6197e6e01..15511b989 100644 --- a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/Reflection.java +++ b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/Reflection.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_20_R1; +package com.dfsek.terra.bukkit.nms.v1_20_R2; import net.minecraft.core.Holder; import net.minecraft.core.Holder.Reference; diff --git a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/RegistryFetcher.java b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/RegistryFetcher.java similarity index 94% rename from platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/RegistryFetcher.java rename to platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/RegistryFetcher.java index 0fad80ec7..fb18b3e17 100644 --- a/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R1/RegistryFetcher.java +++ b/platforms/bukkit/nms/v1_20_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R2/RegistryFetcher.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_20_R1; +package com.dfsek.terra.bukkit.nms.v1_20_R2; import net.minecraft.core.Registry; import net.minecraft.core.registries.Registries; From 2d2bba20b6827176ed3bcbc94b6f4f3db215cc72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Sun, 1 Oct 2023 23:22:44 -0600 Subject: [PATCH 13/34] found an untrue in read me --- README.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/README.md b/README.md index 77e2e511e..c0f9414b7 100644 --- a/README.md +++ b/README.md @@ -47,14 +47,7 @@ JARs are produced in `platforms//build/libs`. To run Minecraft with Terra in the IDE (for testing) use the following tasks: * Bukkit - * `installPaper` - Install a [Paper](https://github.com/PaperMC/Paper) test - server. (Only needs to be run once). - * `installPurpur` - Install a [Purpur](https://github.com/pl3xgaming/Purpur) - test server. (Only needs to be run once). - * `runPaper` - Run the Paper test server with Terra (`installPaper` must - have been run previously). - * `runPurpur` - Run the Purpur test server with Terra (`installPurpur` must - have been run previously). + * `runServer` - Run the Paper test server with Terra installed. * Fabric * `runClient` - Run a Minecraft Fabric client with Terra installed. * `runServer` - Run a Minecraft Fabric server with Terra installed. From 27eebf6a476c35e20101093e019e0f75cdff7871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Mon, 2 Oct 2023 00:21:09 -0600 Subject: [PATCH 14/34] Folia support Co-authored-by: Janet Blackquill --- buildSrc/src/main/kotlin/DependencyConfig.kt | 3 +++ buildSrc/src/main/kotlin/Versions.kt | 1 + platforms/bukkit/build.gradle.kts | 5 ++++- platforms/bukkit/common/build.gradle.kts | 1 + .../main/java/com/dfsek/terra/bukkit/BukkitEntity.java | 5 +++-- .../main/java/com/dfsek/terra/bukkit/BukkitPlayer.java | 5 +++-- .../main/java/com/dfsek/terra/bukkit/PlatformImpl.java | 4 +++- .../java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java | 9 ++++++++- .../main/java/com/dfsek/terra/bukkit/util/PaperUtil.java | 8 +++++--- platforms/bukkit/common/src/main/resources/plugin.yml | 1 + 10 files changed, 32 insertions(+), 10 deletions(-) diff --git a/buildSrc/src/main/kotlin/DependencyConfig.kt b/buildSrc/src/main/kotlin/DependencyConfig.kt index b0e7d32c4..fd87495a7 100644 --- a/buildSrc/src/main/kotlin/DependencyConfig.kt +++ b/buildSrc/src/main/kotlin/DependencyConfig.kt @@ -48,6 +48,9 @@ fun Project.configureDependencies() { maven("https://jitpack.io") { name = "JitPack" } + maven("https://nexuslite.gcnt.net/repos/other/") { + name = "devmart-other" + } } dependencies { diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 529d15726..401f03ace 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -50,6 +50,7 @@ object Versions { object Bukkit { const val paper = "1.18.2-R0.1-SNAPSHOT" const val paperLib = "1.0.5" + const val foliaLib = "0.2.5" const val minecraft = "1.20.2" const val reflectionRemapper = "0.1.0-SNAPSHOT" const val paperDevBundle = "1.20.2-R0.1-SNAPSHOT" diff --git a/platforms/bukkit/build.gradle.kts b/platforms/bukkit/build.gradle.kts index 9238647fe..c72bae196 100644 --- a/platforms/bukkit/build.gradle.kts +++ b/platforms/bukkit/build.gradle.kts @@ -3,7 +3,9 @@ plugins { } repositories { - maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") + maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") { + name = "sonatype" + } } dependencies { @@ -20,6 +22,7 @@ dependencies { tasks { shadowJar { relocate("io.papermc.lib", "com.dfsek.terra.lib.paperlib") + relocate("com.tcoded.folialib", "com.dfsek.terra.lib.folialib") relocate("com.google.common", "com.dfsek.terra.lib.google.common") relocate("org.apache.logging.slf4j", "com.dfsek.terra.lib.slf4j-over-log4j") exclude("org/slf4j/**") diff --git a/platforms/bukkit/common/build.gradle.kts b/platforms/bukkit/common/build.gradle.kts index d8b1671ef..e85f59e3a 100644 --- a/platforms/bukkit/common/build.gradle.kts +++ b/platforms/bukkit/common/build.gradle.kts @@ -8,6 +8,7 @@ dependencies { compileOnly("io.papermc.paper", "paper-api", Versions.Bukkit.paper) shadedApi("io.papermc", "paperlib", Versions.Bukkit.paperLib) + shadedApi("com.tcoded", "FoliaLib" , Versions.Bukkit.foliaLib) shadedApi("com.google.guava", "guava", Versions.Libraries.Internal.guava) shadedApi("cloud.commandframework", "cloud-paper", Versions.Libraries.cloud) diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java index f36436471..7ea9d2294 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java @@ -17,6 +17,7 @@ package com.dfsek.terra.bukkit; +import io.papermc.lib.PaperLib; import org.bukkit.Location; import com.dfsek.terra.api.entity.Entity; @@ -44,14 +45,14 @@ public class BukkitEntity implements Entity { @Override public void position(Vector3 location) { - entity.teleport(BukkitAdapter.adapt(location).toLocation(entity.getWorld())); + PaperLib.teleportAsync(entity, BukkitAdapter.adapt(location).toLocation(entity.getWorld())); } @Override public void world(ServerWorld world) { Location newLoc = entity.getLocation().clone(); newLoc.setWorld(BukkitAdapter.adapt(world)); - entity.teleport(newLoc); + PaperLib.teleportAsync(entity, newLoc); } @Override diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java index 7d8b0a5f0..c2958d44c 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java @@ -17,6 +17,7 @@ package com.dfsek.terra.bukkit; +import io.papermc.lib.PaperLib; import org.bukkit.Location; import com.dfsek.terra.api.entity.Player; @@ -45,14 +46,14 @@ public class BukkitPlayer implements Player { @Override public void position(Vector3 location) { - delegate.teleport(BukkitAdapter.adapt(location).toLocation(delegate.getWorld())); + PaperLib.teleportAsync(delegate, BukkitAdapter.adapt(location).toLocation(delegate.getWorld())); } @Override public void world(ServerWorld world) { Location newLoc = delegate.getLocation().clone(); newLoc.setWorld(BukkitAdapter.adapt(world)); - delegate.teleport(newLoc); + PaperLib.teleportAsync(delegate, newLoc); } @Override diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java index bba0e1bc1..189f1d12f 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java @@ -20,6 +20,7 @@ package com.dfsek.terra.bukkit; import com.dfsek.tectonic.api.TypeRegistry; import com.dfsek.tectonic.api.depth.DepthTracker; import com.dfsek.tectonic.api.exception.LoadException; +import com.tcoded.folialib.wrapper.task.WrappedTask; import org.bukkit.Bukkit; import org.bukkit.entity.EntityType; import org.jetbrains.annotations.NotNull; @@ -29,6 +30,7 @@ import org.slf4j.LoggerFactory; import java.io.File; import java.util.List; import java.util.Locale; +import java.util.function.Consumer; import com.dfsek.terra.AbstractPlatform; import com.dfsek.terra.api.addon.BaseAddon; @@ -85,7 +87,7 @@ public class PlatformImpl extends AbstractPlatform { @Override public void runPossiblyUnsafeTask(@NotNull Runnable task) { - Bukkit.getScheduler().runTask(plugin, task); + plugin.getFoliaLib().getImpl().runAsync(task); } @Override diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java index 6390444f2..0bbf6e2e5 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java @@ -42,6 +42,7 @@ import com.dfsek.terra.bukkit.nms.Initializer; import com.dfsek.terra.bukkit.util.PaperUtil; import com.dfsek.terra.bukkit.util.VersionUtil; import com.dfsek.terra.bukkit.world.BukkitAdapter; +import com.tcoded.folialib.FoliaLib; public class TerraBukkitPlugin extends JavaPlugin { @@ -50,6 +51,8 @@ public class TerraBukkitPlugin extends JavaPlugin { private final PlatformImpl platform = new PlatformImpl(this); private final Map generatorMap = new HashMap<>(); + private final FoliaLib foliaLib = new FoliaLib(this); + @Override public void onEnable() { if(!doVersionCheck()) { @@ -150,7 +153,7 @@ public class TerraBukkitPlugin extends JavaPlugin { """.strip()); }; runnable.run(); - Bukkit.getScheduler().scheduleAsyncDelayedTask(this, runnable, 200L); + getFoliaLib().getImpl().runLaterAsync(runnable, 200L); // Bukkit.shutdown(); // we're not *that* evil Bukkit.getPluginManager().disablePlugin(this); return false; @@ -177,4 +180,8 @@ public class TerraBukkitPlugin extends JavaPlugin { return pack.getGeneratorProvider().newInstance(pack); }), platform.getRawConfigRegistry().getByID(id).orElseThrow(), platform.getWorldHandle().air()); } + + public FoliaLib getFoliaLib() { + return foliaLib; + } } diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/util/PaperUtil.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/util/PaperUtil.java index d7b06b93d..b5c029000 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/util/PaperUtil.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/util/PaperUtil.java @@ -17,6 +17,8 @@ package com.dfsek.terra.bukkit.util; +import com.dfsek.terra.bukkit.TerraBukkitPlugin; + import io.papermc.lib.PaperLib; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; @@ -25,10 +27,10 @@ import static io.papermc.lib.PaperLib.suggestPaper; public final class PaperUtil { - public static void checkPaper(JavaPlugin main) { - Bukkit.getScheduler().scheduleSyncDelayedTask(main, () -> { + public static void checkPaper(TerraBukkitPlugin plugin) { + plugin.getFoliaLib().getImpl().runLaterAsync(() -> { if(!PaperLib.isPaper()) { - suggestPaper(main); + suggestPaper(plugin); } }, 100L); } diff --git a/platforms/bukkit/common/src/main/resources/plugin.yml b/platforms/bukkit/common/src/main/resources/plugin.yml index 15f937a48..d4bfd5534 100644 --- a/platforms/bukkit/common/src/main/resources/plugin.yml +++ b/platforms/bukkit/common/src/main/resources/plugin.yml @@ -6,3 +6,4 @@ author: dfsek website: "@WIKI@" api-version: "1.13" description: "@DESCRIPTION@" +folia-supported: true From 86ba52850d59963fb37e7493494a85d847a53f88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Mon, 2 Oct 2023 00:41:54 -0600 Subject: [PATCH 15/34] update strata --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 529d15726..85209d089 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -2,7 +2,7 @@ object Versions { object Libraries { const val tectonic = "4.2.0" const val paralithic = "0.7.0" - const val strata = "1.1.1" + const val strata = "1.3.2" const val cloud = "1.8.4" From 0ee5f4997258d8c8d1a35a232c005bc45d0de208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Mon, 2 Oct 2023 01:37:47 -0600 Subject: [PATCH 16/34] quilt --- platforms/quilt/src/main/resources/quilt.mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/quilt/src/main/resources/quilt.mod.json b/platforms/quilt/src/main/resources/quilt.mod.json index 0f53988ec..3f1ad2232 100644 --- a/platforms/quilt/src/main/resources/quilt.mod.json +++ b/platforms/quilt/src/main/resources/quilt.mod.json @@ -39,7 +39,7 @@ }, { "id": "minecraft", - "version": "1.19.x" + "version": "1.20.x" }, { "id": "quilted_fabric_api", From 79b3b3466910b433e65d8b8c1504dadb606d71d1 Mon Sep 17 00:00:00 2001 From: Astrash Date: Tue, 3 Oct 2023 09:51:39 +1100 Subject: [PATCH 17/34] Add slant API for noise3d --- .../generation/NoiseChunkGenerator3D.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java index f0f6de8e3..e98dcc316 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java @@ -155,6 +155,16 @@ public class NoiseChunkGenerator3D implements ChunkGenerator { return biomeProvider.getBiome(x, y, z, world.getSeed()).getContext().get(paletteInfoPropertyKey).paletteHolder().getPalette(y); } + public double getSlant(int x, int y, int z, WorldProperties world, BiomeProvider biomeProvider) { + int fdX = FastMath.floorMod(x, 16); + int fdZ = FastMath.floorMod(z, 16); + return biomeProvider.getBiome(x, y, z, world.getSeed()) + .getContext() + .get(paletteInfoPropertyKey) + .slantHolder() + .calculateSlant(samplerCache.get(x, z, world, biomeProvider), fdX, y, fdZ); + } + public SamplerProvider samplerProvider() { return samplerCache; } From f896a9a27832ad92ee067746f153335befd3ffb1 Mon Sep 17 00:00:00 2001 From: Astrash Date: Tue, 3 Oct 2023 11:01:50 +1100 Subject: [PATCH 18/34] Bump noise3d addon minor version --- common/addons/chunk-generator-noise-3d/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/addons/chunk-generator-noise-3d/build.gradle.kts b/common/addons/chunk-generator-noise-3d/build.gradle.kts index 685cc848c..193c9f00b 100644 --- a/common/addons/chunk-generator-noise-3d/build.gradle.kts +++ b/common/addons/chunk-generator-noise-3d/build.gradle.kts @@ -1,4 +1,4 @@ -version = version("1.1.0") +version = version("1.2.0") dependencies { compileOnlyApi(project(":common:addons:manifest-addon-loader")) From f1ea8074de8af6c01bfcd361019890461eb7acc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Tue, 3 Oct 2023 11:54:04 -0600 Subject: [PATCH 19/34] config-ore-v2 --- common/addons/config-ore-v2/LICENSE | 21 ++ common/addons/config-ore-v2/README.md | 3 + common/addons/config-ore-v2/build.gradle.kts | 11 + .../com/dfsek/terra/addons/ore/OreAddon.java | 33 +++ .../dfsek/terra/addons/ore/OreConfigType.java | 37 ++++ .../dfsek/terra/addons/ore/OreFactory.java | 24 +++ .../dfsek/terra/addons/ore/OreTemplate.java | 80 ++++++++ .../terra/addons/ore/ores/VanillaOre.java | 188 ++++++++++++++++++ .../src/main/resources/terra.addon.yml | 12 ++ 9 files changed, 409 insertions(+) create mode 100644 common/addons/config-ore-v2/LICENSE create mode 100644 common/addons/config-ore-v2/README.md create mode 100644 common/addons/config-ore-v2/build.gradle.kts create mode 100644 common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java create mode 100644 common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java create mode 100644 common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreFactory.java create mode 100644 common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java create mode 100644 common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java create mode 100644 common/addons/config-ore-v2/src/main/resources/terra.addon.yml diff --git a/common/addons/config-ore-v2/LICENSE b/common/addons/config-ore-v2/LICENSE new file mode 100644 index 000000000..64c1cd516 --- /dev/null +++ b/common/addons/config-ore-v2/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020-2021 Polyhedral Development + +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. \ No newline at end of file diff --git a/common/addons/config-ore-v2/README.md b/common/addons/config-ore-v2/README.md new file mode 100644 index 000000000..1b72835ea --- /dev/null +++ b/common/addons/config-ore-v2/README.md @@ -0,0 +1,3 @@ +# config-ore + +Registers the default configuration for Terra Ores, `ORE`. \ No newline at end of file diff --git a/common/addons/config-ore-v2/build.gradle.kts b/common/addons/config-ore-v2/build.gradle.kts new file mode 100644 index 000000000..3799c6be1 --- /dev/null +++ b/common/addons/config-ore-v2/build.gradle.kts @@ -0,0 +1,11 @@ +version = version("2.0.0") + +dependencies { + compileOnlyApi(project(":common:addons:manifest-addon-loader")) + implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama) + testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama) +} + +tasks.named("shadowJar") { + relocate("net.jafama", "com.dfsek.terra.addons.ore.lib.jafama") +} diff --git a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java new file mode 100644 index 000000000..4e6f1751b --- /dev/null +++ b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2020-2021 Polyhedral Development + * + * The Terra Core Addons are licensed under the terms of the MIT License. For more details, + * reference the LICENSE file in this module's root directory. + */ + +package com.dfsek.terra.addons.ore; + +import com.dfsek.terra.addons.manifest.api.AddonInitializer; +import com.dfsek.terra.api.Platform; +import com.dfsek.terra.api.addon.BaseAddon; +import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; +import com.dfsek.terra.api.event.functional.FunctionalEventHandler; +import com.dfsek.terra.api.inject.annotations.Inject; + + +public class OreAddon implements AddonInitializer { + @Inject + private Platform platform; + + @Inject + private BaseAddon addon; + + @Override + public void initialize() { + platform.getEventManager() + .getHandler(FunctionalEventHandler.class) + .register(addon, ConfigPackPreLoadEvent.class) + .then(event -> event.getPack().registerConfigType(new OreConfigType(), addon.key("ORE"), 1)) + .failThrough(); + } +} diff --git a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java new file mode 100644 index 000000000..2bdc87bdd --- /dev/null +++ b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2020-2021 Polyhedral Development + * + * The Terra Core Addons are licensed under the terms of the MIT License. For more details, + * reference the LICENSE file in this module's root directory. + */ + +package com.dfsek.terra.addons.ore; + +import com.dfsek.terra.api.Platform; +import com.dfsek.terra.api.config.ConfigFactory; +import com.dfsek.terra.api.config.ConfigPack; +import com.dfsek.terra.api.config.ConfigType; +import com.dfsek.terra.api.structure.Structure; +import com.dfsek.terra.api.util.reflection.TypeKey; + + +public class OreConfigType implements ConfigType { + public static final TypeKey ORE_TYPE_TOKEN = new TypeKey<>() { + }; + private final OreFactory factory = new OreFactory(); + + @Override + public OreTemplate getTemplate(ConfigPack pack, Platform platform) { + return new OreTemplate(); + } + + @Override + public ConfigFactory getFactory() { + return factory; + } + + @Override + public TypeKey getTypeKey() { + return ORE_TYPE_TOKEN; + } +} diff --git a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreFactory.java b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreFactory.java new file mode 100644 index 000000000..9d8b1055a --- /dev/null +++ b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreFactory.java @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2020-2021 Polyhedral Development + * + * The Terra Core Addons are licensed under the terms of the MIT License. For more details, + * reference the LICENSE file in this module's root directory. + */ + +package com.dfsek.terra.addons.ore; + +import com.dfsek.terra.addons.ore.ores.VanillaOre; +import com.dfsek.terra.api.Platform; +import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.config.ConfigFactory; +import com.dfsek.terra.api.structure.Structure; + + +public class OreFactory implements ConfigFactory { + @Override + public VanillaOre build(OreTemplate config, Platform platform) { + BlockState m = config.getMaterial(); + return new VanillaOre(m, config.getSize(), config.getReplaceable(), config.doPhysics(), config.isExposed(), + config.getMaterialOverrides()); + } +} diff --git a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java new file mode 100644 index 000000000..8bfbc82d3 --- /dev/null +++ b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2020-2021 Polyhedral Development + * + * The Terra Core Addons are licensed under the terms of the MIT License. For more details, + * reference the LICENSE file in this module's root directory. + */ + +package com.dfsek.terra.addons.ore; + +import com.dfsek.tectonic.api.config.template.annotations.Default; +import com.dfsek.tectonic.api.config.template.annotations.Description; +import com.dfsek.tectonic.api.config.template.annotations.Final; +import com.dfsek.tectonic.api.config.template.annotations.Value; + +import java.util.HashMap; +import java.util.Map; + +import com.dfsek.terra.api.block.BlockType; +import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.config.AbstractableTemplate; +import com.dfsek.terra.api.config.meta.Meta; +import com.dfsek.terra.api.util.collection.MaterialSet; + + +@SuppressWarnings({ "unused", "FieldMayBeFinal" }) +public class OreTemplate implements AbstractableTemplate { + @Value("id") + @Final + private String id; + + @Value("material") + private @Meta BlockState material; + + @Value("material-overrides") + @Default + private @Meta Map<@Meta BlockType, @Meta BlockState> materials = new HashMap<>(); + + @Value("replace") + private @Meta MaterialSet replaceable; + + @Value("physics") + @Default + private @Meta boolean physics = false; + + @Value("size") + private @Meta double size; + + @Value("exposed") + @Default + @Description("The chance that ore blocks bordering air will be exposed. 0 = 0%, 1 = 100%") + private @Meta double exposed = 1; + + public boolean doPhysics() { + return physics; + } + + public double getSize() { + return size; + } + + public BlockState getMaterial() { + return material; + } + + public MaterialSet getReplaceable() { + return replaceable; + } + + public String getID() { + return id; + } + + public Map getMaterialOverrides() { + return materials; + } + + public double isExposed() { + return exposed; + } +} diff --git a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java new file mode 100644 index 000000000..32f5c7c22 --- /dev/null +++ b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java @@ -0,0 +1,188 @@ +/* + * Copyright (c) 2020-2021 Polyhedral Development + * + * The Terra Core Addons are licensed under the terms of the MIT License. For more details, + * reference the LICENSE file in this module's root directory. + */ + +package com.dfsek.terra.addons.ore.ores; + +import net.jafama.FastMath; + +import java.util.BitSet; +import java.util.Map; +import java.util.Random; + +import com.dfsek.terra.api.block.BlockType; +import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.structure.Structure; +import com.dfsek.terra.api.util.Rotation; +import com.dfsek.terra.api.util.collection.MaterialSet; +import com.dfsek.terra.api.util.vector.Vector3Int; +import com.dfsek.terra.api.world.WritableWorld; + + +public class VanillaOre implements Structure { + + private final BlockState material; + + private final double size; + private final MaterialSet replaceable; + private final boolean applyGravity; + private final double exposed; + private final Map materials; + + public VanillaOre(BlockState material, double size, MaterialSet replaceable, boolean applyGravity, + double exposed, Map materials) { + this.material = material; + this.size = size; + this.replaceable = replaceable; + this.applyGravity = applyGravity; + this.exposed = exposed; + this.materials = materials; + } + + protected static boolean shouldNotDiscard(Random random, double chance) { + if(chance <= 0.0F) { + return true; + } else if(chance >= 1.0F) { + return false; + } else { + return random.nextFloat() >= chance; + } + } + + public static double lerp(double t, double v0, double v1) { + return v0 + t * (v1 - v0); + } + + @Override + public boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation) { + float f = random.nextFloat() * (float) Math.PI; + double g = size / 8.0F; + int i = (int) FastMath.ceil((size / 16.0F * 2.0F + 1.0F) / 2.0F); + double startX = (double) location.getX() + FastMath.sin(f) * g; + double endX = (double) location.getX() - FastMath.sin(f) * g; + double startZ = (double) location.getZ() + FastMath.cos(f) * g; + double endZ = (double) location.getZ() - FastMath.cos(f) * g; + double startY = location.getY() + random.nextInt(3) - 2; + double endY = location.getY() + random.nextInt(3) - 2; + int x = (int) (location.getX() - FastMath.ceil(g) - i); + int y = location.getY() - 2 - i; + int z = (int) (location.getZ() - FastMath.ceil(g) - i); + int horizontalSize = (int) (2 * (FastMath.ceil(g) + i)); + int verticalSize = 2 * (2 + i); + + int i1 = 0; + BitSet bitSet = new BitSet(horizontalSize * verticalSize * horizontalSize); + + int j1 = (int) size; + double[] ds = new double[j1 * 4]; + + for(int k1 = 0; k1 < j1; ++k1) { + float f1 = (float) k1 / (float) j1; + double d1 = lerp(f1, startX, endX); + double e1 = lerp(f1, startY, endY); + double g1 = lerp(f1, startZ, endZ); + double h1 = random.nextDouble() * (double) j1 / 16.0; + double l1 = ((FastMath.sin((float) Math.PI * f1) + 1.0F) * h1 + 1.0) / 2.0; + ds[k1 * 4] = d1; + ds[k1 * 4 + 1] = e1; + ds[k1 * 4 + 2] = g1; + ds[k1 * 4 + 3] = l1; + } + + for(int k1 = 0; k1 < j1 - 1; ++k1) { + if(!(ds[k1 * 4 + 3] <= 0.0)) { + for(int m1 = k1 + 1; m1 < j1; ++m1) { + if(!(ds[m1 * 4 + 3] <= 0.0)) { + double d1 = ds[k1 * 4] - ds[m1 * 4]; + double e1 = ds[k1 * 4 + 1] - ds[m1 * 4 + 1]; + double g1 = ds[k1 * 4 + 2] - ds[m1 * 4 + 2]; + double h1 = ds[k1 * 4 + 3] - ds[m1 * 4 + 3]; + if(h1 * h1 > d1 * d1 + e1 * e1 + g1 * g1) { + if(h1 > 0.0) { + ds[m1 * 4 + 3] = -1.0; + } else { + ds[k1 * 4 + 3] = -1.0; + } + } + } + } + } + } + + for(int m1 = 0; m1 < j1; ++m1) { + double d1 = ds[m1 * 4 + 3]; + if(!(d1 < 0.0)) { + double e1 = ds[m1 * 4]; + double g1 = ds[m1 * 4 + 1]; + double h1 = ds[m1 * 4 + 2]; + int n1 = (int) FastMath.max(FastMath.floor(e1 - d1), x); + int o1 = (int) FastMath.max(FastMath.floor(g1 - d1), y); + int p1 = (int) FastMath.max(FastMath.floor(h1 - d1), z); + int q1 = (int) FastMath.max(FastMath.floor(e1 + d1), n1); + int r1 = (int) FastMath.max(FastMath.floor(g1 + d1), o1); + int s1 = (int) FastMath.max(FastMath.floor(h1 + d1), p1); + + for(int t1 = n1; t1 <= q1; ++t1) { + double u1 = ((double) t1 + 0.5 - e1) / d1; + if(u1 * u1 < 1.0) { + for(int v1 = o1; v1 <= r1; ++v1) { + double w1 = ((double) v1 + 0.5 - g1) / d1; + if(u1 * u1 + w1 * w1 < 1.0) { + for(int aa = p1; aa <= s1; ++aa) { + double ab = ((double) aa + 0.5 - h1) / d1; + if(u1 * u1 + w1 * w1 + ab * ab < 1.0 && !(v1 < world.getMinHeight() || v1 >= world.getMaxHeight())) { + int ac = t1 - x + (v1 - y) * horizontalSize + (aa - z) * horizontalSize * verticalSize; + if(!bitSet.get(ac)) { + bitSet.set(ac); + + BlockType block = world.getBlockState(x, y, z).getBlockType(); + + if(shouldPlace(block, random, world, t1, v1, aa)) { + world.setBlockState(t1, v1, aa, getMaterial(block), isApplyGravity()); + ++i1; + break; + } + } + } + } + } + } + } + } + } + } + + + return i1 > 0; + } + + public boolean shouldPlace(BlockType type, Random random, WritableWorld world, int x, int y, int z) { + if(!getReplaceable().contains(type)) { + return false; + } else if(shouldNotDiscard(random, exposed)) { + return true; + } else { + return !(world.getBlockState(x, y, z - 1).isAir() || + world.getBlockState(x, y, z + 1).isAir() || + world.getBlockState(x, y - 1, z).isAir() || + world.getBlockState(x, y + 1, z).isAir() || + world.getBlockState(x - 1, y, z).isAir() || + world.getBlockState(x + 1, y, z).isAir()); + } + } + + public BlockState getMaterial(BlockType replace) { + return materials.getOrDefault(replace, material); + } + + public MaterialSet getReplaceable() { + return replaceable; + } + + public boolean isApplyGravity() { + return applyGravity; + } +} diff --git a/common/addons/config-ore-v2/src/main/resources/terra.addon.yml b/common/addons/config-ore-v2/src/main/resources/terra.addon.yml new file mode 100644 index 000000000..7edad8d07 --- /dev/null +++ b/common/addons/config-ore-v2/src/main/resources/terra.addon.yml @@ -0,0 +1,12 @@ +schema-version: 1 +contributors: + - Terra contributors +id: config-ore-v2 +version: @VERSION@ +entrypoints: + - "com.dfsek.terra.addons.ore.OreAddon" +website: + issues: https://github.com/PolyhedralDev/Terra/issues + source: https://github.com/PolyhedralDev/Terra + docs: https://terra.polydev.org +license: MIT License \ No newline at end of file From 200281f1401c9a324384182acd3e9ee05bf6aa6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Tue, 3 Oct 2023 11:58:25 -0600 Subject: [PATCH 20/34] dep orev1 --- .../src/main/java/com/dfsek/terra/addons/ore/OreAddon.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java index 4e6f1751b..7ac64ef2b 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java @@ -14,8 +14,13 @@ import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; import com.dfsek.terra.api.inject.annotations.Inject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class OreAddon implements AddonInitializer { + private static final Logger logger = LoggerFactory.getLogger(OreAddon.class); + @Inject private Platform platform; @@ -29,5 +34,7 @@ public class OreAddon implements AddonInitializer { .register(addon, ConfigPackPreLoadEvent.class) .then(event -> event.getPack().registerConfigType(new OreConfigType(), addon.key("ORE"), 1)) .failThrough(); + + logger.warn("The ore-config addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the ore-config-v2 addon for future pack development instead."); } } From 0c1a6efc72ba077a6e1f0b1691229260d7e81f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Tue, 3 Oct 2023 19:42:15 -0600 Subject: [PATCH 21/34] refractor classes --- .../main/java/com/dfsek/terra/addons/ore/{ => v2}/OreAddon.java | 0 .../java/com/dfsek/terra/addons/ore/{ => v2}/OreConfigType.java | 0 .../java/com/dfsek/terra/addons/ore/{ => v2}/OreFactory.java | 0 .../java/com/dfsek/terra/addons/ore/{ => v2}/OreTemplate.java | 0 .../com/dfsek/terra/addons/ore/{ => v2}/ores/VanillaOre.java | 0 common/addons/config-ore-v2/src/main/resources/terra.addon.yml | 2 +- 6 files changed, 1 insertion(+), 1 deletion(-) rename common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/{ => v2}/OreAddon.java (100%) rename common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/{ => v2}/OreConfigType.java (100%) rename common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/{ => v2}/OreFactory.java (100%) rename common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/{ => v2}/OreTemplate.java (100%) rename common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/{ => v2}/ores/VanillaOre.java (100%) diff --git a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreAddon.java similarity index 100% rename from common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java rename to common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreAddon.java diff --git a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreConfigType.java similarity index 100% rename from common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java rename to common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreConfigType.java diff --git a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreFactory.java b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreFactory.java similarity index 100% rename from common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreFactory.java rename to common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreFactory.java diff --git a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreTemplate.java similarity index 100% rename from common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java rename to common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreTemplate.java diff --git a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/ores/VanillaOre.java similarity index 100% rename from common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java rename to common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/ores/VanillaOre.java diff --git a/common/addons/config-ore-v2/src/main/resources/terra.addon.yml b/common/addons/config-ore-v2/src/main/resources/terra.addon.yml index 7edad8d07..72f4b24b9 100644 --- a/common/addons/config-ore-v2/src/main/resources/terra.addon.yml +++ b/common/addons/config-ore-v2/src/main/resources/terra.addon.yml @@ -4,7 +4,7 @@ contributors: id: config-ore-v2 version: @VERSION@ entrypoints: - - "com.dfsek.terra.addons.ore.OreAddon" + - "com.dfsek.terra.addons.ore.v2.OreAddon" website: issues: https://github.com/PolyhedralDev/Terra/issues source: https://github.com/PolyhedralDev/Terra From 84898a7a6beb6f545c9e3754e75b153fb3428037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Tue, 3 Oct 2023 20:03:46 -0600 Subject: [PATCH 22/34] fixes --- common/addons/config-ore-v2/build.gradle.kts | 2 +- .../src/main/java/com/dfsek/terra/addons/ore/v2/OreAddon.java | 2 +- .../java/com/dfsek/terra/addons/ore/v2/OreConfigType.java | 2 +- .../main/java/com/dfsek/terra/addons/ore/v2/OreFactory.java | 4 ++-- .../main/java/com/dfsek/terra/addons/ore/v2/OreTemplate.java | 2 +- .../java/com/dfsek/terra/addons/ore/v2/ores/VanillaOre.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/addons/config-ore-v2/build.gradle.kts b/common/addons/config-ore-v2/build.gradle.kts index 3799c6be1..d575f43d3 100644 --- a/common/addons/config-ore-v2/build.gradle.kts +++ b/common/addons/config-ore-v2/build.gradle.kts @@ -1,4 +1,4 @@ -version = version("2.0.0") +version = version("1.0.0") dependencies { compileOnlyApi(project(":common:addons:manifest-addon-loader")) diff --git a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreAddon.java b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreAddon.java index 4e6f1751b..9a3d3d05b 100644 --- a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreAddon.java +++ b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreAddon.java @@ -5,7 +5,7 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.ore; +package com.dfsek.terra.addons.ore.v2; import com.dfsek.terra.addons.manifest.api.AddonInitializer; import com.dfsek.terra.api.Platform; diff --git a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreConfigType.java b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreConfigType.java index 2bdc87bdd..dd9c74f12 100644 --- a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreConfigType.java +++ b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreConfigType.java @@ -5,7 +5,7 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.ore; +package com.dfsek.terra.addons.ore.v2; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.config.ConfigFactory; diff --git a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreFactory.java b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreFactory.java index 9d8b1055a..65b3f5d65 100644 --- a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreFactory.java +++ b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreFactory.java @@ -5,9 +5,9 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.ore; +package com.dfsek.terra.addons.ore.v2; -import com.dfsek.terra.addons.ore.ores.VanillaOre; +import com.dfsek.terra.addons.ore.v2.ores.VanillaOre; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.ConfigFactory; diff --git a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreTemplate.java b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreTemplate.java index 8bfbc82d3..4fe711d62 100644 --- a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreTemplate.java +++ b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreTemplate.java @@ -5,7 +5,7 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.ore; +package com.dfsek.terra.addons.ore.v2; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Description; diff --git a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/ores/VanillaOre.java b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/ores/VanillaOre.java index 32f5c7c22..0ea41d823 100644 --- a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/ores/VanillaOre.java +++ b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/ores/VanillaOre.java @@ -5,7 +5,7 @@ * reference the LICENSE file in this module's root directory. */ -package com.dfsek.terra.addons.ore.ores; +package com.dfsek.terra.addons.ore.v2.ores; import net.jafama.FastMath; From d71f7d4c36d494112e76bae5e51467a6138827ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Tue, 3 Oct 2023 21:03:44 -0600 Subject: [PATCH 23/34] clarify value and change default --- .../main/java/com/dfsek/terra/addons/ore/v2/OreTemplate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreTemplate.java b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreTemplate.java index 4fe711d62..fa8f49b9e 100644 --- a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreTemplate.java +++ b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/OreTemplate.java @@ -47,8 +47,8 @@ public class OreTemplate implements AbstractableTemplate { @Value("exposed") @Default - @Description("The chance that ore blocks bordering air will be exposed. 0 = 0%, 1 = 100%") - private @Meta double exposed = 1; + @Description("The chance that ore blocks bordering air will be discarded as candidates for ore. 0 = 0%, 1 = 100%") + private @Meta double exposed = 0.0f; public boolean doPhysics() { return physics; From b5e7c7c1127195a73e09494002e38ce9d14a2435 Mon Sep 17 00:00:00 2001 From: Astrash Date: Tue, 10 Oct 2023 09:44:53 +1100 Subject: [PATCH 24/34] Fix TOP locator --- .../dfsek/terra/addons/feature/locator/locators/TopLocator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/TopLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/TopLocator.java index f9e8e0ea6..7706f1ee1 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/TopLocator.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/TopLocator.java @@ -22,7 +22,7 @@ public class TopLocator implements Locator { @Override public BinaryColumn getSuitableCoordinates(Column column) { - for(int y : search) { + for(int y = search.getMax(); y >= search.getMin(); y--) { if(column.getBlock(y).isAir() && !column.getBlock(y - 1).isAir()) { return new BinaryColumn(y, y + 1, yi -> true); } From abd83e82782f5cdefd0a3d3abb4dfaf2b6d19a07 Mon Sep 17 00:00:00 2001 From: Astrashh Date: Tue, 10 Oct 2023 11:35:26 +1100 Subject: [PATCH 25/34] Add number predicate addon (#412) --- .../config-number-predicate/build.gradle.kts | 13 ++++++ .../DoublePredicateLoader.java | 34 +++++++++++++++ .../numberpredicate/NumberPredicateAddon.java | 41 +++++++++++++++++++ .../src/main/resources/terra.addon.yml | 12 ++++++ 4 files changed, 100 insertions(+) create mode 100644 common/addons/config-number-predicate/build.gradle.kts create mode 100644 common/addons/config-number-predicate/src/main/java/com/dfsek/terra/addons/numberpredicate/DoublePredicateLoader.java create mode 100644 common/addons/config-number-predicate/src/main/java/com/dfsek/terra/addons/numberpredicate/NumberPredicateAddon.java create mode 100644 common/addons/config-number-predicate/src/main/resources/terra.addon.yml diff --git a/common/addons/config-number-predicate/build.gradle.kts b/common/addons/config-number-predicate/build.gradle.kts new file mode 100644 index 000000000..2ea535016 --- /dev/null +++ b/common/addons/config-number-predicate/build.gradle.kts @@ -0,0 +1,13 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + +version = version("1.0.0") + +dependencies { + compileOnlyApi(project(":common:addons:manifest-addon-loader")) + api("com.dfsek", "paralithic", Versions.Libraries.paralithic) +} + + +tasks.named("shadowJar") { + relocate("com.dfsek.paralithic", "com.dfsek.terra.addons.numberpredicate.lib.paralithic") +} diff --git a/common/addons/config-number-predicate/src/main/java/com/dfsek/terra/addons/numberpredicate/DoublePredicateLoader.java b/common/addons/config-number-predicate/src/main/java/com/dfsek/terra/addons/numberpredicate/DoublePredicateLoader.java new file mode 100644 index 000000000..4b9bf789e --- /dev/null +++ b/common/addons/config-number-predicate/src/main/java/com/dfsek/terra/addons/numberpredicate/DoublePredicateLoader.java @@ -0,0 +1,34 @@ +package com.dfsek.terra.addons.numberpredicate; + +import com.dfsek.paralithic.Expression; +import com.dfsek.paralithic.eval.parser.Parser; +import com.dfsek.paralithic.eval.parser.Scope; +import com.dfsek.paralithic.eval.tokenizer.ParseException; +import com.dfsek.tectonic.api.depth.DepthTracker; +import com.dfsek.tectonic.api.exception.LoadException; +import com.dfsek.tectonic.api.loader.ConfigLoader; +import com.dfsek.tectonic.api.loader.type.TypeLoader; +import org.jetbrains.annotations.NotNull; + +import java.lang.reflect.AnnotatedType; +import java.util.function.DoublePredicate; + + +public class DoublePredicateLoader implements TypeLoader { + @Override + public DoublePredicate load(@NotNull AnnotatedType annotatedType, @NotNull Object o, @NotNull ConfigLoader configLoader, + DepthTracker depthTracker) throws LoadException { + if (o instanceof String expressionString) { + Scope scope = new Scope(); + scope.addInvocationVariable("value"); + try { + Expression expression = new Parser().parse(expressionString, scope); + return d -> expression.evaluate(d) != 0; // Paralithic expressions treat '!= 0' as true + } catch(ParseException e) { + throw new LoadException("Failed to parse double predicate expression", e, depthTracker); + } + } else { + throw new LoadException("Double predicates must be defined as a string. E.g. 'value > 3'", depthTracker); + } + } +} diff --git a/common/addons/config-number-predicate/src/main/java/com/dfsek/terra/addons/numberpredicate/NumberPredicateAddon.java b/common/addons/config-number-predicate/src/main/java/com/dfsek/terra/addons/numberpredicate/NumberPredicateAddon.java new file mode 100644 index 000000000..e81da028d --- /dev/null +++ b/common/addons/config-number-predicate/src/main/java/com/dfsek/terra/addons/numberpredicate/NumberPredicateAddon.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2020-2021 Polyhedral Development + * + * The Terra Core Addons are licensed under the terms of the MIT License. For more details, + * reference the LICENSE file in this module's root directory. + */ + +package com.dfsek.terra.addons.numberpredicate; + +import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; + +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.function.DoublePredicate; +import java.util.function.Supplier; + +import com.dfsek.terra.addons.manifest.api.AddonInitializer; +import com.dfsek.terra.api.Platform; +import com.dfsek.terra.api.addon.BaseAddon; +import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; +import com.dfsek.terra.api.event.functional.FunctionalEventHandler; +import com.dfsek.terra.api.inject.annotations.Inject; + +public class NumberPredicateAddon implements AddonInitializer { + + @Inject + private Platform plugin; + + @Inject + private BaseAddon addon; + + @Override + public void initialize() { + plugin.getEventManager() + .getHandler(FunctionalEventHandler.class) + .register(addon, ConfigPackPreLoadEvent.class) + .then(event -> event.getPack().applyLoader(DoublePredicate.class, new DoublePredicateLoader())) + .priority(50) + .failThrough(); + } +} diff --git a/common/addons/config-number-predicate/src/main/resources/terra.addon.yml b/common/addons/config-number-predicate/src/main/resources/terra.addon.yml new file mode 100644 index 000000000..e4014b3a3 --- /dev/null +++ b/common/addons/config-number-predicate/src/main/resources/terra.addon.yml @@ -0,0 +1,12 @@ +schema-version: 1 +contributors: + - Terra contributors +id: config-number-predicate +version: @VERSION@ +entrypoints: + - "com.dfsek.terra.addons.numberpredicate.NumberPredicateAddon" +website: + issues: https://github.com/PolyhedralDev/Terra/issues + source: https://github.com/PolyhedralDev/Terra + docs: https://terra.polydev.org +license: MIT License \ No newline at end of file From 47f531089ebbeaa199b5a3dd336b3ef979b6766c Mon Sep 17 00:00:00 2001 From: Astrashh Date: Tue, 10 Oct 2023 11:35:47 +1100 Subject: [PATCH 26/34] Add slant locator (#413) * Add slant locator addon * Bump slant locator noise3d dependency version * Fix slant locator dependency version range * Actually fix slant locator dependency version range --- .../locator-slant-noise-3d/build.gradle.kts | 6 +++ .../feature/locator/slant/SlantLocator.java | 32 ++++++++++++++++ .../locator/slant/SlantLocatorAddon.java | 37 +++++++++++++++++++ .../locator/slant/SlantLocatorTemplate.java | 20 ++++++++++ .../src/main/resources/terra.addon.yml | 14 +++++++ 5 files changed, 109 insertions(+) create mode 100644 common/addons/locator-slant-noise-3d/build.gradle.kts create mode 100644 common/addons/locator-slant-noise-3d/src/main/java/com/dfsek/terra/addon/feature/locator/slant/SlantLocator.java create mode 100644 common/addons/locator-slant-noise-3d/src/main/java/com/dfsek/terra/addon/feature/locator/slant/SlantLocatorAddon.java create mode 100644 common/addons/locator-slant-noise-3d/src/main/java/com/dfsek/terra/addon/feature/locator/slant/SlantLocatorTemplate.java create mode 100644 common/addons/locator-slant-noise-3d/src/main/resources/terra.addon.yml diff --git a/common/addons/locator-slant-noise-3d/build.gradle.kts b/common/addons/locator-slant-noise-3d/build.gradle.kts new file mode 100644 index 000000000..b4283bb75 --- /dev/null +++ b/common/addons/locator-slant-noise-3d/build.gradle.kts @@ -0,0 +1,6 @@ +version = version("1.0.0") + +dependencies { + compileOnlyApi(project(":common:addons:manifest-addon-loader")) + compileOnlyApi(project(":common:addons:chunk-generator-noise-3d")) +} diff --git a/common/addons/locator-slant-noise-3d/src/main/java/com/dfsek/terra/addon/feature/locator/slant/SlantLocator.java b/common/addons/locator-slant-noise-3d/src/main/java/com/dfsek/terra/addon/feature/locator/slant/SlantLocator.java new file mode 100644 index 000000000..732ec540c --- /dev/null +++ b/common/addons/locator-slant-noise-3d/src/main/java/com/dfsek/terra/addon/feature/locator/slant/SlantLocator.java @@ -0,0 +1,32 @@ +package com.dfsek.terra.addon.feature.locator.slant; + +import com.dfsek.terra.addons.chunkgenerator.generation.NoiseChunkGenerator3D; +import com.dfsek.terra.api.structure.feature.BinaryColumn; +import com.dfsek.terra.api.structure.feature.Locator; +import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.api.world.chunk.generation.util.Column; + +import java.util.function.DoublePredicate; + + +public class SlantLocator implements Locator { + + private final DoublePredicate predicate; + + public SlantLocator(DoublePredicate predicate) { + this.predicate = predicate; + } + + @Override + public BinaryColumn getSuitableCoordinates(Column column) { + return column.newBinaryColumn(y -> { + int x = column.getX(); + int z = column.getZ(); + World world = column.getWorld(); + NoiseChunkGenerator3D generator = (NoiseChunkGenerator3D) world.getGenerator(); + BiomeProvider biomeProvider = world.getBiomeProvider(); + return predicate.test(generator.getSlant(x, y, z, world, biomeProvider)); + }); + } +} diff --git a/common/addons/locator-slant-noise-3d/src/main/java/com/dfsek/terra/addon/feature/locator/slant/SlantLocatorAddon.java b/common/addons/locator-slant-noise-3d/src/main/java/com/dfsek/terra/addon/feature/locator/slant/SlantLocatorAddon.java new file mode 100644 index 000000000..78df933d8 --- /dev/null +++ b/common/addons/locator-slant-noise-3d/src/main/java/com/dfsek/terra/addon/feature/locator/slant/SlantLocatorAddon.java @@ -0,0 +1,37 @@ +package com.dfsek.terra.addon.feature.locator.slant; + +import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; + +import com.dfsek.terra.addons.manifest.api.AddonInitializer; +import com.dfsek.terra.api.Platform; +import com.dfsek.terra.api.addon.BaseAddon; +import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; +import com.dfsek.terra.api.event.functional.FunctionalEventHandler; +import com.dfsek.terra.api.inject.annotations.Inject; +import com.dfsek.terra.api.structure.feature.Locator; +import com.dfsek.terra.api.util.reflection.TypeKey; + +import java.util.function.Supplier; + + +public class SlantLocatorAddon implements AddonInitializer { + + public static final TypeKey>> LOCATOR_TOKEN = new TypeKey<>() { + }; + + @Inject + private Platform platform; + + @Inject + private BaseAddon addon; + + @Override + public void initialize() { + platform.getEventManager() + .getHandler(FunctionalEventHandler.class) + .register(addon, ConfigPackPreLoadEvent.class) + .priority(1) + .then(event -> event.getPack().getOrCreateRegistry(LOCATOR_TOKEN).register(addon.key("SLANT"), SlantLocatorTemplate::new)) + .failThrough(); + } +} diff --git a/common/addons/locator-slant-noise-3d/src/main/java/com/dfsek/terra/addon/feature/locator/slant/SlantLocatorTemplate.java b/common/addons/locator-slant-noise-3d/src/main/java/com/dfsek/terra/addon/feature/locator/slant/SlantLocatorTemplate.java new file mode 100644 index 000000000..82beba1dc --- /dev/null +++ b/common/addons/locator-slant-noise-3d/src/main/java/com/dfsek/terra/addon/feature/locator/slant/SlantLocatorTemplate.java @@ -0,0 +1,20 @@ +package com.dfsek.terra.addon.feature.locator.slant; + +import com.dfsek.tectonic.api.config.template.annotations.Value; +import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; + +import com.dfsek.terra.api.structure.feature.Locator; + +import java.util.function.DoublePredicate; + + +public class SlantLocatorTemplate implements ObjectTemplate { + + @Value("condition") + private DoublePredicate predicate; + + @Override + public Locator get() { + return new SlantLocator(predicate); + } +} diff --git a/common/addons/locator-slant-noise-3d/src/main/resources/terra.addon.yml b/common/addons/locator-slant-noise-3d/src/main/resources/terra.addon.yml new file mode 100644 index 000000000..8a7ef4ad9 --- /dev/null +++ b/common/addons/locator-slant-noise-3d/src/main/resources/terra.addon.yml @@ -0,0 +1,14 @@ +schema-version: 1 +contributors: + - Terra contributors +id: locator-slant-noise-3d +version: @VERSION@ +entrypoints: + - "com.dfsek.terra.addon.feature.locator.slant.SlantLocatorAddon" +website: + issues: https://github.com/PolyhedralDev/Terra/issues + source: https://github.com/PolyhedralDev/Terra + docs: https://terra.polydev.org +license: MIT License +depends: + chunk-generator-noise-3d: "[1.2.0,2.0.0)" \ No newline at end of file From 94854f2bdb7cbd76ad895e2188e8e02e5e2e8b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Sat, 14 Oct 2023 15:55:43 -0600 Subject: [PATCH 27/34] update versions --- buildSrc/src/main/kotlin/Versions.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 85209d089..8d2638cca 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,7 +1,7 @@ object Versions { object Libraries { - const val tectonic = "4.2.0" - const val paralithic = "0.7.0" + const val tectonic = "4.2.1" + const val paralithic = "0.7.1" const val strata = "1.3.2" const val cloud = "1.8.4" @@ -14,14 +14,14 @@ object Versions { const val apacheText = "1.10.0" const val jafama = "2.3.2" const val apacheIO = "2.14.0" - const val guava = "32.1.2-jre" + const val guava = "32.1.3-jre" const val asm = "9.5" const val snakeYml = "2.2" } } object Fabric { - const val fabricAPI = "0.89.3+${Mod.minecraft}" + const val fabricAPI = "0.90.0+${Mod.minecraft}" } object Quilt { @@ -33,8 +33,8 @@ object Versions { const val mixin = "0.12.5+mixin.0.8.5" const val minecraft = "1.20.2" - const val yarn = "$minecraft+build.2" - const val fabricLoader = "0.14.22" + const val yarn = "$minecraft+build.4" + const val fabricLoader = "0.14.23" const val architecuryLoom = "1.3.357" const val architecturyPlugin = "3.4.146" From 491716012357302d42512ce179b5d9c1852ece60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB?= Date: Tue, 17 Oct 2023 18:32:00 -0600 Subject: [PATCH 28/34] Update README.md --- common/addons/config-ore-v2/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/addons/config-ore-v2/README.md b/common/addons/config-ore-v2/README.md index 1b72835ea..9171511a3 100644 --- a/common/addons/config-ore-v2/README.md +++ b/common/addons/config-ore-v2/README.md @@ -1,3 +1,3 @@ -# config-ore +# config-ore-v2 -Registers the default configuration for Terra Ores, `ORE`. \ No newline at end of file +Registers the default configuration for Terra Ores, `ORE`. From c8f2871aaa201093d0c8c7b093c091440fa74318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB?= Date: Tue, 17 Oct 2023 20:59:27 -0600 Subject: [PATCH 29/34] Update build.gradle.kts --- platforms/bukkit/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/bukkit/build.gradle.kts b/platforms/bukkit/build.gradle.kts index c72bae196..455c963ec 100644 --- a/platforms/bukkit/build.gradle.kts +++ b/platforms/bukkit/build.gradle.kts @@ -4,7 +4,7 @@ plugins { repositories { maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") { - name = "sonatype" + name = "Sonatype" } } From 9f4a8e06e18e500e3dc7a4d26360fc79dffad546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB?= Date: Tue, 17 Oct 2023 21:00:28 -0600 Subject: [PATCH 30/34] Update DependencyConfig.kt --- buildSrc/src/main/kotlin/DependencyConfig.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/DependencyConfig.kt b/buildSrc/src/main/kotlin/DependencyConfig.kt index fd87495a7..82b3b206b 100644 --- a/buildSrc/src/main/kotlin/DependencyConfig.kt +++ b/buildSrc/src/main/kotlin/DependencyConfig.kt @@ -49,7 +49,7 @@ fun Project.configureDependencies() { name = "JitPack" } maven("https://nexuslite.gcnt.net/repos/other/") { - name = "devmart-other" + name = "GCNT" } } @@ -61,4 +61,4 @@ fun Project.configureDependencies() { compileOnly("com.google.guava:guava:30.0-jre") testImplementation("com.google.guava:guava:30.0-jre") } -} \ No newline at end of file +} From d3a9b578722b50b5f931c5bbf2978f6df0e404a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Wed, 18 Oct 2023 19:53:59 -0600 Subject: [PATCH 31/34] disable quilt --- buildSrc/src/main/kotlin/Versions.kt | 24 +++++++++---------- .../dfsek/terra/fabric/FabricPlatform.java | 2 +- platforms/mixin-common/README.md | 2 +- platforms/mixin-common/build.gradle.kts | 3 ++- platforms/mixin-lifecycle/README.md | 2 +- platforms/mixin-lifecycle/build.gradle.kts | 3 ++- .../terra/lifecycle/LifecyclePlatform.java | 4 ++-- ...d.gradle.kts => build.gradle.kts.disabled} | 0 .../com/dfsek/terra/quilt/QuiltPlatform.java | 2 +- 9 files changed, 22 insertions(+), 20 deletions(-) rename platforms/quilt/{build.gradle.kts => build.gradle.kts.disabled} (100%) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 0982994a4..6a56ded4c 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -23,11 +23,11 @@ object Versions { object Fabric { const val fabricAPI = "0.90.0+${Mod.minecraft}" } - - object Quilt { - const val quiltLoader = "0.20.2" - const val fabricApi = "7.3.1+0.89.3-1.20.1" - } +// +// object Quilt { +// const val quiltLoader = "0.20.2" +// const val fabricApi = "7.3.1+0.89.3-1.20.1" +// } object Mod { const val mixin = "0.12.5+mixin.0.8.5" @@ -57,13 +57,13 @@ object Versions { const val runPaper = "2.2.0" const val paperWeight = "1.5.6" } - - object Sponge { - const val sponge = "9.0.0-SNAPSHOT" - const val mixin = "0.8.2" - const val minecraft = "1.17.1" - } - +// +// object Sponge { +// const val sponge = "9.0.0-SNAPSHOT" +// const val mixin = "0.8.2" +// const val minecraft = "1.17.1" +// } +// object CLI { const val nbt = "6.1" const val logback = "1.4.11" diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricPlatform.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricPlatform.java index 1501b736d..da44b168e 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricPlatform.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricPlatform.java @@ -33,7 +33,7 @@ public class FabricPlatform extends LifecyclePlatform { @Override protected Collection getPlatformMods() { return FabricLoader.getInstance().getAllMods().stream().flatMap( - mod -> parseModData(mod.getMetadata().getId(), mod.getMetadata().getVersion().getFriendlyString())).collect( + mod -> parseModData(mod.getMetadata().getId(), mod.getMetadata().getVersion().getFriendlyString(), "fabric")).collect( Collectors.toList()); } diff --git a/platforms/mixin-common/README.md b/platforms/mixin-common/README.md index 0c411a1bf..f252941a2 100644 --- a/platforms/mixin-common/README.md +++ b/platforms/mixin-common/README.md @@ -1,4 +1,4 @@ # mixin-common -This project contains mixins shared between Forge, Fabric and Quilt, as +This project contains mixins shared between Forge, Fabric and formerly Quilt, as well as glue code. \ No newline at end of file diff --git a/platforms/mixin-common/build.gradle.kts b/platforms/mixin-common/build.gradle.kts index 49c2f5188..fb73717b1 100644 --- a/platforms/mixin-common/build.gradle.kts +++ b/platforms/mixin-common/build.gradle.kts @@ -24,7 +24,8 @@ dependencies { } architectury { - common("fabric", "forge", "quilt") +// common("fabric", "forge", "quilt") + common("fabric", "forge") minecraft = Versions.Mod.minecraft } diff --git a/platforms/mixin-lifecycle/README.md b/platforms/mixin-lifecycle/README.md index 6c2c62cba..95d7e8c1c 100644 --- a/platforms/mixin-lifecycle/README.md +++ b/platforms/mixin-lifecycle/README.md @@ -1,3 +1,3 @@ # mixin-lifecycle -This project contains lifecycle mixins shared between Fabric and Quilt. \ No newline at end of file +This project contains lifecycle mixins shared between Fabric and formerly Quilt. \ No newline at end of file diff --git a/platforms/mixin-lifecycle/build.gradle.kts b/platforms/mixin-lifecycle/build.gradle.kts index 1108046f3..142d6868b 100644 --- a/platforms/mixin-lifecycle/build.gradle.kts +++ b/platforms/mixin-lifecycle/build.gradle.kts @@ -41,6 +41,7 @@ tasks { } architectury { - common("fabric", "quilt") +// common("fabric", "quilt") + common("fabric") minecraft = Versions.Mod.minecraft } \ No newline at end of file diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java index bafd0a02e..9e0e081d3 100644 --- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java +++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java @@ -111,11 +111,11 @@ public abstract class LifecyclePlatform extends ModPlatform { return addons; } - protected Stream parseModData(String id, String modVersion) { + protected Stream parseModData(String id, String modVersion, String platform) { if(id.equals("terra") || id.equals("minecraft") || id.equals("java")) return Stream.empty(); try { Version version = Versions.parseVersion(modVersion); - return Stream.of(new EphemeralAddon(version, "quilt:" + id)); + return Stream.of(new EphemeralAddon(version, platform + ":" + id)); } catch(ParseException e) { LOGGER.warn( "Mod {}, version {} does not follow semantic versioning specification, Terra addons will be unable to depend on " + diff --git a/platforms/quilt/build.gradle.kts b/platforms/quilt/build.gradle.kts.disabled similarity index 100% rename from platforms/quilt/build.gradle.kts rename to platforms/quilt/build.gradle.kts.disabled diff --git a/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPlatform.java b/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPlatform.java index 0aa2e4323..32772b349 100644 --- a/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPlatform.java +++ b/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPlatform.java @@ -32,7 +32,7 @@ public class QuiltPlatform extends LifecyclePlatform { @Override protected Collection getPlatformMods() { - return QuiltLoader.getAllMods().stream().flatMap(mod -> parseModData(mod.metadata().id(), mod.metadata().version().raw())).collect( + return QuiltLoader.getAllMods().stream().flatMap(mod -> parseModData(mod.metadata().id(), mod.metadata().version().raw(), "quilt")).collect( Collectors.toList()); } From e80e998cec9d41f5509b60605b8ae5134af6bae6 Mon Sep 17 00:00:00 2001 From: Astrash Date: Fri, 20 Oct 2023 09:32:33 +1100 Subject: [PATCH 32/34] Only log warnings with debug logging --- .../addons/biome/image/ImageBiomeProviderAddon.java | 3 ++- .../addons/biome/pipeline/BiomePipelineAddon.java | 3 ++- .../java/com/dfsek/terra/addons/ore/OreAddon.java | 3 ++- .../java/com/dfsek/terra/api/config/PluginConfig.java | 2 ++ .../java/com/dfsek/terra/config/PluginConfigImpl.java | 11 +++++++++++ 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java index ecef73f5d..142b7e034 100644 --- a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java +++ b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java @@ -50,6 +50,7 @@ public class ImageBiomeProviderAddon implements AddonInitializer { () -> new ImageProviderTemplate(event.getPack().getRegistry(Biome.class))); }) .failThrough(); - logger.warn("The biome-provider-image addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the biome-provider-image-v2 addon for future pack development instead."); + if(platform.getTerraConfig().isDebugLog()) + logger.warn("The biome-provider-image addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the biome-provider-image-v2 addon for future pack development instead."); } } diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java index 6765ab3c3..0200f17ad 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java @@ -90,6 +90,7 @@ public class BiomePipelineAddon implements AddonInitializer { event.getPack().applyLoader(BiomeDelegate.class, new BiomeDelegateLoader(biomeRegistry)); }); - logger.warn("The biome-provider-pipeline addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the biome-provider-pipeline-v2 addon for future pack development instead."); + if(platform.getTerraConfig().isDebugLog()) + logger.warn("The biome-provider-pipeline addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the biome-provider-pipeline-v2 addon for future pack development instead."); } } diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java index 7ac64ef2b..ff2ddf54c 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java @@ -35,6 +35,7 @@ public class OreAddon implements AddonInitializer { .then(event -> event.getPack().registerConfigType(new OreConfigType(), addon.key("ORE"), 1)) .failThrough(); - logger.warn("The ore-config addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the ore-config-v2 addon for future pack development instead."); + if(platform.getTerraConfig().isDebugLog()) + logger.warn("The ore-config addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the ore-config-v2 addon for future pack development instead."); } } diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/PluginConfig.java b/common/api/src/main/java/com/dfsek/terra/api/config/PluginConfig.java index 2d540e483..f70b61ff0 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/config/PluginConfig.java +++ b/common/api/src/main/java/com/dfsek/terra/api/config/PluginConfig.java @@ -21,6 +21,8 @@ public interface PluginConfig { boolean isDebugScript(); + boolean isDebugLog(); + int getBiomeSearchResolution(); int getStructureCache(); diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java index ee40850d6..810206513 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java @@ -51,6 +51,10 @@ public class PluginConfigImpl implements ConfigTemplate, PluginConfig { @Default private boolean debugScript = false; + @Value("debug.log") + @Default + private boolean debugLog = false; + @Value("biome-search-resolution") @Default private int biomeSearch = 4; @@ -91,6 +95,8 @@ public class PluginConfigImpl implements ConfigTemplate, PluginConfig { logger.info("Debug profiler enabled."); if(debugScript) logger.info("Script debug blocks enabled."); + if(debugLog) + logger.info("Debug logging enabled."); } @Override @@ -113,6 +119,11 @@ public class PluginConfigImpl implements ConfigTemplate, PluginConfig { return debugScript; } + @Override + public boolean isDebugLog() { + return debugLog; + } + @Override public int getBiomeSearchResolution() { return biomeSearch; From 4e5b02ef4202e2ee009afaa512dad224002f8b65 Mon Sep 17 00:00:00 2001 From: Astrash Date: Fri, 20 Oct 2023 10:30:25 +1100 Subject: [PATCH 33/34] Pass correct coords for ore block checks --- .../java/com/dfsek/terra/addons/ore/v2/ores/VanillaOre.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/ores/VanillaOre.java b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/ores/VanillaOre.java index 0ea41d823..68959678c 100644 --- a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/ores/VanillaOre.java +++ b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/ores/VanillaOre.java @@ -138,7 +138,7 @@ public class VanillaOre implements Structure { if(!bitSet.get(ac)) { bitSet.set(ac); - BlockType block = world.getBlockState(x, y, z).getBlockType(); + BlockType block = world.getBlockState(t1, v1, aa).getBlockType(); if(shouldPlace(block, random, world, t1, v1, aa)) { world.setBlockState(t1, v1, aa, getMaterial(block), isApplyGravity()); From 805f99f57a0984eb0c4f1c4f137b49618d554f7a Mon Sep 17 00:00:00 2001 From: Astrash Date: Fri, 20 Oct 2023 10:55:23 +1100 Subject: [PATCH 34/34] Make ore algorithm readable --- .../terra/addons/ore/v2/ores/VanillaOre.java | 161 ++++++++++-------- 1 file changed, 90 insertions(+), 71 deletions(-) diff --git a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/ores/VanillaOre.java b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/ores/VanillaOre.java index 68959678c..dc77f31ed 100644 --- a/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/ores/VanillaOre.java +++ b/common/addons/config-ore-v2/src/main/java/com/dfsek/terra/addons/ore/v2/ores/VanillaOre.java @@ -58,53 +58,56 @@ public class VanillaOre implements Structure { @Override public boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation) { - float f = random.nextFloat() * (float) Math.PI; - double g = size / 8.0F; - int i = (int) FastMath.ceil((size / 16.0F * 2.0F + 1.0F) / 2.0F); - double startX = (double) location.getX() + FastMath.sin(f) * g; - double endX = (double) location.getX() - FastMath.sin(f) * g; - double startZ = (double) location.getZ() + FastMath.cos(f) * g; - double endZ = (double) location.getZ() - FastMath.cos(f) * g; + float randomRadian = random.nextFloat() * (float) Math.PI; + double eigthSize = size / 8.0F; + + // Place points to form a line segment + double startX = (double) location.getX() + FastMath.sin(randomRadian) * eigthSize; + double endX = (double) location.getX() - FastMath.sin(randomRadian) * eigthSize; + + double startZ = (double) location.getZ() + FastMath.cos(randomRadian) * eigthSize; + double endZ = (double) location.getZ() - FastMath.cos(randomRadian) * eigthSize; + double startY = location.getY() + random.nextInt(3) - 2; double endY = location.getY() + random.nextInt(3) - 2; - int x = (int) (location.getX() - FastMath.ceil(g) - i); - int y = location.getY() - 2 - i; - int z = (int) (location.getZ() - FastMath.ceil(g) - i); - int horizontalSize = (int) (2 * (FastMath.ceil(g) + i)); - int verticalSize = 2 * (2 + i); - int i1 = 0; - BitSet bitSet = new BitSet(horizontalSize * verticalSize * horizontalSize); + int sizeInt = (int) size; + double[] points = new double[sizeInt * 4]; - int j1 = (int) size; - double[] ds = new double[j1 * 4]; - - for(int k1 = 0; k1 < j1; ++k1) { - float f1 = (float) k1 / (float) j1; - double d1 = lerp(f1, startX, endX); - double e1 = lerp(f1, startY, endY); - double g1 = lerp(f1, startZ, endZ); - double h1 = random.nextDouble() * (double) j1 / 16.0; - double l1 = ((FastMath.sin((float) Math.PI * f1) + 1.0F) * h1 + 1.0) / 2.0; - ds[k1 * 4] = d1; - ds[k1 * 4 + 1] = e1; - ds[k1 * 4 + 2] = g1; - ds[k1 * 4 + 3] = l1; + // Compute initial point positions and radius + for(int i = 0; i < sizeInt; ++i) { + float t = (float) i / (float) sizeInt; + double xt = lerp(t, startX, endX); + double yt = lerp(t, startY, endY); + double zt = lerp(t, startZ, endZ); + double roll = random.nextDouble() * size / 16.0; + // Taper radius closer to line ends + double radius = ((FastMath.sin((float) Math.PI * t) + 1.0F) * roll + 1.0) / 2.0; + points[i * 4] = xt; + points[i * 4 + 1] = yt; + points[i * 4 + 2] = zt; + points[i * 4 + 3] = radius; } - for(int k1 = 0; k1 < j1 - 1; ++k1) { - if(!(ds[k1 * 4 + 3] <= 0.0)) { - for(int m1 = k1 + 1; m1 < j1; ++m1) { - if(!(ds[m1 * 4 + 3] <= 0.0)) { - double d1 = ds[k1 * 4] - ds[m1 * 4]; - double e1 = ds[k1 * 4 + 1] - ds[m1 * 4 + 1]; - double g1 = ds[k1 * 4 + 2] - ds[m1 * 4 + 2]; - double h1 = ds[k1 * 4 + 3] - ds[m1 * 4 + 3]; - if(h1 * h1 > d1 * d1 + e1 * e1 + g1 * g1) { - if(h1 > 0.0) { - ds[m1 * 4 + 3] = -1.0; + // Compare every point to every other point + for(int a = 0; a < sizeInt - 1; ++a) { + double radiusA = points[a * 4 + 3]; + if(radiusA > 0.0) { + for(int b = a + 1; b < sizeInt; ++b) { + double radiusB = points[b * 4 + 3]; + if(radiusB > 0.0) { + double dxt = points[a * 4] - points[b * 4]; + double dyt = points[a * 4 + 1] - points[b * 4 + 1]; + double dzt = points[a * 4 + 2] - points[b * 4 + 2]; + double dRadius = radiusA - radiusB; + + // If the radius difference is greater than the distance between the two points + if(dRadius * dRadius > dxt * dxt + dyt * dyt + dzt * dzt) { + // Set smaller of two radii to -1 + if(dRadius > 0.0) { + points[b * 4 + 3] = -1.0; } else { - ds[k1 * 4 + 3] = -1.0; + points[a * 4 + 3] = -1.0; } } } @@ -112,37 +115,54 @@ public class VanillaOre implements Structure { } } - for(int m1 = 0; m1 < j1; ++m1) { - double d1 = ds[m1 * 4 + 3]; - if(!(d1 < 0.0)) { - double e1 = ds[m1 * 4]; - double g1 = ds[m1 * 4 + 1]; - double h1 = ds[m1 * 4 + 2]; - int n1 = (int) FastMath.max(FastMath.floor(e1 - d1), x); - int o1 = (int) FastMath.max(FastMath.floor(g1 - d1), y); - int p1 = (int) FastMath.max(FastMath.floor(h1 - d1), z); - int q1 = (int) FastMath.max(FastMath.floor(e1 + d1), n1); - int r1 = (int) FastMath.max(FastMath.floor(g1 + d1), o1); - int s1 = (int) FastMath.max(FastMath.floor(h1 + d1), p1); + int outset = (int) FastMath.ceil((size / 16.0F * 2.0F + 1.0F) / 2.0F); + int x = (int) (location.getX() - FastMath.ceil(eigthSize) - outset); + int y = location.getY() - 2 - outset; + int z = (int) (location.getZ() - FastMath.ceil(eigthSize) - outset); + + int horizontalSize = (int) (2 * (FastMath.ceil(eigthSize) + outset)); + int verticalSize = 2 * (2 + outset); + + int sphereCount = 0; + BitSet visited = new BitSet(horizontalSize * verticalSize * horizontalSize); + + // Generate a sphere at each point + for(int i = 0; i < sizeInt; ++i) { + double radius = points[i * 4 + 3]; + if(radius > 0.0) { + double xt = points[i * 4]; + double yt = points[i * 4 + 1]; + double zt = points[i * 4 + 2]; - for(int t1 = n1; t1 <= q1; ++t1) { - double u1 = ((double) t1 + 0.5 - e1) / d1; - if(u1 * u1 < 1.0) { - for(int v1 = o1; v1 <= r1; ++v1) { - double w1 = ((double) v1 + 0.5 - g1) / d1; - if(u1 * u1 + w1 * w1 < 1.0) { - for(int aa = p1; aa <= s1; ++aa) { - double ab = ((double) aa + 0.5 - h1) / d1; - if(u1 * u1 + w1 * w1 + ab * ab < 1.0 && !(v1 < world.getMinHeight() || v1 >= world.getMaxHeight())) { - int ac = t1 - x + (v1 - y) * horizontalSize + (aa - z) * horizontalSize * verticalSize; - if(!bitSet.get(ac)) { - bitSet.set(ac); + int xLowerBound = (int) FastMath.max(FastMath.floor(xt - radius), x); + int xUpperBound = (int) FastMath.max(FastMath.floor(xt + radius), xLowerBound); + + int yLowerBound = (int) FastMath.max(FastMath.floor(yt - radius), y); + int yUpperBound = (int) FastMath.max(FastMath.floor(yt + radius), yLowerBound); + + int zLowerBound = (int) FastMath.max(FastMath.floor(zt - radius), z); + int zUpperBound = (int) FastMath.max(FastMath.floor(zt + radius), zLowerBound); + + // Iterate over coordinates within bounds + for(int xi = xLowerBound; xi <= xUpperBound; ++xi) { + double dx = ((double) xi + 0.5 - xt) / radius; + if(dx * dx < 1.0) { + for(int yi = yLowerBound; yi <= yUpperBound; ++yi) { + double dy = ((double) yi + 0.5 - yt) / radius; + if(dx * dx + dy * dy < 1.0) { + for(int zi = zLowerBound; zi <= zUpperBound; ++zi) { + double dz = ((double) zi + 0.5 - zt) / radius; + + // If position is inside the sphere + if(dx * dx + dy * dy + dz * dz < 1.0 && !(yi < world.getMinHeight() || yi >= world.getMaxHeight())) { + int index = xi - x + (yi - y) * horizontalSize + (zi - z) * horizontalSize * verticalSize; + if(!visited.get(index)) { // Skip blocks that have already been visited - BlockType block = world.getBlockState(t1, v1, aa).getBlockType(); - - if(shouldPlace(block, random, world, t1, v1, aa)) { - world.setBlockState(t1, v1, aa, getMaterial(block), isApplyGravity()); - ++i1; + visited.set(index); + BlockType block = world.getBlockState(xi, yi, zi).getBlockType(); + if(shouldPlace(block, random, world, xi, yi, zi)) { + world.setBlockState(xi, yi, zi, getMaterial(block), isApplyGravity()); + ++sphereCount; break; } } @@ -155,8 +175,7 @@ public class VanillaOre implements Structure { } } - - return i1 > 0; + return sphereCount > 0; } public boolean shouldPlace(BlockType type, Random random, WritableWorld world, int x, int y, int z) {