diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java | 20 | ||||
| -rw-r--r-- | src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java | 72 |
2 files changed, 71 insertions, 21 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java index 4bcfd6e07c..f8df0a98c8 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -1360,22 +1360,32 @@ public class WerkstoffMaterialPool implements Runnable { public static final Werkstoff CeriumDopedLutetiumAluminiumOxygenBlend = new Werkstoff( new short[] { 0, 200, 0 }, "Cerium-doped Lutetium Aluminium Oxygen Blend", - subscriptNumbers("Lu3Al5O12"), + subscriptNumbers("(Ce)Lu3Al5O12"), new Werkstoff.Stats(), Werkstoff.Types.MATERIAL, - new Werkstoff.GenerationFeatures().disable().onlyDust(), + new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten(), offsetID4 + 31, TextureSet.SET_DULL); public static final Werkstoff CeriumDopedLutetiumAluminiumGarnet = new Werkstoff( - new short[] { 0, 255, 0 }, + new short[] { 127, 255, 127 }, "Cerium-doped Lutetium Aluminium Garnet (Ce:LuAG)", - subscriptNumbers("Lu3Al5O12"), + subscriptNumbers("(Ce)Lu3Al5O12"), new Werkstoff.Stats(), Werkstoff.Types.MATERIAL, new Werkstoff.GenerationFeatures().disable().addGems(), offsetID4 + 32, - TextureSet.SET_GEM_HORIZONTAL); + TextureSet.SET_GEM_VERTICAL); + + // public static final Werkstoff RawCeriumDopedLutetiumAluminiumGarnetPart = new Werkstoff( + // new short[] { 63, 255, 63 }, + // "Raw Cerium Doped Lutetium Aluminium Garnet Part", + // subscriptNumbers("(Ce)Lu3Al5O12"), + // new Werkstoff.Stats(), + // Werkstoff.Types.MATERIAL, + // new Werkstoff.GenerationFeatures().disable().addGems(), + // offsetID4 + 33, + // TextureSet.SET_GEM_VERTICAL); // public static final Werkstoff C272 = new Werkstoff( // new short[] { 0x29, 0xc2, 0x2a }, diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index 6e9d70c530..d3b5028cc1 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -1788,7 +1788,7 @@ public class RecipeLoader { .fluidInputs(Materials.NitricAcid.getFluid(1000), MuddySamariumRareEarthSolution.getFluidOrGas(1000)) .itemOutputs(CeriumDioxide.get(OrePrefixes.dust, 1)) .fluidOutputs(SamariumRareEarthMud.getFluidOrGas(1000)).eut(1920).duration(300) - .addTo(GT_Recipe.GT_Recipe_Map.sChemicalRecipes); + .addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); // 1B SamariumRareEarthMud + 9B water =EV@30s= 10B DilutedSamariumRareEarthSolution + 6 NeodymiumREConcentrate RecipeAdder.instance.DissolutionTankRecipes.addDissolutionTankRecipe( @@ -1807,6 +1807,11 @@ public class RecipeLoader { 7680, 1350, 9); + // Low Efficiency method in LCR + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() + .fluidInputs(SamariumRareEarthMud.getFluidOrGas(1000), Materials.Water.getFluid(9000)) + .fluidOutputs(DilutedSamariumRareEarthSolution.getFluidOrGas(9000)).eut(1920).duration(1200) + .addTo(GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes); // 2B DilutedSamariumRareEarthSolution + 3B Oxalate =EV@10s= 5 ImpureSamariumOxalate + 0.1*2 LepersonniteDust + // 50L @@ -2142,23 +2147,58 @@ public class RecipeLoader { .noFluidInputs().noFluidOutputs().eut(491520).duration(1800) .addTo(GT_Recipe.GT_Recipe_Map.sMixerRecipes); - // 1 LuAG Blend = 1 LuAG in Blast or Vacuum Furnace - GT_Values.RA.stdBuilder().itemInputs(CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 1)) - .itemOutputs(CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1)).noFluidInputs() - .noFluidOutputs().specialValue(9100).eut(1919810).duration(100) - .addTo(GTPP_Recipe.GTPP_Recipe_Map.sVacuumFurnaceRecipes); - GT_Values.RA.stdBuilder().itemInputs(CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 1)) - .itemOutputs(CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1)) - .fluidInputs(WerkstoffLoader.Krypton.getFluidOrGas(40)).noFluidOutputs().specialValue(9100).eut(1919810) - .duration(256).addTo(GT_Recipe.GT_Recipe_Map.sBlastRecipes); + // Get LuAG Crystal seed GT_Values.RA.stdBuilder().itemInputs(CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 1)) + .itemOutputs(CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gem, 1)) + .fluidInputs(Materials.Lutetium.getMolten(144 * 8)).noFluidOutputs().outputChances(514).eut(500000) + .duration(500).addTo(GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes); + + // 1 LuAG Blend = 1.1(Og) 1.0(Xe) 0.99(Kr) LuAG in Autoclave + GT_Values.RA.stdBuilder() + .itemInputs( + CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 1), + CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gem, 1)) + .itemOutputs( + CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1), + CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1)) + .fluidInputs(WerkstoffLoader.Krypton.getFluidOrGas(40)).noFluidOutputs().outputChances(8000, 1900) + .eut(1919810).duration(512).addTo(GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 1), + CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gem, 1)) + .itemOutputs( + CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1), + CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1)) + .fluidInputs(WerkstoffLoader.Xenon.getFluidOrGas(25)).noFluidOutputs().outputChances(9000, 1000) + .eut(1919810).duration(256).addTo(GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 1)) + .itemOutputs( + CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1), + CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1)) + .fluidInputs(WerkstoffLoader.Oganesson.getFluidOrGas(10)).noFluidOutputs().outputChances(10000, 100) + .eut(1919810).duration(128).addTo(GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 1), + CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gem, 1)) + .itemOutputs( + CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1), + CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 2)) + .fluidInputs(WerkstoffLoader.Oganesson.getFluidOrGas(10)).noFluidOutputs().outputChances(10000, 2000) + .eut(1919810).duration(128).addTo(GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes); + + // 1 LuAG Blend = 1 LuAG in Vacuum Furnace + GT_Values.RA.stdBuilder().itemInputs(CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.dust, 1)) .itemOutputs(CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1)) - .fluidInputs(WerkstoffLoader.Xenon.getFluidOrGas(25)).noFluidOutputs().specialValue(9100).eut(1919810) - .duration(128).addTo(GT_Recipe.GT_Recipe_Map.sBlastRecipes); + .fluidInputs(CeriumDopedLutetiumAluminiumOxygenBlend.getMolten(108)).noFluidOutputs().specialValue(9100) + .eut(1919810).duration(100).addTo(GTPP_Recipe.GTPP_Recipe_Map.sVacuumFurnaceRecipes); GT_Values.RA.stdBuilder().itemInputs(CeriumDopedLutetiumAluminiumOxygenBlend.get(OrePrefixes.dust, 1)) - .itemOutputs(CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1)) - .fluidInputs(WerkstoffLoader.Oganesson.getFluidOrGas(10)).noFluidOutputs().specialValue(9100) - .eut(1919810).duration(64).addTo(GT_Recipe.GT_Recipe_Map.sBlastRecipes); + .noItemOutputs().noFluidInputs().fluidOutputs(CeriumDopedLutetiumAluminiumOxygenBlend.getMolten(144)) + .eut(30000).duration(20).addTo(GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes); // 16 Adv Crystal SoC for (ItemStack itemStack : OreDictionary.getOres("craftingLensBlue")) { @@ -2170,7 +2210,7 @@ public class RecipeLoader { .requiresCleanRoom().eut(160000).duration(800).addTo(GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes); } - // 1 LuAG = 16 Crystal SoC + // 16 Crystal SoC for (ItemStack itemStack : OreDictionary.getOres("craftingLensGreen")) { GT_Values.RA.stdBuilder() .itemInputs( |