oughhh,

changelog

@@ -26,4 +26,6 @@
 * Fixed size 15 dual kerosene thruster not rendering at all
 * Fixed HUD/jetpack toggle popup not working at all on multiplayer servers
 * Fixed assembly machine NEI handler not being able to handle all thirteen inputs at once
-* Fixed RBMK fuel channels playing the meltdown sound when broken while hot with meltdowns disabled
+* Fixed RBMK fuel channels playing the meltdown sound when broken while hot with meltdowns disabled
+* Fixed destroyer and crate minecarts having the same entity IDs, causing them to turn into each other when loading a save
+* Fixed GL state leak for ICF lasers

src/main/java/com/hbm/entity/EntityMappings.java

@@ -181,10 +181,8 @@ public class EntityMappings {
 		addEntity(EntityGrenadeBouncyGeneric.class, "entity_grenade_bouncy_generic", 250);
 		addEntity(EntityGrenadeImpactGeneric.class, "entity_grenade_impact_generic", 250);
 		addEntity(EntityMinecartCrate.class, "entity_ntm_cart_crate", 250, false);
-		addEntity(EntityMinecartDestroyer.class, "entity_ntm_cart_crate", 250, false);
+		addEntity(EntityMinecartDestroyer.class, "entity_ntm_cart_destroyer", 250, false);
 		addEntity(EntityMinecartOre.class, "entity_ntm_cart_ore", 250, false);
-		addEntity(EntityMinecartBogie.class, "entity_ntm_cart_bogie", 250, false);
-		addEntity(EntityMagnusCartus.class, "entity_ntm_cart_chungoid", 250, false);
 		addEntity(EntityMinecartPowder.class, "entity_ntm_cart_powder", 250, false);
 		addEntity(EntityMinecartSemtex.class, "entity_ntm_cart_semtex", 250, false);
 		addEntity(EntityNukeTorex.class, "entity_effect_torex", 250, false);

src/main/java/com/hbm/entity/cart/EntityMinecartBogie.java

@@ -1,20 +0,0 @@
-package com.hbm.entity.cart;
-
-import net.minecraft.entity.item.EntityMinecart;
-import net.minecraft.world.World;
-
-public class EntityMinecartBogie extends EntityMinecart {
-
-	public EntityMinecartBogie(World world) {
-		super(world);
-	}
-
-	public EntityMinecartBogie(World world, double x, double y, double z) {
-		super(world, x, y ,z);
-	}
-
-	@Override
-	public int getMinecartType() {
-		return -1;
-	}
-}

src/main/java/com/hbm/entity/item/EntityMagnusCartus.java

@@ -1,107 +0,0 @@
-package com.hbm.entity.item;
-
-import com.hbm.entity.cart.EntityMinecartBogie;
-import com.hbm.handler.threading.PacketThreading;
-import com.hbm.packet.toclient.AuxParticlePacketNT;
-
-import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.item.EntityMinecart;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.Vec3;
-import net.minecraft.world.World;
-
-public class EntityMagnusCartus extends EntityMinecart {
-
-	public EntityMinecartBogie bogie;
-
-	public EntityMagnusCartus(World world) {
-		super(world);
-	}
-
-	public EntityMagnusCartus(World p_i1713_1_, double p_i1713_2_, double p_i1713_4_, double p_i1713_6_) {
-		super(p_i1713_1_, p_i1713_2_, p_i1713_4_, p_i1713_6_);
-	}
-
-	@Override
-	public int getMinecartType() {
-		return -1;
-	}
-
-	@Override
-	protected void entityInit() {
-		super.entityInit();
-		this.dataWatcher.addObject(25, new Integer(0));
-	}
-
-	public void setBogie(EntityMinecartBogie bogie) {
-		this.bogie = bogie;
-		this.dataWatcher.updateObject(25, bogie.getEntityId());
-	}
-
-	public int getBogieID() {
-		return this.dataWatcher.getWatchableObjectInt(25);
-	}
-
-	@Override
-	public void onUpdate() {
-		super.onUpdate();
-
-		if(!worldObj.isRemote) {
-
-			double dist = 3.0D;
-			double force = 0.3D;
-
-			if(bogie == null) {
-				Vec3 vec = Vec3.createVectorHelper(dist, 0, 0);
-				vec.rotateAroundY(rand.nextFloat() * 6.28F);
-				EntityMinecartBogie bog = new EntityMinecartBogie(worldObj, posX + vec.xCoord, posY + vec.yCoord, posZ + vec.zCoord);
-				this.setBogie(bog);
-				worldObj.spawnEntityInWorld(bog);
-			}
-
-			Vec3 delta = Vec3.createVectorHelper(posX - bogie.posX, posY - bogie.posY, posZ - bogie.posZ);
-			delta = delta.normalize();
-			delta.xCoord *= dist;
-			delta.yCoord *= dist;
-			delta.zCoord *= dist;
-
-			double x = posX - delta.xCoord;
-			double y = posY - delta.yCoord;
-			double z = posZ - delta.zCoord;
-
-			NBTTagCompound data = new NBTTagCompound();
-			data.setString("type", "vanillaExt");
-			data.setString("mode", "reddust");
-			PacketThreading.createAllAroundThreadedPacket(new AuxParticlePacketNT(data, x, y, z), new TargetPoint(this.dimension, x, y, z, 25));
-
-			Vec3 pull = Vec3.createVectorHelper(x - bogie.posX, y - bogie.posY, z - bogie.posZ);
-			bogie.motionX += pull.xCoord * force;
-			bogie.motionY += pull.yCoord * force;
-			bogie.motionZ += pull.zCoord * force;
-
-			if(pull.lengthVector() > 1) {
-				this.motionX -= pull.xCoord * force;
-				this.motionY -= pull.yCoord * force;
-				this.motionZ -= pull.zCoord * force;
-			}
-		}
-	}
-
-	@Override
-	protected void readEntityFromNBT(NBTTagCompound nbt) {
-		super.readEntityFromNBT(nbt);
-		int bogieID = nbt.getInteger("bogie");
-		Entity e = worldObj.getEntityByID(bogieID);
-
-		if(e instanceof EntityMinecartBogie) {
-			this.setBogie((EntityMinecartBogie) e);
-		}
-	}
-
-	@Override
-	protected void writeEntityToNBT(NBTTagCompound nbt) {
-		super.writeEntityToNBT(nbt);
-		nbt.setInteger("bogie", this.getBogieID());
-	}
-}

src/main/java/com/hbm/main/ClientProxy.java

@@ -728,7 +728,6 @@ public class ClientProxy extends ServerProxy {
 		RenderingRegistry.registerEntityRenderingHandler(EntityMinecartTest.class, new RenderMinecartTest());
 		RenderingRegistry.registerEntityRenderingHandler(EntityMinecartCrate.class, new RenderMinecart());
 		RenderingRegistry.registerEntityRenderingHandler(EntityMinecartNTM.class, new RenderNeoCart());
-		RenderingRegistry.registerEntityRenderingHandler(EntityMagnusCartus.class, new RenderMagnusCartus());
 		RenderingRegistry.registerEntityRenderingHandler(EntityBoatRubber.class, new RenderBoatRubber());
 		//trains
 		RenderingRegistry.registerEntityRenderingHandler(SeatDummyEntity.class, new RenderEmpty());

src/main/java/com/hbm/render/entity/item/RenderMagnusCartus.java

@@ -1,44 +0,0 @@
-package com.hbm.render.entity.item;
-
-import org.lwjgl.opengl.GL11;
-
-import com.hbm.entity.cart.EntityMinecartBogie;
-import com.hbm.entity.item.EntityMagnusCartus;
-import com.hbm.main.ResourceManager;
-
-import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.Vec3;
-
-public class RenderMagnusCartus extends Render {
-
-	@Override
-	public void doRender(Entity entity, double x, double y, double z, float f0, float f1) {
-		EntityMagnusCartus cart = (EntityMagnusCartus) entity;
-		Entity e = entity.worldObj.getEntityByID(cart.getBogieID());
-		EntityMinecartBogie bogie = null;
-		
-		if(e instanceof EntityMinecartBogie) {
-			bogie = (EntityMinecartBogie) e;
-		}
-		
-		if(bogie == null)
-			return;
-		
-		Vec3 vec = Vec3.createVectorHelper(cart.posX - bogie.posX, cart.posY - bogie.posY, cart.posZ - bogie.posZ);
-		
-		GL11.glPushMatrix();
-		GL11.glTranslated(x - vec.xCoord * 0.5, y - vec.yCoord * 0.5, z - vec.zCoord * 0.5);
-		GL11.glScaled(1.2, 1.2, 1.2);
-		GL11.glRotated(Math.atan2(vec.xCoord, vec.zCoord) / Math.PI * 180D - 90, 0, 1, 0);
-		this.bindTexture(this.getEntityTexture(cart));
-		ResourceManager.b29.renderAll();
-		GL11.glPopMatrix();
-	}
-
-	@Override
-	protected ResourceLocation getEntityTexture(Entity entity) {
-		return ResourceManager.b29_0_tex;
-	}
-}

src/main/java/com/hbm/render/tileentity/RenderICFController.java

@@ -38,6 +38,7 @@ public class RenderICFController extends TileEntitySpecialRenderer {
 			BeamPronter.prontBeam(Vec3.createVectorHelper(controller.laserLength, 0, 0), EnumWaveType.SPIRAL, EnumBeamType.SOLID, 0x202020, 0x100000, 0, 1, 0F, 10, 0.125F);
 			GL11.glEnable(GL11.GL_LIGHTING);
 			GL11.glPopAttrib();
+			GL11.glEnable(GL11.GL_TEXTURE_2D);
 			
 			GL11.glPopMatrix();
 		}

src/main/java/com/hbm/tileentity/machine/fusion/TileEntityFusionPlasmaForge.java

@@ -396,6 +396,9 @@ public class TileEntityFusionPlasmaForge extends TileEntityMachineBase implement
 		
 		public void updateArm() {
 			for(int i = 0; i < angles.length; i++) prevAngles[i] = angles[i];
+
+			if(!didProcess()) this.state = ForgeArmState.RETIRE;
+			if(this.state == ForgeArmState.RETIRE) this.actionDelay = 0;
 			
 			if(this.actionDelay > 0) {
 				this.actionDelay--;
@@ -481,11 +484,6 @@ public class TileEntityFusionPlasmaForge extends TileEntityMachineBase implement
 	
 	public static Consumer<ForgeArm> STRIKER_STATE_MACHINE = (arm) -> {
 		
-		if(!arm.didProcess()) {
-			arm.state = ForgeArmState.RETIRE;
-			arm.actionDelay = 0;
-		}
-		
 		switch(arm.state) {
 		case REPOSITION: {
 			if(arm.move()) {
@@ -548,11 +546,6 @@ public class TileEntityFusionPlasmaForge extends TileEntityMachineBase implement
 
 	@SuppressWarnings("incomplete-switch") // shut up
 	public static Consumer<ForgeArm> JET_STATE_MACHINE = (arm) -> {
-
-		if(!arm.didProcess()) {
-			arm.state = ForgeArmState.RETIRE;
-			arm.actionDelay = 0;
-		}
 		
 		switch(arm.state) {
 		case REPOSITION: {