Fix some stuff

src/main/java/cofh/api/energy/EnergyStorage.java

@@ -6,7 +6,6 @@ import net.minecraft.nbt.NBTTagCompound;
  * Reference implementation of {@link IEnergyStorage}. Use/extend this or implement your own.
  *
  * @author King Lemming
- *
  */
 public class EnergyStorage implements IEnergyStorage {
 

src/main/java/cofh/api/energy/IEnergyConnection.java

@@ -10,7 +10,6 @@ import net.minecraft.util.EnumFacing;
  * Note that {@link IEnergyHandler} is an extension of this.
  *
  * @author King Lemming
- *
  */
 public interface IEnergyConnection {
 

src/main/java/cofh/api/energy/IEnergyContainerItem.java

@@ -8,19 +8,15 @@ import net.minecraft.item.ItemStack;
  * A reference implementation is provided {@link ItemEnergyContainer}.
  *
  * @author King Lemming
- *
  */
 public interface IEnergyContainerItem {
 
     /**
      * Adds energy to a container item. Returns the quantity of energy that was accepted. This should always return 0 if the item cannot be externally charged.
      *
-	 * @param container
+     * @param container  ItemStack to be charged.
-	 *            ItemStack to be charged.
+     * @param maxReceive Maximum amount of energy to be sent into the item.
-	 * @param maxReceive
+     * @param simulate   If TRUE, the charge will only be simulated.
-	 *            Maximum amount of energy to be sent into the item.
-	 * @param simulate
-	 *            If TRUE, the charge will only be simulated.
      * @return Amount of energy that was (or would have been, if simulated) received by the item.
      */
     int receiveEnergy(ItemStack container, int maxReceive, boolean simulate);
@@ -29,12 +25,9 @@ public interface IEnergyContainerItem {
      * Removes energy from a container item. Returns the quantity of energy that was removed. This should always return 0 if the item cannot be externally
      * discharged.
      *
-	 * @param container
+     * @param container  ItemStack to be discharged.
-	 *            ItemStack to be discharged.
+     * @param maxExtract Maximum amount of energy to be extracted from the item.
-	 * @param maxExtract
+     * @param simulate   If TRUE, the discharge will only be simulated.
-	 *            Maximum amount of energy to be extracted from the item.
-	 * @param simulate
-	 *            If TRUE, the discharge will only be simulated.
      * @return Amount of energy that was (or would have been, if simulated) extracted from the item.
      */
     int extractEnergy(ItemStack container, int maxExtract, boolean simulate);

src/main/java/cofh/api/energy/IEnergyHandler.java

@@ -10,7 +10,6 @@ import net.minecraft.util.EnumFacing;
  * Note that {@link IEnergyReceiver} and {@link IEnergyProvider} are extensions of this.
  *
  * @author King Lemming
- *
  */
 public interface IEnergyHandler extends IEnergyConnection {
 

src/main/java/cofh/api/energy/IEnergyProvider.java

@@ -9,19 +9,15 @@ import net.minecraft.util.EnumFacing;
  * A reference implementation is provided {@link TileEnergyHandler}.
  *
  * @author King Lemming
- *
  */
 public interface IEnergyProvider extends IEnergyHandler {
 
     /**
      * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider.
      *
-	 * @param from
+     * @param from       Orientation the energy is extracted from.
-	 *            Orientation the energy is extracted from.
+     * @param maxExtract Maximum amount of energy to extract.
-	 * @param maxExtract
+     * @param simulate   If TRUE, the extraction will only be simulated.
-	 *            Maximum amount of energy to extract.
-	 * @param simulate
-	 *            If TRUE, the extraction will only be simulated.
      * @return Amount of energy that was (or would have been, if simulated) extracted.
      */
     int extractEnergy(EnumFacing from, int maxExtract, boolean simulate);

src/main/java/cofh/api/energy/IEnergyReceiver.java

@@ -9,19 +9,15 @@ import net.minecraft.util.EnumFacing;
  * A reference implementation is provided {@link TileEnergyHandler}.
  *
  * @author King Lemming
- *
  */
 public interface IEnergyReceiver extends IEnergyHandler {
 
     /**
      * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver.
      *
-	 * @param from
+     * @param from       Orientation the energy is received from.
-	 *            Orientation the energy is received from.
+     * @param maxReceive Maximum amount of energy to receive.
-	 * @param maxReceive
+     * @param simulate   If TRUE, the charge will only be simulated.
-	 *            Maximum amount of energy to receive.
-	 * @param simulate
-	 *            If TRUE, the charge will only be simulated.
      * @return Amount of energy that was (or would have been, if simulated) received.
      */
     int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate);

src/main/java/cofh/api/energy/IEnergyStorage.java

@@ -7,17 +7,14 @@ package cofh.api.energy;
  * A reference implementation can be found at {@link EnergyStorage}.
  *
  * @author King Lemming
- *
  */
 public interface IEnergyStorage {
 
     /**
      * Adds energy to the storage. Returns quantity of energy that was accepted.
      *
-	 * @param maxReceive
+     * @param maxReceive Maximum amount of energy to be inserted.
-	 *            Maximum amount of energy to be inserted.
+     * @param simulate   If TRUE, the insertion will only be simulated.
-	 * @param simulate
-	 *            If TRUE, the insertion will only be simulated.
      * @return Amount of energy that was (or would have been, if simulated) accepted by the storage.
      */
     int receiveEnergy(int maxReceive, boolean simulate);
@@ -25,10 +22,8 @@ public interface IEnergyStorage {
     /**
      * Removes energy from the storage. Returns quantity of energy that was removed.
      *
-	 * @param maxExtract
+     * @param maxExtract Maximum amount of energy to be extracted.
-	 *            Maximum amount of energy to be extracted.
+     * @param simulate   If TRUE, the extraction will only be simulated.
-	 * @param simulate
-	 *            If TRUE, the extraction will only be simulated.
      * @return Amount of energy that was (or would have been, if simulated) extracted from the storage.
      */
     int extractEnergy(int maxExtract, boolean simulate);

src/main/java/cofh/api/energy/ItemEnergyContainer.java

@@ -8,7 +8,6 @@ import net.minecraft.nbt.NBTTagCompound;
  * Reference implementation of {@link IEnergyContainerItem}. Use/extend this or implement your own.
  *
  * @author King Lemming
- *
  */
 public class ItemEnergyContainer extends Item implements IEnergyContainerItem {
 

src/main/java/cofh/api/energy/TileEnergyHandler.java

@@ -6,11 +6,10 @@ import net.minecraft.util.EnumFacing;
 
 /**
  * Reference implementation of {@link IEnergyReceiver} and {@link IEnergyProvider}. Use/extend this or implement your own.
- * 
+ * <p>
  * This class is really meant to summarize how each interface is properly used.
  *
  * @author King Lemming
- *
  */
 public class TileEnergyHandler extends TileEntity implements IEnergyReceiver, IEnergyProvider {
 

src/main/java/cofh/api/energy/package-info.java

@@ -5,6 +5,6 @@
 @API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHAPI", provides = "CoFHAPI|energy")
 package cofh.api.energy;
 
-import net.minecraftforge.fml.common.API;
 import cofh.api.CoFHAPIProps;
+import net.minecraftforge.fml.common.API;
 

src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java

@@ -2,8 +2,7 @@ package powercrystals.minefactoryreloaded.api;
 
 import net.minecraft.item.ItemStack;
 
-public interface IDeepStorageUnit
+public interface IDeepStorageUnit {
-{
     /**
      * @return A populated ItemStack with stackSize for the full amount of materials in the DSU. May have a stackSize > getMaxStackSize().
      */

src/main/java/refinedstorage/block/BlockConstructor.java

@@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageGui;
@@ -22,7 +23,7 @@ public class BlockConstructor extends BlockMachine {
     }
 
     @Override
-    public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
+    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
             player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.CONSTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ());
         }

src/main/java/refinedstorage/block/BlockDestructor.java

@@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageGui;
@@ -22,7 +23,7 @@ public class BlockDestructor extends BlockMachine {
     }
 
     @Override
-    public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
+    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
             player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DESTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ());
         }

src/main/java/refinedstorage/block/BlockDetector.java

@@ -66,7 +66,7 @@ public class BlockDetector extends BlockMachine {
     }
 
     @Override
-    public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
+    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
             player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DETECTOR, world, pos.getX(), pos.getY(), pos.getZ());
         }

src/main/java/refinedstorage/block/BlockDiskDrive.java

@@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageGui;
@@ -22,7 +23,7 @@ public class BlockDiskDrive extends BlockMachine {
     }
 
     @Override
-    public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
+    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
             player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DISK_DRIVE, world, pos.getX(), pos.getY(), pos.getZ());
         }

src/main/java/refinedstorage/block/BlockExporter.java

@@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageGui;
@@ -22,7 +23,7 @@ public class BlockExporter extends BlockMachine {
     }
 
     @Override
-    public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
+    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
             player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.EXPORTER, world, pos.getX(), pos.getY(), pos.getZ());
         }

src/main/java/refinedstorage/block/BlockExternalStorage.java

@@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageGui;
@@ -22,7 +23,7 @@ public class BlockExternalStorage extends BlockMachine {
     }
 
     @Override
-    public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
+    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
             player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ());
         }

src/main/java/refinedstorage/block/BlockImporter.java

@@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageGui;
@@ -22,7 +23,7 @@ public class BlockImporter extends BlockMachine {
     }
 
     @Override
-    public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
+    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
             player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.IMPORTER, world, pos.getX(), pos.getY(), pos.getZ());
         }

src/main/java/refinedstorage/block/BlockInterface.java

@@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageGui;
@@ -22,7 +23,7 @@ public class BlockInterface extends BlockMachine {
     }
 
     @Override
-    public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
+    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
             player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.INTERFACE, world, pos.getX(), pos.getY(), pos.getZ());
         }

src/main/java/refinedstorage/block/BlockSolderer.java

@@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageGui;
@@ -22,7 +23,7 @@ public class BlockSolderer extends BlockMachine {
     }
 
     @Override
-    public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
+    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
             player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.SOLDERER, world, pos.getX(), pos.getY(), pos.getZ());
         }

src/main/java/refinedstorage/block/BlockStorage.java

@@ -65,7 +65,7 @@ public class BlockStorage extends BlockMachine {
     }
 
     @Override
-    public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
+    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
             player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ());
         }

src/main/java/refinedstorage/block/BlockWirelessTransmitter.java

@@ -45,7 +45,7 @@ public class BlockWirelessTransmitter extends BlockMachine {
     }
 
     @Override
-    public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
+    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (!world.isRemote) {
             player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.WIRELESS_TRANSMITTER, world, pos.getX(), pos.getY(), pos.getZ());
         }

src/main/java/refinedstorage/gui/GuiSolderer.java

@@ -1,6 +1,5 @@
 package refinedstorage.gui;
 
-import net.minecraft.inventory.Container;
 import refinedstorage.container.ContainerSolderer;
 import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
 import refinedstorage.tile.TileSolderer;

src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java

@@ -1,6 +1,5 @@
 package refinedstorage.gui;
 
-import net.minecraft.inventory.Container;
 import refinedstorage.container.ContainerWirelessTransmitter;
 import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
 import refinedstorage.tile.TileWirelessTransmitter;

src/main/java/refinedstorage/proxy/CommonProxy.java

@@ -21,6 +21,7 @@ import refinedstorage.network.*;
 import refinedstorage.storage.NBTStorage;
 import refinedstorage.tile.*;
 import refinedstorage.tile.solderer.*;
+
 import static refinedstorage.RefinedStorage.ID;
 
 public class CommonProxy {

src/main/resources/assets/refinedstorage/blockstates/cable.json

@@ -9,10 +9,12 @@
     "uvlock": true
   },
   "variants": {
-		"inventory": [{
+    "inventory": [
+      {
         "model": "refinedstorage:cable",
         "transform": "forge:default-block"
-			}],
+      }
+    ],
     "north": {
       "true": {
         "submodel": "refinedstorage:cable_north"

src/main/resources/assets/refinedstorage/models/block/cable.json

@@ -3,94 +3,208 @@
   "elements": [
     {
       "name": "Core",
-			"from": [6.0, 6.0, 6.0],
+      "from": [
-			"to": [10.0, 10.0, 10.0],
+        6.0,
+        6.0,
+        6.0
+      ],
+      "to": [
+        10.0,
+        10.0,
+        10.0
+      ],
       "faces": {
         "north": {
           "texture": "#all",
-					"uv": [4.0, 4.0, 8.0, 8.0]
+          "uv": [
+            4.0,
+            4.0,
+            8.0,
+            8.0
+          ]
         },
         "east": {
           "texture": "#all",
-					"uv": [0.0, 4.0, 4.0, 8.0]
+          "uv": [
+            0.0,
+            4.0,
+            4.0,
+            8.0
+          ]
         },
         "south": {
           "texture": "#all",
-					"uv": [12.0, 4.0, 16.0, 8.0]
+          "uv": [
+            12.0,
+            4.0,
+            16.0,
+            8.0
+          ]
         },
         "west": {
           "texture": "#all",
-					"uv": [8.0, 4.0, 12.0, 8.0]
+          "uv": [
+            8.0,
+            4.0,
+            12.0,
+            8.0
+          ]
         },
         "up": {
           "texture": "#all",
-					"uv": [8.0, 4.0, 4.0, 0.0]
+          "uv": [
+            8.0,
+            4.0,
+            4.0,
+            0.0
+          ]
         },
         "down": {
           "texture": "#all",
-					"uv": [12.0, 0.0, 8.0, 4.0]
+          "uv": [
+            12.0,
+            0.0,
+            8.0,
+            4.0
+          ]
         }
       }
     },
     {
       "name": "East",
-			"from": [10.0, 6.0, 6.0],
+      "from": [
-			"to": [16.0, 10.0, 10.0],
+        10.0,
+        6.0,
+        6.0
+      ],
+      "to": [
+        16.0,
+        10.0,
+        10.0
+      ],
       "faces": {
         "north": {
           "texture": "#all",
-					"uv": [4.0, 4.0, 8.0, 8.0]
+          "uv": [
+            4.0,
+            4.0,
+            8.0,
+            8.0
+          ]
         },
         "east": {
           "texture": "#all",
-					"uv": [0.0, 4.0, 4.0, 8.0]
+          "uv": [
+            0.0,
+            4.0,
+            4.0,
+            8.0
+          ]
         },
         "south": {
           "texture": "#all",
-					"uv": [12.0, 4.0, 16.0, 8.0]
+          "uv": [
+            12.0,
+            4.0,
+            16.0,
+            8.0
+          ]
         },
         "west": {
           "texture": "#all",
-					"uv": [8.0, 4.0, 12.0, 8.0]
+          "uv": [
+            8.0,
+            4.0,
+            12.0,
+            8.0
+          ]
         },
         "up": {
           "texture": "#all",
-					"uv": [8.0, 4.0, 4.0, 0.0]
+          "uv": [
+            8.0,
+            4.0,
+            4.0,
+            0.0
+          ]
         },
         "down": {
           "texture": "#all",
-					"uv": [12.0, 0.0, 8.0, 4.0]
+          "uv": [
+            12.0,
+            0.0,
+            8.0,
+            4.0
+          ]
         }
       }
     },
     {
       "name": "West",
-			"from": [0.0, 6.0, 6.0],
+      "from": [
-			"to": [6.0, 10.0, 10.0],
+        0.0,
+        6.0,
+        6.0
+      ],
+      "to": [
+        6.0,
+        10.0,
+        10.0
+      ],
       "faces": {
         "north": {
           "texture": "#all",
-					"uv": [4.0, 4.0, 8.0, 8.0]
+          "uv": [
+            4.0,
+            4.0,
+            8.0,
+            8.0
+          ]
         },
         "east": {
           "texture": "#all",
-					"uv": [0.0, 4.0, 4.0, 8.0]
+          "uv": [
+            0.0,
+            4.0,
+            4.0,
+            8.0
+          ]
         },
         "south": {
           "texture": "#all",
-					"uv": [12.0, 4.0, 16.0, 8.0]
+          "uv": [
+            12.0,
+            4.0,
+            16.0,
+            8.0
+          ]
         },
         "west": {
           "texture": "#all",
-					"uv": [8.0, 4.0, 12.0, 8.0]
+          "uv": [
+            8.0,
+            4.0,
+            12.0,
+            8.0
+          ]
         },
         "up": {
           "texture": "#all",
-					"uv": [8.0, 4.0, 4.0, 0.0]
+          "uv": [
+            8.0,
+            4.0,
+            4.0,
+            0.0
+          ]
         },
         "down": {
           "texture": "#all",
-					"uv": [12.0, 0.0, 8.0, 4.0]
+          "uv": [
+            12.0,
+            0.0,
+            8.0,
+            4.0
+          ]
         }
       }
     }

src/main/resources/assets/refinedstorage/models/block/cable_core.json

@@ -3,32 +3,70 @@
   "elements": [
     {
       "name": "Core",
-			"from": [6.0, 6.0, 6.0],
+      "from": [
-			"to": [10.0, 10.0, 10.0],
+        6.0,
+        6.0,
+        6.0
+      ],
+      "to": [
+        10.0,
+        10.0,
+        10.0
+      ],
       "faces": {
         "north": {
           "texture": "#all",
-					"uv": [4.0, 4.0, 8.0, 8.0]
+          "uv": [
+            4.0,
+            4.0,
+            8.0,
+            8.0
+          ]
         },
         "east": {
           "texture": "#all",
-					"uv": [0.0, 4.0, 4.0, 8.0]
+          "uv": [
+            0.0,
+            4.0,
+            4.0,
+            8.0
+          ]
         },
         "south": {
           "texture": "#all",
-					"uv": [12.0, 4.0, 16.0, 8.0]
+          "uv": [
+            12.0,
+            4.0,
+            16.0,
+            8.0
+          ]
         },
         "west": {
           "texture": "#all",
-					"uv": [8.0, 4.0, 12.0, 8.0]
+          "uv": [
+            8.0,
+            4.0,
+            12.0,
+            8.0
+          ]
         },
         "up": {
           "texture": "#all",
-					"uv": [8.0, 4.0, 4.0, 0.0]
+          "uv": [
+            8.0,
+            4.0,
+            4.0,
+            0.0
+          ]
         },
         "down": {
           "texture": "#all",
-					"uv": [12.0, 0.0, 8.0, 4.0]
+          "uv": [
+            12.0,
+            0.0,
+            8.0,
+            4.0
+          ]
         }
       }
     }

src/main/resources/assets/refinedstorage/models/block/cable_down.json

@@ -3,32 +3,70 @@
   "elements": [
     {
       "name": "Down",
-			"from": [6.0, 0.0, 6.0],
+      "from": [
-			"to": [10.0, 6.0, 10.0],
+        6.0,
+        0.0,
+        6.0
+      ],
+      "to": [
+        10.0,
+        6.0,
+        10.0
+      ],
       "faces": {
         "north": {
           "texture": "#all",
-					"uv": [4.0, 4.0, 8.0, 8.0]
+          "uv": [
+            4.0,
+            4.0,
+            8.0,
+            8.0
+          ]
         },
         "east": {
           "texture": "#all",
-					"uv": [0.0, 4.0, 4.0, 8.0]
+          "uv": [
+            0.0,
+            4.0,
+            4.0,
+            8.0
+          ]
         },
         "south": {
           "texture": "#all",
-					"uv": [12.0, 4.0, 16.0, 8.0]
+          "uv": [
+            12.0,
+            4.0,
+            16.0,
+            8.0
+          ]
         },
         "west": {
           "texture": "#all",
-					"uv": [8.0, 4.0, 12.0, 8.0]
+          "uv": [
+            8.0,
+            4.0,
+            12.0,
+            8.0
+          ]
         },
         "up": {
           "texture": "#all",
-					"uv": [8.0, 4.0, 4.0, 0.0]
+          "uv": [
+            8.0,
+            4.0,
+            4.0,
+            0.0
+          ]
         },
         "down": {
           "texture": "#all",
-					"uv": [12.0, 0.0, 8.0, 4.0]
+          "uv": [
+            12.0,
+            0.0,
+            8.0,
+            4.0
+          ]
         }
       }
     }

src/main/resources/assets/refinedstorage/models/block/cable_east.json

@@ -3,32 +3,70 @@
   "elements": [
     {
       "name": "East",
-			"from": [10.0, 6.0, 6.0],
+      "from": [
-			"to": [16.0, 10.0, 10.0],
+        10.0,
+        6.0,
+        6.0
+      ],
+      "to": [
+        16.0,
+        10.0,
+        10.0
+      ],
       "faces": {
         "north": {
           "texture": "#all",
-					"uv": [4.0, 4.0, 8.0, 8.0]
+          "uv": [
+            4.0,
+            4.0,
+            8.0,
+            8.0
+          ]
         },
         "east": {
           "texture": "#all",
-					"uv": [0.0, 4.0, 4.0, 8.0]
+          "uv": [
+            0.0,
+            4.0,
+            4.0,
+            8.0
+          ]
         },
         "south": {
           "texture": "#all",
-					"uv": [12.0, 4.0, 16.0, 8.0]
+          "uv": [
+            12.0,
+            4.0,
+            16.0,
+            8.0
+          ]
         },
         "west": {
           "texture": "#all",
-					"uv": [8.0, 4.0, 12.0, 8.0]
+          "uv": [
+            8.0,
+            4.0,
+            12.0,
+            8.0
+          ]
         },
         "up": {
           "texture": "#all",
-					"uv": [8.0, 4.0, 4.0, 0.0]
+          "uv": [
+            8.0,
+            4.0,
+            4.0,
+            0.0
+          ]
         },
         "down": {
           "texture": "#all",
-					"uv": [12.0, 0.0, 8.0, 4.0]
+          "uv": [
+            12.0,
+            0.0,
+            8.0,
+            4.0
+          ]
         }
       }
     }

src/main/resources/assets/refinedstorage/models/block/cable_north.json

@@ -3,32 +3,70 @@
   "elements": [
     {
       "name": "North",
-			"from": [6.0, 6.0, 0.0],
+      "from": [
-			"to": [10.0, 10.0, 6.0],
+        6.0,
+        6.0,
+        0.0
+      ],
+      "to": [
+        10.0,
+        10.0,
+        6.0
+      ],
       "faces": {
         "north": {
           "texture": "#all",
-					"uv": [4.0, 4.0, 8.0, 8.0]
+          "uv": [
+            4.0,
+            4.0,
+            8.0,
+            8.0
+          ]
         },
         "east": {
           "texture": "#all",
-					"uv": [0.0, 4.0, 4.0, 8.0]
+          "uv": [
+            0.0,
+            4.0,
+            4.0,
+            8.0
+          ]
         },
         "south": {
           "texture": "#all",
-					"uv": [12.0, 4.0, 16.0, 8.0]
+          "uv": [
+            12.0,
+            4.0,
+            16.0,
+            8.0
+          ]
         },
         "west": {
           "texture": "#all",
-					"uv": [8.0, 4.0, 12.0, 8.0]
+          "uv": [
+            8.0,
+            4.0,
+            12.0,
+            8.0
+          ]
         },
         "up": {
           "texture": "#all",
-					"uv": [8.0, 4.0, 4.0, 0.0]
+          "uv": [
+            8.0,
+            4.0,
+            4.0,
+            0.0
+          ]
         },
         "down": {
           "texture": "#all",
-					"uv": [12.0, 0.0, 8.0, 4.0]
+          "uv": [
+            12.0,
+            0.0,
+            8.0,
+            4.0
+          ]
         }
       }
     }

src/main/resources/assets/refinedstorage/models/block/cable_south.json

@@ -3,32 +3,70 @@
   "elements": [
     {
       "name": "South",
-			"from": [6.0, 6.0, 10.0],
+      "from": [
-			"to": [10.0, 10.0, 16.0],
+        6.0,
+        6.0,
+        10.0
+      ],
+      "to": [
+        10.0,
+        10.0,
+        16.0
+      ],
       "faces": {
         "north": {
           "texture": "#all",
-					"uv": [4.0, 4.0, 8.0, 8.0]
+          "uv": [
+            4.0,
+            4.0,
+            8.0,
+            8.0
+          ]
         },
         "east": {
           "texture": "#all",
-					"uv": [0.0, 4.0, 4.0, 8.0]
+          "uv": [
+            0.0,
+            4.0,
+            4.0,
+            8.0
+          ]
         },
         "south": {
           "texture": "#all",
-					"uv": [12.0, 4.0, 16.0, 8.0]
+          "uv": [
+            12.0,
+            4.0,
+            16.0,
+            8.0
+          ]
         },
         "west": {
           "texture": "#all",
-					"uv": [8.0, 4.0, 12.0, 8.0]
+          "uv": [
+            8.0,
+            4.0,
+            12.0,
+            8.0
+          ]
         },
         "up": {
           "texture": "#all",
-					"uv": [8.0, 4.0, 4.0, 0.0]
+          "uv": [
+            8.0,
+            4.0,
+            4.0,
+            0.0
+          ]
         },
         "down": {
           "texture": "#all",
-					"uv": [12.0, 0.0, 8.0, 4.0]
+          "uv": [
+            12.0,
+            0.0,
+            8.0,
+            4.0
+          ]
         }
       }
     }

src/main/resources/assets/refinedstorage/models/block/cable_up.json

@@ -3,32 +3,70 @@
   "elements": [
     {
       "name": "Up",
-			"from": [6.0, 10.0, 6.0],
+      "from": [
-			"to": [10.0, 16.0, 10.0],
+        6.0,
+        10.0,
+        6.0
+      ],
+      "to": [
+        10.0,
+        16.0,
+        10.0
+      ],
       "faces": {
         "north": {
           "texture": "#all",
-					"uv": [4.0, 4.0, 8.0, 8.0]
+          "uv": [
+            4.0,
+            4.0,
+            8.0,
+            8.0
+          ]
         },
         "east": {
           "texture": "#all",
-					"uv": [0.0, 4.0, 4.0, 8.0]
+          "uv": [
+            0.0,
+            4.0,
+            4.0,
+            8.0
+          ]
         },
         "south": {
           "texture": "#all",
-					"uv": [12.0, 4.0, 16.0, 8.0]
+          "uv": [
+            12.0,
+            4.0,
+            16.0,
+            8.0
+          ]
         },
         "west": {
           "texture": "#all",
-					"uv": [8.0, 4.0, 12.0, 8.0]
+          "uv": [
+            8.0,
+            4.0,
+            12.0,
+            8.0
+          ]
         },
         "up": {
           "texture": "#all",
-					"uv": [8.0, 4.0, 4.0, 0.0]
+          "uv": [
+            8.0,
+            4.0,
+            4.0,
+            0.0
+          ]
         },
         "down": {
           "texture": "#all",
-					"uv": [12.0, 0.0, 8.0, 4.0]
+          "uv": [
+            12.0,
+            0.0,
+            8.0,
+            4.0
+          ]
         }
       }
     }

src/main/resources/assets/refinedstorage/models/block/cable_west.json

@@ -3,32 +3,70 @@
   "elements": [
     {
       "name": "West",
-			"from": [0.0, 6.0, 6.0],
+      "from": [
-			"to": [6.0, 10.0, 10.0],
+        0.0,
+        6.0,
+        6.0
+      ],
+      "to": [
+        6.0,
+        10.0,
+        10.0
+      ],
       "faces": {
         "north": {
           "texture": "#all",
-					"uv": [4.0, 4.0, 8.0, 8.0]
+          "uv": [
+            4.0,
+            4.0,
+            8.0,
+            8.0
+          ]
         },
         "east": {
           "texture": "#all",
-					"uv": [0.0, 4.0, 4.0, 8.0]
+          "uv": [
+            0.0,
+            4.0,
+            4.0,
+            8.0
+          ]
         },
         "south": {
           "texture": "#all",
-					"uv": [12.0, 4.0, 16.0, 8.0]
+          "uv": [
+            12.0,
+            4.0,
+            16.0,
+            8.0
+          ]
         },
         "west": {
           "texture": "#all",
-					"uv": [8.0, 4.0, 12.0, 8.0]
+          "uv": [
+            8.0,
+            4.0,
+            12.0,
+            8.0
+          ]
         },
         "up": {
           "texture": "#all",
-					"uv": [8.0, 4.0, 4.0, 0.0]
+          "uv": [
+            8.0,
+            4.0,
+            4.0,
+            0.0
+          ]
         },
         "down": {
           "texture": "#all",
-					"uv": [12.0, 0.0, 8.0, 4.0]
+          "uv": [
+            12.0,
+            0.0,
+            8.0,
+            4.0
+          ]
         }
       }
     }