% Nerfed Radon Production from Radium within GTNH.

$ Minor adjustments to the Decayables Chest, it now ticks 20x per second, not just once.

2 files changed, 16 insertions, 3 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index bf9ead6f90..96fb7f0125 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -80,7 +80,7 @@ public class RECIPES_GREGTECH {
 				ItemUtils.getSimpleStack(ModItems.dustDecayedRadium226, 1),
 				null,
 				null,
-				FluidUtils.getFluidStack("radon", 500),
+				FluidUtils.getFluidStack("radon", !CORE.GTNH ? 500 : 144),
 				null,
 				null, 
 				null, 
diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java
index eefdaff439..0a9a77a415 100644
--- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java
+++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java
@@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.inventories.Inventory_DecayablesChest;
 import gtPlusPlus.core.item.materials.DustDecayable;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -33,8 +34,11 @@ public class TileEntityDecayablesChest extends TileEntity implements ISidedInven
 				
 				this.tickCount++;
 				
-				if ((this.tickCount % 20) == 0) {
+				if ((this.tickCount % 20) == 0) {					
 					for (ItemStack inv : this.getInventory().getInventory()) {
+						if (inv == null) {
+							continue;
+						}
 						if (inv.getItem() instanceof DustDecayable) {
 							DustDecayable D = (DustDecayable) inv.getItem();
 							tryUpdateDecayable(D, inv, this.worldObj);
@@ -57,10 +61,19 @@ public class TileEntityDecayablesChest extends TileEntity implements ISidedInven
 		}
 		
 		boolean a1, a2;		
+		int u = 0;
 		a1 = b.getIsActive(world, iStack);
 		a2 = b.tickItemTag(world, iStack);
+		while (u < 19) {
+			if (!a1) {
+				break;
+			}
+			a1 = b.getIsActive(world, iStack);
+			a2 = b.tickItemTag(world, iStack);
+			u++;
+		}		
 		
-		if (!a1 && !a2) {			
+		if (!a1 && !a2) {	
 				ItemStack replacement = ItemUtils.getSimpleStack(b.getDecayResult());
 				replacement.stackSize=1;
 				iStack = replacement.copy();