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

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
Download Patch File Download Diff File Expand all files Collapse all files

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;
}