Updated CalCore

archaic/src/main/java/resonantinduction/archaic/engineering/TileEngineeringTable.java

@@ -30,7 +30,7 @@ import universalelectricity.api.vector.Vector3;
 import calclavia.lib.content.module.TileRender;
 import calclavia.lib.content.module.prefab.TileInventory;
 import calclavia.lib.gui.ContainerDummy;
-import calclavia.lib.java.Pair;
+import calclavia.lib.type.Pair;
 import calclavia.lib.network.IPacketReceiver;
 import calclavia.lib.network.PacketHandler;
 import calclavia.lib.prefab.item.ItemBlockSaved;

archaic/src/main/java/resonantinduction/archaic/fluid/tank/TileTank.java

@@ -3,7 +3,7 @@ package resonantinduction.archaic.fluid.tank;
 import calclavia.lib.content.module.TileBlock.IComparatorInputOverride;
 import calclavia.lib.content.module.TileRender;
 import calclavia.lib.render.FluidRenderUtility;
-import calclavia.lib.render.RenderBlockUtility;
+import calclavia.lib.utility.render.RenderBlockUtility;
 import calclavia.lib.render.RenderUtility;
 import calclavia.lib.utility.FluidUtility;
 import calclavia.lib.utility.WorldUtility;

electrical/src/main/java/resonantinduction/electrical/armbot/TileArmbot.java

@@ -20,7 +20,7 @@ import resonantinduction.electrical.encoder.coding.ProgramHelper;
 import universalelectricity.api.energy.EnergyStorageHandler;
 import universalelectricity.api.vector.Vector2;
 import universalelectricity.api.vector.Vector3;
-import calclavia.lib.java.Pair;
+import calclavia.lib.type.Pair;
 import calclavia.lib.multiblock.fake.IMultiBlock;
 import calclavia.lib.network.IPacketReceiverWithID;
 import calclavia.lib.network.PacketHandler;

electrical/src/main/java/resonantinduction/electrical/armbot/task/TaskBreak.java

@@ -12,7 +12,7 @@ import resonantinduction.electrical.armbot.TaskBaseArmbot;
 import resonantinduction.electrical.armbot.TaskBaseProcess;
 import resonantinduction.electrical.encoder.coding.ITask;
 import universalelectricity.api.vector.Vector3;
-import calclavia.lib.java.Pair;
+import calclavia.lib.type.Pair;
 import calclavia.lib.utility.inventory.InventoryUtility;
 
 /**

electrical/src/main/java/resonantinduction/electrical/armbot/task/TaskFire.java

@@ -14,7 +14,7 @@ import resonantinduction.electrical.armbot.TaskBaseArmbot;
 import resonantinduction.electrical.armbot.TaskBaseProcess;
 import resonantinduction.electrical.encoder.coding.args.ArgumentFloatData;
 import universalelectricity.api.vector.Vector3;
-import calclavia.lib.java.Pair;
+import calclavia.lib.type.Pair;
 import calclavia.lib.science.units.UnitHelper;
 
 public class TaskFire extends TaskBaseArmbot

electrical/src/main/java/resonantinduction/electrical/encoder/coding/IProgrammableMachine.java

@@ -2,7 +2,7 @@ package resonantinduction.electrical.encoder.coding;
 
 import net.minecraft.world.World;
 import universalelectricity.api.vector.Vector3;
-import calclavia.lib.java.Pair;
+import calclavia.lib.type.Pair;
 
 /**
  * Simple interface too say an object is programmable

electrical/src/main/java/resonantinduction/electrical/multimeter/Graph.java

@@ -1,7 +1,7 @@
 package resonantinduction.electrical.multimeter;
 
 import net.minecraft.nbt.NBTTagCompound;
-import calclavia.lib.java.EvictingList;
+import calclavia.lib.type.EvictingList;
 
 /**
  * Graph for the multimeter

mechanical/src/main/java/resonantinduction/mechanical/energy/turbine/SchematicWaterTurbine.java

@@ -5,7 +5,7 @@ import java.util.HashMap;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.mechanical.Mechanical;
 import universalelectricity.api.vector.Vector3;
-import calclavia.lib.java.Pair;
+import calclavia.lib.type.Pair;
 import calclavia.lib.schematic.Schematic;
 
 public class SchematicWaterTurbine extends Schematic

mechanical/src/main/java/resonantinduction/mechanical/energy/turbine/SchematicWindTurbine.java

@@ -5,7 +5,7 @@ import java.util.HashMap;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.mechanical.Mechanical;
 import universalelectricity.api.vector.Vector3;
-import calclavia.lib.java.Pair;
+import calclavia.lib.type.Pair;
 import calclavia.lib.schematic.Schematic;
 
 public class SchematicWindTurbine extends Schematic

mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java

@@ -16,7 +16,7 @@ import resonantinduction.core.grid.fluid.FluidPressureNode;
 import resonantinduction.core.grid.fluid.IPressureNodeProvider;
 import resonantinduction.core.prefab.part.PartFramedNode;
 import resonantinduction.mechanical.Mechanical;
-import calclavia.lib.java.EvictingList;
+import calclavia.lib.type.EvictingList;
 import calclavia.lib.utility.WorldUtility;
 import codechicken.lib.data.MCDataInput;
 import codechicken.lib.render.CCRenderState;