Updated to 1.4.1

Lach01298 · Sep 1, 2024 · 17d54a6 · 17d54a6
1 parent 408cf88
commit 17d54a6
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -25,7 +25,7 @@ minecraftVersion = 1.12.2
 # Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
 # Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
 # Alternatively this can be set with the 'DEV_USERNAME' environment variable.
-developmentEnvironmentUserName = lach_01298
+developmentEnvironmentUserName = Developer
 
 # Enables using modern java syntax (up to version 17) via Jabel, while still targeting JVM 8.
 # See https://github.com/bsideup/jabel for details on how this works.

diff --git a/src/main/java/lach_01298/qmd/fluid/QMDFluids.java b/src/main/java/lach_01298/qmd/fluid/QMDFluids.java
@@ -85,7 +85,7 @@ public static void init()
 			addFluidPair(FluidType.MOLTEN, "polonium", 0x5c7c78);
 			addFluidPair(FluidType.MOLTEN, "radium", 0x6e607b);
 
-			addFluidPair(FluidType.MOLTEN, "carbon", 0x343434);
+			addFluidPair(FluidType.HOT_GAS, "carbon", 0x343434);
 			addFluidPair(FluidType.MOLTEN, "sodium_chloride", 0xd4cccc);
 
 			//exotic matter

diff --git a/src/main/java/lach_01298/qmd/recipes/MassSpectrometerRecipes.java b/src/main/java/lach_01298/qmd/recipes/MassSpectrometerRecipes.java
@@ -158,7 +158,7 @@ public void addRecipes()
 				new EmptyFluidIngredient(), fluidStack("oxygen", 9000), new EmptyFluidIngredient(), new EmptyFluidIngredient());
 
 		addRecipe("gemLapis",new EmptyFluidIngredient(),
-				oreStack("dustCalcium", 4), oreStack("dustAluminium", 3),oreStack("itemSilicon", 3), oreStack("dustSulfur", 1),
+				oreStack("dustCalcium", 4), oreStack("dustAluminum", 3),oreStack("itemSilicon", 3), oreStack("dustSulfur", 1),
 				new EmptyFluidIngredient(), new EmptyFluidIngredient(), new EmptyFluidIngredient(), new EmptyFluidIngredient());
 
 		// chemicals

diff --git a/src/main/java/lach_01298/qmd/recipes/QMDCraftingRecipeHandler.java b/src/main/java/lach_01298/qmd/recipes/QMDCraftingRecipeHandler.java
@@ -71,8 +71,8 @@ public static void registerCraftingRecipes()
 			addShapedOreRecipe(QMDItems.advanced_drill, new Object[] {"NTN", "TMT", "SBS", 'T', "ingotTungstenCarbide",'M', "motor", 'S', "magnetNeodymium", 'B', NCBlocks.lithium_ion_battery_basic, 'N', "gemBoronNitride"});
 		}
 
-		addShapelessOreRecipe(new ItemStack(Items.GUNPOWDER,4), new Object[] {"dustCoal","dustSulfur","dustSodiumNitrate","dustSodiumNitrate"});
-		addShapelessOreRecipe(new ItemStack(Items.GUNPOWDER,4), new Object[] {"dustCharcoal","dustSulfur","dustSodiumNitrate","dustSodiumNitrate"});
+		addShapelessOreRecipe(new ItemStack(Items.GUNPOWDER,8), new Object[] {"dustCoal","dustCoal","dustSulfur","dustSulfur","dustSodiumNitrate","dustSodiumNitrate","dustSodiumNitrate","dustSodiumNitrate"});
+		addShapelessOreRecipe(new ItemStack(Items.GUNPOWDER,8), new Object[] {"dustCharcoal","dustCharcoal","dustSulfur","dustSulfur","dustSodiumNitrate","dustSodiumNitrate","dustSodiumNitrate","dustSodiumNitrate"});
 		addShapelessOreRecipe(new ItemStack(QMDItems.luminousPaint,16,LuminousPaintType.GREEN.getID()), new Object[] {"dustZincSulfide","dustRadium","dustCopper"});
 		addShapelessOreRecipe(new ItemStack(QMDItems.luminousPaint,16,LuminousPaintType.GREEN.getID()), new Object[] {"dustZincSulfide","dustPromethium147","dustCopper"});
 		addShapelessOreRecipe(new ItemStack(QMDItems.luminousPaint,16,LuminousPaintType.BLUE.getID()), new Object[] {"dustZincSulfide","dustRadium","dustSilver"});

diff --git a/src/main/java/lach_01298/qmd/recipes/QMDRecipes.java b/src/main/java/lach_01298/qmd/recipes/QMDRecipes.java
@@ -236,8 +236,27 @@ public static void addRecipes()
 		NCRecipes.melter.addRecipe("dustBismuth", fluidStack("bismuth", FluidStackHelper.INGOT_VOLUME));
 		NCRecipes.melter.addRecipe("dustPolonium", fluidStack("polonium", FluidStackHelper.INGOT_VOLUME));
 		NCRecipes.melter.addRecipe("dustRadium", fluidStack("radium", FluidStackHelper.INGOT_VOLUME));
-		NCRecipes.melter.addRecipe("dustSalt", fluidStack("sodium_chloride", FluidStackHelper.GEM_VOLUME));
-
+
+
+		if (FluidRegHelper.fluidExists("brine") && QMDConfig.override_nc_recipes)
+		{
+			List<IFluidIngredient> fluidIngredients = new ArrayList<IFluidIngredient>();
+			List<IItemIngredient> itemIngredients = new ArrayList<IItemIngredient>();
+			itemIngredients.add(AbstractRecipeHandler.oreStack("dustSalt",1));
+			NCRecipes.melter.removeRecipe(NCRecipes.melter.getRecipeFromIngredients(itemIngredients, fluidIngredients));
+			itemIngredients.add(AbstractRecipeHandler.oreStack("itemSalt",1));
+			NCRecipes.melter.removeRecipe(NCRecipes.melter.getRecipeFromIngredients(itemIngredients, fluidIngredients));
+
+			NCRecipes.melter.addRecipe("dustSalt", fluidStack("sodium_chloride", FluidStackHelper.GEM_VOLUME));
+		}
+		else if(!FluidRegHelper.fluidExists("brine"))
+		{
+			NCRecipes.melter.addRecipe("dustSalt", fluidStack("sodium_chloride", FluidStackHelper.GEM_VOLUME));
+		}
+
+
+
+
 		if(QMDConfig.override_nc_recipes)
 		{
 			List<IFluidIngredient> fluidIngredients = new ArrayList<IFluidIngredient>();
@@ -257,6 +276,7 @@ public static void addRecipes()
 
 			NCRecipes.melter.removeRecipe(NCRecipes.melter.getRecipeFromIngredients(itemIngredients, fluidIngredients));
 			NCRecipes.melter.addRecipe("blockGraphite", fluidStack("carbon", FluidStackHelper.COAL_BLOCK_VOLUME));
+
 		}
 		NCRecipes.melter.addRecipe(AbstractRecipeHandler.oreStackList(Lists.newArrayList("dustCharcoal", "charcoal"),1), fluidStack("carbon", FluidStackHelper.COAL_DUST_VOLUME));