ough

changelog

@@ -1,7 +1,10 @@
 ## Changed
 * The chemistry achievement now requires the new chemical plant
 * The new chemical plant can now be used to upgrade the meteorite sword
+* Fluid containers are now re-registered when using `/ntmreload` which should correctly generate fluid container items for freshly added custom fluids
+* Recipe configs will no longer try to parse null value recipes, meaing that trailing commas in a recipe config will no longer create an error
 
 ## Fixed
 * Fixed crash caused by breaking a tool while the fortune or silk touch ability is enabled
 * Fixed NTM adding mob spawns to the mushroom island
+# Fixed line break not working on the tip of the day

src/main/java/com/hbm/commands/CommandReloadRecipes.java

@@ -1,6 +1,7 @@
 package com.hbm.commands;
 
 import com.hbm.config.ItemPoolConfigJSON;
+import com.hbm.inventory.FluidContainerRegistry;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.inventory.recipes.loader.SerializableRecipe;
 import com.hbm.particle.helper.SkeletonCreator;
@@ -27,7 +28,9 @@ public class CommandReloadRecipes extends CommandBase {
 	@Override
 	public void processCommand(ICommandSender sender, String[] args) {
 		try {
+			FluidContainerRegistry.clearRegistry(); // we do this first so IFluidRegisterListener can go wild with the registry
 			Fluids.reloadFluids();
+			FluidContainerRegistry.register();
 			SerializableRecipe.initialize();
 			ItemPoolConfigJSON.initialize();
 			DamageResistanceHandler.init();

src/main/java/com/hbm/inventory/FluidContainerRegistry.java

@@ -19,11 +19,17 @@ import net.minecraftforge.oredict.OreDictionary;
 
 public class FluidContainerRegistry {
 
-	//TODO: continue incorporating hashmaps into this
+	// TODO: continue incorporating hashmaps into this
 	public static List<FluidContainer> allContainers = new ArrayList<FluidContainer>();
 	private static HashMap<FluidType, List<FluidContainer>> containerMap = new HashMap<FluidType, List<FluidContainer>>();
 	
+	public static void clearRegistry() {
+		allContainers.clear();
+		containerMap.clear();
+	}
+
 	public static void register() {
+
 		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(Items.water_bucket), new ItemStack(Items.bucket), Fluids.WATER, 1000));
 		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(Items.potionitem), new ItemStack(Items.glass_bottle), Fluids.WATER, 250));
 		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(Items.lava_bucket), new ItemStack(Items.bucket), Fluids.LAVA, 1000));
@@ -71,9 +77,9 @@ public class FluidContainerRegistry {
 
 			if(type.hasNoContainer()) continue;
 
-			if(type.isDispersable()){
+			if(type.isDispersable()) {
-				FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.disperser_canister, 1 , i), new ItemStack(ModItems.disperser_canister_empty), Fluids.fromID(i), 2000));
+				FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.disperser_canister, 1, i), new ItemStack(ModItems.disperser_canister_empty), Fluids.fromID(i), 2000));
-				FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.glyphid_gland, 1 , i), new ItemStack(ModItems.glyphid_gland_empty), Fluids.fromID(i), 4000));
+				FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.glyphid_gland, 1, i), new ItemStack(ModItems.glyphid_gland_empty), Fluids.fromID(i), 4000));
 			}
 
 			FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_tank_lead_full, 1, id), new ItemStack(ModItems.fluid_tank_lead_empty), type, 1000));
@@ -103,17 +109,16 @@ public class FluidContainerRegistry {
 	}
 
 	public static FluidContainer getContainer(FluidType type, ItemStack stack) {
-		if(stack == null)
+		if(stack == null) return null;
-			return null;
 
 		ItemStack sta = stack.copy();
 		sta.stackSize = 1;
 
-		if (!containerMap.containsKey(type))
+		if(!containerMap.containsKey(type))
 			return null;
 
-		for (FluidContainer container : getContainers(type)) {
+		for(FluidContainer container : getContainers(type)) {
-			if (ItemStack.areItemStacksEqual(container.emptyContainer, sta) && ItemStack.areItemStackTagsEqual(container.emptyContainer, sta)) {
+			if(ItemStack.areItemStacksEqual(container.emptyContainer, sta) && ItemStack.areItemStackTagsEqual(container.emptyContainer, sta)) {
 				return container;
 			}
 		}
@@ -129,7 +134,7 @@ public class FluidContainerRegistry {
 		ItemStack sta = stack.copy();
 		sta.stackSize = 1;
 
-		if (!containerMap.containsKey(type))
+		if(!containerMap.containsKey(type))
 			return 0;
 
 		for(FluidContainer container : containerMap.get(type)) {
@@ -141,9 +146,7 @@ public class FluidContainerRegistry {
 	}
 
 	public static FluidType getFluidType(ItemStack stack) {
-		
+		if(stack == null) return Fluids.NONE;
-		if(stack == null)
-			return Fluids.NONE;
 
 		ItemStack sta = stack.copy();
 		sta.stackSize = 1;
@@ -157,17 +160,15 @@ public class FluidContainerRegistry {
 	}
 
 	public static ItemStack getFullContainer(ItemStack stack, FluidType type) {
-		if(stack == null)
+		if(stack == null) return null;
-			return null;
 
 		ItemStack sta = stack.copy();
 		sta.stackSize = 1;
 
-		if (!containerMap.containsKey(type))
+		if(!containerMap.containsKey(type)) return null;
-			return null;
 
 		for(FluidContainer container : containerMap.get(type)) {
-			if(ItemStack.areItemStacksEqual(container.emptyContainer, sta) &&  ItemStack.areItemStackTagsEqual(container.emptyContainer, sta))
+			if(ItemStack.areItemStacksEqual(container.emptyContainer, sta) && ItemStack.areItemStackTagsEqual(container.emptyContainer, sta))
 				return container.fullContainer.copy();
 		}
 
@@ -175,8 +176,7 @@ public class FluidContainerRegistry {
 	}
 
 	public static ItemStack getEmptyContainer(ItemStack stack) {
-		if(stack == null)
+		if(stack == null) return null;
-			return null;
 
 		ItemStack sta = stack.copy();
 		sta.stackSize = 1;
@@ -188,5 +188,4 @@ public class FluidContainerRegistry {
 
 		return null;
 	}
-
 }

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

@@ -166,7 +166,7 @@ public class LoadingScreenRendererNT extends LoadingScreenRenderer {
 					this.mc.fontRenderer.drawStringWithShadow(this.currentlyDisplayedText, (width - this.mc.fontRenderer.getStringWidth(this.currentlyDisplayedText)) / 2, height / 2 - 4 - 16, 16777215);
 					this.mc.fontRenderer.drawStringWithShadow(this.message, (width - this.mc.fontRenderer.getStringWidth(this.message)) / 2, height / 2 - 4 + 8, 16777215);
 					
-					String[] frags = this.tipOfTheDay.split("$");
+					String[] frags = this.tipOfTheDay.split("\\$");
 					for(int i = 0; i < frags.length; i++) {
 						String frag = frags[i];
 						this.mc.fontRenderer.drawStringWithShadow(EnumChatFormatting.YELLOW + frag, (width - this.mc.fontRenderer.getStringWidth(frag)) / 2, height / 2 - 4 - 60 + i * 10, 16777215);

src/main/java/com/hbm/inventory/recipes/loader/SerializableRecipe.java

@@ -237,7 +237,7 @@ public abstract class SerializableRecipe {
 		JsonObject json = gson.fromJson(reader, JsonObject.class);
 		JsonArray recipes = json.get("recipes").getAsJsonArray();
 		for(JsonElement recipe : recipes) {
-			this.readRecipe(recipe);
+			if(recipe != null) this.readRecipe(recipe);
 		}
 	}