mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-23 16:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
dfsek
2020-12-18 15:44:16 -07:00
parent b33c8d6b77
commit 300fe10da5
1 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
View File

@@ -48,10 +48,7 @@ import net.minecraft.world.gen.feature.ConfiguredFeature;
import net.minecraft.world.gen.feature.ConfiguredFeatures; import net.minecraft.world.gen.feature.ConfiguredFeatures;
import net.minecraft.world.gen.feature.DefaultBiomeFeatures; import net.minecraft.world.gen.feature.DefaultBiomeFeatures;
import net.minecraft.world.gen.feature.DefaultFeatureConfig; import net.minecraft.world.gen.feature.DefaultFeatureConfig;
import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.feature.FeatureConfig; import net.minecraft.world.gen.feature.FeatureConfig;
import net.minecraft.world.gen.feature.HugeMushroomFeature;
import net.minecraft.world.gen.feature.TreeFeature;
import net.minecraft.world.gen.surfacebuilder.SurfaceBuilder; import net.minecraft.world.gen.surfacebuilder.SurfaceBuilder;
import net.minecraft.world.gen.surfacebuilder.TernarySurfaceConfig; import net.minecraft.world.gen.surfacebuilder.TernarySurfaceConfig;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
@@ -83,12 +80,20 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
private final WorldHandle worldHandle = new FabricWorldHandle(); private final WorldHandle worldHandle = new FabricWorldHandle();
private final ConfigRegistry registry = new ConfigRegistry(); private final ConfigRegistry registry = new ConfigRegistry();
private File config; private File config;
private final PluginConfig plugin; private static final Transformer<String, ConfiguredFeature<?, ?>> TREE_TRANSFORMER = new Transformer.Builder<String, ConfiguredFeature<?, ?>>()
.addTransform(TerraFabricPlugin::getFeature)
{ .addTransform(id -> getFeature(StringUtils.stripMinecraftNamespace(id)))
logger.setLevel(Level.INFO); .addTransform(new MapTransform<String, ConfiguredFeature<?, ?>>()
plugin = new PluginConfig(); .add("BROWN_MUSHROOM", ConfiguredFeatures.BROWN_MUSHROOM_GIANT)
} .add("RED_MUSHROOM", ConfiguredFeatures.RED_MUSHROOM_GIANT)
.add("JUNGLE", ConfiguredFeatures.MEGA_JUNGLE_TREE)
.add("JUNGLE_COCOA", ConfiguredFeatures.JUNGLE_TREE)
.add("LARGE_OAK", ConfiguredFeatures.FANCY_OAK)
.add("LARGE_SPRUCE", ConfiguredFeatures.PINE)
.add("SMALL_JUNGLE", ConfiguredFeatures.JUNGLE_TREE)
.add("SWAMP_OAK", ConfiguredFeatures.SWAMP_TREE)
.add("TALL_BIRCH", ConfiguredFeatures.BIRCH_TALL)).build();
private final PluginConfig plugin = new PluginConfig();
@Override @Override
public WorldHandle getWorldHandle() { public WorldHandle getWorldHandle() {
@@ -131,7 +136,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
@Override @Override
public Language getLanguage() { public Language getLanguage() {
try { try {
return new Language(new File(getDataFolder(), "lang/en_us/yml")); return new Language(new File(getDataFolder(), "lang/en_us.yml"));
} catch(IOException e) { } catch(IOException e) {
throw new IllegalArgumentException(); throw new IllegalArgumentException();
} }
@@ -207,8 +212,8 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
.category(vanilla.getCategory()) .category(vanilla.getCategory())
.depth(vanilla.getDepth()) .depth(vanilla.getDepth())
.scale(vanilla.getScale()) .scale(vanilla.getScale())
.temperature(0.8F) .temperature(vanilla.getTemperature())
.downfall(0.4F) .downfall(vanilla.getDownfall())
.effects(vanilla.getEffects()) // TODO: configurable .effects(vanilla.getEffects()) // TODO: configurable
.spawnSettings(spawnSettings.build()) .spawnSettings(spawnSettings.build())
.generationSettings(generationSettings.build()) .generationSettings(generationSettings.build())
@@ -228,26 +233,10 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
@Override @Override
public void onInitialize() { public void onInitialize() {
logger.setLevel(Level.INFO);
instance = this; instance = this;
Map<Identifier, Feature<?>> treeFeatureMap = new HashMap<>(); ((FabricWorldHandle) worldHandle).setTreeTransformer(TREE_TRANSFORMER);
BuiltinRegistries.CONFIGURED_FEATURE.stream().filter(feature ->
feature.feature instanceof TreeFeature
|| feature.feature instanceof HugeMushroomFeature).forEach(tree -> System.out.println(BuiltinRegistries.CONFIGURED_FEATURE.getId(tree)));
Transformer<String, ConfiguredFeature<?, ?>> treeTransformer = new Transformer.Builder<String, ConfiguredFeature<?, ?>>()
.addTransform(TerraFabricPlugin::getFeature)
.addTransform(id -> getFeature(StringUtils.stripMinecraftNamespace(id)))
.addTransform(new MapTransform<String, ConfiguredFeature<?, ?>>()
.add("BROWN_MUSHROOM", ConfiguredFeatures.BROWN_MUSHROOM_GIANT)
.add("RED_MUSHROOM", ConfiguredFeatures.RED_MUSHROOM_GIANT)
.add("JUNGLE", ConfiguredFeatures.MEGA_JUNGLE_TREE)
.add("JUNGLE_COCOA", ConfiguredFeatures.JUNGLE_TREE)
.add("LARGE_OAK", ConfiguredFeatures.FANCY_OAK)
.add("LARGE_SPRUCE", ConfiguredFeatures.PINE)
.add("SMALL_JUNGLE", ConfiguredFeatures.JUNGLE_TREE)
.add("SWAMP_OAK", ConfiguredFeatures.SWAMP_TREE)
.add("TALL_BIRCH", ConfiguredFeatures.BIRCH_TALL)).build();
((FabricWorldHandle) worldHandle).setTreeTransformer(treeTransformer);
config = new File(FabricLoader.getInstance().getConfigDir().toFile(), "Terra"); config = new File(FabricLoader.getInstance().getConfigDir().toFile(), "Terra");
saveDefaultConfig(); saveDefaultConfig();