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

preparations for Sponge API8

Browse Source
This commit is contained in:
dfsek
2021-02-23 15:57:27 -07:00
parent 98c1fea7fd
commit 9c2b844290
33 changed files with 413 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,8 @@ import com.dfsek.terra.api.registry.CheckedRegistry;
import com.dfsek.terra.api.registry.LockedRegistry;
import com.dfsek.terra.api.transform.NotNullValidator;
import com.dfsek.terra.api.transform.Transformer;
import com.dfsek.terra.api.util.DebugLogger;
import com.dfsek.terra.api.util.logging.DebugLogger;
import com.dfsek.terra.api.util.logging.Logger;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.tree.Tree;
import com.dfsek.terra.config.GenericLoaders;
@@ -73,9 +74,7 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.LogManager;
import java.util.logging.Logger;
public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
@@ -93,16 +92,24 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
public static final ConfiguredFeature<?, ?> POPULATOR_CONFIGURED_FEATURE = POPULATOR_FEATURE.configure(FeatureConfig.DEFAULT).decorate(Decorator.NOPE.configure(NopeDecoratorConfig.INSTANCE));
private final GenericLoaders genericLoaders = new GenericLoaders(this);
private final Logger logger;
private final DebugLogger debugLogger;
private final Logger logger = new Logger() {
@Override
public void info(String message) {
}
@Override
public void warning(String message) {
}
@Override
public void severe(String message) {
}
};
private final DebugLogger debugLogger = new DebugLogger(logger);
{
Logger logger = Logger.getLogger("Terra");
LogManager.getLogManager().addLogger(logger);
this.logger = logger;
debugLogger = new DebugLogger(logger);
debugLogger.setDebug(true);
}
private final ItemHandle itemHandle = new FabricItemHandle();
private final WorldHandle worldHandle = new FabricWorldHandle();
@@ -131,7 +138,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
}
@Override
public Logger getLogger() {
public Logger logger() {
return logger;
}
@@ -254,8 +261,6 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
@Override
public void onInitialize() {
logger.setLevel(Level.INFO);
instance = this;
config = new File(FabricLoader.getInstance().getConfigDir().toFile(), "Terra");

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGeneratorWrapper.java
View File

@@ -76,7 +76,7 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements com.d
this.pack = configPack;
this.delegate = new DefaultChunkGenerator3D(configPack, TerraFabricPlugin.getInstance(), pack.getSamplerCache());
delegate.getMain().getLogger().info("Loading world...");
delegate.getMain().logger().info("Loading world...");
this.biomeSource = biomeSource;
this.seed = seed;