ough

changelog

@@ -11,7 +11,7 @@
     * Filters can be set using items or RoR commands
     * Requests can be configured to take as much as possible, to only take full stacks, or to only take full requests
     * In combination with assembler recipe switching, using RoR logic, this means that on-demand recipe automation is now possible
-  * The budget didn't cover actually testing this so uh, you go figure it out
+  * Still in testing, there's no recpes for any of the parts yet
 
 ## Changed
 * Updated chinese localization
@@ -84,3 +84,4 @@
 * Fixed AUTOCAL units not closing their GUI when the unit is destroyed
 * Fixed AUTOCAL's $buffer$ substitution not working
 * Fixed meteorite sword localization still being broken
+* Fixed missing localization on the FM radio

src/main/java/com/hbm/entity/mob/EntityMaskMan.java

@@ -92,25 +92,18 @@ public class EntityMaskMan extends EntityMob implements IBossDisplayData, IRadia
 	}
 
 	@Override
-	public void onDeath(DamageSource p_70645_1_) {
+	public void onDeath(DamageSource source) {
-		super.onDeath(p_70645_1_);
+		super.onDeath(source);
 
-		List<EntityPlayer> players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, this.boundingBox.expand(50, 50, 50));
+		List<EntityPlayer> players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, this.boundingBox.expand(100, 100, 100));
 
 		for(EntityPlayer player : players) {
 			player.triggerAchievement(MainRegistry.bossMaskman);
 		}
 	}
 
-	@Override
+	@Override public boolean isAIEnabled() { return true; }
-	public boolean isAIEnabled() {
+	@Override protected boolean canDespawn() { return false; }
-		return true;
-	}
-
-	@Override
-	protected boolean canDespawn() {
-		return false;
-	}
 
 	@Override
 	protected void dropFewItems(boolean bool, int i) {

src/main/java/com/hbm/entity/mob/ai/EntityAIMaskmanMinigun.java

@@ -1,7 +1,7 @@
 package com.hbm.entity.mob.ai;
 
-import com.hbm.entity.projectile.EntityBulletBaseNT;
+import com.hbm.entity.projectile.EntityBulletBaseMK4;
-import com.hbm.handler.BulletConfigSyncingUtil;
+import com.hbm.items.weapon.sedna.factory.XFactory762mm;
 
 import net.minecraft.entity.EntityCreature;
 import net.minecraft.entity.EntityLivingBase;
@@ -51,11 +51,9 @@ public class EntityAIMaskmanMinigun extends EntityAIBase {
 		if(timer <= 0) {
 			timer = delay;
 
-			EntityBulletBaseNT bullet = new EntityBulletBaseNT(owner.worldObj, BulletConfigSyncingUtil.MASKMAN_BULLET, owner, target, 1.0F, 0);
+			EntityBulletBaseMK4 bullet = new EntityBulletBaseMK4(this.owner, XFactory762mm.r762_fmj, 5F, 0.05F, 0, 0, 0); // TODO: test the offsets
 			owner.worldObj.spawnEntityInWorld(bullet);
 			owner.playSound("hbm:weapon.calShoot", 1.0F, 1.0F);
 		}
-
-		this.owner.rotationYaw = this.owner.rotationYawHead;
 	}
 }

src/main/java/com/hbm/handler/BulletConfigSyncingUtil.java

@@ -16,7 +16,6 @@ public class BulletConfigSyncingUtil {
 
 	public static int TURBINE = i++;
 
-	public static int MASKMAN_BULLET = i++;
 	public static int MASKMAN_ORB = i++;
 	public static int MASKMAN_BOLT = i++;
 	public static int MASKMAN_ROCKET = i++;
@@ -32,7 +31,6 @@ public class BulletConfigSyncingUtil {
 
 		configSet.put(TURBINE, GunEnergyFactory.getTurbineConfig());
 
-		configSet.put(MASKMAN_BULLET, GunNPCFactory.getMaskmanBullet());
 		configSet.put(MASKMAN_ORB, GunNPCFactory.getMaskmanOrb());
 		configSet.put(MASKMAN_BOLT, GunNPCFactory.getMaskmanBolt());
 		configSet.put(MASKMAN_ROCKET, GunNPCFactory.getMaskmanRocket());

src/main/java/com/hbm/handler/guncfg/GunNPCFactory.java

@@ -93,21 +93,6 @@ public class GunNPCFactory {
 		return bullet;
 	}
 
-	public static BulletConfiguration getMaskmanBullet() {
-
-		BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig();
-
-		bullet.ammo = new ComparableStack(ModItems.coin_maskman);
-		bullet.spread = 0.0F;
-		bullet.dmgMin = 5;
-		bullet.dmgMax = 10;
-		bullet.leadChance = 15;
-		bullet.style = BulletConfiguration.STYLE_FLECHETTE;
-		bullet.vPFX = "bluedust";
-
-		return bullet;
-	}
-
 	public static BulletConfiguration getMaskmanTracer() {
 
 		BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig();

src/main/java/com/hbm/inventory/gui/GUIRadioRec.java

@@ -65,7 +65,7 @@ public class GUIRadioRec extends GuiScreen {
 
 
 	private void drawGuiContainerForegroundLayer(int x, int y) {
-		String name = I18nUtil.resolveKey("container.radio");
+		String name = I18nUtil.resolveKey("container.radiorec");
 		this.fontRendererObj.drawString(name, this.guiLeft + this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, this.guiTop + 6, 4210752);
 
 		if(guiLeft + 137 <= x && guiLeft + 137 + 18 > x && guiTop + 17 < y && guiTop + 17 + 18 >= y) {

src/main/java/com/hbm/tileentity/network/pneumatic/TileEntityPneumaticStorageBase.java

@@ -86,7 +86,7 @@ public abstract class TileEntityPneumaticStorageBase extends TileEntityMachineBa
 			}
 			
 			if(this.compair.getFill() > 0) {
-				int consumption = (int) Math.ceil(this.compair.getFill() * 17 / this.compair.getMaxFill()) + 3;
+				int consumption = (int) Math.ceil(this.compair.getFill() * 9 / this.compair.getMaxFill()) + 1;
 				this.compair.setFill(Math.max(this.compair.getFill() - consumption, 0));
 			}