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

Fixed a lot of impractical voltages #965

Merged
merged 8 commits into from
Sep 4, 2024
Merged

Fixed a lot of impractical voltages #965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
476cca8
Fix impractical voltages for iron electromagnet and radiation proof p…
FourIsTheNumber Sep 3, 2024
422d7af
Fix lots of impractical avaritia voltages
FourIsTheNumber Sep 3, 2024
aa56756
Fix lots of impractical coremod voltages
FourIsTheNumber Sep 3, 2024
1c2cf29
Fix lots of impractical thaumic energistics voltages
FourIsTheNumber Sep 3, 2024
f439d7b
Fix lots of impractical amun-ra voltages
FourIsTheNumber Sep 3, 2024
c2ca9e4
Fix lots of impractical AE2FC voltages
FourIsTheNumber Sep 3, 2024
414dd24
Fix lots of impractical gregtech voltages
FourIsTheNumber Sep 3, 2024
428daa0
Yet more impractical gregtech voltages
FourIsTheNumber Sep 3, 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
6 changes: 3 additions & 3 deletions src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.TungstenSteel, 16L),
GTUtility.getIntegratedCircuit(2))
.itemOutputs(ItemList.OilDrill4.get(1L)).fluidInputs(Materials.SolderingAlloy.getMolten(1440))
.duration(20 * SECONDS).eut(7860).addTo(assemblerRecipes);
.duration(20 * SECONDS).eut(TierEU.RECIPE_IV).addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
Expand Down Expand Up @@ -2299,7 +2299,7 @@ public void run() {
ItemList.IV_Coil.get(8L),
GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorIV, 16L))
.itemOutputs(ItemList.Electromagnet_Iron.get(1)).fluidInputs(Materials.Cobalt.getMolten(1152))
.duration(30 * SECONDS).eut(TierEU.IV).addTo(assemblerRecipes);
.duration(30 * SECONDS).eut(TierEU.RECIPE_IV).addTo(assemblerRecipes);

// Ultimate Time Anomaly
GTValues.RA.stdBuilder()
Expand Down Expand Up @@ -9161,7 +9161,7 @@ private void makeSolderingAlloyRecipes() {
GTUtility.getIntegratedCircuit(2))
.itemOutputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 3))
.fluidInputs(tMat.getMolten(1152L * tMultiplier / 2L)).duration(1 * MINUTES + 10 * SECONDS)
.eut(7860).addTo(assemblerRecipes);
.eut(TierEU.RECIPE_IV).addTo(assemblerRecipes);

}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/dreammaster/gthandler/recipes/AutoclaveRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ public static void spaceRecipes() {
.itemInputs(com.dreammaster.item.ItemList.StargateCrystalDust.getIS().splitStack(64))
.itemOutputs(GTModHandler.getModItem(SGCraft.ID, "sgCoreCrystal", 1L)).outputChances(10000)
.fluidInputs(Materials.Silver.getPlasma(8000L)).requiresCleanRoom().requiresLowGravity()
.duration(3 * MINUTES).eut(131000).addTo(autoclaveRecipes);
.duration(3 * MINUTES).eut(TierEU.RECIPE_ZPM).addTo(autoclaveRecipes);

}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/dreammaster/gthandler/recipes/ChemicalReactorRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ public void run() {
ItemList.Circuit_Wafer_PIC.get(1L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.IndiumGalliumPhosphide, 2))
.itemOutputs(ItemList.Circuit_Wafer_HPIC.get(1L)).fluidInputs(Materials.VanadiumGallium.getMolten(288L))
.requiresCleanRoom().duration(60 * SECONDS).eut(7860).addTo(UniversalChemical);
.requiresCleanRoom().duration(60 * SECONDS).eut(TierEU.RECIPE_IV).addTo(UniversalChemical);

GTValues.RA.stdBuilder()
.itemInputs(
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/dreammaster/gthandler/recipes/CircuitAssemblerRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ public class CircuitAssemblerRecipes implements Runnable {
CustomItemList.SchematicsTier8.get(1L), };

// Rocket Circuits
public final int[] EUperRecipe = new int[] { 480, // t2 = HV
1920, // t3 = EV
7680, // t4 = IV
30720, // t5 = LuV (Gated behind Assline)
30720, // t6 = LuV
130870, // t7 = ZPM
520400, // t8 = UV
public final long[] EUperRecipe = new long[] { TierEU.RECIPE_HV, // t2 = HV
TierEU.RECIPE_EV, // t3 = EV
TierEU.RECIPE_IV, // t4 = IV
TierEU.RECIPE_LuV, // t5 = LuV (Gated behind Assline)
TierEU.RECIPE_LuV, // t6 = LuV
TierEU.RECIPE_ZPM, // t7 = ZPM
TierEU.RECIPE_UV, // t8 = UV
};

public final ItemStack[] ExtraChips = new ItemStack[] { CustomItemList.SchematicsMoonBuggy.get(1L),
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/dreammaster/gthandler/recipes/CuttingMachineRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ public void run() {
.eut(TierEU.RECIPE_EV).addTo(cutterRecipes);

GTValues.RA.stdBuilder().itemInputs(ItemList.Circuit_Wafer_HPIC.get(1L))
.itemOutputs(ItemList.Circuit_Chip_HPIC.get(2L)).requiresCleanRoom().duration(45 * SECONDS).eut(7860)
.addTo(cutterRecipes);
.itemOutputs(ItemList.Circuit_Chip_HPIC.get(2L)).requiresCleanRoom().duration(45 * SECONDS)
.eut(TierEU.RECIPE_IV).addTo(cutterRecipes);

GTValues.RA.stdBuilder().itemInputs(ItemList.Circuit_Wafer_UHPIC.get(1L))
.itemOutputs(ItemList.Circuit_Chip_UHPIC.get(2L)).requiresCleanRoom().duration(45 * SECONDS)
Expand All @@ -83,12 +83,12 @@ public void run() {
.eut(TierEU.RECIPE_ZPM).addTo(cutterRecipes);

GTValues.RA.stdBuilder().itemInputs(ItemList.Circuit_Wafer_PPIC.get(1L))
.itemOutputs(ItemList.Circuit_Chip_PPIC.get(2L)).requiresCleanRoom().duration(45 * SECONDS).eut(500000)
.addTo(cutterRecipes);
.itemOutputs(ItemList.Circuit_Chip_PPIC.get(2L)).requiresCleanRoom().duration(45 * SECONDS)
.eut(TierEU.RECIPE_UV).addTo(cutterRecipes);

GTValues.RA.stdBuilder().itemInputs(ItemList.Circuit_Wafer_QPIC.get(1L))
.itemOutputs(ItemList.Circuit_Chip_QPIC.get(2L)).requiresCleanRoom().duration(45 * SECONDS).eut(2000000)
.addTo(cutterRecipes);
.itemOutputs(ItemList.Circuit_Chip_QPIC.get(2L)).requiresCleanRoom().duration(45 * SECONDS)
.eut(TierEU.RECIPE_UHV).addTo(cutterRecipes);

GTValues.RA.stdBuilder().itemInputs(ItemList.Circuit_Wafer_NanoCPU.get(1L))
.itemOutputs(ItemList.Circuit_Chip_NanoCPU.get(8L)).requiresCleanRoom().duration(45 * SECONDS)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public void run() {
new ItemStack(Loaders.advancedRadiationProtectionPlate, 4, 0),
1,
50 * 20,
(int) TierEU.ZPM,
(int) TierEU.RECIPE_ZPM,
null,
null);

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/dreammaster/scripts/ScriptAE2FC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ public void loadRecipes() {
ItemList.Circuit_Board_Bio_Ultra.get(1),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(COMPONENT_16384).fluidInputs(Materials.Lead.getMolten(288)).requiresCleanRoom()
.duration(10 * SECONDS).eut(500000).addTo(circuitAssemblerRecipes);
.duration(10 * SECONDS).eut(TierEU.RECIPE_UV).addTo(circuitAssemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
Expand All @@ -684,7 +684,7 @@ public void loadRecipes() {
ItemList.Circuit_Board_Bio_Ultra.get(1),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(COMPONENT_16384).fluidInputs(Materials.Tin.getMolten(144)).requiresCleanRoom()
.duration(10 * SECONDS).eut(500000).addTo(circuitAssemblerRecipes);
.duration(10 * SECONDS).eut(TierEU.RECIPE_UV).addTo(circuitAssemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
Expand All @@ -695,7 +695,7 @@ public void loadRecipes() {
ItemList.Circuit_Board_Bio_Ultra.get(1),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(COMPONENT_16384).fluidInputs(Materials.SolderingAlloy.getMolten(72)).requiresCleanRoom()
.duration(10 * SECONDS).eut(500000).addTo(circuitAssemblerRecipes);
.duration(10 * SECONDS).eut(TierEU.RECIPE_UV).addTo(circuitAssemblerRecipes);

// Fluid Quantum Drive
ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/com/dreammaster/scripts/ScriptAmunRa.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ public void loadRecipes() {
new ItemStack(GameRegistry.findBlock(GalacticraftMars.ID, "tile.marsMachine"), 1, 8),
64000,
64,
2000000,
(int) TierEU.RECIPE_UHV,
8,
new Object[] { ItemList.Hull_MAX.get(1), new ItemStack(baseItem, 32, 28),
com.dreammaster.item.ItemList.IrradiantReinforcedNeutroniumPlate.getIS(64),
Expand All @@ -400,12 +400,12 @@ public void loadRecipes() {
new FluidStack(mutatedLivingSolder, 64 * INGOTS) },
new ItemStack(machines1, 1, 2),
15 * MINUTES,
2000000);
(int) TierEU.RECIPE_UHV);
TTRecipeAdder.addResearchableAssemblylineRecipe(
com.dreammaster.item.ItemList.HeavyDutyRocketEngineTier4.getIS(),
64000,
64,
2000000,
(int) TierEU.RECIPE_UHV,
8,
new Object[] { new ItemStack(dysonSwarmParts, 64, 3), new ItemStack(dysonSwarmParts, 64, 3),
new ItemStack(dysonSwarmParts, 64, 3), new ItemStack(dysonSwarmParts, 64, 3),
Expand All @@ -418,7 +418,7 @@ public void loadRecipes() {
new FluidStack(mutatedLivingSolder, 64 * INGOTS) },
new ItemStack(machines2),
5 * MINUTES,
2000000);
(int) TierEU.RECIPE_UHV);
TTRecipeAdder.addResearchableAssemblylineRecipe(
new ItemStack(machines2),
80000,
Expand All @@ -443,7 +443,7 @@ public void loadRecipes() {
com.dreammaster.item.ItemList.Tier4Booster.getIS(),
64000,
64,
2000000,
(int) TierEU.RECIPE_UHV,
8,
new Object[] { new ItemStack(dysonSwarmParts, 16, 3), new ItemStack(dysonSwarmParts, 16, 3),
new ItemStack(dysonSwarmParts, 16, 3), new ItemStack(dysonSwarmParts, 16, 3),
Expand All @@ -454,7 +454,7 @@ public void loadRecipes() {
new FluidStack(mutatedLivingSolder, 64 * INGOTS) },
new ItemStack(msBoosters1),
5 * MINUTES,
2000000);
(int) TierEU.RECIPE_UHV);
TTRecipeAdder.addResearchableAssemblylineRecipe(
new ItemStack(msBoosters1),
80000,
Expand All @@ -477,7 +477,7 @@ public void loadRecipes() {
GameRegistry.findItemStack(GalaxySpace.ID, "item.SchematicTier8", 1),
64000,
64,
2000000,
(int) TierEU.RECIPE_UHV,
8,
new Object[] { new Object[] { OrePrefixes.ore.get(Materials.Samarium), 64 },
new Object[] { OrePrefixes.ore.get(Materials.Tartarite), 64 },
Expand All @@ -498,7 +498,7 @@ public void loadRecipes() {
FluidRegistry.getFluidStack("molten.astraltitanium", 64 * INGOTS) },
GameRegistry.findItemStack(GalacticraftAmunRa.ID, "item.schematic", 1),
15 * MINUTES,
2000000);
(int) TierEU.RECIPE_UHV);
GTValues.RA.stdBuilder()
.itemInputs(
com.dreammaster.item.ItemList.HeavyDutyPlateTier8.getIS(),
Expand All @@ -508,7 +508,7 @@ public void loadRecipes() {
.fluidInputs(Materials.RadoxPolymer.getMolten(4 * INGOTS))
.itemOutputs(com.dreammaster.item.ItemList.HeavyDutyAlloyIngotT9.getIS())
.metadata(GTRecipeConstants.RESEARCH_ITEM, com.dreammaster.item.ItemList.HeavyDutyPlateTier8.getIS())
.metadata(GTRecipeConstants.RESEARCH_TIME, 750 * SECONDS).duration(15 * SECONDS).eut(8000000)
.metadata(GTRecipeConstants.RESEARCH_TIME, 750 * SECONDS).duration(15 * SECONDS).eut(TierEU.RECIPE_UEV)
.addTo(GTRecipeConstants.AssemblyLine);
}

Expand Down
32 changes: 16 additions & 16 deletions src/main/java/com/dreammaster/scripts/ScriptAvaritia.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,18 +847,18 @@ public void loadRecipes() {

GTValues.RA.stdBuilder()
.itemInputs(getModItem(Avaritia.ID, "Resource", 1, 4, missing), ItemList.Shape_Mold_Nugget.get(0L))
.itemOutputs(getModItem(Avaritia.ID, "Resource", 9, 3, missing)).duration(2 * MINUTES).eut(480)
.addTo(alloySmelterRecipes);
.itemOutputs(getModItem(Avaritia.ID, "Resource", 9, 3, missing)).duration(2 * MINUTES)
.eut(TierEU.RECIPE_HV).addTo(alloySmelterRecipes);
GTValues.RA.stdBuilder()
.itemInputs(getModItem(Avaritia.ID, "Resource_Block", 1, 0, missing), ItemList.Shape_Mold_Ingot.get(0L))
.itemOutputs(getModItem(Avaritia.ID, "Resource", 9, 4, missing)).duration(4 * MINUTES).eut(480)
.addTo(alloySmelterRecipes);
.itemOutputs(getModItem(Avaritia.ID, "Resource", 9, 4, missing)).duration(4 * MINUTES)
.eut(TierEU.RECIPE_HV).addTo(alloySmelterRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Avaritia.ID, "Resource", 4, 0, missing),
getModItem(Minecraft.ID, "nether_star", 2, 0, missing))
.itemOutputs(getModItem(Avaritia.ID, "Resource", 1, 1, missing)).duration(1 * MINUTES).eut(480)
.addTo(assemblerRecipes);
.itemOutputs(getModItem(Avaritia.ID, "Resource", 1, 1, missing)).duration(1 * MINUTES)
.eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(Avaritia.ID, "Double_Craft", 1, 0))
.itemOutputs(new ItemStack(Blocks.crafting_table, 9)).duration(15 * SECONDS).eut(2)
.addTo(extractorRecipes);
Expand All @@ -872,40 +872,40 @@ public void loadRecipes() {
.itemInputs(
getModItem(Avaritia.ID, "Resource_Block", 1, 0, missing),
ItemList.Shape_Extruder_Ingot.get(0L))
.itemOutputs(getModItem(Avaritia.ID, "Resource", 9, 4, missing)).duration(50 * SECONDS).eut(524000)
.addTo(extruderRecipes);
.itemOutputs(getModItem(Avaritia.ID, "Resource", 9, 4, missing)).duration(50 * SECONDS)
.eut(TierEU.RECIPE_UV).addTo(extruderRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(Avaritia.ID, "Resource_Block", 1, 1, missing),
ItemList.Shape_Extruder_Ingot.get(0L))
.itemOutputs(getModItem(Avaritia.ID, "Resource", 9, 6, missing)).duration(1 * MINUTES).eut(524000)
.addTo(extruderRecipes);
.itemOutputs(getModItem(Avaritia.ID, "Resource", 9, 6, missing)).duration(1 * MINUTES)
.eut(TierEU.RECIPE_UV).addTo(extruderRecipes);
GTValues.RA.stdBuilder()
.itemInputs(getModItem(Avaritia.ID, "Resource", 1, 6, missing), ItemList.Shape_Extruder_Plate.get(0L))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 1L))
.duration(3 * MINUTES + 20 * SECONDS).eut(524000).addTo(extruderRecipes);
.duration(3 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_UV).addTo(extruderRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Infinity, 1),
ItemList.Shape_Extruder_Plate.get(0L))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 1L))
.duration(3 * MINUTES + 20 * SECONDS).eut(524000).addTo(extruderRecipes);
.duration(3 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_UV).addTo(extruderRecipes);
GTValues.RA.stdBuilder()
.itemInputs(getModItem(Avaritia.ID, "Resource", 1, 4, missing), ItemList.Shape_Extruder_Plate.get(0L))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 1L))
.duration(2 * MINUTES + 30 * SECONDS).eut(524000).addTo(extruderRecipes);
.duration(2 * MINUTES + 30 * SECONDS).eut(TierEU.RECIPE_UV).addTo(extruderRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.ingot, Materials.CosmicNeutronium, 1),
ItemList.Shape_Extruder_Plate.get(0L))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 1L))
.duration(2 * MINUTES + 30 * SECONDS).eut(524000).addTo(extruderRecipes);
.duration(2 * MINUTES + 30 * SECONDS).eut(TierEU.RECIPE_UV).addTo(extruderRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 4L),
CustomItemList.StainlessSteelBars.get(1L))
.itemOutputs(getModItem(Avaritia.ID, "Resource", 1, 0, missing)).duration(10 * SECONDS).eut(120)
.addTo(formingPressRecipes);
.itemOutputs(getModItem(Avaritia.ID, "Resource", 1, 0, missing)).duration(10 * SECONDS)
.eut(TierEU.RECIPE_MV).addTo(formingPressRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(Avaritia.ID, "Resource", 1, 3, missing))
.itemOutputs(getModItem(Avaritia.ID, "Resource", 9, 2, missing)).outputChances(10000)
.duration(15 * SECONDS).eut(2).addTo(maceratorRecipes);
Expand Down
Loading