Remove Proxy.getBuildCraftBase()
It was only used by the blueprint code, and will be replaced eventually anyway.
This commit is contained in:
parent
29eb8776a4
commit
8a3d837e94
6 changed files with 8 additions and 18 deletions
|
@ -108,7 +108,7 @@ public abstract class BptBase {
|
||||||
|
|
||||||
public File save() {
|
public File save() {
|
||||||
try {
|
try {
|
||||||
File baseDir = CoreProxy.proxy.getBuildCraftBase();
|
File baseDir = new File("./");
|
||||||
|
|
||||||
baseDir.mkdir();
|
baseDir.mkdir();
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ public class BptPlayerIndex {
|
||||||
private File file;
|
private File file;
|
||||||
|
|
||||||
public BptPlayerIndex(String filename, BptRootIndex rootIndex) throws IOException {
|
public BptPlayerIndex(String filename, BptRootIndex rootIndex) throws IOException {
|
||||||
baseDir = new File(CoreProxy.proxy.getBuildCraftBase(), "blueprints/");
|
baseDir = new File("./", "blueprints/");
|
||||||
file = new File(baseDir, filename);
|
file = new File(baseDir, filename);
|
||||||
baseDir.mkdir();
|
baseDir.mkdir();
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ public class BptRootIndex {
|
||||||
public int maxBpt = 0;
|
public int maxBpt = 0;
|
||||||
|
|
||||||
public BptRootIndex(String filename) throws IOException {
|
public BptRootIndex(String filename) throws IOException {
|
||||||
baseDir = new File(CoreProxy.proxy.getBuildCraftBase(), "blueprints/");
|
baseDir = new File("./", "blueprints/");
|
||||||
file = new File(baseDir, filename);
|
file = new File(baseDir, filename);
|
||||||
baseDir.mkdir();
|
baseDir.mkdir();
|
||||||
|
|
||||||
|
|
|
@ -149,11 +149,6 @@ public class CoreProxy {
|
||||||
public void sendToServer(Packet packet) {
|
public void sendToServer(Packet packet) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/* FILE SYSTEM */
|
|
||||||
public File getBuildCraftBase() {
|
|
||||||
return new File("./");
|
|
||||||
}
|
|
||||||
|
|
||||||
public int addCustomTexture(String pathToTexture) {
|
public int addCustomTexture(String pathToTexture) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,7 +31,6 @@ import java.util.List;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.multiplayer.WorldClient;
|
import net.minecraft.client.multiplayer.WorldClient;
|
||||||
import net.minecraft.client.resources.LanguageManager;
|
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.entity.Entity;
|
import net.minecraft.entity.Entity;
|
||||||
import net.minecraft.entity.item.EntityItem;
|
import net.minecraft.entity.item.EntityItem;
|
||||||
|
@ -42,7 +41,6 @@ import net.minecraft.network.packet.Packet;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.util.ChatMessageComponent;
|
import net.minecraft.util.ChatMessageComponent;
|
||||||
import net.minecraft.util.ChunkCoordinates;
|
import net.minecraft.util.ChunkCoordinates;
|
||||||
import net.minecraft.util.StringTranslate;
|
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
public class CoreProxyClient extends CoreProxy {
|
public class CoreProxyClient extends CoreProxy {
|
||||||
|
@ -135,12 +133,6 @@ public class CoreProxyClient extends CoreProxy {
|
||||||
FMLClientHandler.instance().getClient().getNetHandler().addToSendQueue(packet);
|
FMLClientHandler.instance().getClient().getNetHandler().addToSendQueue(packet);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* FILE SYSTEM */
|
|
||||||
@Override
|
|
||||||
public File getBuildCraftBase() {
|
|
||||||
return Minecraft.getMinecraftDir();
|
|
||||||
}
|
|
||||||
|
|
||||||
/* BUILDCRAFT PLAYER */
|
/* BUILDCRAFT PLAYER */
|
||||||
@Override
|
@Override
|
||||||
public String playerName() {
|
public String playerName() {
|
||||||
|
|
|
@ -46,11 +46,14 @@ public class PipeConnectionBans {
|
||||||
banConnection(PipePowerWood.class);
|
banConnection(PipePowerWood.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private PipeConnectionBans() {
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Will ban connection between any set of pipe types provided.
|
* 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
|
* If only one parameter is passed in, it will ban connection to pipes of
|
||||||
* same type.
|
* the same type.
|
||||||
*
|
*
|
||||||
* @param types
|
* @param types
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue