guh

changelog

@@ -28,6 +28,7 @@
 * Copper wires, like AA and gold, can now be welded into dense wires
 * Removed the crafting recipe for the small geothermal generator and ZPE generators
 * Removed the gemothermal, ZPE and ambient radiation generators from the creative menu
+* Disabled the horrid flicker on the quad rocket launcher's antenna, making steered mode look less terrible
 
 ## Fixed
 * Fixed animation errors on the MAS-36

src/main/java/com/hbm/crafting/WeaponRecipes.java

@@ -54,6 +54,7 @@ public class WeaponRecipes {
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_light_revolver, 1), new Object[] { "BRM", "  G", 'B', STEEL.lightBarrel(), 'R', STEEL.lightReceiver(), 'M', GUNMETAL.mechanism(), 'G', WOOD.grip() });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_light_revolver_atlas, 1), new Object[] { " M ", "MAM", " M ", 'M', WEAPONSTEEL.mechanism(), 'A', ModItems.gun_light_revolver });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_henry, 1), new Object[] { "BRP", "BMS", 'B', STEEL.lightBarrel(), 'R', GUNMETAL.lightReceiver(), 'M', GUNMETAL.mechanism(), 'S', WOOD.stock(), 'P', GUNMETAL.plate() });
+		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_henry_lincoln, 1), new Object[] { " M ", "PGP", " M ", 'M', WEAPONSTEEL.mechanism(), 'P', GOLD.plateCast(), 'G', ModItems.gun_henry });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_greasegun, 1), new Object[] { "BRS", "SMG", 'B', STEEL.lightBarrel(), 'R', STEEL.lightReceiver(), 'S', STEEL.bolt(), 'M', GUNMETAL.mechanism(), 'G', STEEL.grip() });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_maresleg, 1), new Object[] { "BRM", "BGS", 'B', STEEL.lightBarrel(), 'R', STEEL.lightReceiver(), 'M', GUNMETAL.mechanism(), 'G', STEEL.bolt(), 'S', WOOD.stock() });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_maresleg_akimbo, 1), new Object[] { "SMS", 'S', ModItems.gun_maresleg, 'M', WEAPONSTEEL.mechanism() });

src/main/java/com/hbm/items/weapon/sedna/factory/XFactory44.java

@@ -97,7 +97,7 @@ public class XFactory44 {
 		ModItems.gun_henry_lincoln = new ItemGunBaseNT(WeaponQuality.B_SIDE, new GunConfig()
 				.dura(300).draw(15).inspect(23).reloadSequential(true).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE)
 				.rec(new Receiver(0)
-						.dmg(20F).delay(20).reload(25, 11, 14, 8).jam(45).sound("hbm:weapon.fire.rifle", 1.0F, 1.25F)
+						.dmg(20F).spreadHipfire(0F).delay(20).reload(25, 11, 14, 8).jam(45).sound("hbm:weapon.fire.rifle", 1.0F, 1.25F)
 						.mag(new MagazineSingleReload(0, 14).addConfigs(m44_bp, m44_sp, m44_fmj, m44_jhp, m44_ap, m44_express))
 						.offset(0.75, -0.0625, -0.1875D)
 						.setupStandardFire().recoil(LAMBDA_RECOIL_HENRY))

src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderQuadro.java

@@ -88,8 +88,7 @@ public class ItemRenderQuadro extends ItemRenderWeaponBase {
 			GL11.glTranslated(-(font.getStringWidth(label) / 2) * f3, 0, 0);
 			GL11.glScalef(f3, -f3, f3);
 			GL11.glNormal3f(0.0F, 0.0F, -1.0F * f3);
-			float variance = 0.7F + player.getRNG().nextFloat() * 0.3F;
-			font.drawString(label, 0, 0, new Color(0F, variance, variance).getRGB());
+			font.drawString(label, 0, 0, new Color(0F, 1F, 1F).getRGB());
 			GL11.glColor3f(1F, 1F, 1F);
 
 			GL11.glEnable(GL11.GL_LIGHTING);

src/main/java/com/hbm/tileentity/machine/TileEntityWatz.java

@@ -46,8 +46,9 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 public class TileEntityWatz extends TileEntityMachineBase implements IFluidStandardTransceiver, IControlReceiver, IGUIProvider, IFluidCopiable {
-	
+
 	public FluidTank[] tanks;
+	public FluidTank[] sharedTanks;
 	public int heat;
 	public double fluxLastBase;		//flux created by the previous passive emission, only used for display
 	public double fluxLastReaction;	//flux created by the previous reaction, used for the next reaction
@@ -65,16 +66,29 @@ public class TileEntityWatz extends TileEntityMachineBase implements IFluidStand
 		this.tanks[0] = new FluidTank(Fluids.COOLANT, 64_000);
 		this.tanks[1] = new FluidTank(Fluids.COOLANT_HOT, 64_000);
 		this.tanks[2] = new FluidTank(Fluids.WATZ, 64_000);
+		resetSharedTanks();
 	}
 
 	@Override
 	public String getName() {
 		return "container.watz";
 	}
+	
+	protected void resetSharedTanks() {
+		this.sharedTanks = new FluidTank[3];
+		this.sharedTanks[0] = new FluidTank(Fluids.COOLANT, 64_000);
+		this.sharedTanks[1] = new FluidTank(Fluids.COOLANT_HOT, 64_000);
+		this.sharedTanks[2] = new FluidTank(Fluids.WATZ, 64_000);
+		this.sharedTanks[0].setFill(tanks[0].getFill());
+		this.sharedTanks[1].setFill(tanks[1].getFill());
+		this.sharedTanks[2].setFill(tanks[2].getFill());
+	}
 
 	@Override
 	public void updateEntity() {
 		
+		if(!worldObj.isRemote) resetSharedTanks();
+		
 		if(!worldObj.isRemote && !updateLock()) {
 			
 			boolean turnedOn = worldObj.getBlock(xCoord, yCoord + 3, zCoord) == ModBlocks.watz_pump && worldObj.getIndirectPowerLevelTo(xCoord, yCoord + 5, zCoord, 0) > 0;
@@ -120,6 +134,9 @@ public class TileEntityWatz extends TileEntityMachineBase implements IFluidStand
 			
 			/* send sync packets (order doesn't matter) */
 			for(TileEntityWatz segment : segments) {
+				segment.sharedTanks[0] = sharedTanks[0];
+				segment.sharedTanks[1] = sharedTanks[1];
+				segment.sharedTanks[2] = sharedTanks[2];
 				segment.isOn = turnedOn;
 				segment.networkPackNT(25);
 				segment.heat *= 0.99; //cool 1% per tick
@@ -286,7 +303,7 @@ public class TileEntityWatz extends TileEntityMachineBase implements IFluidStand
 		buf.writeBoolean(isOn);
 		buf.writeBoolean(isLocked);
 		buf.writeDouble(this.fluxLastReaction + this.fluxLastBase);
-		for (FluidTank tank : tanks) {
+		for(FluidTank tank : sharedTanks) {
 			tank.serialize(buf);
 		}
 	}
@@ -298,7 +315,7 @@ public class TileEntityWatz extends TileEntityMachineBase implements IFluidStand
 		this.isOn = buf.readBoolean();
 		this.isLocked = buf.readBoolean();
 		this.fluxDisplay = buf.readDouble();
-		for (FluidTank tank : tanks) {
+		for(FluidTank tank : tanks) {
 			tank.deserialize(buf);
 		}
 	}

src/main/resources/assets/hbm/lang/en_US.lang

@@ -5314,7 +5314,7 @@ tile.crane_grabber.name=Conveyor Grabber
 tile.crane_grabber.desc=Takes items from passing conveyors and places them into containers$Will only take items from the closest lane$Has up to 9 filter slots with black and whitelist$Right-click with screwdriver to set input side$Shift-click with screwdriver to set the output side$Click twice to set the opposite side
 tile.crane_inserter.name=Conveyor Inserter
 tile.crane_inserter.desc=Accepts items from conveyors and places them into containers$Right-click with screwdriver to set input side$Shift-click with screwdriver to set the output side$Click twice to set the opposite side
-tile.crane_partitioner.name=Acidizer Input Paritioner
+tile.crane_partitioner.name=Acidizer Input Partitioner
 tile.crane_partitioner.desc=Receives and stores up to nine Ore Acidizer inputs$and releases them if they match the required input size.$Invalid items are also saved, and need to be extracted from the side.
 tile.crane_router.name=Conveyor Sorter
 tile.crane_router.desc=Sorts item based on defined criteria$Sides can be defined as blacklist, whitelist or wildcard$Wildcard sides are only chosen if no other filter matches