First steps to refactor api package

Author: robotgryphon

build.gradle

@@ -21,6 +21,16 @@ archivesBaseName = mod_id
 
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 
+sourceSets {
+    api
+    main
+    test
+}
+
+configurations {
+    apiCompile.extendsFrom(compile)
+}
+
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 minecraft {
     mappings channel: 'snapshot', version: mappings_version
@@ -146,6 +156,8 @@ dependencies {
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
+    implementation sourceSets.api.output
+
     // Deobfuscate each dev mod for runtime
     dev_mods.each {
         compileOnly fg.deobf(it)

src/main/java/com/robotgryphon/compactmachines/tunnels/EnumTunnelSide.java renamed to src/api/java/com/robotgryphon/compactmachines/api/tunnels/EnumTunnelSide.java

@@ -1,4 +1,4 @@
-package com.robotgryphon.compactmachines.tunnels;
+package com.robotgryphon.compactmachines.api.tunnels;
 
 /**
  * Represents the side of a tunnel (inside or outside).

src/main/java/com/robotgryphon/compactmachines/tunnels/api/ICapableTunnel.java renamed to src/api/java/com/robotgryphon/compactmachines/api/tunnels/ICapableTunnel.java

@@ -1,4 +1,4 @@
-package com.robotgryphon.compactmachines.tunnels.api;
+package com.robotgryphon.compactmachines.api.tunnels;
 
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;

src/main/java/com/robotgryphon/compactmachines/tunnels/api/IItemTunnel.java renamed to src/api/java/com/robotgryphon/compactmachines/api/tunnels/IItemTunnel.java

@@ -1,4 +1,4 @@
-package com.robotgryphon.compactmachines.tunnels.api;
+package com.robotgryphon.compactmachines.api.tunnels;
 
 public interface IItemTunnel extends ICapableTunnel {
 

src/main/java/com/robotgryphon/compactmachines/tunnels/api/IRedstoneTunnel.java renamed to src/api/java/com/robotgryphon/compactmachines/api/tunnels/IRedstoneTunnel.java

@@ -1,4 +1,4 @@
-package com.robotgryphon.compactmachines.tunnels.api;
+package com.robotgryphon.compactmachines.api.tunnels;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.util.Direction;

src/main/java/com/robotgryphon/compactmachines/tunnels/TunnelDefinition.java renamed to src/api/java/com/robotgryphon/compactmachines/api/tunnels/TunnelDefinition.java

@@ -1,4 +1,4 @@
-package com.robotgryphon.compactmachines.tunnels;
+package com.robotgryphon.compactmachines.api.tunnels;
 
 import net.minecraft.item.Item;
 import net.minecraftforge.registries.ForgeRegistryEntry;

src/main/java/com/robotgryphon/compactmachines/block/tiles/CompactMachineTile.java

@@ -7,9 +7,9 @@
 import com.robotgryphon.compactmachines.data.machines.CompactMachinePlayerData;
 import com.robotgryphon.compactmachines.data.machines.CompactMachineRegistrationData;
 import com.robotgryphon.compactmachines.reference.Reference;
-import com.robotgryphon.compactmachines.tunnels.TunnelDefinition;
+import com.robotgryphon.compactmachines.api.tunnels.TunnelDefinition;
 import com.robotgryphon.compactmachines.tunnels.TunnelHelper;
-import com.robotgryphon.compactmachines.tunnels.api.ICapableTunnel;
+import com.robotgryphon.compactmachines.api.tunnels.ICapableTunnel;
 import net.minecraft.block.BlockState;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.nbt.ListNBT;
@@ -21,7 +21,6 @@
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
-import net.minecraft.world.IWorld;
 import net.minecraft.world.chunk.IChunk;
 import net.minecraft.world.server.ServerWorld;
 import net.minecraftforge.common.capabilities.Capability;

src/main/java/com/robotgryphon/compactmachines/block/tiles/TunnelWallTile.java

@@ -6,8 +6,8 @@
 import com.robotgryphon.compactmachines.network.NetworkHandler;
 import com.robotgryphon.compactmachines.network.TunnelAddedPacket;
 import com.robotgryphon.compactmachines.teleportation.DimensionalPosition;
-import com.robotgryphon.compactmachines.tunnels.TunnelDefinition;
-import com.robotgryphon.compactmachines.tunnels.api.ICapableTunnel;
+import com.robotgryphon.compactmachines.api.tunnels.TunnelDefinition;
+import com.robotgryphon.compactmachines.api.tunnels.ICapableTunnel;
 import com.robotgryphon.compactmachines.util.CompactMachineUtil;
 import net.minecraft.block.BlockState;
 import net.minecraft.nbt.CompoundNBT;

src/main/java/com/robotgryphon/compactmachines/block/walls/TunnelWallBlock.java

@@ -5,9 +5,9 @@
 import com.robotgryphon.compactmachines.compat.theoneprobe.IProbeDataProvider;
 import com.robotgryphon.compactmachines.compat.theoneprobe.providers.TunnelProvider;
 import com.robotgryphon.compactmachines.core.Registration;
-import com.robotgryphon.compactmachines.tunnels.TunnelDefinition;
+import com.robotgryphon.compactmachines.api.tunnels.TunnelDefinition;
 import com.robotgryphon.compactmachines.tunnels.TunnelHelper;
-import com.robotgryphon.compactmachines.tunnels.api.IRedstoneTunnel;
+import com.robotgryphon.compactmachines.api.tunnels.IRedstoneTunnel;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.item.ItemEntity;
@@ -106,7 +106,6 @@ public ActionResultType onBlockActivated(BlockState state, World worldIn, BlockP
 
 
         if (player.isSneaking()) {
-            // TODO Remove tunnelDef and return
             Optional<TunnelDefinition> tunnelDef = getTunnelInfo(worldIn, pos);
 
             if (!tunnelDef.isPresent())

src/main/java/com/robotgryphon/compactmachines/client/TunnelColors.java

@@ -1,7 +1,7 @@
 package com.robotgryphon.compactmachines.client;
 
 import com.robotgryphon.compactmachines.block.tiles.TunnelWallTile;
-import com.robotgryphon.compactmachines.tunnels.TunnelDefinition;
+import com.robotgryphon.compactmachines.api.tunnels.TunnelDefinition;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.renderer.color.IBlockColor;
 import net.minecraft.tileentity.TileEntity;