diff options
Diffstat (limited to 'src/Java/gtPlusPlus')
| -rw-r--r-- | src/Java/gtPlusPlus/core/block/machine/FishTrap.java | 6 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/container/Container_FishTrap.java | 6 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java | 4 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/handler/GuiHandler.java | 6 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/inventories/InventoryFishTrap.java (renamed from src/Java/gtPlusPlus/core/inventories/InventoryFishtrap.java) | 8 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java | 4 |
6 files changed, 13 insertions, 21 deletions
diff --git a/src/Java/gtPlusPlus/core/block/machine/FishTrap.java b/src/Java/gtPlusPlus/core/block/machine/FishTrap.java index fd91a1d500..089e63597b 100644 --- a/src/Java/gtPlusPlus/core/block/machine/FishTrap.java +++ b/src/Java/gtPlusPlus/core/block/machine/FishTrap.java @@ -3,7 +3,7 @@ package gtPlusPlus.core.block.machine; import gtPlusPlus.GTplusplus; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.general.TileEntityFishtrap; +import gtPlusPlus.core.tileentities.general.TileEntityFishTrap; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -66,7 +66,7 @@ public class FishTrap extends BlockContainer if (world.isRemote) return true; TileEntity te = world.getTileEntity(x, y, z); - if (te != null && te instanceof TileEntityFishtrap){ + if (te != null && te instanceof TileEntityFishTrap){ player.openGui(GTplusplus.instance, 5, world, x, y, z); return true; } @@ -85,7 +85,7 @@ public class FishTrap extends BlockContainer @Override public TileEntity createNewTileEntity(World world, int p_149915_2_) { - return new TileEntityFishtrap(); + return new TileEntityFishTrap(); } }
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/container/Container_FishTrap.java b/src/Java/gtPlusPlus/core/container/Container_FishTrap.java index 9502ada19f..9e69ed4d46 100644 --- a/src/Java/gtPlusPlus/core/container/Container_FishTrap.java +++ b/src/Java/gtPlusPlus/core/container/Container_FishTrap.java @@ -3,7 +3,7 @@ package gtPlusPlus.core.container; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.inventories.*; import gtPlusPlus.core.slots.SlotNoInput; -import gtPlusPlus.core.tileentities.general.TileEntityFishtrap; +import gtPlusPlus.core.tileentities.general.TileEntityFishTrap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.*; @@ -12,7 +12,7 @@ import net.minecraft.world.World; public class Container_FishTrap extends Container { - protected TileEntityFishtrap tile_entity; + protected TileEntityFishTrap tile_entity; public final InventoryFishTrap inventoryChest; private World worldObj; @@ -27,7 +27,7 @@ public class Container_FishTrap extends Container { private int[] slotStorage = new int[15]; - public Container_FishTrap(InventoryPlayer inventory, TileEntityFishtrap te){ + public Container_FishTrap(InventoryPlayer inventory, TileEntityFishTrap te){ this.tile_entity = te; this.inventoryChest = te.getInventory(); diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java index 11beacaae7..81a37d2751 100644 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java +++ b/src/Java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java @@ -2,7 +2,7 @@ package gtPlusPlus.core.gui.machine; import gtPlusPlus.core.container.Container_FishTrap; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.general.TileEntityFishtrap; +import gtPlusPlus.core.tileentities.general.TileEntityFishTrap; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; @@ -17,7 +17,7 @@ public class GUI_FishTrap extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(CORE.MODID, "textures/gui/FishTrap.png"); - public GUI_FishTrap(InventoryPlayer player_inventory, TileEntityFishtrap te){ + public GUI_FishTrap(InventoryPlayer player_inventory, TileEntityFishTrap te){ super(new Container_FishTrap(player_inventory, te)); } diff --git a/src/Java/gtPlusPlus/core/handler/GuiHandler.java b/src/Java/gtPlusPlus/core/handler/GuiHandler.java index f58ad539bc..5f2416413b 100644 --- a/src/Java/gtPlusPlus/core/handler/GuiHandler.java +++ b/src/Java/gtPlusPlus/core/handler/GuiHandler.java @@ -9,7 +9,7 @@ import gtPlusPlus.core.gui.machine.*; import gtPlusPlus.core.interfaces.IGuiManager; import gtPlusPlus.core.inventories.BaseInventoryBackpack; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.general.TileEntityFishtrap; +import gtPlusPlus.core.tileentities.general.TileEntityFishTrap; import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench; import gtPlusPlus.core.tileentities.machines.TileEntityWorkbenchAdvanced; import gtPlusPlus.core.util.Utils; @@ -80,7 +80,7 @@ public class GuiHandler implements IGuiHandler { } if (ID == GUI6){ - return new Container_FishTrap(player.inventory, (TileEntityFishtrap)te); + return new Container_FishTrap(player.inventory, (TileEntityFishTrap)te); } } @@ -126,7 +126,7 @@ public class GuiHandler implements IGuiHandler { return new GUI_WorkbenchAdvanced(player.inventory, (TileEntityWorkbenchAdvanced)te); } if (ID == GUI6){ - return new GUI_FishTrap(player.inventory, (TileEntityFishtrap)te); + return new GUI_FishTrap(player.inventory, (TileEntityFishTrap)te); } } diff --git a/src/Java/gtPlusPlus/core/inventories/InventoryFishtrap.java b/src/Java/gtPlusPlus/core/inventories/InventoryFishTrap.java index 834173a768..ca6d006740 100644 --- a/src/Java/gtPlusPlus/core/inventories/InventoryFishtrap.java +++ b/src/Java/gtPlusPlus/core/inventories/InventoryFishTrap.java @@ -16,14 +16,6 @@ public class InventoryFishTrap implements IInventory{ /** Inventory's size must be same as number of slots you add to the Container class */ private ItemStack[] inventory = new ItemStack[INV_SIZE]; - - /** - * @param itemstack - the ItemStack to which this inventory belongs - */ - public InventoryFishTrap() - { - - } public void readFromNBT(NBTTagCompound nbt){ NBTTagList list = nbt.getTagList("Items", 10); diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java index a91fda7a22..5f6bd802a3 100644 --- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java +++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java @@ -12,7 +12,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -public class TileEntityFishtrap extends TileEntity{ +public class TileEntityFishTrap extends TileEntity{ private int tickCount = 0; private boolean isInWater = false; @@ -23,7 +23,7 @@ public class TileEntityFishtrap extends TileEntity{ private int waterSides = 0; private int baseTickRate = 600*5; - public TileEntityFishtrap(){ + public TileEntityFishTrap(){ this.inventoryContents = new InventoryFishTrap();//number of slots - without product slot setTileLocation(); } |