feat: update to UE 5.0.0

build.gradle

@@ -18,6 +18,7 @@ buildscript {
 }
 
 apply plugin: 'forge'
+apply plugin: 'maven-publish'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
@@ -26,7 +27,7 @@ sourceSets {
     api {}
 }
 
-version = "1.0"
+version = "1.0.0"
 group = "universalelectricity"
 archivesBaseName = "electricexpansion"
 
@@ -48,7 +49,8 @@ dependencies {
     compile "codechicken:NotEnoughItems:1.7.10-1.0.5.120:dev"
     compile "codechicken:CodeChickenCore:1.7.10-1.0.7.48:dev"
     compile "codechicken:CodeChickenLib:1.7.10-1.1.3.141:dev"
-    compile "universalelectricity:basiccomponents:1.1.1:deobf"
+    compile "universalelectricity:basiccomponents:2.0.0:deobf"
+    compile "universalelectricity:universalelectricity:5.0.0:deobf"
 }
 
 processResources {
@@ -59,3 +61,41 @@ processResources {
         expand 'version':project.version, 'mcversion':project.minecraft.version
     }
 }
+
+task deobfJar(type: Jar) {
+    from sourceSets.main.output
+    classifier = 'deobf'
+}
+
+task sourcesJar(type: Jar) {
+    from sourceSets.main.allSource
+    classifier = 'sources'
+}
+
+publishing {
+    tasks.publish.dependsOn 'build'
+    publications {
+        mavenJava(MavenPublication) {
+            artifactId = project.archivesBaseName
+
+            artifact deobfJar
+            artifact sourcesJar
+            artifact jar
+        }
+    }
+
+    repositories {
+	if (project.hasProperty('mvnURL')) {
+		maven {
+                    credentials {
+                	username findProperty("mvnUsername")
+                	password findProperty("mvnPassword")
+            	    }
+            	    url = findProperty("mvnURL")
+        	}
+	}
+	else {
+		mavenLocal()
+	}
+    }
+}

src/main/java/electricexpansion/client/gui/GuiAdvancedBatteryBox.java

@@ -10,7 +10,8 @@ import net.minecraft.inventory.Container;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 import org.lwjgl.opengl.GL11;
-import universalelectricity.core.electricity.ElectricityDisplay;
+
+import universalelectricity.api.energy.UnitDisplay;
 import universalelectricity.prefab.TranslationHelper;
 
 @SideOnly(Side.CLIENT)
@@ -32,15 +33,15 @@ public class GuiAdvancedBatteryBox extends GuiContainer {
         this.fontRendererObj.drawString(
                 TranslationHelper.getLocal(this.tileEntity.getInventoryName()), 22, 6,
                 4210752);
-        final String displayJoules = ElectricityDisplay.getDisplayShort(
+        final String displayJoules = UnitDisplay.getDisplayShort(
-                this.tileEntity.getJoules(), ElectricityDisplay.ElectricUnit.JOULES);
+                this.tileEntity.getJoules(), UnitDisplay.Unit.JOULES);
-        String displayMaxJoules = ElectricityDisplay.getDisplayShort(
+        String displayMaxJoules = UnitDisplay.getDisplayShort(
-                this.tileEntity.getMaxJoules(), ElectricityDisplay.ElectricUnit.JOULES);
+                this.tileEntity.getMaxJoules(), UnitDisplay.Unit.JOULES);
-        final String displayInputVoltage = ElectricityDisplay.getDisplayShort(
+        final String displayInputVoltage = UnitDisplay.getDisplayShort(
                 this.tileEntity.getInputVoltage(),
-                ElectricityDisplay.ElectricUnit.VOLTAGE);
+                UnitDisplay.Unit.VOLTAGE);
-        final String displayOutputVoltage = ElectricityDisplay.getDisplayShort(
+        final String displayOutputVoltage = UnitDisplay.getDisplayShort(
-                this.tileEntity.getVoltage(), ElectricityDisplay.ElectricUnit.VOLTAGE);
+                this.tileEntity.getVoltage(), UnitDisplay.Unit.VOLTAGE);
         if (this.tileEntity.isDisabled()) {
             displayMaxJoules = "Disabled";
         }

src/main/java/electricexpansion/client/gui/GuiFuseBox.java

@@ -10,7 +10,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 import org.lwjgl.opengl.GL11;
-import universalelectricity.core.electricity.ElectricityDisplay;
+
+import universalelectricity.api.energy.UnitDisplay;
 import universalelectricity.prefab.TranslationHelper;
 
 public class GuiFuseBox extends GuiContainer {
@@ -42,8 +43,8 @@ public class GuiFuseBox extends GuiContainer {
         this.fontRendererObj.drawString(
                 TranslationHelper.getLocal(this.tileEntity.getInventoryName()), 8, 6,
                 4210752);
-        final String displayVoltage = ElectricityDisplay.getDisplayShort(
+        final String displayVoltage = UnitDisplay.getDisplayShort(
-                this.tileEntity.getVoltage(), ElectricityDisplay.ElectricUnit.VOLTAGE);
+                this.tileEntity.getVoltage(), UnitDisplay.Unit.VOLTAGE);
         this.fontRendererObj.drawString(
                 StatCollector.translateToLocal("container.voltage") + ": " +
                         displayVoltage,

src/main/java/electricexpansion/client/gui/GuiInsulationMachine.java

@@ -9,8 +9,9 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
+import universalelectricity.api.energy.UnitDisplay;
+
 import org.lwjgl.opengl.GL11;
-import universalelectricity.core.electricity.ElectricityDisplay;
 
 @SideOnly(Side.CLIENT)
 public class GuiInsulationMachine extends GuiContainer {
@@ -39,15 +40,15 @@ public class GuiInsulationMachine extends GuiContainer {
         }
         this.fontRendererObj.drawString("Status: " + displayText, 82, 45, 4210752);
         this.fontRendererObj.drawString(
-                "Voltage: " + ElectricityDisplay.getDisplayShort(
+                "Voltage: " + UnitDisplay.getDisplayShort(
                         this.tileEntity.getVoltage(),
-                        ElectricityDisplay.ElectricUnit.VOLTAGE),
+                        UnitDisplay.Unit.VOLTAGE),
                 82, 56, 4210752);
         final StringBuilder append = new StringBuilder().append("Require: ");
         this.fontRendererObj.drawString(
                 append
-                        .append(ElectricityDisplay.getDisplayShort(
+                        .append(UnitDisplay.getDisplayShort(
-                                500.0 * 20.0, ElectricityDisplay.ElectricUnit.WATT))
+                                500.0 * 20.0, UnitDisplay.Unit.WATT))
                         .toString(),
                 82, 68, 4210752);
         this.fontRendererObj.drawString(

src/main/java/electricexpansion/client/gui/GuiQuantumBatteryBox.java

@@ -14,7 +14,8 @@ import net.minecraft.inventory.Container;
 import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
-import universalelectricity.core.electricity.ElectricityDisplay;
+
+import universalelectricity.api.energy.UnitDisplay;
 import universalelectricity.core.vector.Vector3;
 import universalelectricity.prefab.TranslationHelper;
 
@@ -49,9 +50,9 @@ public class GuiQuantumBatteryBox extends GuiContainer {
     protected void drawGuiContainerForegroundLayer(final int par1,
             final int par2) {
         this.textFieldFrequency.drawTextBox();
-        final String displayJoules = ElectricityDisplay.getDisplayShort(
+        final String displayJoules = UnitDisplay.getDisplayShort(
                 this.tileEntity.getJoulesForDisplay(new Object[0]),
-                ElectricityDisplay.ElectricUnit.JOULES);
+                UnitDisplay.Unit.JOULES);
         this.fontRendererObj.drawString(
                 TranslationHelper.getLocal(this.tileEntity.getInventoryName()), 42, 6,
                 4210752);

src/main/java/electricexpansion/client/gui/GuiWireMill.java

@@ -10,8 +10,9 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
+import universalelectricity.api.energy.UnitDisplay;
+
 import org.lwjgl.opengl.GL11;
-import universalelectricity.core.electricity.ElectricityDisplay;
 
 @SideOnly(Side.CLIENT)
 public class GuiWireMill extends GuiContainer {
@@ -39,16 +40,16 @@ public class GuiWireMill extends GuiContainer {
         }
         this.fontRendererObj.drawString("Status: " + displayText, 82, 45, 4210752);
         this.fontRendererObj.drawString(
-                "Voltage: " + ElectricityDisplay.getDisplayShort(
+                "Voltage: " + UnitDisplay.getDisplayShort(
                         this.tileEntity.getVoltage(),
-                        ElectricityDisplay.ElectricUnit.VOLTAGE),
+                        UnitDisplay.Unit.VOLTAGE),
                 82, 56, 4210752);
         final FontRenderer fontRendererObj = this.fontRendererObj;
         final StringBuilder append = new StringBuilder().append("Require: ");
         fontRendererObj.drawString(
                 append
-                        .append(ElectricityDisplay.getDisplayShort(
+                        .append(UnitDisplay.getDisplayShort(
-                                500.0 * 20.0, ElectricityDisplay.ElectricUnit.WATT))
+                                500.0 * 20.0, UnitDisplay.Unit.WATT))
                         .toString(),
                 82, 68, 4210752);
         this.fontRendererObj.drawString(

src/main/java/electricexpansion/client/render/RenderMultimeter.java

@@ -9,7 +9,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.util.ForgeDirection;
 import org.lwjgl.opengl.GL11;
-import universalelectricity.core.electricity.ElectricityDisplay;
+
+import universalelectricity.api.energy.UnitDisplay;
 import universalelectricity.core.vector.VectorHelper;
 
 @SideOnly(Side.CLIENT)
@@ -75,14 +76,14 @@ public class RenderMultimeter extends TileEntitySpecialRenderer {
                 GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
                 final FontRenderer fontRenderer = this.func_147498_b();
                 int maxWidth = 1;
-                final String amperes = ElectricityDisplay.getDisplay(
+                final String amperes = UnitDisplay.getDisplay(
                         te.electricityReading.amperes,
-                        ElectricityDisplay.ElectricUnit.AMPERE);
+                        UnitDisplay.Unit.AMPERE);
-                final String voltage = ElectricityDisplay.getDisplay(
+                final String voltage = UnitDisplay.getDisplay(
                         te.electricityReading.voltage,
-                        ElectricityDisplay.ElectricUnit.VOLTAGE);
+                        UnitDisplay.Unit.VOLTAGE);
-                final String watt = ElectricityDisplay.getDisplay(te.electricityReading.getWatts(),
+                final String watt = UnitDisplay.getDisplay(te.electricityReading.getWatts(),
-                        ElectricityDisplay.ElectricUnit.WATT);
+                        UnitDisplay.Unit.WATT);
                 maxWidth = Math.max(fontRenderer.getStringWidth(amperes), maxWidth);
                 maxWidth = Math.max(fontRenderer.getStringWidth(voltage), maxWidth);
                 maxWidth = Math.max(fontRenderer.getStringWidth(watt), maxWidth);

src/main/java/electricexpansion/common/ElectricExpansion.java

@@ -69,7 +69,7 @@ import universalelectricity.prefab.ore.OreGenReplaceStone;
 import universalelectricity.prefab.ore.OreGenerator;
 
 @Mod(
-    modid = "ElectricExpansion", name = "Electric Expansion", version = "2.1.0",
+    modid = "ElectricExpansion", name = "Electric Expansion", version = ElectricExpansion.VERSION,
     dependencies =
         "after:basiccomponents;after:AtomicScience;after:ICBM|Contraption;after:MineFactoryReloaded;after:IC2",
     useMetadata = true)
@@ -80,7 +80,7 @@ public class ElectricExpansion {
   public static final String BUILD_VERSION = "43";
   public static final String MOD_ID = "ElectricExpansion";
   public static final String MOD_NAME = "Electric Expansion";
-  public static final String VERSION = "2.1.0";
+  public static final String VERSION = "1.0.0";
   public static final boolean USE_METADATA = true;
   public static final boolean USES_CLIENT = true;
   public static final boolean USES_SERVER = false;

src/main/java/electricexpansion/common/helpers/ItemBlockCableHelper.java

@@ -11,7 +11,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
-import universalelectricity.core.electricity.ElectricityDisplay;
+import universalelectricity.api.energy.UnitDisplay;
 
 public abstract class ItemBlockCableHelper extends ItemBlock {
     protected HashMap<String, IIcon> icons;
@@ -38,14 +38,14 @@ public abstract class ItemBlockCableHelper extends ItemBlock {
             final boolean par4) {
         par3List.add(
                 "Resistance: " +
-                        ElectricityDisplay.getDisplay(
+                        UnitDisplay.getDisplay(
                                 EnumWireMaterial.values()[itemstack.getItemDamage()].resistance,
-                                ElectricityDisplay.ElectricUnit.RESISTANCE));
+                                UnitDisplay.Unit.RESISTANCE));
         par3List.add(
                 "Max Amps: " +
-                        ElectricityDisplay.getDisplay(
+                        UnitDisplay.getDisplay(
                                 EnumWireMaterial.values()[itemstack.getItemDamage()].maxAmps,
-                                ElectricityDisplay.ElectricUnit.AMPERE));
+                                UnitDisplay.Unit.AMPERE));
     }
 
     @SideOnly(Side.CLIENT)

src/main/java/electricexpansion/common/helpers/TileEntityConductorBase.java

@@ -16,9 +16,12 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraftforge.common.util.ForgeDirection;
+import universalelectricity.compat.CompatHandler;
 import universalelectricity.core.block.IConductor;
 import universalelectricity.core.block.IConnector;
 import universalelectricity.core.block.INetworkProvider;
+import universalelectricity.core.block.ISelfDriven;
+import universalelectricity.core.electricity.ElectricityNetworkHelper;
 import universalelectricity.core.electricity.IElectricityNetwork;
 import universalelectricity.core.vector.Vector3;
 import universalelectricity.core.vector.VectorHelper;
@@ -122,7 +125,7 @@ public abstract class TileEntityConductorBase
 
     public void updateConnection(final TileEntity tileEntity,
             final ForgeDirection side) {
-        if (!this.getWorldObj().isRemote && tileEntity != null) {
+        if (!this.getWorldObj().isRemote) {
             if (tileEntity instanceof TileEntityInsulatedWire &&
                     this instanceof TileEntityInsulatedWire) {
                 final TileEntityInsulatedWire tileEntityIns = (TileEntityInsulatedWire) tileEntity;
@@ -156,18 +159,27 @@ public abstract class TileEntityConductorBase
                     }
                     return;
                 }
-            } else if (((IConnector) tileEntity).canConnect(side.getOpposite())) {
+            } else if (ElectricityNetworkHelper.canConnect(tileEntity, side.getOpposite(), this)) {
                 this.connectedBlocks[side.ordinal()] = tileEntity;
                 this.visuallyConnected[side.ordinal()] = true;
                 if (tileEntity.getClass() == this.getClass() && tileEntity instanceof INetworkProvider) {
                     this.getNetwork().mergeConnection(
                             ((INetworkProvider) tileEntity).getNetwork());
+                } else if (!(tileEntity instanceof ISelfDriven)) {
+                    CompatHandler.registerTile(tileEntity);
                 }
+
                 return;
             }
+
+            if(this.connectedBlocks[side.ordinal()] != null) {
+                this.getNetwork().stopProducing(this.connectedBlocks[side.ordinal()]);
+                this.getNetwork().stopRequesting(this.connectedBlocks[side.ordinal()]);
+             }
+    
+             this.connectedBlocks[side.ordinal()] = null;
+             this.visuallyConnected[side.ordinal()] = false;
         }
-        this.connectedBlocks[side.ordinal()] = null;
-        this.visuallyConnected[side.ordinal()] = false;
     }
 
     @Override
@@ -234,12 +246,9 @@ public abstract class TileEntityConductorBase
     public void updateAdjacentConnections() {
         if (this.getWorldObj() != null && !this.worldObj.isRemote) {
             final boolean[] previousConnections = this.visuallyConnected.clone();
-            for (byte i = 0; i < 6; ++i) {
+            for(byte i = 0; i < 6; ++i) {
-                this.updateConnection(VectorHelper.getConnectorFromSide(
+                this.updateConnection(VectorHelper.getTileEntityFromSide(this.worldObj, new Vector3(this), ForgeDirection.getOrientation(i)), ForgeDirection.getOrientation(i));
-                        this.getWorldObj(), new Vector3(this),
+             }
-                        ForgeDirection.getOrientation((int) i)),
-                        ForgeDirection.getOrientation((int) i));
-            }
             if (!Arrays.equals(previousConnections, this.visuallyConnected)) {
                 this.getWorldObj().markBlockForUpdate(this.xCoord, this.yCoord,
                         this.zCoord);

src/main/java/electricexpansion/common/items/ItemMultimeter.java

@@ -11,10 +11,10 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.world.World;
+import universalelectricity.api.energy.UnitDisplay;
 import universalelectricity.core.block.IConductor;
 import universalelectricity.core.block.IElectricityStorage;
 import universalelectricity.core.block.IVoltage;
-import universalelectricity.core.electricity.ElectricityDisplay;
 import universalelectricity.core.electricity.ElectricityPack;
 import universalelectricity.core.item.ItemElectric;
 
@@ -42,36 +42,36 @@ public class ItemMultimeter extends ItemElectric {
             final ElectricityPack getProduced = wireTile.getNetwork().getProduced(new TileEntity[0]);
             player.addChatMessage(new ChatComponentText(
                     "Electric Expansion: " +
-                            ElectricityDisplay.getDisplay(
+                            UnitDisplay.getDisplay(
-                                    getProduced.amperes * 20.0, ElectricityDisplay.ElectricUnit.AMPERE)
+                                    getProduced.amperes * 20.0, UnitDisplay.Unit.AMPERE)
                             +
                             ", " +
-                            ElectricityDisplay.getDisplay(
+                            UnitDisplay.getDisplay(
-                                    getProduced.voltage, ElectricityDisplay.ElectricUnit.VOLTAGE)
+                                    getProduced.voltage, UnitDisplay.Unit.VOLTAGE)
                             +
                             ", " +
-                            ElectricityDisplay.getDisplay(getProduced.getWatts() * 20.0,
+                            UnitDisplay.getDisplay(getProduced.getWatts() * 20.0,
-                                    ElectricityDisplay.ElectricUnit.WATT)));
+                                    UnitDisplay.Unit.WATT)));
             return true;
         }
         if (tileEntity instanceof IElectricityStorage) {
             final IElectricityStorage tileStorage = (IElectricityStorage) tileEntity;
             player.addChatMessage(new ChatComponentText(
                     "Electric Expansion: " +
-                            ElectricityDisplay.getDisplay(
+                            UnitDisplay.getDisplay(
-                                    tileStorage.getJoules(), ElectricityDisplay.ElectricUnit.JOULES)
+                                    tileStorage.getJoules(), UnitDisplay.Unit.JOULES)
                             +
                             "/" +
-                            ElectricityDisplay.getDisplay(
+                            UnitDisplay.getDisplay(
                                     tileStorage.getMaxJoules(),
-                                    ElectricityDisplay.ElectricUnit.JOULES)));
+                                    UnitDisplay.Unit.JOULES)));
         }
         if (tileEntity instanceof IVoltage) {
             player.addChatMessage(
                     new ChatComponentText("Electric Expansion: " +
-                            ElectricityDisplay.getDisplay(
+                            UnitDisplay.getDisplay(
                                     ((IVoltage) tileEntity).getVoltage(),
-                                    ElectricityDisplay.ElectricUnit.VOLTAGE)));
+                                    UnitDisplay.Unit.VOLTAGE)));
         }
         return true;
     }

src/main/java/electricexpansion/common/items/ItemUpgrade.java

@@ -8,12 +8,12 @@ import java.util.List;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
+import universalelectricity.api.energy.UnitDisplay;
 import universalelectricity.prefab.modifier.IModifier;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.StatCollector;
-import universalelectricity.core.electricity.ElectricityDisplay;
 
 public class ItemUpgrade extends Item implements IModifier {
     private String[] names;
@@ -148,8 +148,8 @@ public class ItemUpgrade extends Item implements IModifier {
         String strength = "";
         final double effectiveness = this.getEffectiveness(itemstack);
         if (this.getType(itemstack).equals("Capacity")) {
-            strength = ElectricityDisplay.getDisplay(this.getEffectiveness(itemstack),
+            strength = UnitDisplay.getDisplay(this.getEffectiveness(itemstack),
-                    ElectricityDisplay.ElectricUnit.JOULES);
+                    UnitDisplay.Unit.JOULES);
         } else if (effectiveness < 0.0) {
             strength = "1/" + String.valueOf(effectiveness * -1.0);
         } else {

src/main/java/electricexpansion/common/misc/EENetwork.java

@@ -354,11 +354,40 @@ public class EENetwork implements IElectricityNetwork
         this.redstoneInterfacers.add(interfacer);
     }
 
-    public boolean isInactive() {
+    @Override
-        return false;
+   public void addConnector(IConductor connector) {
-    }
+      this.conductors.add(connector);
+   }
+
+   @Override
+   public void removeConnector(IConductor connector) {
+      this.conductors.remove(connector);
+   }
+
+   @Override
+   public Set<IConductor> getConnectors() {
+      return this.conductors;
+   }
+
+   @Override
+   public void reconstruct() {
+      refreshConductors();
+   }
+
+   @Override
+   public IElectricityNetwork merge(IElectricityNetwork network) {
+      this.mergeConnection(network);
+      return this;
+   }
+
+   @Override
+   public void split(IConductor connection) {
+      splitNetwork(connection);
+   }
+
+   @Override
+   public void split(IConductor connectorA, IConductor connectorB) {
+      // TODO: implement this
+   }
 
-    public void tick() {
-        
-    }
 }