From 8ee25ddf2c38032331c02409ddc0b7c9e78ddb0c Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sun, 21 Sep 2014 01:39:54 +0200 Subject: [PATCH] Typo SlotInaccessable --- client/gui/AEBaseGui.java | 14 +++----------- container/AEBaseContainer.java | 12 +++--------- .../implementations/ContainerCraftAmount.java | 4 ++-- container/implementations/ContainerGrinder.java | 4 ++-- ...SlotInaccessable.java => SlotInaccessible.java} | 4 ++-- container/slot/SlotInaccessibleHD.java | 2 +- 6 files changed, 13 insertions(+), 27 deletions(-) rename container/slot/{SlotInaccessable.java => SlotInaccessible.java} (85%) diff --git a/client/gui/AEBaseGui.java b/client/gui/AEBaseGui.java index 65bafe00..72196034 100644 --- a/client/gui/AEBaseGui.java +++ b/client/gui/AEBaseGui.java @@ -11,6 +11,7 @@ import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; +import appeng.container.slot.*; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; @@ -36,17 +37,8 @@ import appeng.client.me.SlotDisconnected; import appeng.client.me.SlotME; import appeng.client.render.AppEngRenderItem; import appeng.container.AEBaseContainer; -import appeng.container.slot.AppEngCraftingSlot; -import appeng.container.slot.AppEngSlot; import appeng.container.slot.AppEngSlot.hasCalculatedValidness; -import appeng.container.slot.OptionalSlotFake; -import appeng.container.slot.SlotCraftingTerm; -import appeng.container.slot.SlotDisabled; -import appeng.container.slot.SlotFake; -import appeng.container.slot.SlotInaccessable; -import appeng.container.slot.SlotOutput; -import appeng.container.slot.SlotPatternTerm; -import appeng.container.slot.SlotRestrictedInput; +import appeng.container.slot.SlotInaccessible; import appeng.core.AELog; import appeng.core.AppEng; import appeng.core.sync.network.NetworkHandler; @@ -909,7 +901,7 @@ public abstract class AEBaseGui extends GuiContainer if ( ((AppEngSlot) s).isValid == hasCalculatedValidness.NotAvailable ) { boolean isValid = s.isItemValid( is ) || s instanceof SlotOutput || s instanceof AppEngCraftingSlot || s instanceof SlotDisabled - || s instanceof SlotInaccessable || s instanceof SlotFake || s instanceof SlotRestrictedInput || s instanceof SlotDisconnected; + || s instanceof SlotInaccessible || s instanceof SlotFake || s instanceof SlotRestrictedInput || s instanceof SlotDisconnected; if ( isValid && s instanceof SlotRestrictedInput ) { try diff --git a/container/AEBaseContainer.java b/container/AEBaseContainer.java index 16ca7c78..5ab81d2f 100644 --- a/container/AEBaseContainer.java +++ b/container/AEBaseContainer.java @@ -10,6 +10,7 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; +import appeng.container.slot.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; @@ -41,14 +42,7 @@ import appeng.client.me.InternalSlotME; import appeng.client.me.SlotME; import appeng.container.guisync.GuiSync; import appeng.container.guisync.SyncDat; -import appeng.container.slot.AppEngSlot; -import appeng.container.slot.SlotCraftingMatrix; -import appeng.container.slot.SlotCraftingTerm; -import appeng.container.slot.SlotDisabled; -import appeng.container.slot.SlotFake; -import appeng.container.slot.SlotInaccessable; -import appeng.container.slot.SlotPlayerHotBar; -import appeng.container.slot.SlotPlayerInv; +import appeng.container.slot.SlotInaccessible; import appeng.core.AELog; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketInventoryAction; @@ -346,7 +340,7 @@ public abstract class AEBaseContainer extends Container ItemStack tis = null; AppEngSlot clickSlot = (AppEngSlot) this.inventorySlots.get( idx ); // require AE SLots! - if ( clickSlot instanceof SlotDisabled || clickSlot instanceof SlotInaccessable ) + if ( clickSlot instanceof SlotDisabled || clickSlot instanceof SlotInaccessible ) return null; if ( clickSlot != null && clickSlot.getHasStack() ) { diff --git a/container/implementations/ContainerCraftAmount.java b/container/implementations/ContainerCraftAmount.java index 632e998a..1587457e 100644 --- a/container/implementations/ContainerCraftAmount.java +++ b/container/implementations/ContainerCraftAmount.java @@ -1,5 +1,6 @@ package appeng.container.implementations; +import appeng.container.slot.SlotInaccessible; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.world.World; @@ -11,7 +12,6 @@ import appeng.api.networking.security.PlayerSource; import appeng.api.storage.ITerminalHost; import appeng.api.storage.data.IAEItemStack; import appeng.container.AEBaseContainer; -import appeng.container.slot.SlotInaccessable; import appeng.tile.inventory.AppEngInternalInventory; public class ContainerCraftAmount extends AEBaseContainer @@ -26,7 +26,7 @@ public class ContainerCraftAmount extends AEBaseContainer super( ip, te ); priHost = te; - craftingItem = new SlotInaccessable( new AppEngInternalInventory( null, 1 ), 0, 34, 53 ); + craftingItem = new SlotInaccessible( new AppEngInternalInventory( null, 1 ), 0, 34, 53 ); addSlotToContainer( craftingItem ); } diff --git a/container/implementations/ContainerGrinder.java b/container/implementations/ContainerGrinder.java index 065e6daa..8a5c875e 100644 --- a/container/implementations/ContainerGrinder.java +++ b/container/implementations/ContainerGrinder.java @@ -1,8 +1,8 @@ package appeng.container.implementations; +import appeng.container.slot.SlotInaccessible; import net.minecraft.entity.player.InventoryPlayer; import appeng.container.AEBaseContainer; -import appeng.container.slot.SlotInaccessable; import appeng.container.slot.SlotOutput; import appeng.container.slot.SlotRestrictedInput; import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; @@ -21,7 +21,7 @@ public class ContainerGrinder extends AEBaseContainer addSlotToContainer( new SlotRestrictedInput( PlaceableItemType.ORE, te, 1, 12 + 18, 17, invPlayer ) ); addSlotToContainer( new SlotRestrictedInput( PlaceableItemType.ORE, te, 2, 12 + 36, 17, invPlayer ) ); - addSlotToContainer( new SlotInaccessable( te, 6, 80, 40 ) ); + addSlotToContainer( new SlotInaccessible( te, 6, 80, 40 ) ); addSlotToContainer( new SlotOutput( te, 3, 112, 63, 2 * 16 + 15 ) ); addSlotToContainer( new SlotOutput( te, 4, 112 + 18, 63, 2 * 16 + 15 ) ); diff --git a/container/slot/SlotInaccessable.java b/container/slot/SlotInaccessible.java similarity index 85% rename from container/slot/SlotInaccessable.java rename to container/slot/SlotInaccessible.java index 5424b0ad..d6981192 100644 --- a/container/slot/SlotInaccessable.java +++ b/container/slot/SlotInaccessible.java @@ -4,10 +4,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -public class SlotInaccessable extends AppEngSlot +public class SlotInaccessible extends AppEngSlot { - public SlotInaccessable(IInventory i, int slotIdx, int x, int y) { + public SlotInaccessible(IInventory i, int slotIdx, int x, int y) { super( i, slotIdx, x, y ); } diff --git a/container/slot/SlotInaccessibleHD.java b/container/slot/SlotInaccessibleHD.java index 1b877896..3634d902 100644 --- a/container/slot/SlotInaccessibleHD.java +++ b/container/slot/SlotInaccessibleHD.java @@ -2,7 +2,7 @@ package appeng.container.slot; import net.minecraft.inventory.IInventory; -public class SlotInaccessibleHD extends SlotInaccessable +public class SlotInaccessibleHD extends SlotInaccessible { public SlotInaccessibleHD(IInventory i, int slotIdx, int x, int y) {