Merge pull request #367 from duplexsystem/ver/7.0.0

fixes

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<Boolean> {
         
         
         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()),
+                                                         .buffer(xValue,
-                                                                 y.apply(implementationArguments, scope).intValue(),
+                                                                 yValue,
-                                                                 FastMath.roundToInt(xz.getZ())),
+                                                                 zValue),
                                                 arguments.getRotation(), arguments.getRecursions() + 1);
             }
             return script.generate(arguments.getOrigin(),
                                    arguments.getWorld()
-                                            .buffer(FastMath.roundToInt(xz.getX()),
+                                            .buffer(xValue,
-                                                    y.apply(implementationArguments, scope).intValue(),
+                                                    yValue,
-                                                    FastMath.roundToInt(xz.getZ())),
+                                                    zValue),
                                    arguments.getRotation());
         }).orElseGet(() -> {
             LOGGER.error("No such structure {}", app);

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)
+                .register(this, ConfigPackPreLoadEvent.class)
-                .then(event -> {
+                .then(event -> event.loadTemplate(new VanillaWorldProperties()))
-                    if(event.is(ConfigPack.class)) {
-                        event.getLoadedObject(ConfigPack.class).getContext().put(event.load(new VanillaWorldProperties()));
-                    }
-                })
                 .global();
         modPlatform.getEventManager()
                    .getHandler(FunctionalEventHandler.class)

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);
 

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<net.minecraft.world.biome.Biome> registerKey(Identifier identifier) {
+        return RegistryKey.of(Registry.BIOME_KEY, identifier);
+    }
+    
     protected static RegistryKey<net.minecraft.world.biome.Biome> registerBiome(Identifier identifier,
                                                                                 net.minecraft.world.biome.Biome biome) {
-        BuiltinRegistries.add(BuiltinRegistries.BIOME,
+        RegistryKey key = registerKey(identifier);
-                              MinecraftUtil.registerKey(identifier)
+        if(!BuiltinRegistries.BIOME.contains(key)) {
-                                           .getValue(),
+            BuiltinRegistries.add(BuiltinRegistries.BIOME,
-                              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);
-            vanillaBiomeProperties = biome.getContext().get(VanillaBiomeProperties.class);
-        } else {
-            vanillaBiomeProperties = new VanillaBiomeProperties();
-        }
 
         
         net.minecraft.world.biome.Biome minecraftBiome = MinecraftUtil.createBiome(vanillaBiomeProperties);

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<DimensionType> registerDimension(Identifier identifier,
                                                                                 DimensionType dimension) {
-        BuiltinRegistries.add(BuiltinRegistries.DIMENSION_TYPE,
+        RegistryKey key = registerKey(identifier);
-                              registerKey(identifier)
+        if(!BuiltinRegistries.BIOME.contains(key)) {
-                                           .getValue(),
+            BuiltinRegistries.add(BuiltinRegistries.DIMENSION_TYPE,
-                              dimension);
+                                  key
+                                          .getValue(),
+                                  dimension);
+        }
         return getDimensionKey(identifier);
     }
     
@@ -34,11 +37,7 @@ public class DimensionUtil {
     
     protected static RegistryKey<DimensionType> registerDimension(ConfigPack pack) {
         VanillaWorldProperties vanillaWorldProperties;
-        if (pack.getContext().has(VanillaBiomeProperties.class)) {
+        vanillaWorldProperties = pack.getContext().get(VanillaWorldProperties.class);
-            vanillaWorldProperties = pack.getContext().get(VanillaWorldProperties.class);
-        } else {
-            vanillaWorldProperties = new VanillaWorldProperties();
-        }
     
         DimensionType overworldDimensionType = new DimensionType(
                 vanillaWorldProperties.getFixedTime() == null ? OptionalLong.empty() : OptionalLong.of(vanillaWorldProperties.getFixedTime()),

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<Biome> registerKey(Identifier identifier) {
-        return RegistryKey.of(Registry.BIOME_KEY, identifier);
-    }
-    
     public static Biome createBiome(VanillaBiomeProperties vanillaBiomeProperties) {
         
         GenerationSettings.Builder generationSettings = new GenerationSettings.Builder();