From 08df8b1652e3f842df682cd11ef20ecb7e7e18bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB?= Date: Mon, 22 Aug 2022 22:41:26 -0500 Subject: [PATCH 1/2] some fixes --- .../com/dfsek/terra/mod/MinecraftAddon.java | 9 +++------ .../mod/config/VanillaWorldProperties.java | 2 +- .../com/dfsek/terra/mod/util/BiomeUtil.java | 20 ++++++++++--------- .../dfsek/terra/mod/util/DimensionUtil.java | 17 ++++++++-------- .../dfsek/terra/mod/util/MinecraftUtil.java | 4 ---- 5 files changed, 23 insertions(+), 29 deletions(-) diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/MinecraftAddon.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/MinecraftAddon.java index e41141f1f..3f2b1a24c 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/MinecraftAddon.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/MinecraftAddon.java @@ -22,6 +22,7 @@ import ca.solostudios.strata.version.Version; import com.dfsek.terra.api.config.ConfigPack; +import com.dfsek.terra.api.event.events.PackEvent; import com.dfsek.terra.mod.config.VanillaWorldProperties; import com.dfsek.terra.mod.util.MinecraftUtil; @@ -53,12 +54,8 @@ public abstract class MinecraftAddon implements BaseAddon { public void initialize() { modPlatform.getEventManager() .getHandler(FunctionalEventHandler.class) - .register(this, ConfigurationLoadEvent.class) - .then(event -> { - if(event.is(ConfigPack.class)) { - event.getLoadedObject(ConfigPack.class).getContext().put(event.load(new VanillaWorldProperties())); - } - }) + .register(this, ConfigPackPreLoadEvent.class) + .then(event -> event.loadTemplate(new VanillaWorldProperties())) .global(); modPlatform.getEventManager() .getHandler(FunctionalEventHandler.class) diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VanillaWorldProperties.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VanillaWorldProperties.java index 8ee95432b..87d91268c 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VanillaWorldProperties.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VanillaWorldProperties.java @@ -51,7 +51,7 @@ public class VanillaWorldProperties implements ConfigTemplate, Properties { @Default private Boolean respawnAnchorWorks = false; - @Value("minecraft.height") + @Value("minecraft.height.range") @Default private Range height = new ConstantRange(0, 16); diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/BiomeUtil.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/BiomeUtil.java index ebc59e7cb..496b0dfec 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/BiomeUtil.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/BiomeUtil.java @@ -41,12 +41,18 @@ public class BiomeUtil { logger.info("Terra biomes registered."); } + public static RegistryKey registerKey(Identifier identifier) { + return RegistryKey.of(Registry.BIOME_KEY, identifier); + } + protected static RegistryKey registerBiome(Identifier identifier, net.minecraft.world.biome.Biome biome) { - BuiltinRegistries.add(BuiltinRegistries.BIOME, - MinecraftUtil.registerKey(identifier) - .getValue(), - biome); + RegistryKey key = registerKey(identifier); + if(!BuiltinRegistries.BIOME.contains(key)) { + BuiltinRegistries.add(BuiltinRegistries.BIOME, + key.getValue(), + biome); + } return getBiomeKey(identifier); } @@ -63,11 +69,7 @@ public class BiomeUtil { protected static void registerBiome(Biome biome, ConfigPack pack, com.dfsek.terra.api.registry.key.RegistryKey id) { VanillaBiomeProperties vanillaBiomeProperties; - if (biome.getContext().has(VanillaBiomeProperties.class)) { - vanillaBiomeProperties = biome.getContext().get(VanillaBiomeProperties.class); - } else { - vanillaBiomeProperties = new VanillaBiomeProperties(); - } + vanillaBiomeProperties = biome.getContext().get(VanillaBiomeProperties.class); net.minecraft.world.biome.Biome minecraftBiome = MinecraftUtil.createBiome(vanillaBiomeProperties); diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/DimensionUtil.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/DimensionUtil.java index 234ea2940..c7a5be993 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/DimensionUtil.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/DimensionUtil.java @@ -18,10 +18,13 @@ import java.util.OptionalLong; public class DimensionUtil { protected static RegistryKey registerDimension(Identifier identifier, DimensionType dimension) { - BuiltinRegistries.add(BuiltinRegistries.DIMENSION_TYPE, - registerKey(identifier) - .getValue(), - dimension); + RegistryKey key = registerKey(identifier); + if(!BuiltinRegistries.BIOME.contains(key)) { + BuiltinRegistries.add(BuiltinRegistries.DIMENSION_TYPE, + key + .getValue(), + dimension); + } return getDimensionKey(identifier); } @@ -34,11 +37,7 @@ public class DimensionUtil { protected static RegistryKey registerDimension(ConfigPack pack) { VanillaWorldProperties vanillaWorldProperties; - if (pack.getContext().has(VanillaBiomeProperties.class)) { - vanillaWorldProperties = pack.getContext().get(VanillaWorldProperties.class); - } else { - vanillaWorldProperties = new VanillaWorldProperties(); - } + vanillaWorldProperties = pack.getContext().get(VanillaWorldProperties.class); DimensionType overworldDimensionType = new DimensionType( vanillaWorldProperties.getFixedTime() == null ? OptionalLong.empty() : OptionalLong.of(vanillaWorldProperties.getFixedTime()), diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java index fc623fa6c..e260321b0 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java @@ -69,10 +69,6 @@ public final class MinecraftUtil { TerraIntProvider.TERRA_RANGE_TYPE_TO_INT_PROVIDER_TYPE.put(ConstantRange.class, CONSTANT); } - public static RegistryKey registerKey(Identifier identifier) { - return RegistryKey.of(Registry.BIOME_KEY, identifier); - } - public static Biome createBiome(VanillaBiomeProperties vanillaBiomeProperties) { GenerationSettings.Builder generationSettings = new GenerationSettings.Builder(); From 2e8bc8d56113fa799d53da9896bb23a9472c49df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB?= Date: Mon, 22 Aug 2022 22:55:28 -0500 Subject: [PATCH 2/2] sub structures use pos as origin --- .../script/functions/StructureFunction.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java index 84245a763..e79ec1129 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java @@ -7,6 +7,8 @@ package com.dfsek.terra.addons.terrascript.script.functions; +import com.dfsek.terra.api.util.vector.Vector3Int; + import net.jafama.FastMath; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -66,20 +68,24 @@ public class StructureFunction implements Function { String app = id.apply(implementationArguments, scope); + int xValue = FastMath.roundToInt(xz.getX()); + int yValue = y.apply(implementationArguments, scope).intValue(); + int zValue = FastMath.roundToInt(xz.getZ()); + Vector3Int origin = Vector3Int.of(xValue, yValue, zValue); return registry.getByID(app).map(script -> { if(script instanceof StructureScript structureScript) { - return structureScript.generate(arguments.getOrigin(), + return structureScript.generate(origin, arguments.getWorld() - .buffer(FastMath.roundToInt(xz.getX()), - y.apply(implementationArguments, scope).intValue(), - FastMath.roundToInt(xz.getZ())), + .buffer(xValue, + yValue, + zValue), arguments.getRotation(), arguments.getRecursions() + 1); } return script.generate(arguments.getOrigin(), arguments.getWorld() - .buffer(FastMath.roundToInt(xz.getX()), - y.apply(implementationArguments, scope).intValue(), - FastMath.roundToInt(xz.getZ())), + .buffer(xValue, + yValue, + zValue), arguments.getRotation()); }).orElseGet(() -> { LOGGER.error("No such structure {}", app);