mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-01 23:47:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
dfsek 2021-09-26 22:49:47 -07:00
parent 0a6a3268da
commit 10f62b75b6
5 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/api/core/src/main/java/com/dfsek/terra/api/Platform.java
View File

@ -19,8 +19,6 @@ import com.dfsek.terra.api.tectonic.LoaderRegistrar;
* Represents a Terra mod/plugin instance.
*/
public interface Platform extends LoaderRegistrar {
Logger logger();
boolean reload();
String platformName();

1
common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java
View File

@ -23,7 +23,6 @@ public final class LangUtil {
private LangUtil() { }
public static void load(String langID, Platform platform) {
Logger logger = platform.logger();
File file = new File(platform.getDataFolder(), "lang");
try {
File file1 = new File(file, langID + ".yml");

6
common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java
View File

@ -137,7 +137,7 @@ public class ConfigPackImpl implements ConfigPack {
ConfigPackPostTemplate packPostTemplate = new ConfigPackPostTemplate();
selfLoader.load(packPostTemplate, configuration);
seededBiomeProvider = packPostTemplate.getProviderBuilder();
checkDeadEntries(platform);
checkDeadEntries();
} catch(FileNotFoundException e) {
throw new LoadException("No pack.yml file found in " + folder.getAbsolutePath(), e);
}
@ -189,7 +189,7 @@ public class ConfigPackImpl implements ConfigPack {
selfLoader.load(packPostTemplate, configuration);
seededBiomeProvider = packPostTemplate.getProviderBuilder();
checkDeadEntries(platform);
checkDeadEntries();
} catch(IOException e) {
throw new LoadException("Unable to load pack.yml from ZIP file", e);
}
@ -362,7 +362,7 @@ public class ConfigPackImpl implements ConfigPack {
});
}
private void checkDeadEntries(TerraPlugin main) {
private void checkDeadEntries() {
registryMap.forEach((clazz, pair) -> ((OpenRegistryImpl<?>) pair.getLeft())
.getDeadEntries()
.forEach((id, value) -> logger.warn("Dead entry in '{}' registry: '{}'", ReflectionUtil.typeToString(clazz), id)));

1
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java
View File

@ -10,7 +10,6 @@ import java.util.Locale;
import java.util.Optional;
import com.dfsek.terra.AbstractPlatform;
import com.dfsek.terra.api.util.Logger;
import com.dfsek.terra.api.addon.TerraAddon;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.handle.ItemHandle;

4
platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricEntryPoint.java
View File

@ -25,8 +25,8 @@ public class FabricEntryPoint implements ModInitializer {
public static final ConfiguredFeature<?, ?> POPULATOR_CONFIGURED_FEATURE = POPULATOR_FEATURE.configure(FeatureConfig.DEFAULT).decorate(
Decorator.NOPE.configure(NopeDecoratorConfig.INSTANCE));
private static final PlatformImpl TERRA_PLUGIN = new PlatformImpl();
.decorate(Decorator.NOPE.configure(
NopeDecoratorConfig.INSTANCE));
public static PlatformImpl getTerraPlugin() {
return TERRA_PLUGIN;
}