yeag

changelog

@@ -15,9 +15,12 @@
   * High-xenon MOX pellets now yield xenon-135 again
 * Improved logging for incorrectly configured machine recipes
 * Removed the legacy toolbox item
+* Due to complaints, the MOX recipe was now made more expensive
+* Manual control rods now have the `extendrods` command, which allows the target setting to be adjusted without using an abolute value
 
 ## Fixed
 * Fixed some damage categories not applying correctly, causing things like general energy resistance to not work against lasers
 * Fixed RoR components not being able to be attached to the top of reasim fuel rods
 * Fixed a crash in multiplayer regarding RBMK control rods
-* Fixed incorrect QMAW description of the autoloader, talking about fuel depletion instead of fuel enrichment
+* Fixed incorrect QMAW description of the autoloader, talking about fuel depletion instead of fuel enrichment
+* Fixed log spam when placing down a RoR controller

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

@@ -174,8 +174,8 @@ public class MineralRecipes {
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_neptunium_fuel, 3), new Object[] { ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_neptunium });
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_neptunium_fuel, 1), new Object[] { "nuggetNeptunium237", "nuggetNeptunium237", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238" }));
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_neptunium_fuel, 1), new Object[] { "tinyNp237", "tinyNp237", "tinyU238", "tinyU238", "tinyU238", "tinyU238" }));
-		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_mox_fuel, 3), new Object[] { ModItems.billet_uranium_fuel, "billetUranium238", "billetPlutonium239" }));
-		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_mox_fuel, 1), new Object[] { "nuggetPlutonium239", "nuggetPlutonium239", "nuggetUranium238", "nuggetUranium238", ModItems.nugget_uranium_fuel, ModItems.nugget_uranium_fuel }));
+		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_mox_fuel, 3), new Object[] { ModItems.billet_uranium_fuel, ModItems.billet_uranium_fuel, "billetPlutonium239" }));
+		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_mox_fuel, 1), new Object[] { "nuggetPlutonium239", "nuggetPlutonium239", ModItems.nugget_uranium_fuel, ModItems.nugget_uranium_fuel, ModItems.nugget_uranium_fuel, ModItems.nugget_uranium_fuel }));
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_schrabidium_fuel, 3), new Object[] { ModItems.billet_schrabidium, ModItems.billet_neptunium, ModItems.billet_beryllium });
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_schrabidium_fuel, 1), new Object[] { ModItems.nugget_schrabidium, ModItems.nugget_schrabidium, "nuggetNeptunium237", "nuggetNeptunium237", ModItems.nugget_beryllium, ModItems.nugget_beryllium }));
 		GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_schrabidium_fuel, 1), new Object[] { ModItems.nugget_schrabidium, ModItems.nugget_schrabidium, "tinyNp237", "tinyNp237", ModItems.nugget_beryllium, ModItems.nugget_beryllium }));

src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlManual.java

@@ -198,7 +198,8 @@ public class TileEntityRBMKControlManual extends TileEntityRBMKControl implement
 	@Override
 	public String[] getFunctionInfo() {
 		return new String[] {
-				PREFIX_FUNCTION + "setrods" + NAME_SEPARATOR + "percent"
+				PREFIX_FUNCTION + "setrods" + NAME_SEPARATOR + "percent",
+				PREFIX_FUNCTION + "extendrods" + NAME_SEPARATOR + "percent"
 		};
 	}
 
@@ -212,6 +213,13 @@ public class TileEntityRBMKControlManual extends TileEntityRBMKControl implement
 			return null;
 		}
 
+		if((PREFIX_FUNCTION + "extendrods").equals(name) && params.length > 0) {
+			int percent = IRORInteractive.parseInt(params[0], -100, 100);
+			this.targetLevel = MathHelper.clamp_double(this.targetLevel + percent / 100D, 0D, 1D);
+			this.markDirty();
+			return null;
+		}
+
 		return null;
 	}
 }

src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKKeyPad.java

@@ -102,11 +102,13 @@ public class TileEntityRBMKKeyPad extends TileEntityLoadedBase implements IGUIPr
 			if(!polling) {
 				if(canSend()) RTTYSystem.broadcast(worldObj, rtty, command);
 				this.isPressed = true;
-				this.clickTimer = 10;
+				this.clickTimer = 7;
 			} else {
 				this.isPressed = !this.isPressed;
 				TileEntityRBMKKeyPad.this.markDirty();
 			}
+			
+			worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, "random.click", 1F, this.isPressed ? 1F : 0.75F);
 		}
 		
 		public void update() {
@@ -117,7 +119,9 @@ public class TileEntityRBMKKeyPad extends TileEntityLoadedBase implements IGUIPr
 			}
 			
 			if(!polling && isPressed) {
-				if(this.clickTimer-- <= 0) this.isPressed = false;
+				if(this.clickTimer-- <= 0) {
+					this.isPressed = false;
+				}
 			}
 		}
 		

src/main/java/com/hbm/tileentity/network/TileEntityRadioTorchController.java

@@ -20,7 +20,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 public class TileEntityRadioTorchController extends TileEntityLoadedBase implements IControlReceiver {
 
-	public String channel;
+	public String channel = "";
 	public String prev;
 	public boolean polling = false;