From 8d2ab7aa7af774ff5d9584490863187bdabf569c Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Fri, 12 Jun 2015 14:53:28 -0400 Subject: [PATCH] Small stuff --- .../api/items/interfaces/ILPGauge.java | 2 +- .../client/renderer/RitualDivinerRender.java | 3 +++ .../common/commands/CommandSN.java | 13 ++++++++++-- .../common/items/sigil/SigilOfMagnetism.java | 21 +++++++++++++++++-- .../tileEntity/TEImperfectRitualStone.java | 10 --------- .../assets/alchemicalwizardry/lang/en_US.lang | 1 + 6 files changed, 35 insertions(+), 15 deletions(-) delete mode 100644 src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEImperfectRitualStone.java diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/ILPGauge.java b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/ILPGauge.java index 7607023f..b75815ca 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/ILPGauge.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/ILPGauge.java @@ -4,5 +4,5 @@ import net.minecraft.item.ItemStack; public interface ILPGauge { - public boolean canSeeLPBar(ItemStack itemStack); + boolean canSeeLPBar(ItemStack itemStack); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RitualDivinerRender.java b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RitualDivinerRender.java index 31211814..94b0cfc1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RitualDivinerRender.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/renderer/RitualDivinerRender.java @@ -1,5 +1,7 @@ package WayofTime.alchemicalWizardry.client.renderer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import WayofTime.alchemicalWizardry.ModBlocks; @@ -21,6 +23,7 @@ import net.minecraftforge.client.event.RenderWorldLastEvent; * Created in Scala by Alex-Hawks * Translated and implemented by Arcaratus */ +@SideOnly(Side.CLIENT) public class RitualDivinerRender { @SubscribeEvent diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandSN.java b/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandSN.java index 8d7368e6..58451a17 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandSN.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandSN.java @@ -71,8 +71,17 @@ public class CommandSN extends CommandBase } else if ("get".equalsIgnoreCase(astring[1])) { - int amount = SoulNetworkHandler.getCurrentEssence(owner); - func_152373_a(icommandsender, this, "commands.soulnetwork.get.success", amount, owner); + int currentEssence = SoulNetworkHandler.getCurrentEssence(owner); + func_152373_a(icommandsender, this, "commands.soulnetwork.get.success", currentEssence, owner); + } + else if ("fillMax".equalsIgnoreCase(astring[1])) + { + int currentEssence = SoulNetworkHandler.getCurrentEssence(owner); + int orbTier = SoulNetworkHandler.getCurrentMaxOrb(owner); + int maxForOrb = SoulNetworkHandler.getMaximumForOrbTier(orbTier); + int fillAmount = maxForOrb - currentEssence; + SoulNetworkHandler.addCurrentEssenceToMaximum(owner, fillAmount, fillAmount); + func_152373_a(icommandsender, this, "commands.soulnetwork.fillMax.success", owner); } else { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java index 2d152898..b0a899e1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java @@ -6,6 +6,7 @@ import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -153,6 +154,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol float posY = (float) (par3Entity.posY - par3Entity.getEyeHeight()); float posZ = Math.round(par3Entity.posZ); List entities = par3EntityPlayer.worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).expand(range, verticalRange, range)); + List xpOrbs = par3EntityPlayer.worldObj.getEntitiesWithinAABB(EntityXPOrb.class, AxisAlignedBB.getBoundingBox(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).expand(range, verticalRange, range)); for (EntityItem entity : entities) { @@ -161,9 +163,15 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol entity.onCollideWithPlayer(par3EntityPlayer); } } - } - return; + for (EntityXPOrb xpOrb : xpOrbs) + { + if (xpOrb != null && !par2World.isRemote) + { + xpOrb.onCollideWithPlayer(par3EntityPlayer); + } + } + } } @Override @@ -175,6 +183,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol float posY = (float) (player.posY - player.getEyeHeight()); float posZ = Math.round(player.posZ); List entities = player.worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).expand(range, verticalRange, range)); + List xpOrbs = player.worldObj.getEntitiesWithinAABB(EntityXPOrb.class, AxisAlignedBB.getBoundingBox(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).expand(range, verticalRange, range)); for (EntityItem entity : entities) { @@ -183,6 +192,14 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol entity.onCollideWithPlayer(player); } } + + for (EntityXPOrb xpOrb : xpOrbs) + { + if (xpOrb != null && !world.isRemote) + { + xpOrb.onCollideWithPlayer(player); + } + } } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEImperfectRitualStone.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEImperfectRitualStone.java deleted file mode 100644 index a6b0404c..00000000 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEImperfectRitualStone.java +++ /dev/null @@ -1,10 +0,0 @@ -package WayofTime.alchemicalWizardry.common.tileEntity; - -import net.minecraft.tileentity.TileEntity; - -public class TEImperfectRitualStone extends TileEntity -{ - public TEImperfectRitualStone() - { - } -} diff --git a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang index a3afbcd8..5436c4bc 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang @@ -296,6 +296,7 @@ commands.soulnetwork.get.success=There is %dLP in %s's Soul Network! commands.soulnetwork.noPlayer=There is no player specified commands.soulnetwork.noCommand=There is no command specified commands.soulnetwork.notACommand=That is not a valid command +commands.soulnetwork.fillMax.success=Successfully filled %s's Soul Network to their orb max! #Tooltips tooltip.activationcrystal.creativeonly=Creative Only - activates any ritual