Merge branch 'tgarr0-master'

Author: TrainerGuy22

src/main/java/xreliquary/blocks/BlockApothecaryCauldron.java

@@ -156,14 +156,16 @@ public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity c
                     collidingEntity.attackEntityFrom(DamageSource.inFire, 1.0F);
                 }
             }
-        }
-
-
-        if (collidingEntity instanceof EntityItem) {
-            ItemStack item = ((EntityItem) collidingEntity).getEntityItem();
-            if (cauldron.isItemValidForInput(item)) {
-                cauldron.addItem(item);
-                collidingEntity.setDead();
+        
+
+            if (collidingEntity instanceof EntityItem) {
+                ItemStack item = ((EntityItem) collidingEntity).getEntityItem();
+                while (cauldron.isItemValidForInput(item)) {
+                    
+                    cauldron.addItem(item);
+                    if (--item.stackSize < 1)
+                        collidingEntity.setDead();
+                }
             }
         }
     }

src/main/java/xreliquary/blocks/tile/TileEntityCauldron.java

@@ -84,11 +84,9 @@ public void spawnBoilingParticles() {
 
         EntityCauldronBubbleFX bubble = new EntityCauldronBubbleFX(worldObj, xCoord + 0.5D + xOffset, yCoord + 0.01D + BlockCauldron.getRenderLiquidLevel(worldObj.getBlockMetadata(xCoord, yCoord, zCoord)), zCoord + 0.5D + zOffset, 0D, 0D, 0D, red, green, blue);
         EntityCauldronSteamFX steam = new EntityCauldronSteamFX(worldObj, xCoord + 0.5D + xOffset, yCoord + 0.01D + BlockCauldron.getRenderLiquidLevel(worldObj.getBlockMetadata(xCoord, yCoord, zCoord)), zCoord + 0.5D + zOffset, 0D, 0.05D + 0.02F * BlockCauldron.getRenderLiquidLevel(worldObj.getBlockMetadata(xCoord, yCoord, zCoord)), 0D, red, green, blue);
-        if (worldObj.isRemote) {
-            FMLClientHandler.instance().getClient().effectRenderer.addEffect(bubble);
-            if (worldObj.rand.nextInt(6) == 0)
-                FMLClientHandler.instance().getClient().effectRenderer.addEffect(steam);
-        }
+        FMLClientHandler.instance().getClient().effectRenderer.addEffect(bubble);
+        if (worldObj.rand.nextInt(6) == 0)
+            FMLClientHandler.instance().getClient().effectRenderer.addEffect(steam);
     }
 
     public int getColor(PotionEssence essence) {

src/main/java/xreliquary/client/particle/EntityCauldronBubbleFX.java

@@ -1,18 +1,25 @@
 package xreliquary.client.particle;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
+
 import org.lwjgl.opengl.GL11;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import xreliquary.lib.Names;
 import xreliquary.lib.Reference;
 
 /**
  * Created by Xeno on 11/9/2014.
  */
+@SideOnly(Side.CLIENT)
 public class EntityCauldronBubbleFX extends EntityFX {
     private static ResourceLocation bubbleTexture = new ResourceLocation(Reference.MOD_ID + ":textures/particles/" + Names.cauldron_bubble + ".png");
 

src/main/java/xreliquary/entities/shot/EntityShotBase.java

@@ -443,7 +443,9 @@ protected void seekTarget() {
             this.motionX = seekVector.xCoord * 0.4D;
             this.motionY = seekVector.yCoord * 0.4D;
             this.motionZ = seekVector.zCoord * 0.4D;
-            this.setVelocity(motionX, motionY, motionZ);
+            if(worldObj.isRemote){
+                this.setVelocity(motionX, motionY, motionZ);
+            }
         }
     }
 

src/main/java/xreliquary/items/ItemMagazine.java

@@ -90,7 +90,7 @@ public int getColor(ItemStack itemStack) {
     @Override
     public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
         if (stack.getItemDamage() < 2) {
-            list.add(LanguageHelper.getLocalization("item." + Names.magazine + "_" + stack.getItemDamage() + ".tooltip"));
+            //list.add(LanguageHelper.getLocalization("item." + Names.magazine + "_" + stack.getItemDamage() + ".tooltip"));
         } else {
             list.add(LanguageHelper.getLocalization("item." + Names.bullet + "_" + stack.getItemDamage() + ".tooltip"));
         }