diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 6d93dbc8..002b39f4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -113,7 +113,6 @@ import WayofTime.alchemicalWizardry.common.harvest.GourdHarvestHandler; import WayofTime.alchemicalWizardry.common.harvest.PamHarvestCompatRegistry; import WayofTime.alchemicalWizardry.common.items.ItemRitualDiviner; import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmour; -import WayofTime.alchemicalWizardry.common.items.forestry.ItemBloodFrame; import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding; import WayofTime.alchemicalWizardry.common.items.thaumcraft.ItemSanguineArmour; import WayofTime.alchemicalWizardry.common.omega.OmegaParadigmEarth; @@ -1191,14 +1190,14 @@ public class AlchemicalWizardry { this.isForestryLoaded = true; - ModItems.itemBloodFrame = new ItemBloodFrame().setUnlocalizedName("bloodFrame"); - - ItemStack provenFrame = GameRegistry.findItemStack("Forestry", "frameImpregnated", 1); - - if(provenFrame !=null) - { - AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.itemBloodFrame), provenFrame, 3, 30000, 20, 20, false); - } +// ModItems.itemBloodFrame = new ItemBloodFrame(this.itemBloodFrameItemID).setUnlocalizedName("bloodFrame"); +// +// ItemStack provenFrame = GameRegistry.findItemStack("Forestry", "frameImpregnated", 1); +// +// if(provenFrame !=null) +// { +// AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.itemBloodFrame), provenFrame, 3, 30000, 20, 20, false); +// } } else { this.isForestryLoaded = false; @@ -1398,7 +1397,7 @@ public class AlchemicalWizardry Rituals.registerRitual("AW010Crusher", 1, 2500, new RitualEffectCrushing(), "Ritual of the Crusher", new AlchemyCircleRenderer(new ResourceLocation("alchemicalwizardry:textures/models/SimpleTransCircle.png"), 0, 0, 0, 255, 0, 0.501, 0.501, 0, 1.5, false)); Rituals.registerRitual("AW011Speed", 1, 1000, new RitualEffectLeap(), "Ritual of Speed", new AlchemyCircleRenderer(new ResourceLocation("alchemicalwizardry:textures/models/SimpleTransCircle.png"), 0, 0, 0, 255, 0, 0.501, 0.501, 0, 1.5, false)); Rituals.registerRitual("AW012AnimalGrowth", 1, 10000, new RitualEffectAnimalGrowth(), "Ritual of the Shepherd", new AlchemyCircleRenderer(new ResourceLocation("alchemicalwizardry:textures/models/SimpleTransCircle.png"), 0, 0, 0, 255, 0, 0.501, 0.501, 0, 1.5, false)); - Rituals.registerRitual("AW013Suffering", 1, 50000, new RitualEffectWellOfSuffering(), "Well of Suffering", new AlchemyCircleRenderer(new ResourceLocation("alchemicalwizardry:textures/models/AlchemyArrays/WellOfSufferingArray.png"), 0, 0, 0, 255, 0, 0.501, 0.8, 0, 2.5, true)); + Rituals.registerRitual("AW013Suffering", 1, 50000, new RitualEffectWellOfSuffering(), "Well of Suffering", new AlchemyCircleRenderer(new ResourceLocation("alchemicalwizardry:textures/models/TransCircleSuffering.png"), 0, 0, 0, 255, 0, 0.501, 0.8, 0, 2.5, true)); Rituals.registerRitual("AW014Regen", 1, 25000, new RitualEffectHealing(), "Ritual of Regeneration", new AlchemyCircleRenderer(new ResourceLocation("alchemicalwizardry:textures/models/SimpleTransCircle.png"), 0, 0, 0, 255, 0, 0.501, 0.501, 0, 1.5, false)); Rituals.registerRitual("AW015FeatheredKnife", 1, 50000, new RitualEffectFeatheredKnife(), "Ritual of the Feathered Knife", new AlchemyCircleRenderer(new ResourceLocation("alchemicalwizardry:textures/models/SimpleTransCircle.png"), 0, 0, 0, 255, 0, 0.501, 0.501, 0, 1.5, false)); Rituals.registerRitual("AW016FeatheredEarth", 2, 100000, new RitualEffectFeatheredEarth(), "Ritual of the Feathered Earth", new AlchemyCircleRenderer(new ResourceLocation("alchemicalwizardry:textures/models/SimpleTransCircle.png"), 0, 0, 0, 255, 0, 0.501, 0.501, 0, 1.5, false)); diff --git a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java index 589771a1..969aac58 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java +++ b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java @@ -166,11 +166,11 @@ public class BloodMagicConfiguration BoundArmour.tryComplexRendering = config.get("WimpySettings", "UseFancyBoundArmour", true).getBoolean(true); -// ItemIncense.itemDuration = config.get("TestIncenseSettings", "ItemDuration", 100).getInt(); -// ItemIncense.minValue = config.get("TestIncenseSettings", "MinValue", 0).getInt(); -// ItemIncense.maxValue = config.get("TestIncenseSettings", "MaxValue", 100).getInt(); -// PlayerSacrificeHandler.scalingOfSacrifice = (float) config.get("TestIncenseSettings", "ScalingFactor", 0.0025f).getDouble(); -// PlayerSacrificeHandler.soulFrayDuration = config.get("TestIncenseSettings", "SoulFrayDuration", 400).getInt(); + ItemIncense.itemDuration = config.get("TestIncenseSettings", "ItemDuration", 100).getInt(); + ItemIncense.minValue = config.get("TestIncenseSettings", "MinValue", 0).getInt(); + ItemIncense.maxValue = config.get("TestIncenseSettings", "MaxValue", 100).getInt(); + PlayerSacrificeHandler.scalingOfSacrifice = (float) config.get("TestIncenseSettings", "ScalingFactor", 0.0025f).getDouble(); + PlayerSacrificeHandler.soulFrayDuration = config.get("TestIncenseSettings", "SoulFrayDuration", 400).getInt(); Side side = FMLCommonHandler.instance().getSide(); diff --git a/src/main/java/WayofTime/alchemicalWizardry/ModItems.java b/src/main/java/WayofTime/alchemicalWizardry/ModItems.java index d6520283..ce548e9e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/ModItems.java +++ b/src/main/java/WayofTime/alchemicalWizardry/ModItems.java @@ -511,5 +511,6 @@ public class ModItems GameRegistry.registerItem(ModItems.itemMailCatalogue, "itemMailCatalogue"); GameRegistry.registerItem(ModItems.itemIncense, "bloodMagicIncenseItem"); + //GameRegistry.registerItem(ModItems.itemBloodFrame, "itemBloodFrame"); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/PlayerSacrificeHandler.java b/src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/PlayerSacrificeHandler.java index 9ed5766a..1bff133d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/PlayerSacrificeHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/sacrifice/PlayerSacrificeHandler.java @@ -10,7 +10,7 @@ import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; public class PlayerSacrificeHandler { - public static float scalingOfSacrifice = 0.001f; + public static float scalingOfSacrifice = 0.0025f; public static int soulFrayDuration = 400; public static float getPlayerIncense(EntityPlayer player) { @@ -22,7 +22,7 @@ public class PlayerSacrificeHandler APISpellHelper.setCurrentIncense(player, amount); } - public static boolean incrementIncense(EntityPlayer player, float min, float max, float increment) + public static boolean incrementIncense(EntityPlayer player, float min, float max) { float amount = getPlayerIncense(player); if(amount < min || amount >= max) @@ -30,7 +30,7 @@ public class PlayerSacrificeHandler return false; } - amount = amount + Math.max(increment, max - amount); + amount++; setPlayerIncense(player, amount); return true; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandSN.java b/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandSN.java index 72fa59d7..8d7368e6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandSN.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandSN.java @@ -1,13 +1,11 @@ package WayofTime.alchemicalWizardry.common.commands; -import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; -import net.minecraft.world.World; import java.util.List; @@ -99,7 +97,7 @@ public class CommandSN extends CommandBase } else if (astring.length == 2) { - return getListOfStringsMatchingLastWord(astring, "add", "subtract", "fill", "empty"); + return getListOfStringsMatchingLastWord(astring, "add", "subtract", "fill", "empty", "get"); } return null; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java index c46c5551..7883a489 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemIncense.java @@ -17,7 +17,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemIncense extends Item implements IIncense { - private static final String[] ITEM_NAMES = new String[]{"Woodash", "Cloves"}; + private static final String[] ITEM_NAMES = new String[]{"Woodash"}; @SideOnly(Side.CLIENT) private IIcon[] icons; @@ -80,26 +80,12 @@ public class ItemIncense extends Item implements IIncense @Override public int getMinLevel(ItemStack stack) { - switch(stack.getItemDamage()) - { - case 0: - return 0; - case 1: - return 200; - } return 0; } @Override public int getMaxLevel(ItemStack stack) { - switch(stack.getItemDamage()) - { - case 0: - return 200; - case 1: - return 500; - } return 100; } @@ -112,13 +98,6 @@ public class ItemIncense extends Item implements IIncense @Override public float getTickRate(ItemStack stack) { - switch(stack.getItemDamage()) - { - case 0: - return 1.0f; - case 1: - return 0.5f; - } return 1.0f; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java index 89a7106c..8f9fedaf 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java @@ -328,10 +328,7 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner } NBTTagCompound locTag = (NBTTagCompound)tag.getTag("location"); - if(locTag != null) - { - locTag.setBoolean("isStored", false); - } + locTag.setBoolean("isStored", false); } public Int3 getStoredLocation(ItemStack stack) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/SacrificialDagger.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/SacrificialDagger.java index a22cae6f..d87d812e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/SacrificialDagger.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/SacrificialDagger.java @@ -91,11 +91,11 @@ public class SacrificialDagger extends Item @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - if (this.canUseForSacrifice(stack)) - { - player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); - return stack; - } +// if (this.canUseForSacrifice(stack)) +// { +// player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); +// return stack; +// } if (!player.capabilities.isCreativeMode) { @@ -183,11 +183,6 @@ public class SacrificialDagger extends Item for (int k = -2; k <= 1; k++) { tileEntity = world.getTileEntity(i + x, k + y, j + z); - - if(tileEntity instanceof IBloodAltar) - { - return (IBloodAltar)tileEntity; - } } } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java index 1a10f2da..c7ad045e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/forestry/ItemBloodFrame.java @@ -1,29 +1,25 @@ package WayofTime.alchemicalWizardry.common.items.forestry; -import java.util.List; - +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.apiculture.IBee; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.apiculture.IHiveFrame; -public class ItemBloodFrame extends EnergyItems implements IHiveFrame +import java.util.List; + +public class ItemBloodFrame extends EnergyItems //implements IHiveFrame { public ItemBloodFrame() { super(); this.maxStackSize = 1; this.setMaxDamage(10); - setEnergyUsed(1000); + setEnergyUsed(3000); setCreativeTab(AlchemicalWizardry.tabBloodMagic); } @@ -52,15 +48,14 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame { if (par1ItemStack.getItemDamage() > 0) { - if(EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) - { - par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); - } + EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()); + par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); } } return par1ItemStack; } + /**TODO Bee Stuff @Override public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { // TODO Auto-generated method stub @@ -140,6 +135,6 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame } - + */ } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/DivinationSigil.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/DivinationSigil.java index b777d8f9..9b9d7612 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/DivinationSigil.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/DivinationSigil.java @@ -1,18 +1,5 @@ package WayofTime.alchemicalWizardry.common.items.sigil; -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.alchemy.energy.IReagentHandler; import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentContainerInfo; @@ -23,6 +10,21 @@ import WayofTime.alchemicalWizardry.api.items.interfaces.IReagentManipulator; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +import java.util.List; public class DivinationSigil extends Item implements ArmourUpgrade, IReagentManipulator, IBindable { @@ -128,7 +130,7 @@ public class DivinationSigil extends Item implements ArmourUpgrade, IReagentMani @Override public boolean isUpgrade() { - return false; + return true; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TECrucible.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TECrucible.java index 5552a5cd..aa25b207 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TECrucible.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TECrucible.java @@ -23,7 +23,6 @@ public class TECrucible extends TEInventory public int ticksRemaining = 0; public int minValue = 0; public int maxValue = 0; - public float incrementValue = 0; public int state = 0; //0 is when it gives off gray particles, 1 is when it gives off white particles (player can't use this incense anymore), 2 is the normal colour of the incense, 3 means no particles (it is out) @@ -60,8 +59,6 @@ public class TECrucible extends TEInventory minValue = incense.getMinLevel(stack); maxValue = incense.getMaxLevel(stack); - incrementValue = incense.getTickRate(stack); - stack.stackSize--; if(stack.stackSize <= 0) { @@ -81,7 +78,7 @@ public class TECrucible extends TEInventory for(EntityPlayer player : playerList) { - if(ticksRemaining > 0 && PlayerSacrificeHandler.incrementIncense(player, minValue, maxValue, incrementValue)) + if(ticksRemaining > 0 && PlayerSacrificeHandler.incrementIncense(player, minValue, maxValue)) { ticksRemaining--; if(state != 2) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/container/ContainerTeleposer.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/container/ContainerTeleposer.java index 1a644e98..eeb19933 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/container/ContainerTeleposer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/container/ContainerTeleposer.java @@ -1,5 +1,6 @@ package WayofTime.alchemicalWizardry.common.tileEntity.container; +import WayofTime.alchemicalWizardry.common.items.TelepositionFocus; import WayofTime.alchemicalWizardry.common.tileEntity.TETeleposer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -14,7 +15,7 @@ public class ContainerTeleposer extends Container public ContainerTeleposer(InventoryPlayer inventoryPlayer, TETeleposer te) { tileEntity = te; - addSlotToContainer(new Slot(tileEntity, 0, 80, 67)); + addSlotToContainer(new Slot(tileEntity, 0, 80, 15)); bindPlayerInventory(inventoryPlayer); } @@ -30,13 +31,13 @@ public class ContainerTeleposer extends Container { for (int j = 0; j < 9; j++) { - addSlotToContainer(new Slot(inventoryPlayer, j + i * 9 + 9, 8 + j * 18, 140 + i * 18)); + addSlotToContainer(new Slot(inventoryPlayer, j + i * 9 + 9, 8 + j * 18, 39 + i * 18)); } } for (int i = 0; i < 9; i++) { - addSlotToContainer(new Slot(inventoryPlayer, i, 8 + i * 18, 198)); + addSlotToContainer(new Slot(inventoryPlayer, i, 8 + i * 18, 97)); } } @@ -45,30 +46,27 @@ public class ContainerTeleposer extends Container { ItemStack stack = null; Slot slotObject = (Slot) inventorySlots.get(slot); + int slots = inventorySlots.size(); + if (slotObject != null && slotObject.getHasStack()) { ItemStack stackInSlot = slotObject.getStack(); stack = stackInSlot.copy(); + System.out.println("Slots: " + slots); - if (slot == 7) + if (stack.getItem() instanceof TelepositionFocus) { - if (!this.mergeItemStack(stackInSlot, 7, 35, true)) + if (slot <= slots) + { + if (!this.mergeItemStack(stackInSlot, 0, slots, false)) + { + return null; + } + } + else if (!this.mergeItemStack(stackInSlot, slots, 36 + slots, false)) { return null; } - - slotObject.onSlotChange(stackInSlot, stack); - } - if (slot < 1) - { - if (!this.mergeItemStack(stackInSlot, 7, 35, true)) - { - return null; - } - } - else if (!this.mergeItemStack(stackInSlot, 0, 0, false)) - { - return null; } if (stackInSlot.stackSize == 0) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/container/ContainerWritingTable.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/container/ContainerWritingTable.java index 647f43e7..6bfd7228 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/container/ContainerWritingTable.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/container/ContainerWritingTable.java @@ -62,13 +62,15 @@ public class ContainerWritingTable extends Container { return null; } - } else if (stack.getItem() instanceof IBloodOrb) + } + else if (stack.getItem() instanceof IBloodOrb) { if (!this.mergeItemStack(stackInSlot, 0, 1, false)) { return null; } - } else if (!this.mergeItemStack(stackInSlot, 1, 6, false)) + } + else if (!this.mergeItemStack(stackInSlot, 1, 6, false)) { return null; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/gui/GuiTeleposer.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/gui/GuiTeleposer.java index 450e63ac..35187582 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/gui/GuiTeleposer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/gui/GuiTeleposer.java @@ -15,16 +15,16 @@ public class GuiTeleposer extends GuiContainer { super(new ContainerTeleposer(inventoryPlayer, tileEntity)); xSize = 176; - ySize = 222; + ySize = 121; } @Override protected void drawGuiContainerForegroundLayer(int param1, int param2) { //the parameters for drawString are: string, x, y, color - fontRendererObj.drawString("Teleposer", 8, 6, 4210752); + fontRendererObj.drawString("Teleposer", 64, 5, 4210752); //draws "Inventory" or your regional equivalent - fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, 130, 4210752); + fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, 29, 4210752); } @Override @@ -37,6 +37,5 @@ public class GuiTeleposer extends GuiContainer int x = (width - xSize) / 2; int y = (height - ySize) / 2; this.drawTexturedModalRect(x, y, 0, 0, xSize, ySize); - GuiBrewingStand d; } } \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/gui/Teleposer.png b/src/main/resources/assets/alchemicalwizardry/gui/Teleposer.png index 394b08ad..2efcbe9a 100644 Binary files a/src/main/resources/assets/alchemicalwizardry/gui/Teleposer.png and b/src/main/resources/assets/alchemicalwizardry/gui/Teleposer.png differ