Moving to source sets

.gitignore

@@ -15,8 +15,6 @@
 !LICENSE
 
 # include sourcecode except generated
-!core/
-!api/
 !src/
 src/generated
 

build.gradle

@@ -18,7 +18,7 @@
 
 plugins {
     id 'java'
-    id 'fabric-loom'
+    id 'fabric-loom' version "${loom_version}" apply false
     id 'maven-publish'
     id "org.jetbrains.kotlin.jvm" apply false
 }
@@ -62,12 +62,12 @@ allprojects {
     }
 
     dependencies {
-        minecraft "com.mojang:minecraft:1.16.1"
+        minecraft "com.mojang:minecraft:${project.minecraft_version}"
-        mappings "net.fabricmc:yarn:1.16.1+build.9:v2"
+        mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-        modImplementation "net.fabricmc:fabric-loader:0.8.8+build.202"
+        modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
         //Fabric api
-        modImplementation "net.fabricmc.fabric-api:fabric-api:0.14.0+build.371-1.16"
+        modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
 
         modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}"
 

core/src/main/java/appeng/crafting/CraftingJob.java

@@ -1,8 +0,0 @@
-package appeng.crafting;
-
-// FIXME FABRIC DUMMY
-public class CraftingJob {
-    public boolean simulateFor(int simTime) {
-        return false;
-    }
-}

core/src/main/java/appeng/me/cache/P2PCache.java

@@ -1,41 +0,0 @@
-package appeng.me.cache;
-
-import appeng.api.networking.IGridCache;
-import appeng.api.networking.IGridHost;
-import appeng.api.networking.IGridNode;
-import appeng.api.networking.IGridStorage;
-
-import javax.annotation.Nonnull;
-
-// FIXME FABRIC DUMMY
-public class P2PCache implements IGridCache {
-    @Override
-    public void onUpdateTick() {
-
-    }
-
-    @Override
-    public void removeNode(@Nonnull IGridNode gridNode, @Nonnull IGridHost machine) {
-
-    }
-
-    @Override
-    public void addNode(@Nonnull IGridNode gridNode, @Nonnull IGridHost machine) {
-
-    }
-
-    @Override
-    public void onSplit(@Nonnull IGridStorage destinationStorage) {
-
-    }
-
-    @Override
-    public void onJoin(@Nonnull IGridStorage sourceStorage) {
-
-    }
-
-    @Override
-    public void populateGridStorage(@Nonnull IGridStorage destinationStorage) {
-
-    }
-}

core/src/main/java/appeng/tile/networking/ControllerBlockEntity.java

@@ -1,34 +0,0 @@
-package appeng.tile.networking;
-
-import appeng.api.networking.IGridHost;
-import appeng.api.networking.IGridNode;
-import appeng.api.util.AECableType;
-import appeng.api.util.AEPartLocation;
-import net.minecraft.util.math.BlockPos;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-// FIXME FABRIC DUMMY
-public class ControllerBlockEntity implements IGridHost {
-    @Nullable
-    @Override
-    public IGridNode getGridNode(@Nonnull AEPartLocation dir) {
-        return null;
-    }
-
-    @Nonnull
-    @Override
-    public AECableType getCableConnectionType(@Nonnull AEPartLocation dir) {
-        return null;
-    }
-
-    @Override
-    public void securityBreak() {
-
-    }
-
-    public BlockPos getPos() {
-        return null;
-    }
-}

gradle.properties

@@ -4,17 +4,17 @@ artifact_group=appeng
 artifact_basename=appliedenergistics2-fabric
 
 kotlin.code.style=official
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 # Check these on https://modmuss50.me/fabric.html
 
 minecraft_version=1.16.1
-yarn_mappings=1.16.1+build.9
+yarn_mappings=1.16.1+build.19
-loader_version=0.8.8+build.202
+loader_version=0.8.9+build.203
 
 #Fabric api
-fabric_version=0.14.0+build.371-1.16
+fabric_version=0.14.1+build.372-1.16
 
 loom_version=0.4-SNAPSHOT