PipeNet rewrite

dependencies.gradle

@@ -46,6 +46,10 @@ dependencies {
     api rfg.deobf("curse.maven:ae2-extended-life-570458:4402048") // AE2UEL 0.55.6
     api rfg.deobf("curse.maven:ctm-267602:2915363") // CTM 1.0.2.31
 
+    // Shadowed Dependencies
+    // Packages that aren't mods, and thus need to be included in the release files.
+    shadowCompile 'org.jgrapht:jgrapht-core:1.4.0' // JGraphT 1.4.0
+
     // Non-published dependencies
     // Change any to devOnlyNonPublishable to test them in-game.
     compileOnly("curse.maven:journeymap-32274:2916002") // Journeymap 5.7.1

gradle.properties

@@ -82,7 +82,7 @@ includeCommonDevEnvMods = true
 
 # If enabled, you may use 'shadowCompile' for dependencies. They will be integrated in your jar. It is your
 # responsibility check the licence and request permission for distribution, if required.
-usesShadowedDependencies = false
+usesShadowedDependencies = true
 # If disabled, won't remove unused classes from shaded dependencies. Some libraries use reflection to access
 # their own classes, making the minimization unreliable.
 minimizeShadowedDependencies = true

src/main/java/gregtech/api/block/UnlistedByteProperty.java

@@ -0,0 +1,36 @@
+package gregtech.api.block;
+
+import net.minecraftforge.common.property.IUnlistedProperty;
+
+import org.jetbrains.annotations.NotNull;
+
+public class UnlistedByteProperty implements IUnlistedProperty<Byte> {
+
+    private final String name;
+
+    public UnlistedByteProperty(@NotNull String name) {
+        this.name = name;
+    }
+
+    @NotNull
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    @Override
+    public boolean isValid(Byte value) {
+        return true;
+    }
+
+    @NotNull
+    @Override
+    public Class<Byte> getType() {
+        return Byte.class;
+    }
+
+    @Override
+    public String valueToString(@NotNull Byte value) {
+        return value.toString();
+    }
+}

src/main/java/gregtech/api/block/UnlistedFloatProperty.java

@@ -0,0 +1,36 @@
+package gregtech.api.block;
+
+import net.minecraftforge.common.property.IUnlistedProperty;
+
+import org.jetbrains.annotations.NotNull;
+
+public class UnlistedFloatProperty implements IUnlistedProperty<Float> {
+
+    private final String name;
+
+    public UnlistedFloatProperty(@NotNull String name) {
+        this.name = name;
+    }
+
+    @NotNull
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    @Override
+    public boolean isValid(Float value) {
+        return true;
+    }
+
+    @NotNull
+    @Override
+    public Class<Float> getType() {
+        return Float.class;
+    }
+
+    @Override
+    public String valueToString(@NotNull Float value) {
+        return value.toString();
+    }
+}

src/main/java/gregtech/api/block/UnlistedPropertyMaterial.java

@@ -0,0 +1,37 @@
+package gregtech.api.block;
+
+import gregtech.api.unification.material.Material;
+
+import net.minecraftforge.common.property.IUnlistedProperty;
+
+import org.jetbrains.annotations.NotNull;
+
+public class UnlistedPropertyMaterial implements IUnlistedProperty<Material> {
+
+    private final String name;
+
+    public UnlistedPropertyMaterial(@NotNull String name) {
+        this.name = name;
+    }
+
+    @NotNull
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public boolean isValid(Material value) {
+        return true;
+    }
+
+    @Override
+    public Class<Material> getType() {
+        return Material.class;
+    }
+
+    @Override
+    public String valueToString(Material value) {
+        return value.toString();
+    }
+}

src/main/java/gregtech/api/block/machines/BlockMachine.java

@@ -6,13 +6,13 @@
 import gregtech.api.block.UnlistedStringProperty;
 import gregtech.api.cover.Cover;
 import gregtech.api.cover.IFacadeCover;
+import gregtech.api.graphnet.pipenetold.IBlockAppearance;
 import gregtech.api.items.toolitem.ToolClasses;
 import gregtech.api.items.toolitem.ToolHelper;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.MetaTileEntityHolder;
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
 import gregtech.api.metatileentity.multiblock.MultiblockControllerBase;
-import gregtech.api.pipenet.IBlockAppearance;
 import gregtech.api.util.GTUtility;
 import gregtech.api.util.Mods;
 import gregtech.client.renderer.handler.MetaTileEntityRenderer;

src/main/java/gregtech/api/block/machines/MachineItemBlock.java

@@ -4,15 +4,12 @@
 import gregtech.api.GregTechAPI;
 import gregtech.api.metatileentity.ITieredMetaTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.pipenet.block.BlockPipe;
-import gregtech.api.pipenet.tile.IPipeTile;
 import gregtech.api.util.GTUtility;
 import gregtech.api.util.LocalizationUtils;
 import gregtech.client.utils.TooltipHelper;
 import gregtech.common.ConfigHolder;
 import gregtech.common.creativetab.GTCreativeTabs;
 
-import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.client.util.ITooltipFlag;
@@ -91,20 +88,8 @@ public boolean placeBlockAt(@NotNull ItemStack stack, @NotNull EntityPlayer play
         MetaTileEntity metaTileEntity = GTUtility.getMetaTileEntity(stack);
         // prevent rendering glitch before meta tile entity sync to client, but after block placement
         // set opaque property on the placing on block, instead during set of meta tile entity
-        boolean superVal = super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ,
+        return super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ,
                 newState.withProperty(BlockMachine.OPAQUE, metaTileEntity == null || metaTileEntity.isOpaqueCube()));
-        if (superVal && !world.isRemote) {
-            BlockPos possiblePipe = pos.offset(side.getOpposite());
-            Block block = world.getBlockState(possiblePipe).getBlock();
-            if (block instanceof BlockPipe) {
-                IPipeTile pipeTile = ((BlockPipe<?, ?, ?>) block).getPipeTileEntity(world, possiblePipe);
-                if (pipeTile != null && ((BlockPipe<?, ?, ?>) block).canPipeConnectToBlock(pipeTile, side.getOpposite(),
-                        world.getTileEntity(pos))) {
-                    pipeTile.setConnection(side, true, false);
-                }
-            }
-        }
-        return superVal;
     }
 
     @Nullable

src/main/java/gregtech/api/capability/GregtechDataCodes.java

@@ -58,7 +58,7 @@ public static int assignId() {
     public static final int UPDATE_FACADE_STACK = assignId();
 
     // Pipe implementation update codes
-    public static final int UPDATE_INSULATION_COLOR = assignId();
+    public static final int UPDATE_PAINT = assignId();
     public static final int UPDATE_CONNECTIONS = assignId();
     public static final int SYNC_COVER_IMPLEMENTATION = assignId();
     public static final int UPDATE_PIPE_TYPE = assignId();
@@ -68,9 +68,9 @@ public static int assignId() {
     public static final int UPDATE_COVER_DATA_PIPE = assignId();
     public static final int COVER_ATTACHED_PIPE = assignId();
     public static final int COVER_REMOVED_PIPE = assignId();
-    public static final int PIPE_OPTICAL_ACTIVE = assignId();
-    public static final int PIPE_LASER_ACTIVE = assignId();
+    public static final int PIPE_ACTIVE = assignId();
     public static final int CABLE_TEMPERATURE = assignId();
+    public static final int UPDATE_PIPE_LOGIC = assignId();
 
     // Multiblock implementation update codes
     public static final int SYNC_CONTROLLER = assignId();

src/main/java/gregtech/api/capability/GregtechTileCapabilities.java

@@ -1,5 +1,6 @@
 package gregtech.api.capability;
 
+import gregtech.api.capability.data.IDataAccess;
 import gregtech.api.capability.impl.AbstractRecipeLogic;
 import gregtech.api.cover.CoverHolder;
 import gregtech.api.metatileentity.multiblock.IMaintenance;
@@ -30,12 +31,9 @@ public class GregtechTileCapabilities {
     @CapabilityInject(IMaintenance.class)
     public static Capability<IMaintenance> CAPABILITY_MAINTENANCE = null;
 
-    @CapabilityInject(IDataAccessHatch.class)
-    public static Capability<IDataAccessHatch> CAPABILITY_DATA_ACCESS = null;
+    @CapabilityInject(IDataAccess.class)
+    public static Capability<IDataAccess> CAPABILITY_DATA_ACCESS = null;
 
-    @CapabilityInject(ILaserContainer.class)
-    public static Capability<ILaserContainer> CAPABILITY_LASER = null;
-
-    @CapabilityInject(IOpticalComputationProvider.class)
-    public static Capability<IOpticalComputationProvider> CABABILITY_COMPUTATION_PROVIDER = null;
+    @CapabilityInject(ILaserRelay.class)
+    public static Capability<ILaserRelay> CAPABILITY_LASER = null;
 }

src/main/java/gregtech/api/capability/IEnergyContainer.java

@@ -5,14 +5,18 @@
 public interface IEnergyContainer {
 
     /**
-     * This method is basically {@link #changeEnergy(long)}, but it also handles amperes.
+     * This method is basically {@link #changeEnergy(long)}, but it also handles amperes and simulation.
      * This method should always be used when energy is passed between blocks.
      *
-     * @param voltage  amount of energy packets (energy to add / input voltage)
-     * @param amperage packet size (energy to add / input amperage)
+     * @param voltage  packet size (energy to add divided by input amperage)
+     * @param amperage amount of energy packets (energy to add divided by input voltage)
      * @return amount of used amperes. 0 if not accepted anything.
      */
-    long acceptEnergyFromNetwork(EnumFacing side, long voltage, long amperage);
+    long acceptEnergyFromNetwork(EnumFacing side, long voltage, long amperage, boolean simulate);
+
+    default long acceptEnergyFromNetwork(EnumFacing side, long voltage, long amperage) {
+        return acceptEnergyFromNetwork(side, voltage, amperage, false);
+    }
 
     /**
      * @return if this container accepts energy from the given side
@@ -123,7 +127,7 @@ default boolean isOneProbeHidden() {
     IEnergyContainer DEFAULT = new IEnergyContainer() {
 
         @Override
-        public long acceptEnergyFromNetwork(EnumFacing enumFacing, long l, long l1) {
+        public long acceptEnergyFromNetwork(EnumFacing side, long voltage, long amperage, boolean simulate) {
             return 0;
         }
 

src/main/java/gregtech/api/capability/ILaserContainer.java

@@ -1,6 +1,3 @@
 package gregtech.api.capability;
 
-/**
- * It is its own separate interface to make piping work easier
- */
-public interface ILaserContainer extends IEnergyContainer {}
+public interface ILaserContainer extends ILaserRelay, IEnergyContainer {}

src/main/java/gregtech/api/capability/ILaserRelay.java

@@ -0,0 +1,13 @@
+package gregtech.api.capability;
+
+public interface ILaserRelay {
+
+    /**
+     * Receive a laser pulse.
+     * 
+     * @param laserVoltage  the voltage of the laser.
+     * @param laserAmperage the amperage of the laser.
+     * @return how much amperage was received.
+     */
+    long receiveLaser(long laserVoltage, long laserAmperage);
+}