diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackTemplate.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackTemplate.java index 0ced6acd7..c8cabb795 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackTemplate.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackTemplate.java @@ -23,9 +23,7 @@ import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage; @@ -37,26 +35,10 @@ public class ConfigPackTemplate implements ConfigTemplate { @Value("id") private String id; - @Value("variables") - @Default - private @Meta Map variables = new HashMap<>(); - - @Value("structures.locatable") - @Default - private @Meta Map<@Meta String, @Meta String> locatable = new HashMap<>(); - - @Value("blend.terrain.elevation") - @Default - private @Meta int elevationBlend = 4; - @Value("author") @Default private String author = "Anon Y. Mous"; - @Value("disable.sapling") - @Default - private @Meta boolean disableSaplings = false; - @Value("stages") @Default private @Meta List<@Meta GenerationStage> stages = Collections.emptyList(); @@ -83,10 +65,6 @@ public class ConfigPackTemplate implements ConfigTemplate { return version; } - public boolean isDisableSaplings() { - return disableSaplings; - } - public String getID() { return id; } @@ -95,18 +73,6 @@ public class ConfigPackTemplate implements ConfigTemplate { return author; } - public Map getVariables() { - return variables; - } - - public int getElevationBlend() { - return elevationBlend; - } - - public Map getLocatable() { - return locatable; - } - public boolean getBiomeCache() { return biomeCache; } diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricASMEntryPoint.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricASMEntryPoint.java index d3d2d2a5c..60dcde0d1 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricASMEntryPoint.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricASMEntryPoint.java @@ -1,10 +1,9 @@ package com.dfsek.terra.fabric; -import com.dfsek.terra.fabric.util.FabricLoaderUtil; - import net.gudenau.minecraft.asm.api.v1.AsmInitializer; import net.gudenau.minecraft.asm.api.v1.AsmRegistry; +import com.dfsek.terra.fabric.util.FabricLoaderUtil; import com.dfsek.terra.lifecycle.asm.FertilizableASM; import com.dfsek.terra.lifecycle.util.LoaderUtil;