diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java index 8cfd55f4..5d96c204 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java @@ -697,10 +697,6 @@ public class ConduitRecipes { res.stackSize = 1; ItemStack resDense = new ItemStack(EnderIO.itemMEConduit, 1, 1); - ItemStack resUltra = new ItemStack(EnderIO.itemMEConduit, 1, 2); addShaped(resDense, "bCb", "CbC", "bCb", 'b', conduitBinder, 'C', res); - if (Config.enableMEUltraDenseConduits) { - addShaped(resUltra, "bCb", "CbC", "bCb", 'b', conduitBinder, 'C', resDense); - } } } diff --git a/src/main/java/crazypants/enderio/conduit/me/IMEConduit.java b/src/main/java/crazypants/enderio/conduit/me/IMEConduit.java index 811dcfd0..13294e7f 100644 --- a/src/main/java/crazypants/enderio/conduit/me/IMEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/IMEConduit.java @@ -14,7 +14,5 @@ public interface IMEConduit extends IConduit { boolean isDense(); - boolean isDenseUltra(); - int getChannelsInUse(); } diff --git a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java index 9887b09e..c10f2ef6 100644 --- a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java @@ -16,7 +16,6 @@ import com.enderio.core.client.render.IconUtil; import com.enderio.core.common.util.BlockCoord; import appeng.api.AEApi; -import appeng.api.networking.GridFlags; import appeng.api.networking.IGridConnection; import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; @@ -51,7 +50,6 @@ public class MEConduit extends AbstractConduit implements IMEConduit { public static IIcon[] longTextures; private boolean isDense; - private boolean isDenseUltra; private int playerID = -1; public MEConduit() { @@ -59,7 +57,6 @@ public class MEConduit extends AbstractConduit implements IMEConduit { } public MEConduit(int itemDamage) { - isDenseUltra = itemDamage == 2; isDense = itemDamage == 1; } @@ -68,16 +65,14 @@ public class MEConduit extends AbstractConduit implements IMEConduit { @Override public void registerIcons(IIconRegister register) { - coreTextures = new IIcon[3]; - longTextures = new IIcon[3]; + coreTextures = new IIcon[2]; + longTextures = new IIcon[2]; coreTextures[0] = register.registerIcon(EnderIO.DOMAIN + ":meConduitCore"); coreTextures[1] = register.registerIcon(EnderIO.DOMAIN + ":meConduitCoreDense"); - coreTextures[2] = register.registerIcon(EnderIO.DOMAIN + ":meConduitCoreDenseUltra"); longTextures[0] = register.registerIcon(EnderIO.DOMAIN + ":meConduit"); longTextures[1] = register.registerIcon(EnderIO.DOMAIN + ":meConduitDense"); - longTextures[2] = register.registerIcon(EnderIO.DOMAIN + ":meConduitDenseUltra"); } @Override @@ -87,10 +82,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit { }); } - public static int getDamageForState(boolean isDense, boolean isDenseUltra) { - if (isDenseUltra) { - return 2; - } + public static int getDamageForState(boolean isDense) { if (isDense) { return 1; } @@ -104,7 +96,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit { @Override public ItemStack createItem() { - return new ItemStack(EnderIO.itemMEConduit, 1, getDamageForState(isDense, isDenseUltra)); + return new ItemStack(EnderIO.itemMEConduit, 1, getDamageForState(isDense)); } @Override @@ -122,7 +114,6 @@ public class MEConduit extends AbstractConduit implements IMEConduit { public void writeToNBT(NBTTagCompound nbtRoot) { super.writeToNBT(nbtRoot); nbtRoot.setBoolean("isDense", isDense); - nbtRoot.setBoolean("isDenseUltra", isDenseUltra); nbtRoot.setInteger("playerID", playerID); } @@ -135,9 +126,6 @@ public class MEConduit extends AbstractConduit implements IMEConduit { } else { playerID = -1; } - if (nbtRoot.hasKey("isDenseUltra")) { - isDenseUltra = nbtRoot.getBoolean("isDenseUltra"); - } } public void setPlayerID(int playerID) { @@ -208,22 +196,12 @@ public class MEConduit extends AbstractConduit implements IMEConduit { @Method(modid = "appliedenergistics2") private Boolean canConnectToGridNode(IGridNode node, ForgeDirection dir) { - if (node.getGridBlock().getConnectableSides().contains(dir.getOpposite())) { - if (isDenseUltra()) { - return node.hasFlag(GridFlags.ULTRA_DENSE_CAPACITY) - || ((node.hasFlag(GridFlags.DENSE_CAPACITY)) && !node.hasFlag(GridFlags.CANNOT_CARRY)); - } else if (isDense()) { - return true; - } else { - return !node.hasFlag(GridFlags.ULTRA_DENSE_CAPACITY); - } - } - return false; + return node.getGridBlock().getConnectableSides().contains(dir.getOpposite()); } @Override public IIcon getTextureForState(CollidableComponent component) { - int state = getDamageForState(isDense, isDenseUltra); + int state = getDamageForState(isDense); if (component.dir == ForgeDirection.UNKNOWN) { return coreTextures[state]; } else { @@ -400,9 +378,4 @@ public class MEConduit extends AbstractConduit implements IMEConduit { public boolean isDense() { return isDense; } - - @Override - public boolean isDenseUltra() { - return isDenseUltra; - } } diff --git a/src/main/java/crazypants/enderio/conduit/me/MEConduitGrid.java b/src/main/java/crazypants/enderio/conduit/me/MEConduitGrid.java index f052479a..eeb598e0 100644 --- a/src/main/java/crazypants/enderio/conduit/me/MEConduitGrid.java +++ b/src/main/java/crazypants/enderio/conduit/me/MEConduitGrid.java @@ -43,9 +43,6 @@ public class MEConduitGrid implements IGridBlock { @Override public EnumSet getFlags() { - if (conduit.isDenseUltra()) { - return EnumSet.of(GridFlags.ULTRA_DENSE_CAPACITY); - } if (conduit.isDense()) { return EnumSet.of(GridFlags.DENSE_CAPACITY); } diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 1073a733..95e54040 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -475,7 +475,6 @@ public final class Config { public static boolean isGasConduitEnabled = true; public static boolean enableMEConduits = true; - public static boolean enableMEUltraDenseConduits = false; public static boolean enableOCConduits = true; public static boolean enableOCConduitsAnimatedTexture = true; @@ -2415,11 +2414,6 @@ public final class Config { sectionItems.name, enableMEConduits, "Allows ME conduits. Only has an effect with AE2 installed."); - enableMEUltraDenseConduits = config.getBoolean( - "enableMEUltraDenseConduits", - sectionItems.name, - enableMEUltraDenseConduits, - "Allows ME Ultra Dense conduits. Only has an effect with AE2 installed."); enableOCConduits = config.getBoolean( "enableOCConduits", sectionItems.name, diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index 3e55ba38..37f1e87d 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -344,14 +344,13 @@ public class WailaCompat implements IWailaDataProvider { } else if (itemStack.getItem() == EnderIO.itemMEConduit) { NBTTagCompound nbtRoot = accessor.getNBTData(); if (nbtRoot.hasKey("isDense")) { - boolean isDenseUltra = nbtRoot.getBoolean("isDenseUltra"); boolean isDense = nbtRoot.getBoolean("isDense"); int channelsInUse = nbtRoot.getInteger("channelsInUse"); currenttip.add( MessageFormat.format( EnderIO.lang.localize("itemMEConduit.channelsUsed"), channelsInUse, - isDenseUltra ? 128 : (isDense ? 32 : 8))); + isDense ? 32 : 8)); } } } @@ -387,7 +386,6 @@ public class WailaCompat implements IWailaDataProvider { if (mec != null) { tag.setInteger("channelsInUse", mec.getChannelsInUse()); tag.setBoolean("isDense", mec.isDense()); - tag.setBoolean("isDenseUltra", mec.isDenseUltra()); } } else if (te instanceof IInternalPoweredTile) { IInternalPoweredTile ipte = (IInternalPoweredTile) te; diff --git a/src/main/resources/assets/enderio/lang/de_DE.lang b/src/main/resources/assets/enderio/lang/de_DE.lang index 77ad4d2c..69a5f1a9 100644 --- a/src/main/resources/assets/enderio/lang/de_DE.lang +++ b/src/main/resources/assets/enderio/lang/de_DE.lang @@ -130,7 +130,6 @@ enderio.itemGasConduit.tooltip.detailed.line1=Transportiert Mekanism-kompatible enderio.itemMEConduit.name=ME-Leitung enderio.itemMEConduitDense.name=Dichte ME-Leitung -enderio.itemMEConduitDenseUltra.name=Extrem Dichte ME-Leitungen enderio.itemMEConduit.channelsUsed={0,number} von {1,number} Kanälen enderio.itemOCConduit.name=Netzwerkleitung (OC) diff --git a/src/main/resources/assets/enderio/lang/en_US.lang b/src/main/resources/assets/enderio/lang/en_US.lang index 92a86359..e8673a66 100644 --- a/src/main/resources/assets/enderio/lang/en_US.lang +++ b/src/main/resources/assets/enderio/lang/en_US.lang @@ -136,7 +136,6 @@ enderio.itemGasConduit.tooltip.detailed.line1=Transfers Mekanism-compatible gase enderio.itemMEConduit.name=ME Conduit enderio.itemMEConduitDense.name=Dense ME Conduit -enderio.itemMEConduitDenseUltra.name=Ultra Dense ME Conduit enderio.itemMEConduit.channelsUsed={0,number} of {1,number} Channels enderio.itemOCConduit.name=Network Conduit (OC) diff --git a/src/main/resources/assets/enderio/textures/blocks/meConduitCoreDenseUltra.png b/src/main/resources/assets/enderio/textures/blocks/meConduitCoreDenseUltra.png deleted file mode 100644 index 72b484fe..00000000 Binary files a/src/main/resources/assets/enderio/textures/blocks/meConduitCoreDenseUltra.png and /dev/null differ diff --git a/src/main/resources/assets/enderio/textures/blocks/meConduitDenseUltra.png b/src/main/resources/assets/enderio/textures/blocks/meConduitDenseUltra.png deleted file mode 100644 index ab1c82cb..00000000 Binary files a/src/main/resources/assets/enderio/textures/blocks/meConduitDenseUltra.png and /dev/null differ diff --git a/src/main/resources/assets/enderio/textures/items/itemMeConduitDenseUltra.png b/src/main/resources/assets/enderio/textures/items/itemMeConduitDenseUltra.png deleted file mode 100644 index 88e58942..00000000 Binary files a/src/main/resources/assets/enderio/textures/items/itemMeConduitDenseUltra.png and /dev/null differ