Post-Merge fixes

2020-08-02 22:30:59 +02:00
parent c0fa8ab2dc
commit d238f6e8e4
10 changed files with 82 additions and 68 deletions
@@ -3,6 +3,8 @@ package appeng.core;
 import java.util.OptionalLong;
 import java.util.function.Consumer;

+import javax.annotation.Nullable;
+
 import net.earthcomputer.libstructure.LibStructure;
 import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry;
@@ -152,8 +154,6 @@ import appeng.worldgen.ChargedQuartzOreConfig;
 import appeng.worldgen.ChargedQuartzOreFeature;
 import appeng.worldgen.meteorite.MeteoriteStructure;

-import javax.annotation.Nullable;
-
 public abstract class AppEngBase implements AppEng {

    protected AdvancementTriggers advancementTriggers;