revert improvements from b284f46

See more: https://github.com/GTNewHorizons/EnderIO/pull/118

build.gradle

@@ -1,4 +1,4 @@
-//version: 1702141377
+//version: 1696265388
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -28,12 +28,27 @@ import java.util.concurrent.TimeUnit
 
 buildscript {
     repositories {
+        mavenCentral()
+
+        maven {
+            name 'forge'
+            url 'https://maven.minecraftforge.net'
+        }
         maven {
             // GTNH RetroFuturaGradle and ASM Fork
             name "GTNH Maven"
             url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
             allowInsecureProtocol = true
         }
+        maven {
+            name 'sonatype'
+            url 'https://oss.sonatype.org/content/repositories/snapshots/'
+        }
+        maven {
+            name 'Scala CI dependencies'
+            url 'https://repo1.maven.org/maven2/'
+        }
+
         mavenLocal()
     }
 }
@@ -54,7 +69,7 @@ plugins {
     id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version
     id 'com.modrinth.minotaur' version '2.+' apply false
     id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
-    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.26'
+    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.24'
 }
 
 print("You might want to check out './gradlew :faq' if your build fails.\n")
@@ -287,7 +302,7 @@ if (apiPackage) {
 }
 
 if (accessTransformersFile) {
-    for (atFile in accessTransformersFile.split(" ")) {
+    for (atFile in accessTransformersFile.split(",")) {
         String targetFile = "src/main/resources/META-INF/" + atFile.trim()
         if (!getFile(targetFile).exists()) {
             throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
@@ -613,7 +628,7 @@ repositories {
         }
         maven {
             name = "ic2"
-            url = getURL("https://maven2.ic2.player.to/", "https://maven.ic2.player.to/")
+            url = getURL("https://maven.ic2.player.to/", "https://maven2.ic2.player.to/")
             content {
                 includeGroup "net.industrial-craft"
             }
@@ -631,7 +646,7 @@ repositories {
 
 def mixinProviderGroup = "io.github.legacymoddingmc"
 def mixinProviderModule = "unimixins"
-def mixinProviderVersion = "0.1.13"
+def mixinProviderVersion = "0.1.7.1"
 def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}"
 def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
 ext.mixinProviderSpec = mixinProviderSpec
@@ -672,8 +687,6 @@ configurations.all {
         substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
         substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
         substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier")
-
-        substitute module('org.scala-lang:scala-library:2.11.1') using module('org.scala-lang:scala-library:2.11.5') because('To allow mixing with Java 8 targets')
     }
 }
 
@@ -780,12 +793,12 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
 }
 
 dependencies {
-    def lwjgl3ifyVersion = '1.5.7'
+    def lwjgl3ifyVersion = '1.5.0'
     if (modId != 'lwjgl3ify') {
         java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
     }
     if (modId != 'hodgepodge') {
-        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35')
+        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.7')
     }
 
     java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
@@ -1174,8 +1187,9 @@ publishing {
             version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
         }
     }
+
     repositories {
-        if (usesMavenPublishing.toBoolean() && System.getenv("MAVEN_USER") != null) {
+        if (usesMavenPublishing.toBoolean()) {
             maven {
                 url = mavenPublishUrl
                 allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven
@@ -1297,7 +1311,7 @@ def addCurseForgeRelation(String type, String name) {
 
 // Updating
 
-def buildscriptGradleVersion = "8.5"
+def buildscriptGradleVersion = "8.2.1"
 
 tasks.named('wrapper', Wrapper).configure {
     gradleVersion = buildscriptGradleVersion

dependencies.gradle

@@ -1,22 +1,22 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:EnderCore:0.2.18:dev')
-    implementation('com.github.GTNewHorizons:ForestryMC:4.7.0:dev')
-    implementation('com.github.GTNewHorizons:NotEnoughItems:2.4.13-GTNH:dev')
+    api('com.github.GTNewHorizons:EnderCore:0.2.17:dev')
+    implementation('com.github.GTNewHorizons:ForestryMC:4.6.14:dev')
+    implementation('com.github.GTNewHorizons:NotEnoughItems:2.4.3-GTNH:dev')
     implementation("com.github.GTNewHorizons:GTNHLib:0.0.13:dev")
-    api('com.github.GTNewHorizons:BuildCraft:7.1.37:dev')
+    api('com.github.GTNewHorizons:BuildCraft:7.1.36:dev')
     api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
     shadowImplementation('cglib:cglib-nodep:3.3.0')
 
-    compileOnly('com.github.GTNewHorizons:waila:1.6.5:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-291-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Baubles:1.0.3:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.106:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.15.2:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.12.1-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Chisel:2.12.3-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.19-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:waila:1.6.0:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-259-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.30:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.15.0:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.12.0-GTNH:api') {transitive = false}
+    implementation('com.github.GTNewHorizons:Chisel:2.11.4-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.17-GTNH:api') {transitive = false}
     compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
     compileOnly('curse.maven:ee3-65509:2305023') // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -130,13 +130,10 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.

src/main/java/crazypants/enderio/EnderIO.java

@@ -1,8 +1,6 @@
 package crazypants.enderio;
 
-import static crazypants.enderio.EnderIO.MODID;
-import static crazypants.enderio.EnderIO.MOD_NAME;
-import static crazypants.enderio.EnderIO.VERSION;
+import static crazypants.enderio.EnderIO.*;
 
 import java.io.BufferedWriter;
 import java.io.File;

src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java

@@ -641,8 +641,8 @@ public class BlockConduitBundle extends BlockEio
 
     @Override
     public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player) {
-        ITool tool = ToolUtil.getEquippedTool(player);
-        if (!player.isSneaking() || tool == null || !tool.canUse(player.getCurrentEquippedItem(), player, x, y, z)) {
+        ItemStack equipped = player.getCurrentEquippedItem();
+        if (!player.isSneaking() || equipped == null || equipped.getItem() != EnderIO.itemYetaWench) {
             return;
         }
         ConduitUtil.openConduitGui(world, x, y, z, player);

src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java

@@ -1,15 +1,6 @@
 package crazypants.enderio.conduit;
 
-import static crazypants.enderio.gui.IconEIO.CROSS;
-import static crazypants.enderio.gui.IconEIO.TICK;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_FLUID;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_FLUID_OFF;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_ITEM;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_ITEM_OFF;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_POWER;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_POWER_OFF;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_REDSTONE;
-import static crazypants.enderio.gui.IconEIO.WRENCH_OVERLAY_REDSTONE_OFF;
+import static crazypants.enderio.gui.IconEIO.*;
 
 import java.util.List;
 

src/main/java/crazypants/enderio/conduit/ConduitRecipes.java

@@ -1,20 +1,10 @@
 package crazypants.enderio.conduit;
 
 import static crazypants.enderio.ModObject.blockPainter;
-import static crazypants.enderio.material.Alloy.CONDUCTIVE_IRON;
-import static crazypants.enderio.material.Alloy.ELECTRICAL_STEEL;
-import static crazypants.enderio.material.Alloy.END_STEEL;
-import static crazypants.enderio.material.Alloy.ENERGETIC_ALLOY;
-import static crazypants.enderio.material.Alloy.PHASED_GOLD;
-import static crazypants.enderio.material.Alloy.REDSTONE_ALLOY;
+import static crazypants.enderio.material.Alloy.*;
 import static crazypants.enderio.material.Material.CONDUIT_BINDER;
 import static crazypants.enderio.material.Material.PHASED_IRON_NUGGET;
-import static crazypants.enderio.material.endergy.AlloyEndergy.CRUDE_STEEL;
-import static crazypants.enderio.material.endergy.AlloyEndergy.CRYSTALLINE_ALLOY;
-import static crazypants.enderio.material.endergy.AlloyEndergy.CRYSTALLINE_PINK_SLIME;
-import static crazypants.enderio.material.endergy.AlloyEndergy.ENERGETIC_SILVER;
-import static crazypants.enderio.material.endergy.AlloyEndergy.MELODIC_ALLOY;
-import static crazypants.enderio.material.endergy.AlloyEndergy.STELLAR_ALLOY;
+import static crazypants.enderio.material.endergy.AlloyEndergy.*;
 import static crazypants.util.RecipeUtil.addShaped;
 
 import net.minecraft.init.Blocks;

src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java

@@ -165,8 +165,7 @@ public class ItemFilter implements IInventory, IItemFilter {
     }
 
     private boolean isNBTMatch(ItemStack filter, ItemStack item) {
-        if (filter.stackTagCompound == null && (item.stackTagCompound == null || item.stackTagCompound.hasNoTags()))
-            return true;
+        if (filter.stackTagCompound == null && item.stackTagCompound == null) return true;
         if (filter.stackTagCompound == null || item.stackTagCompound == null) return false;
         if (!filter.getTagCompound().hasKey("GEN")) return filter.stackTagCompound.equals(item.stackTagCompound);
         NBTTagCompound filterTag = (NBTTagCompound) filter.getTagCompound().copy();

src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java

@@ -1,14 +1,7 @@
 package crazypants.enderio.conduit.render;
 
-import static com.enderio.core.client.render.CubeRenderer.addVecWithUV;
-import static com.enderio.core.client.render.CubeRenderer.setupVertices;
-import static com.enderio.core.client.render.CubeRenderer.verts;
-import static net.minecraftforge.common.util.ForgeDirection.DOWN;
-import static net.minecraftforge.common.util.ForgeDirection.EAST;
-import static net.minecraftforge.common.util.ForgeDirection.NORTH;
-import static net.minecraftforge.common.util.ForgeDirection.SOUTH;
-import static net.minecraftforge.common.util.ForgeDirection.UP;
-import static net.minecraftforge.common.util.ForgeDirection.WEST;
+import static com.enderio.core.client.render.CubeRenderer.*;
+import static net.minecraftforge.common.util.ForgeDirection.*;
 
 import java.util.Collection;
 import java.util.List;

src/main/java/crazypants/enderio/config/Config.java

@@ -84,6 +84,8 @@ public final class Config {
     public static boolean reinforcedObsidianEnabled = true;
     public static boolean reinforcedObsidianUseDarkSteelBlocks = false;
 
+    public static boolean enforceOfflinePlayerUUID = false;
+
     public static boolean useAlternateBinderRecipe = false;
 
     public static boolean useAlternateTesseractModel = false;
@@ -1035,6 +1037,13 @@ public final class Config {
                 "Enable per tick sampling on individual power inputs and outputs. This allows slightly more detailed messages from the RF Reader but has a negative impact on server performance.")
                 .getBoolean(detailedPowerTrackingEnabled);
 
+        enforceOfflinePlayerUUID = config.get(
+                sectionAdvanced.name,
+                "enforceOfflinePlayerUUID",
+                false,
+                "Enforces to use the players offline UUID. Recommendet to use before creating your world, otherwise it might breaks all secuity related things.")
+                .getBoolean(enforceOfflinePlayerUUID);
+
         useSneakMouseWheelYetaWrench = config.get(
                 sectionPersonal.name,
                 "useSneakMouseWheelYetaWrench",

src/main/java/crazypants/enderio/item/ItemRecipes.java

@@ -1,11 +1,6 @@
 package crazypants.enderio.item;
 
-import static crazypants.enderio.material.Alloy.CONDUCTIVE_IRON;
-import static crazypants.enderio.material.Alloy.DARK_STEEL;
-import static crazypants.enderio.material.Alloy.ELECTRICAL_STEEL;
-import static crazypants.enderio.material.Alloy.END_STEEL;
-import static crazypants.enderio.material.Alloy.ENERGETIC_ALLOY;
-import static crazypants.enderio.material.Alloy.SOULARIUM;
+import static crazypants.enderio.material.Alloy.*;
 import static crazypants.enderio.material.Material.VIBRANT_CYSTAL;
 import static crazypants.enderio.material.endergy.AlloyEndergy.STELLAR_ALLOY;
 import static crazypants.util.RecipeUtil.addShaped;

src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java

@@ -489,7 +489,11 @@ public abstract class AbstractMachineEntity extends TileEntityEio
         if (stack == null || stack.stackTagCompound == null) {
             return;
         }
-        readCommon(stack.stackTagCompound);
+        NBTTagCompound root = stack.stackTagCompound;
+        if (!root.hasKey("eio.abstractMachine")) {
+            return;
+        }
+        readCommon(root);
     }
 
     @Override

src/main/java/crazypants/enderio/machine/MachineRecipes.java

@@ -1,19 +1,8 @@
 package crazypants.enderio.machine;
 
 import static crazypants.enderio.EnderIO.itemBasicCapacitor;
-import static crazypants.enderio.material.Alloy.DARK_STEEL;
-import static crazypants.enderio.material.Alloy.ELECTRICAL_STEEL;
-import static crazypants.enderio.material.Alloy.END_STEEL;
-import static crazypants.enderio.material.Alloy.ENERGETIC_ALLOY;
-import static crazypants.enderio.material.Alloy.PHASED_GOLD;
-import static crazypants.enderio.material.Alloy.PHASED_IRON;
-import static crazypants.enderio.material.Alloy.REDSTONE_ALLOY;
-import static crazypants.enderio.material.Alloy.SOULARIUM;
-import static crazypants.enderio.material.Material.CONDUIT_BINDER;
-import static crazypants.enderio.material.Material.ENDER_CRYSTAL;
-import static crazypants.enderio.material.Material.PULSATING_CYSTAL;
-import static crazypants.enderio.material.Material.SILICON;
-import static crazypants.enderio.material.Material.VIBRANT_CYSTAL;
+import static crazypants.enderio.material.Alloy.*;
+import static crazypants.enderio.material.Material.*;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;

src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java

@@ -4,20 +4,13 @@ import java.util.HashMap;
 import java.util.Map;
 
 import net.minecraft.world.World;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.world.WorldEvent;
 
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import crazypants.enderio.machine.capbank.TileCapBank;
 
 public class ClientNetworkManager {
 
     private static final ClientNetworkManager instance = new ClientNetworkManager();
 
-    static {
-        MinecraftForge.EVENT_BUS.register(instance);
-    }
-
     public static ClientNetworkManager getInstance() {
         return instance;
     }
@@ -60,12 +53,4 @@ public class ClientNetworkManager {
         CapBankClientNetwork network = getOrCreateNetwork(id);
         network.addMember(tileCapBank);
     }
-
-    @SubscribeEvent
-    public void onWorldUnload(WorldEvent.Unload event) {
-        if (event.world.isRemote) {
-            networks.forEach((id, network) -> network.destroyNetwork());
-            networks.clear();
-        }
-    }
 }

src/main/java/crazypants/enderio/machine/farm/FarmingStationSpecialRenderer.java

@@ -1,8 +1,6 @@
 package crazypants.enderio.machine.farm;
 
-import static org.lwjgl.opengl.GL11.GL_LIGHTING;
-import static org.lwjgl.opengl.GL11.glDisable;
-import static org.lwjgl.opengl.GL11.glEnable;
+import static org.lwjgl.opengl.GL11.*;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;

src/main/java/crazypants/enderio/machine/obelisk/ObeliskSpecialRenderer.java

@@ -1,14 +1,6 @@
 package crazypants.enderio.machine.obelisk;
 
-import static org.lwjgl.opengl.GL11.GL_ALL_ATTRIB_BITS;
-import static org.lwjgl.opengl.GL11.glDepthMask;
-import static org.lwjgl.opengl.GL11.glPopAttrib;
-import static org.lwjgl.opengl.GL11.glPopMatrix;
-import static org.lwjgl.opengl.GL11.glPushAttrib;
-import static org.lwjgl.opengl.GL11.glPushMatrix;
-import static org.lwjgl.opengl.GL11.glRotatef;
-import static org.lwjgl.opengl.GL11.glScalef;
-import static org.lwjgl.opengl.GL11.glTranslated;
+import static org.lwjgl.opengl.GL11.*;
 
 import java.util.Random;
 
@@ -114,7 +106,7 @@ public class ObeliskSpecialRenderer<T extends TileEntity> extends TileEntitySpec
 
     protected void renderItemStack(T te, World world, double x, double y, double z, float tick) {
         if (ei == null) {
-            ei = new EntityItem(null, 0, 0, 0, getFloatingItem(te));
+            ei = new EntityItem(world, 0, 0, 0, getFloatingItem(te));
         }
 
         ei.setEntityItemStack(getFloatingItem(te));

src/main/java/crazypants/enderio/machine/tank/BlockItemTank.java

@@ -71,12 +71,14 @@ public class BlockItemTank extends ItemBlockWithMetadata implements IAdvancedToo
         EnderIO.blockTank.addDetailedEntries(itemstack, entityplayer, list, flag);
     }
 
+    private static final FluidTank dummy = new SmartTank(FluidRegistry.WATER, 16000);
+
     private FluidTank loadTank(ItemStack stack) {
         if (stack.hasTagCompound()) {
             FluidTank tank = TileTank.loadTank(stack.getTagCompound());
-            return tank != null ? tank : new SmartTank(FluidRegistry.WATER, 16000);
+            return tank != null ? tank : dummy;
         }
-        return new SmartTank(FluidRegistry.WATER, 16000);
+        return dummy;
     }
 
     private void saveTank(ItemStack stack, FluidTank tank) {

src/main/java/crazypants/enderio/material/MaterialRecipes.java

@@ -1,28 +1,9 @@
 package crazypants.enderio.material;
 
-import static crazypants.enderio.material.Alloy.DARK_STEEL;
-import static crazypants.enderio.material.Alloy.END_STEEL;
-import static crazypants.enderio.material.Alloy.ENERGETIC_ALLOY;
-import static crazypants.enderio.material.Alloy.PHASED_GOLD;
-import static crazypants.enderio.material.Alloy.PHASED_IRON;
-import static crazypants.enderio.material.Alloy.SOULARIUM;
-import static crazypants.enderio.material.Material.BINDER_COMPOSITE;
-import static crazypants.enderio.material.Material.CONDUIT_BINDER;
-import static crazypants.enderio.material.Material.PRECIENT_CRYSTAL;
-import static crazypants.enderio.material.endergy.AlloyEndergy.CRYSTALLINE_ALLOY;
-import static crazypants.enderio.material.endergy.AlloyEndergy.ENERGETIC_SILVER;
-import static crazypants.enderio.material.endergy.AlloyEndergy.MELODIC_ALLOY;
-import static crazypants.enderio.material.endergy.AlloyEndergy.STELLAR_ALLOY;
-import static crazypants.enderio.material.endergy.AlloyEndergy.VIVID_ALLOY;
-import static crazypants.enderio.power.Capacitors.ACTIVATED_CAPACITOR;
-import static crazypants.enderio.power.Capacitors.BASIC_CAPACITOR;
-import static crazypants.enderio.power.Capacitors.CRYSTALLINE_CAPACITOR;
-import static crazypants.enderio.power.Capacitors.ENDERGETIC_CAPACITOR;
-import static crazypants.enderio.power.Capacitors.ENDERGISED_CAPACITOR;
-import static crazypants.enderio.power.Capacitors.ENDER_CAPACITOR;
-import static crazypants.enderio.power.Capacitors.MELODIC_CAPACITOR;
-import static crazypants.enderio.power.Capacitors.SILVER_CAPACITOR;
-import static crazypants.enderio.power.Capacitors.STELLAR_CAPACITOR;
+import static crazypants.enderio.material.Alloy.*;
+import static crazypants.enderio.material.Material.*;
+import static crazypants.enderio.material.endergy.AlloyEndergy.*;
+import static crazypants.enderio.power.Capacitors.*;
 
 import java.util.ArrayList;
 

src/main/java/crazypants/enderio/material/PowderIngot.java

@@ -1,10 +1,6 @@
 package crazypants.enderio.material;
 
-import static com.enderio.core.common.util.OreDictionaryHelper.DUST_ENDERPEARL;
-import static com.enderio.core.common.util.OreDictionaryHelper.INGOT_COPPER;
-import static com.enderio.core.common.util.OreDictionaryHelper.INGOT_ENDERIUM;
-import static com.enderio.core.common.util.OreDictionaryHelper.INGOT_TIN;
-import static com.enderio.core.common.util.OreDictionaryHelper.isRegistered;
+import static com.enderio.core.common.util.OreDictionaryHelper.*;
 
 public enum PowderIngot {
 

src/main/java/crazypants/enderio/teleport/telepad/TeleportEntityRenderHandler.java

@@ -1,23 +1,6 @@
 package crazypants.enderio.teleport.telepad;
 
-import static org.lwjgl.opengl.GL11.GL_ALL_ATTRIB_BITS;
-import static org.lwjgl.opengl.GL11.GL_ALPHA_TEST;
-import static org.lwjgl.opengl.GL11.GL_BLEND;
-import static org.lwjgl.opengl.GL11.GL_CULL_FACE;
-import static org.lwjgl.opengl.GL11.GL_LIGHTING;
-import static org.lwjgl.opengl.GL11.GL_ONE;
-import static org.lwjgl.opengl.GL11.GL_SMOOTH;
-import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA;
-import static org.lwjgl.opengl.GL11.GL_TEXTURE_2D;
-import static org.lwjgl.opengl.GL11.GL_ZERO;
-import static org.lwjgl.opengl.GL11.glDepthMask;
-import static org.lwjgl.opengl.GL11.glDisable;
-import static org.lwjgl.opengl.GL11.glEnable;
-import static org.lwjgl.opengl.GL11.glPushAttrib;
-import static org.lwjgl.opengl.GL11.glPushMatrix;
-import static org.lwjgl.opengl.GL11.glRotatef;
-import static org.lwjgl.opengl.GL11.glShadeModel;
-import static org.lwjgl.opengl.GL11.glTranslated;
+import static org.lwjgl.opengl.GL11.*;
 
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.Tessellator;

src/main/java/crazypants/enderio/waila/WailaCompat.java

@@ -1,8 +1,6 @@
 package crazypants.enderio.waila;
 
-import static crazypants.enderio.waila.IWailaInfoProvider.BIT_BASIC;
-import static crazypants.enderio.waila.IWailaInfoProvider.BIT_COMMON;
-import static crazypants.enderio.waila.IWailaInfoProvider.BIT_DETAILED;
+import static crazypants.enderio.waila.IWailaInfoProvider.*;
 
 import java.text.MessageFormat;
 import java.util.List;
@@ -125,6 +123,8 @@ public class WailaCompat implements IWailaDataProvider {
 
     public static final WailaCompat INSTANCE = new WailaCompat();
 
+    private static IWailaDataAccessor _accessor = null;
+
     public static void load(IWailaRegistrar registrar) {
         registrar.registerStackProvider(INSTANCE, IFacade.class);
         registrar.registerStackProvider(INSTANCE, BlockDarkSteelAnvil.class);
@@ -188,6 +188,8 @@ public class WailaCompat implements IWailaDataProvider {
     public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
             IWailaConfigHandler config) {
 
+        _accessor = accessor;
+
         EntityPlayer player = accessor.getPlayer();
         MovingObjectPosition pos = accessor.getPosition();
         int x = pos.blockX, y = pos.blockY, z = pos.blockZ;
@@ -263,7 +265,7 @@ public class WailaCompat implements IWailaDataProvider {
         }
 
         if (te instanceof IConduitBundle) {
-            getWailaBodyConduitBundle(itemStack, currenttip, accessor);
+            getWailaBodyConduitBundle(itemStack, currenttip);
 
         } else if (te instanceof IInternalPoweredTile && block == accessor.getBlock() && !(te instanceof TileCapBank)) {
             IInternalPoweredTile power = (IInternalPoweredTile) te;
@@ -293,13 +295,13 @@ public class WailaCompat implements IWailaDataProvider {
         return currenttip;
     }
 
-    private void getWailaBodyConduitBundle(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor) {
+    private void getWailaBodyConduitBundle(ItemStack itemStack, List<String> currenttip) {
         if (itemStack == null) {
             return;
         }
 
         if (itemStack.getItem() == EnderIO.itemPowerConduit || itemStack.getItem() == EnderIO.itemPowerConduitEndergy) {
-            NBTTagCompound nbtRoot = accessor.getNBTData();
+            NBTTagCompound nbtRoot = _accessor.getNBTData();
             if (nbtRoot.hasKey("storedEnergyRF")) {
                 int stored = nbtRoot.getInteger("storedEnergyRF");
                 int max = nbtRoot.getInteger("maxStoredRF");
@@ -316,7 +318,7 @@ public class WailaCompat implements IWailaDataProvider {
             }
 
         } else if (itemStack.getItem() == EnderIO.itemLiquidConduit) {
-            NBTTagCompound nbtRoot = accessor.getNBTData();
+            NBTTagCompound nbtRoot = _accessor.getNBTData();
             if (nbtRoot.hasKey("fluidLocked") && nbtRoot.hasKey("FluidName")) {
                 boolean fluidTypeLocked = nbtRoot.getBoolean("fluidLocked");
                 FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbtRoot);
@@ -348,7 +350,7 @@ public class WailaCompat implements IWailaDataProvider {
             }
 
         } else if (itemStack.getItem() == EnderIO.itemMEConduit) {
-            NBTTagCompound nbtRoot = accessor.getNBTData();
+            NBTTagCompound nbtRoot = _accessor.getNBTData();
             if (nbtRoot.hasKey("isDense")) {
                 boolean isDenseUltra = nbtRoot.getBoolean("isDenseUltra");
                 boolean isDense = nbtRoot.getBoolean("isDense");
@@ -407,4 +409,7 @@ public class WailaCompat implements IWailaDataProvider {
         return tag;
     }
 
+    public static NBTTagCompound getNBTData() {
+        return _accessor.getNBTData();
+    }
 }

src/main/java/crazypants/util/EE3Util.java

@@ -1,9 +1,6 @@
 package crazypants.util;
 
-import static crazypants.enderio.material.Material.BINDER_COMPOSITE;
-import static crazypants.enderio.material.Material.CONDUIT_BINDER;
-import static crazypants.enderio.material.Material.PHASED_IRON_NUGGET;
-import static crazypants.enderio.material.Material.SILICON;
+import static crazypants.enderio.material.Material.*;
 
 import java.util.ArrayList;
 import java.util.Arrays;

src/main/java/crazypants/util/UserIdent.java

@@ -6,6 +6,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.server.MinecraftServer;
 import net.minecraftforge.common.UsernameCache;
 
 import com.enderio.core.common.util.PlayerUtil;
@@ -13,6 +14,7 @@ import com.google.common.base.Charsets;
 import com.mojang.authlib.GameProfile;
 
 import crazypants.enderio.Log;
+import crazypants.enderio.config.Config;
 
 public class UserIdent {
 
@@ -76,7 +78,7 @@ public class UserIdent {
      * changes, implement them and write a log message.
      */
     public static @Nonnull UserIdent create(@Nonnull String suuid, @Nullable String playerName) {
-        if (NONE_MARKER.equals(suuid)) {
+        if (NONE_MARKER.equals(suuid) || Config.enforceOfflinePlayerUUID) {
             return new UserIdent(null, playerName);
         }
         try {
@@ -110,8 +112,7 @@ public class UserIdent {
      */
     public static @Nonnull UserIdent create(@Nullable GameProfile gameProfile) {
         if (gameProfile != null && (gameProfile.getId() != null || gameProfile.getName() != null)) {
-            if (gameProfile.getId() != null && gameProfile.getName() != null
-                    && gameProfile.getId().equals(offlineUUID(gameProfile.getName()))) {
+            if (gameProfile.getName() != null && (Config.enforceOfflinePlayerUUID || !isOnlineMode())) {
                 return new UserIdent(null, gameProfile.getName());
             } else {
                 return new UserIdent(gameProfile.getId(), gameProfile.getName());
@@ -121,6 +122,11 @@ public class UserIdent {
         }
     }
 
+    private static boolean isOnlineMode() {
+        MinecraftServer server = MinecraftServer.getServer();
+        return server != null ? server.isServerInOnlineMode() : true;
+    }
+
     private static @Nonnull UUID offlineUUID(String playerName) {
         UUID result = UUID.nameUUIDFromBytes(("OfflinePlayer:" + playerName).getBytes(Charsets.UTF_8));
         return result != null ? result : new UUID(-1, -1);
@@ -221,6 +227,9 @@ public class UserIdent {
 
         @Override
         public boolean equals(Object obj) {
+            if (obj instanceof UUID) {
+                return getUUID().equals(obj);
+            }
             return this == obj;
         }