diff --git a/common/buildcraft/core/blueprints/BptBase.java b/common/buildcraft/core/blueprints/BptBase.java index 22f09ff3..0f578278 100644 --- a/common/buildcraft/core/blueprints/BptBase.java +++ b/common/buildcraft/core/blueprints/BptBase.java @@ -108,7 +108,7 @@ public abstract class BptBase { public File save() { try { - File baseDir = CoreProxy.proxy.getBuildCraftBase(); + File baseDir = new File("./"); baseDir.mkdir(); diff --git a/common/buildcraft/core/blueprints/BptPlayerIndex.java b/common/buildcraft/core/blueprints/BptPlayerIndex.java index dd38205c..4dc666a2 100644 --- a/common/buildcraft/core/blueprints/BptPlayerIndex.java +++ b/common/buildcraft/core/blueprints/BptPlayerIndex.java @@ -19,7 +19,7 @@ public class BptPlayerIndex { private File file; public BptPlayerIndex(String filename, BptRootIndex rootIndex) throws IOException { - baseDir = new File(CoreProxy.proxy.getBuildCraftBase(), "blueprints/"); + baseDir = new File("./", "blueprints/"); file = new File(baseDir, filename); baseDir.mkdir(); diff --git a/common/buildcraft/core/blueprints/BptRootIndex.java b/common/buildcraft/core/blueprints/BptRootIndex.java index 275562ec..926082c3 100644 --- a/common/buildcraft/core/blueprints/BptRootIndex.java +++ b/common/buildcraft/core/blueprints/BptRootIndex.java @@ -33,7 +33,7 @@ public class BptRootIndex { public int maxBpt = 0; public BptRootIndex(String filename) throws IOException { - baseDir = new File(CoreProxy.proxy.getBuildCraftBase(), "blueprints/"); + baseDir = new File("./", "blueprints/"); file = new File(baseDir, filename); baseDir.mkdir(); diff --git a/common/buildcraft/core/proxy/CoreProxy.java b/common/buildcraft/core/proxy/CoreProxy.java index ffde5076..ba2b9da1 100644 --- a/common/buildcraft/core/proxy/CoreProxy.java +++ b/common/buildcraft/core/proxy/CoreProxy.java @@ -149,11 +149,6 @@ public class CoreProxy { public void sendToServer(Packet packet) { } - /* FILE SYSTEM */ - public File getBuildCraftBase() { - return new File("./"); - } - public int addCustomTexture(String pathToTexture) { return 0; } diff --git a/common/buildcraft/core/proxy/CoreProxyClient.java b/common/buildcraft/core/proxy/CoreProxyClient.java index 0f902eb3..c30dedca 100644 --- a/common/buildcraft/core/proxy/CoreProxyClient.java +++ b/common/buildcraft/core/proxy/CoreProxyClient.java @@ -31,7 +31,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.client.resources.LanguageManager; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -42,7 +41,6 @@ import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatMessageComponent; import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.StringTranslate; import net.minecraft.world.World; public class CoreProxyClient extends CoreProxy { @@ -135,12 +133,6 @@ public class CoreProxyClient extends CoreProxy { FMLClientHandler.instance().getClient().getNetHandler().addToSendQueue(packet); } - /* FILE SYSTEM */ - @Override - public File getBuildCraftBase() { - return Minecraft.getMinecraftDir(); - } - /* BUILDCRAFT PLAYER */ @Override public String playerName() { diff --git a/common/buildcraft/transport/PipeConnectionBans.java b/common/buildcraft/transport/PipeConnectionBans.java index 84a5fc24..3e641a1c 100644 --- a/common/buildcraft/transport/PipeConnectionBans.java +++ b/common/buildcraft/transport/PipeConnectionBans.java @@ -46,11 +46,14 @@ public class PipeConnectionBans { banConnection(PipePowerWood.class); } + private PipeConnectionBans() { + } + /** * Will ban connection between any set of pipe types provided. * - * If only one parameter is passed in, it will ban connection to pipes of the - * same type. + * If only one parameter is passed in, it will ban connection to pipes of + * the same type. * * @param types */