Merge branch 'master' into ChargingBus

GTNewHorizons · Sep 24, 2024 · 108fb2a · 108fb2a
2 parents 8ab7590 + ec16529
commit 108fb2a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git a/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java b/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java
@@ -80,6 +80,7 @@
 import static gregtech.api.util.GTRecipeConstants.UniversalChemical;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.alloyBlastSmelterRecipes;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.quantumForceTransformerRecipes;
+import static gtPlusPlus.api.recipe.GTPPRecipeMaps.vacuumFurnaceRecipes;
 import static gtPlusPlus.core.material.MaterialsAlloy.HELICOPTER;
 import static gtPlusPlus.core.material.MaterialsElements.STANDALONE.WHITE_METAL;
 import static tectech.recipe.TecTechRecipeMaps.eyeOfHarmonyRecipes;
@@ -744,7 +745,8 @@ public static boolean isMapIgnored(RecipeMap<?> map) {
  || map == eyeOfHarmonyRecipes
  || map == quantumForceTransformerRecipes
  || map == fluidExtractionRecipes
- || map == alloyBlastSmelterRecipes;
+ || map == alloyBlastSmelterRecipes
+ || map == vacuumFurnaceRecipes;
  }
 
  public static String displayRecipe(GTRecipe recipe) {

diff --git a/src/main/java/gregtech/loaders/materials/MaterialsInit1.java b/src/main/java/gregtech/loaders/materials/MaterialsInit1.java
@@ -234,7 +234,7 @@ public static void load() {
  Materials.Silicon = new Materials( 20, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1|2 |8 |32 , 60, 60, 80, 0, "Silicon" , "Raw Silicon" , 0, 0, 2273, 2273, true, false, 1, 1, 1, Dyes.dyeBlack , Element.Si , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.TENEBRAE, 1)));
  Materials.Silver = new Materials( 54, TextureSet.SET_SHINY , 10.0F, 64, 2, 1|2 |8 |32|64|128 , 220, 220, 255, 0, "Silver" , "Silver" , 0, 0, 1234, 0, false, false, 3, 1, 1, Dyes.dyeLightGray , Element.Ag , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 1)));
  Materials.Sodium = new Materials( 17, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1 |16|32 , 0, 0, 150, 0, "Sodium" , "Sodium" , 0, 0, 370, 0, false, false, 1, 1, 1, Dyes.dyeBlue , Element.Na , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.VITREUS, 2), new TCAspects.TC_AspectStack(TCAspects.LUX, 1)));
- Materials.Strontium = new Materials( 44, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1 |8 |32   , 200, 200, 200, 0, "Strontium" , "Strontium" , 0, 0, 1050, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Element.Sr , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.STRONTIO, 1)));
+ Materials.Strontium = new Materials( 44, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1|2 |8 |32 |128 , 200, 200, 200, 0, "Strontium" , "Strontium" , 0, 0, 1050, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Element.Sr , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.STRONTIO, 1)));
  Materials.Sulfur = new Materials( 22, TextureSet.SET_DULL , 1.0F, 0, 2, 1 |8 |32 , 200, 200, 0, 0, "Sulfur" , "Sulfur" , 0, 0, 388, 0, false, false, 2, 1, 1, Dyes.dyeYellow , Element.S , Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1)));
  Materials.Tantalum = new Materials( 80, TextureSet.SET_SHINY , 6.0F, 2560, 3, 1|2 |8 |32 , 105, 183, 255, 0, "Tantalum" , "Tantalum" , 0, 0, 3290, 3290, true, false, 4, 1, 1, Dyes._NULL , Element.Ta , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.VINCULUM, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
  Materials.Tellurium = new Materials( 59, TextureSet.SET_DULL , 1.0F, 0, 2, 1|2 |8 |32 , 206, 277, 86, 0, "Tellurium" , "Tellurium" , 0, 0, 722, 0, false, false, 4, 1, 1, Dyes.dyeGray , Element.Te , Arrays.asList(new TCAspects.TC_AspectStack(TCAspects.METALLUM, 2), new TCAspects.TC_AspectStack(TCAspects.RADIO, 1)));

diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java
@@ -275,28 +275,16 @@ public static void init() {
  MaterialGenerator.generate(MaterialsElements.getInstance().SELENIUM); // LFTR byproduct
  MaterialGenerator.generate(MaterialsElements.getInstance().BROMINE);
  MaterialGenerator.generate(MaterialsElements.getInstance().KRYPTON); // LFTR byproduct
- MaterialGenerator.generate(MaterialsElements.getInstance().STRONTIUM);
- MaterialGenerator.generate(MaterialsElements.getInstance().ZIRCONIUM);
- MaterialGenerator.generate(MaterialsElements.getInstance().RUTHENIUM);
  MaterialGenerator.generate(MaterialsElements.getInstance().IODINE); // LFTR byproduct
- MaterialGenerator.generate(MaterialsElements.getInstance().HAFNIUM);
- MaterialGenerator.generate(MaterialsElements.getInstance().DYSPROSIUM);
- MaterialGenerator.generate(MaterialsElements.getInstance().ERBIUM);
- MaterialGenerator.generate(MaterialsElements.getInstance().PRASEODYMIUM);
- MaterialGenerator.generate(MaterialsElements.getInstance().TELLURIUM); // LFTR byproduct
- MaterialGenerator.generate(MaterialsElements.getInstance().RHODIUM);
  MaterialGenerator.generate(MaterialsElements.getInstance().RHENIUM);
  MaterialGenerator.generate(MaterialsElements.getInstance().THALLIUM);
  MaterialGenerator.generate(MaterialsElements.getInstance().GERMANIUM);
 
  // RADIOACTIVE ELEMENTS
  MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().POLONIUM, false);
- // MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().RADON, false);
  MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().RADIUM, false);
- MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().PROMETHIUM, false);
  MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().PROTACTINIUM, false);
  MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().CURIUM, false);
- MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().CALIFORNIUM, false);
  MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().NEPTUNIUM, false);
  MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().FERMIUM, false);
 
@@ -310,8 +298,6 @@ public static void init() {
  // lithium a
  // strong requirement for the possible use in lithium fluoride reactors.
  MaterialGenerator.generate(MaterialsElements.getInstance().LITHIUM7, false);
- // Thorium-232 is the most stable isotope of Thorium, purified for nuclear fuel use in this case.
- MaterialGenerator.generateNuclearMaterial(MaterialsElements.getInstance().THORIUM232);
  // Production of 233U (through the neutron irradiation of 232Th) invariably produces small amounts of 232U
  // as an impurity
  // because of parasitic (n,2n) reactions on uranium-233 itself, or on protactinium-233, or on thorium-232:

diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.core.item.chemistry;
 
+import static bartworks.system.material.WerkstoffLoader.PTMetallicPowder;
 import static gregtech.api.enums.Mods.BiomesOPlenty;
 import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.util.GTRecipeBuilder.MINUTES;
@@ -276,8 +277,8 @@ private void addVacuumFurnaceRecipes() {
  GTValues.RA.stdBuilder()
  .itemInputs(GTUtility.getIntegratedCircuit(aCircuitID++))
  .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 64),
- GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 64),
+ PTMetallicPowder.get(OrePrefixes.dust, 64),
+ PTMetallicPowder.get(OrePrefixes.dust, 64),
  MaterialsElements.getInstance().RHODIUM.getDust(60),
  MaterialsElements.getInstance().SELENIUM.getDust(40),
  GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tellurium, 10))