Fix server startup, jar building and after-merge fixes.

src/main/java/appeng/client/AppEngClient.java

@@ -195,7 +195,7 @@ public final class AppEngClient extends AppEngBase {
         // On the client, we'll register for server startup/shutdown to properly setup
         // WorldData
         // each time the integrated server starts&stops
-        ServerLifecycleEvents.SERVER_STARTED.register(WorldData::onServerStarting);
+        ServerLifecycleEvents.SERVER_STARTING.register(WorldData::onServerStarting);
         ServerLifecycleEvents.SERVER_STOPPING.register(server -> WorldData.instance().onServerStopping());
         ServerLifecycleEvents.SERVER_STOPPED.register(server -> WorldData.instance().onServerStoppped());
 

src/main/java/appeng/client/render/cablebus/FacadeBlockAccess.java

@@ -68,12 +68,6 @@ public class FacadeBlockAccess implements BlockRenderView {
         return world.getFluidState(pos);
     }
 
-    // This is for diffuse lighting
-    @Override
-    public float func_230487_a_(Direction p_230487_1_, boolean p_230487_2_) {
-        return world.func_230487_a_(p_230487_1_, p_230487_2_);
-    }
-
     @Override
     public LightingProvider getLightingProvider() {
         return world.getLightingProvider();

src/main/java/appeng/mixins/DimensionStructuresSettingsMixin.java

@@ -1,40 +0,0 @@
-package appeng.mixins;
-
-import com.google.common.collect.ImmutableMap;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.world.gen.feature.structure.Structure;
-import net.minecraft.world.gen.settings.DimensionStructuresSettings;
-import net.minecraft.world.gen.settings.StructureSeparationSettings;
-
-import appeng.worldgen.meteorite.MeteoriteStructure;
-
-/**
- * This Mixin will add the structure placement configuration for the meteorite
- * structure to the static final immutable map that contains them. There is
- * currently no Forge hook for this, and registering them during the registry
- * event is already too late.
- * <p>
- * If this is not done, Meteorites spawn every chunk, since that is the default
- * for missing entries.
- */
-@Mixin(DimensionStructuresSettings.class)
-public class DimensionStructuresSettingsMixin {
-
-    @Shadow
-    @Mutable
-    private static ImmutableMap<Structure<?>, StructureSeparationSettings> field_236191_b_;
-
-    @Inject(method = "<clinit>", at = @At("TAIL"))
-    private static void addMeteoriteSpreadConfig(CallbackInfo ci) {
-        field_236191_b_ = ImmutableMap.<Structure<?>, StructureSeparationSettings>builder().putAll(field_236191_b_)
-                .put(MeteoriteStructure.INSTANCE, new StructureSeparationSettings(32, 8, 124895654)).build();
-    }
-
-}

src/main/java/appeng/mixins/StructureAccessor.java

@@ -1,17 +0,0 @@
-package appeng.mixins;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-import net.minecraft.world.gen.GenerationStage;
-import net.minecraft.world.gen.feature.structure.Structure;
-
-@Mixin(Structure.class)
-public interface StructureAccessor {
-
-    @Invoker("func_236394_a_")
-    static <F extends Structure<?>> F register(String id, F feature, GenerationStage.Decoration defaultStage) {
-        throw new AssertionError();
-    }
-
-}