Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add LuV+ Lubricant and Soldering Alloy #2598

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add LuV+ Lubricant and Soldering Alloy #2598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f1ee94
LuV+ Soldering Alloy and Lubricant
IncandescenceSy Aug 4, 2024
5955001
Oops
IncandescenceSy Aug 4, 2024
16a5c69
Molybdenite Lubricant Texture
IncandescenceSy Aug 4, 2024
03b7455
Uptier MoS2 Lube Brewing
IncandescenceSy Aug 4, 2024
2fa4a9f
luv+ lube and solder
IncandescenceSy Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions src/main/java/gregtech/api/recipes/RecipeMaps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,10 @@ public final class RecipeMaps {

recipeBuilder.copy().clearFluidInputs().fluidInputs(Materials.Tin.getFluid(amount * 2))
.buildAndRegister();

recipeBuilder.copy().clearFluidInputs()
.fluidInputs(Materials.HighGradeSolderingAlloy.getFluid((int) (amount * 0.5)))
.buildAndRegister();
}
})
.onBuild(gregtechId("assembler_recycling"), recipeBuilder -> {
Expand Down Expand Up @@ -304,7 +308,7 @@ public final class RecipeMaps {
@ZenProperty
public static final RecipeMap<SimpleRecipeBuilder> BREWING_RECIPES = new RecipeMapBuilder<>("brewery",
new SimpleRecipeBuilder().duration(128).EUt(4))
.itemInputs(1)
.itemInputs(2)
.fluidInputs(1)
.fluidOutputs(1)
.itemSlotOverlay(GuiTextures.BREWER_OVERLAY, false)
Expand Down Expand Up @@ -495,11 +499,16 @@ public final class RecipeMaps {
(GTValues.L / 2) * recipeBuilder.getSolderMultiplier())))
.buildAndRegister();

recipeBuilder.copy().fluidInputs(Materials.Tin.getFluid(Math.max(1, GTValues.L *
recipeBuilder.getSolderMultiplier()))).buildAndRegister();;

// Don't call buildAndRegister as we are mutating the original recipe and already in the
// middle of a buildAndRegister call.
// Adding a second call will result in duplicate recipe generation attempts
recipeBuilder.fluidInputs(Materials.Tin.getFluid(Math.max(1, GTValues.L *
recipeBuilder.getSolderMultiplier())));

recipeBuilder.fluidInputs(
Materials.HighGradeSolderingAlloy.getFluid(Math.max(1, (GTValues.L / 4) *
recipeBuilder.getSolderMultiplier())));
}
})
.build();
Expand Down Expand Up @@ -629,13 +638,22 @@ public final class RecipeMaps {
.duration((int) (duration * 1.5))
.buildAndRegister();

recipeBuilder
.copy()
.fluidInputs(Materials.Lubricant.getFluid(GTUtility.safeCastLongToInt(Math.max(1,
Math.min(250, duration * eut / 1280)))))
.duration(Math.max(1, duration))
.buildAndRegister();

// Don't call buildAndRegister as we are mutating the original recipe and already in the
// middle of a buildAndRegister call.
// Adding a second call will result in duplicate recipe generation attempts

recipeBuilder
.fluidInputs(Materials.Lubricant.getFluid(GTUtility.safeCastLongToInt(Math.max(1,
Math.min(250, duration * eut / 1280)))))
.duration(Math.max(1, duration));
.fluidInputs(Materials.MolybdeniteLubricant
.getFluid(GTUtility.safeCastLongToInt(Math.max(1,
Math.min(125, duration * eut / 2560)))))
.duration(Math.max(1, (int) (duration * 0.8)));

}
})
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/gregtech/api/unification/material/Materials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,7 @@ public static void register() {
public static Material Pyrochlore;
public static Material RTMAlloy;
public static Material IlmeniteSlag;
public static Material HighGradeSolderingAlloy;

/**
* Organic chemistry
Expand Down Expand Up @@ -690,6 +691,7 @@ public static void register() {
public static Material BauxiteSludge;
public static Material DecalcifiedBauxiteSludge;
public static Material BauxiteSlag;
public static Material MolybdeniteLubricant;

/**
* Second Degree Compounds
Expand Down Expand Up @@ -747,6 +749,7 @@ public static void register() {
public static Material SaltWater;
public static Material Clay;
public static Material Redstone;
public static Material ChromiumDopedMolybdenite;

/**
* Third Degree Materials
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1555,5 +1555,16 @@ public static void register() {
.dust(1)
.color(0x8B0000).iconSet(SAND)
.build();

HighGradeSolderingAlloy = new Material.Builder(453, gregtechId("high_grade_soldering_alloy"))
.ingot(3)
.liquid(new FluidBuilder().temperature(544))
.color(0x8A65F0).iconSet(SHINY)
.components(Cadmium, 4, Antimony, 3, Indium, 1)
.blast(b -> b
.temp(4500, GasTier.HIGH)
.blastStats(VA[IV], 1200)
.vacuumStats(VA[EV], 300))
.build();
}
}
6 changes: 6 additions & 0 deletions src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,5 +503,11 @@ public static void register() {
EXCLUDE_PLATE_COMPRESSOR_RECIPE, DECOMPOSITION_BY_CENTRIFUGING)
.components(Silicon, 1, Pyrite, 5, Ruby, 1, Mercury, 3)
.build();

ChromiumDopedMolybdenite = new Material.Builder(2065, gregtechId("chromium_doped_molybdenite"))
.dust().color(0x9C5fB5)
.flags(DISABLE_DECOMPOSITION)
.components(Chrome, 1, Molybdenite, 1)
.build();
}
}
4 changes: 4 additions & 0 deletions src/main/java/gregtech/api/unification/material/materials/UnknownCompositionMaterials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,5 +657,9 @@ public static void register() {
.dust(1)
.color(0x0C0550).iconSet(SAND)
.build();

MolybdeniteLubricant = new Material.Builder(1656, gregtechId("molybdenite_lubricant"))
.color(0xB7A5F9).liquid(new FluidBuilder().customStill())
.build();
}
}
6 changes: 3 additions & 3 deletions src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public static void init() {
.input(FIELD_GENERATOR_IV, 2)
.input(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 64)
.input(wireGtSingle, IndiumTinBariumTitaniumCuprate, 32)
.fluidInputs(SolderingAlloy.getFluid(L * 8))
.fluidInputs(HighGradeSolderingAlloy.getFluid(L * 8))
.fluidInputs(NiobiumTitanium.getFluid(L * 8))
.outputs(FUSION_REACTOR[0].getStackForm())
.scannerResearch(b -> b
Expand All @@ -42,7 +42,7 @@ public static void init() {
.input(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 64)
.input(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 32)
.input(wireGtSingle, UraniumRhodiumDinaquadide, 32)
.fluidInputs(SolderingAlloy.getFluid(L * 8))
.fluidInputs(HighGradeSolderingAlloy.getFluid(L * 8))
.fluidInputs(VanadiumGallium.getFluid(L * 8))
.outputs(FUSION_REACTOR[1].getStackForm())
.stationResearch(b -> b
Expand All @@ -60,7 +60,7 @@ public static void init() {
.input(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 64)
.input(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 64)
.input(wireGtSingle, EnrichedNaquadahTriniumEuropiumDuranide, 32)
.fluidInputs(SolderingAlloy.getFluid(L * 8))
.fluidInputs(HighGradeSolderingAlloy.getFluid(L * 8))
.fluidInputs(YttriumBariumCuprate.getFluid(L * 8))
.outputs(FUSION_REACTOR[2].getStackForm())
.stationResearch(b -> b
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/gregtech/loaders/recipe/BatteryRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ private static void gemBatteries() {
.input(ADVANCED_SMD_INDUCTOR, 8)
.input(wireFine, Platinum, 64)
.input(bolt, Naquadah, 16)
.fluidInputs(SolderingAlloy.getFluid(L * 5))
.fluidInputs(HighGradeSolderingAlloy.getFluid(L * 5))
.output(ENERGY_LAPOTRONIC_ORB_CLUSTER)
.scannerResearch(ENERGY_LAPOTRONIC_ORB.getStackForm())
.buildAndRegister();
Expand All @@ -378,7 +378,7 @@ private static void gemBatteries() {
.input(ADVANCED_SMD_INDUCTOR, 12)
.input(wireFine, Ruridit, 64)
.input(bolt, Trinium, 16)
.fluidInputs(SolderingAlloy.getFluid(L * 10))
.fluidInputs(HighGradeSolderingAlloy.getFluid(L * 10))
.output(ENERGY_MODULE)
.stationResearch(b -> b
.researchStack(ENERGY_LAPOTRONIC_ORB_CLUSTER.getStackForm())
Expand All @@ -400,7 +400,7 @@ private static void gemBatteries() {
.input(ADVANCED_SMD_INDUCTOR, 16)
.input(wireFine, Osmiridium, 64)
.input(bolt, Naquadria, 16)
.fluidInputs(SolderingAlloy.getFluid(L * 20))
.fluidInputs(HighGradeSolderingAlloy.getFluid(L * 20))
.fluidInputs(Polybenzimidazole.getFluid(L * 4))
.output(ENERGY_CLUSTER)
.stationResearch(b -> b
Expand All @@ -424,7 +424,7 @@ private static void gemBatteries() {
.input(ADVANCED_SMD_INDUCTOR, 64)
.input(wireGtSingle, EnrichedNaquadahTriniumEuropiumDuranide, 64)
.input(bolt, Neutronium, 64)
.fluidInputs(SolderingAlloy.getFluid(L * 40))
.fluidInputs(HighGradeSolderingAlloy.getFluid(L * 40))
.fluidInputs(Polybenzimidazole.getFluid(2304))
.fluidInputs(Naquadria.getFluid(L * 18))
.output(ULTIMATE_BATTERY)
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/gregtech/loaders/recipe/CircuitRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1454,7 +1454,7 @@ private static void circuitRecipes() {
.input(ADVANCED_SMD_INDUCTOR, 8)
.input(ADVANCED_SMD_CAPACITOR, 16)
.input(ADVANCED_SMD_DIODE, 8)
.fluidInputs(SolderingAlloy.getFluid(L * 10))
.fluidInputs(HighGradeSolderingAlloy.getFluid(L * 10))
.output(CRYSTAL_MAINFRAME_UV)
.stationResearch(b -> b
.researchStack(CRYSTAL_COMPUTER_ZPM.getStackForm())
Expand Down Expand Up @@ -1521,7 +1521,7 @@ private static void circuitRecipes() {
.input(wireFine, YttriumBariumCuprate, 24)
.input(foil, Polybenzimidazole, 32)
.input(plate, Europium, 4)
.fluidInputs(SolderingAlloy.getFluid(1152))
.fluidInputs(HighGradeSolderingAlloy.getFluid(1152))
.output(WETWARE_SUPER_COMPUTER_UV)
.stationResearch(b -> b
.researchStack(WETWARE_PROCESSOR_ASSEMBLY_ZPM.getStackForm())
Expand All @@ -1541,7 +1541,7 @@ private static void circuitRecipes() {
.input(RANDOM_ACCESS_MEMORY, 32)
.input(wireGtDouble, EnrichedNaquadahTriniumEuropiumDuranide, 16)
.input(plate, Europium, 8)
.fluidInputs(SolderingAlloy.getFluid(L * 20))
.fluidInputs(HighGradeSolderingAlloy.getFluid(L * 20))
.fluidInputs(Polybenzimidazole.getFluid(L * 8))
.output(WETWARE_MAINFRAME_UHV)
.stationResearch(b -> b
Expand Down
Loading