diff --git a/src/main/java/com/teamfear/creepypastacraft/client/gui/inventory/GuiLaptop.java b/src/main/java/com/teamfear/creepypastacraft/client/gui/inventory/GuiLaptop.java index 33414f9..163e97b 100644 --- a/src/main/java/com/teamfear/creepypastacraft/client/gui/inventory/GuiLaptop.java +++ b/src/main/java/com/teamfear/creepypastacraft/client/gui/inventory/GuiLaptop.java @@ -20,7 +20,7 @@ public GuiLaptop(InventoryPlayer inventory, TileEntityLaptop laptop) { int i = short1 - 108; int inventoryRows = inventory.getSizeInventory() / 9; this.ySize = i + inventoryRows * 18; - this.texture = new ResourceLocation("com.teamfear.creepypastacraft:textures/gui/laptop.png"); + this.texture = new ResourceLocation("creepypastacraft:textures/gui/laptop.png"); } protected void drawGuiContainerForegroundLayer(int i, int j) { diff --git a/src/main/java/com/teamfear/creepypastacraft/client/renderer/tileentity/TileEntityLaptopRenderer.java b/src/main/java/com/teamfear/creepypastacraft/client/renderer/tileentity/TileEntityLaptopRenderer.java index c02702b..ffb514d 100644 --- a/src/main/java/com/teamfear/creepypastacraft/client/renderer/tileentity/TileEntityLaptopRenderer.java +++ b/src/main/java/com/teamfear/creepypastacraft/client/renderer/tileentity/TileEntityLaptopRenderer.java @@ -25,7 +25,7 @@ public void renderLaptop(TileEntityLaptop laptop, glColor4f(1.0F, 1.0F, 1.0F, 1.0F); glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); glScalef(1.0F, -1.0F, -1.0F); - bindTexture(new ResourceLocation("com.teamfear.creepypastacraft:textures/entity/laptop.png")); + bindTexture(new ResourceLocation("creepypastacraft:textures/entity/laptop.png")); short short1; switch (i) { case 2: diff --git a/src/main/java/com/teamfear/creepypastacraft/common/inventory/ContainerLaptop.java b/src/main/java/com/teamfear/creepypastacraft/common/inventory/ContainerLaptop.java index 5497ec2..821df0d 100644 --- a/src/main/java/com/teamfear/creepypastacraft/common/inventory/ContainerLaptop.java +++ b/src/main/java/com/teamfear/creepypastacraft/common/inventory/ContainerLaptop.java @@ -21,7 +21,7 @@ public ContainerLaptop(InventoryPlayer inventory, TileEntityLaptop entityLaptop) laptop = entityLaptop; addSlotToContainer(new Slot(entityLaptop, INPUT, 56, 34)); addSlotToContainer(new SlotLaptop(inventory.player, entityLaptop, OUTPUT, 116, 35)); - laptop.openInventory(); + laptop.openChest(); int i; for (i = 0; i < 3; ++i) { @@ -121,6 +121,6 @@ public ItemStack transferStackInSlot(EntityPlayer player, int index) { public void onContainerClosed(EntityPlayer player) { super.onContainerClosed(player); - laptop.closeInventory(); + laptop.closeChest(); } } diff --git a/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCArchive.java b/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCArchive.java index 7b7bea7..3ad5463 100644 --- a/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCArchive.java +++ b/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCArchive.java @@ -166,6 +166,6 @@ public void getSubItems(Item item, CreativeTabs tabs, List list) { @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { - itemIcon = iconRegister.registerIcon("com.teamfear.creepypastacraft:archive"); + itemIcon = iconRegister.registerIcon("creepypastacraft:archive"); } } diff --git a/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCArmorBaby.java b/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCArmorBaby.java index 20c7126..19081fd 100644 --- a/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCArmorBaby.java +++ b/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCArmorBaby.java @@ -21,7 +21,7 @@ public boolean getIsRepairable(ItemStack stack1, ItemStack stack2) { @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - String textureLoc = "com.teamfear.creepypastacraft:textures/models/armor/baby_layer_"; + String textureLoc = "creepypastacraft:textures/models/armor/baby_layer_"; switch (this.armorType) { case 2: return (textureLoc + "2.png"); @@ -34,19 +34,19 @@ public String getArmorTexture(ItemStack stack, Entity entity, int slot, String t public void registerIcons(IIconRegister iconRegister) { switch (textureID) { case 0: - itemIcon = iconRegister.registerIcon("com.teamfear.creepypastacraft:bonnet"); + itemIcon = iconRegister.registerIcon("creepypastacraft:bonnet"); break; case 1: - itemIcon = iconRegister.registerIcon("com.teamfear.creepypastacraft:bib"); + itemIcon = iconRegister.registerIcon("creepypastacraft:bib"); break; case 2: - itemIcon = iconRegister.registerIcon("com.teamfear.creepypastacraft:diaper"); + itemIcon = iconRegister.registerIcon("creepypastacraft:diaper"); break; case 3: - itemIcon = iconRegister.registerIcon("com.teamfear.creepypastacraft:booties"); + itemIcon = iconRegister.registerIcon("creepypastacraft:booties"); break; default: - itemIcon = iconRegister.registerIcon("com.teamfear.creepypastacraft:horror"); + itemIcon = iconRegister.registerIcon("creepypastacraft:horror"); break; } } diff --git a/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCFood.java b/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCFood.java index fb0b461..2da3be8 100644 --- a/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCFood.java +++ b/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCFood.java @@ -40,10 +40,10 @@ public ItemStack onItemUseFinish(ItemStack stack, World world, EntityPlayer play public void registerIcons(IIconRegister iconRegister) { switch (foodType) { case 0: - itemIcon = iconRegister.registerIcon("com.teamfear.creepypastacraft:pasta"); + itemIcon = iconRegister.registerIcon("creepypastacraft:pasta"); break; default: - itemIcon = iconRegister.registerIcon("com.teamfear.creepypastacraft:horror"); + itemIcon = iconRegister.registerIcon("creepypastacraft:horror"); break; } } diff --git a/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCKnife.java b/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCKnife.java index 47d75d3..0f97156 100644 --- a/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCKnife.java +++ b/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCKnife.java @@ -27,13 +27,13 @@ public boolean getIsRepairable(ItemStack itemToRepair, public void registerIcons(IIconRegister iconRegister) { switch (textureID) { case 0: - itemIcon = iconRegister.registerIcon("com.teamfear.creepypastacraft:jeffKnife"); + itemIcon = iconRegister.registerIcon("creepypastacraft:jeffKnife"); break; case 1: - itemIcon = iconRegister.registerIcon("com.teamfear.creepypastacraft:hiltBlack"); + itemIcon = iconRegister.registerIcon("creepypastacraft:hiltBlack"); break; default: - itemIcon = iconRegister.registerIcon("com.teamfear.creepypastacraft:horror"); + itemIcon = iconRegister.registerIcon("creepypastacraft:horror"); break; } } diff --git a/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCRecord.java b/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCRecord.java index f484e10..9688418 100644 --- a/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCRecord.java +++ b/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCRecord.java @@ -32,7 +32,7 @@ public ItemCPCRecord(String recordName) { @Override public void registerIcons(IIconRegister iconRegister) { - itemIcon = iconRegister.registerIcon("com.teamfear.creepypastacraft:record_" + name); + itemIcon = iconRegister.registerIcon("creepypastacraft:record_" + name); } @Override @@ -76,6 +76,6 @@ public static ItemCPCRecord getRecord(String name) { @Override public ResourceLocation getRecordResource(String name) { - return new ResourceLocation("com.teamfear.creepypastacraft:" + name); + return new ResourceLocation("creepypastacraft:" + name); } } diff --git a/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCSmileJPG.java b/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCSmileJPG.java index 75c5a0a..33b0ea6 100644 --- a/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCSmileJPG.java +++ b/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCSmileJPG.java @@ -11,6 +11,6 @@ public ItemCPCSmileJPG() { } public void registerIcons(IIconRegister iconRegister) { - itemIcon = iconRegister.registerIcon("com.teamfear.creepypastacraft:smile"); + itemIcon = iconRegister.registerIcon("creepypastacraft:smile"); } } diff --git a/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCStephano.java b/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCStephano.java index e82f55c..3de6931 100644 --- a/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCStephano.java +++ b/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCStephano.java @@ -13,8 +13,8 @@ public ItemCPCStephano() { setMaxStackSize(8); setMaxDurability(0); setCreativeTab(CPC.tabCPC); - setUnlocalizedName("com.teamfear.creepypastacraft.stephano"); - setTextureName("com.teamfear.creepypastacraft:stephano"); + setUnlocalizedName("creepypastacraft.stephano"); + setTextureName("creepypastacraft:stephano"); } @Override diff --git a/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCTab.java b/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCTab.java index b63308a..4154f51 100644 --- a/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCTab.java +++ b/src/main/java/com/teamfear/creepypastacraft/common/item/ItemCPCTab.java @@ -6,7 +6,7 @@ public class ItemCPCTab extends Item { public ItemCPCTab() { this.setMaxStackSize(1); this.setMaxDurability(0); - this.setTextureName("com.teamfear.creepypastacraft:tabCPC"); + this.setTextureName("creepypastacraft:tabCPC"); this.setUnlocalizedName("horror"); } diff --git a/src/main/java/com/teamfear/creepypastacraft/common/tile/TileLaptop.java b/src/main/java/com/teamfear/creepypastacraft/common/tile/TileLaptop.java index 5cf107a..fdbbd41 100644 --- a/src/main/java/com/teamfear/creepypastacraft/common/tile/TileLaptop.java +++ b/src/main/java/com/teamfear/creepypastacraft/common/tile/TileLaptop.java @@ -20,8 +20,8 @@ public class TileLaptop extends BlockContainer { public TileLaptop() { super(Material.iron); setCreativeTab(CPC.tabCPC); - setTextureName("com.teamfear.creepypastacraft:laptop"); - setUnlocalizedName("com.teamfear.creepypastacraft:laptop"); + setTextureName("creepypastacraft:laptop"); + setUnlocalizedName("creepypastacraft:laptop"); } public Item getBlockDropped(int par1, Random random, int par3) {