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 3aa0a8c27..0ced6acd7 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 @@ -41,10 +41,6 @@ public class ConfigPackTemplate implements ConfigTemplate { @Default private @Meta Map variables = new HashMap<>(); - @Value("beta.carving") - @Default - private @Meta boolean betaCarvers = false; - @Value("structures.locatable") @Default private @Meta Map<@Meta String, @Meta String> locatable = new HashMap<>(); @@ -53,22 +49,6 @@ public class ConfigPackTemplate implements ConfigTemplate { @Default private @Meta int elevationBlend = 4; - @Value("vanilla.mobs") - @Default - private @Meta boolean vanillaMobs = true; - - @Value("vanilla.caves") - @Default - private @Meta boolean vanillaCaves = false; - - @Value("vanilla.decorations") - @Default - private @Meta boolean vanillaDecorations = false; - - @Value("vanilla.structures") - @Default - private @Meta boolean vanillaStructures = false; - @Value("author") @Default private String author = "Anon Y. Mous"; @@ -84,26 +64,6 @@ public class ConfigPackTemplate implements ConfigTemplate { @Value("version") private Version version; - @Value("disable.carvers") - @Default - private @Meta boolean disableCarvers = false; - - @Value("disable.structures") - @Default - private @Meta boolean disableStructures = false; - - @Value("disable.ores") - @Default - private @Meta boolean disableOres = false; - - @Value("disable.trees") - @Default - private @Meta boolean disableTrees = false; - - @Value("disable.flora") - @Default - private @Meta boolean disableFlora = false; - @Value("generator") private @Meta ChunkGeneratorProvider generatorProvider; @@ -111,46 +71,6 @@ public class ConfigPackTemplate implements ConfigTemplate { @Default private boolean biomeCache = false; - public boolean disableCarvers() { - return disableCarvers; - } - - public boolean disableFlora() { - return disableFlora; - } - - public boolean disableOres() { - return disableOres; - } - - public boolean disableStructures() { - return disableStructures; - } - - public boolean disableTrees() { - return disableTrees; - } - - public boolean vanillaMobs() { - return vanillaMobs; - } - - public boolean vanillaCaves() { - return vanillaCaves; - } - - public boolean vanillaDecorations() { - return vanillaDecorations; - } - - public boolean vanillaStructures() { - return vanillaStructures; - } - - public boolean doBetaCarvers() { - return betaCarvers; - } - public ChunkGeneratorProvider getGeneratorProvider() { return generatorProvider; } 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 afd877f0b..d3d2d2a5c 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 @@ -7,7 +7,6 @@ import net.gudenau.minecraft.asm.api.v1.AsmRegistry; import com.dfsek.terra.lifecycle.asm.FertilizableASM; import com.dfsek.terra.lifecycle.util.LoaderUtil; -import com.dfsek.terra.quilt.util.QuiltLoaderUtil; public class FabricASMEntryPoint implements AsmInitializer { 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 d61bb74c7..00be6a437 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 @@ -110,7 +110,7 @@ public final class MinecraftUtil { builder.temperatureModifier(Objects.requireNonNull(vanillaBiomeProperties.getTemperatureModifier())); builder.spawnSettings(Objects.requireNonNull(vanillaBiomeProperties.getSpawnSettings())); - + return builder .effects(effects.build()) .generationSettings(generationSettings.build()) diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/asm/FertilizableASM.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/asm/FertilizableASM.java index e8d525c52..09cfa0272 100644 --- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/asm/FertilizableASM.java +++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/asm/FertilizableASM.java @@ -14,8 +14,8 @@ import org.objectweb.asm.tree.VarInsnNode; import java.io.IOException; -import com.dfsek.terra.lifecycle.util.LoaderUtil; import com.dfsek.terra.lifecycle.util.ASMUtil; +import com.dfsek.terra.lifecycle.util.LoaderUtil; import com.dfsek.terra.mod.util.FertilizableUtil; import static org.objectweb.asm.Opcodes.ACC_STATIC;