diff --git a/changelog b/changelog index 76500e081..947d5839a 100644 --- a/changelog +++ b/changelog @@ -43,4 +43,5 @@ * Fixed artillery shells not playing the explosion animation when directly impacting entities * Fixed bauxite and malachite vein toggles being on backwards * Fixed pneumatic tube order settings not saving -* Fixed crash caused by launching ABMs with blank target designators \ No newline at end of file +* Fixed crash caused by launching ABMs with blank target designators +* Fixed particle source throwing errors when trying to save nonexistant particles diff --git a/src/main/java/com/hbm/render/item/ItemRenderLibrary.java b/src/main/java/com/hbm/render/item/ItemRenderLibrary.java index 2feabfbe3..b61f4ddcd 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderLibrary.java +++ b/src/main/java/com/hbm/render/item/ItemRenderLibrary.java @@ -97,11 +97,10 @@ public class ItemRenderLibrary { renderers.put(Item.getItemFromBlock(ModBlocks.machine_reactor_breeding), new ItemRenderBase() { public void renderInventory() { - GL11.glTranslated(0, -4, 0); + GL11.glTranslated(0, -4.5, 0); GL11.glScaled(4.5, 4.5, 4.5); } public void renderCommon() { - GL11.glScaled(0.5, 0.5, 0.5); GL11.glShadeModel(GL11.GL_SMOOTH); GL11.glDisable(GL11.GL_CULL_FACE); bindTexture(ResourceManager.breeder_tex); ResourceManager.breeder.renderAll(); diff --git a/src/main/java/com/hbm/render/tileentity/RenderBreeder.java b/src/main/java/com/hbm/render/tileentity/RenderBreeder.java index 25c8659b7..1e48fcc2f 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderBreeder.java +++ b/src/main/java/com/hbm/render/tileentity/RenderBreeder.java @@ -40,8 +40,6 @@ public class RenderBreeder extends TileEntitySpecialRenderer { GL11.glPopMatrix(); } - GL11.glScaled(0.5, 0.5, 0.5); - bindTexture(ResourceManager.breeder_tex); GL11.glShadeModel(GL11.GL_SMOOTH); diff --git a/src/main/java/com/hbm/tileentity/machine/albion/TileEntityPASource.java b/src/main/java/com/hbm/tileentity/machine/albion/TileEntityPASource.java index 151817494..1128ff67f 100644 --- a/src/main/java/com/hbm/tileentity/machine/albion/TileEntityPASource.java +++ b/src/main/java/com/hbm/tileentity/machine/albion/TileEntityPASource.java @@ -236,23 +236,26 @@ public class TileEntityPASource extends TileEntityCooledBase implements IGUIProv @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - NBTTagCompound particleTag = new NBTTagCompound(); - particleTag.setInteger("x", particle.x); - particleTag.setInteger("y", particle.y); - particleTag.setInteger("z", particle.z); - particleTag.setByte("dir", (byte) particle.dir.ordinal()); - particleTag.setInteger("momentum", particle.momentum); - particleTag.setInteger("defocus", particle.defocus); - particleTag.setInteger("dist", particle.distanceTraveled); - - NBTTagCompound inputTag1 = new NBTTagCompound(); - NBTTagCompound inputTag2 = new NBTTagCompound(); - particle.input1.writeToNBT(inputTag1); - particle.input2.writeToNBT(inputTag2); - - particleTag.setTag("input1", inputTag1); - particleTag.setTag("input2", inputTag2); - nbt.setTag("particle", particleTag); + + if(particle != null) { + NBTTagCompound particleTag = new NBTTagCompound(); + particleTag.setInteger("x", particle.x); + particleTag.setInteger("y", particle.y); + particleTag.setInteger("z", particle.z); + particleTag.setByte("dir", (byte) particle.dir.ordinal()); + particleTag.setInteger("momentum", particle.momentum); + particleTag.setInteger("defocus", particle.defocus); + particleTag.setInteger("dist", particle.distanceTraveled); + + NBTTagCompound inputTag1 = new NBTTagCompound(); + NBTTagCompound inputTag2 = new NBTTagCompound(); + particle.input1.writeToNBT(inputTag1); + particle.input2.writeToNBT(inputTag2); + + particleTag.setTag("input1", inputTag1); + particleTag.setTag("input2", inputTag2); + nbt.setTag("particle", particleTag); + } } @Override