Skip to content

Commit

Permalink
Merge branch 'master' into oc-transistorachievement-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dream-Master
Dream-Master authored Oct 13, 2024
2 parents df47a90 + f9f5acd commit dc5d531
Show file tree
Hide file tree
Showing 15 changed files with 181 additions and 152 deletions.
14 changes: 0 additions & 14 deletions src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,20 +275,6 @@ public void recipes() {
ItemList.Sensor_UMV, 'C', OrePrefixes.circuit.get(Materials.UXV), 'W',
OrePrefixes.cableGt01.get(Materials.Draconium) });

GTModHandler.addCraftingRecipe(
ItemList.PumpLuV.get(1L),
bitsd,
new Object[] { "CPC", "PMP", "BPB", 'M', ItemList.Hull_LuV, 'B',
GT_CustomLoader.AdvancedGTMaterials.LuV.getPipeL(), 'C',
GT_CustomLoader.AdvancedGTMaterials.LuV.getCircuit(), 'P', ItemList.Electric_Pump_LuV });

GTModHandler.addCraftingRecipe(
ItemList.PumpZPM.get(1L),
bitsd,
new Object[] { "CPC", "PMP", "BPB", 'M', ItemList.Hull_ZPM, 'B',
GT_CustomLoader.AdvancedGTMaterials.ZPM.getPipeL(), 'C',
GT_CustomLoader.AdvancedGTMaterials.ZPM.getCircuit(), 'P', ItemList.Electric_Pump_ZPM });

GTModHandler.addCraftingRecipe(
ItemList.AcceleratorLV.get(1L),
bitsd,
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/dreammaster/gthandler/enums/MetaTileEntityIDs.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,6 @@ public enum MetaTileEntityIDs {
WIREMILL_UEV(11054),
WIREMILL_UIV(11055),
WIREMILL_UMV(11056),
PUMP_LuV(11060),
PUMP_ZPM(11061),
ARC_FURNACE_LuV(11070),
ARC_FURNACE_ZPM(11071),
ARC_FURNACE_UV(11072),
Expand Down
29 changes: 29 additions & 0 deletions src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2642,6 +2642,35 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 1))
.itemOutputs(ItemList.Casing_Assembler.get(1)).duration(10 * SECONDS).eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

if (IronChests.isModLoaded()) {
for (FluidStack fluid : new FluidStack[] { Materials.SolderingAlloy.getMolten(L / 2),
Materials.Tin.getMolten(L), Materials.Lead.getMolten(L * 2), }) {
GTValues.RA.stdBuilder()
.itemInputs(
new ItemStack(Blocks.chest),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1),
GTUtility.getIntegratedCircuit(1))
.fluidInputs(fluid.copy()).itemOutputs(ItemList.Cover_Chest_Basic.get(1)).duration(40 * SECONDS)
.eut(16).addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
getModItem(IronChests.ID, "BlockIronChest", 1, 3),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1),
GTUtility.getIntegratedCircuit(1))
.fluidInputs(fluid.copy()).itemOutputs(ItemList.Cover_Chest_Good.get(1)).duration(40 * SECONDS)
.eut(16).addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
getModItem(IronChests.ID, "BlockIronChest", 1, 0),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 1),
GTUtility.getIntegratedCircuit(1))
.fluidInputs(fluid.copy()).itemOutputs(ItemList.Cover_Chest_Advanced.get(1))
.duration(40 * SECONDS).eut(16).addTo(assemblerRecipes);
}
}
}

private void makeElectricMachinePartRecipes() {
Expand Down
71 changes: 30 additions & 41 deletions src/main/java/com/dreammaster/gthandler/recipes/BlastFurnaceRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -911,71 +911,57 @@ public void run() {
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L),
GTUtility.getIntegratedCircuit(11))
.itemOutputs(
GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L),
Materials.Ash.getDustTiny(1))
.fluidInputs(Materials.Oxygen.getGas(1000L)).duration(25 * SECONDS).eut(TierEU.RECIPE_MV)
.metadata(COIL_HEAT, 1000).addTo(blastFurnaceRecipes);
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), Materials.Ash.getDust(1))
.outputChances(10000, 1111).fluidInputs(Materials.Oxygen.getGas(1000L)).duration(25 * SECONDS)
.eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 1000).addTo(blastFurnaceRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L))
.itemOutputs(
GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 4L),
Materials.Ash.getDustTiny(1))
.duration(12 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_EV).metadata(COIL_HEAT, 2000)
.addTo(blastFurnaceRecipes);
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 4L), Materials.Ash.getDust(1))
.outputChances(10000, 1111).duration(12 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_EV)
.metadata(COIL_HEAT, 2000).addTo(blastFurnaceRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.WroughtIron, 4L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L))
.itemOutputs(
GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 4L),
Materials.Ash.getDustTiny(1))
.duration(2 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_EV).metadata(COIL_HEAT, 2000)
.addTo(blastFurnaceRecipes);
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 4L), Materials.Ash.getDust(1))
.outputChances(10000, 1111).duration(2 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_EV)
.metadata(COIL_HEAT, 2000).addTo(blastFurnaceRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L))
.itemOutputs(
GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 4L),
Materials.Ash.getDustTiny(1))
.duration(12 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_EV).metadata(COIL_HEAT, 2000)
.addTo(blastFurnaceRecipes);
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 4L), Materials.Ash.getDust(1))
.outputChances(10000, 1111).duration(12 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_EV)
.metadata(COIL_HEAT, 2000).addTo(blastFurnaceRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.WroughtIron, 4L),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L))
.itemOutputs(
GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 4L),
Materials.Ash.getDustTiny(1))
.duration(2 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_EV).metadata(COIL_HEAT, 2000)
.addTo(blastFurnaceRecipes);
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 4L), Materials.Ash.getDust(1))
.outputChances(10000, 1111).duration(2 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_EV)
.metadata(COIL_HEAT, 2000).addTo(blastFurnaceRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.PigIron, 1L),
GTUtility.getIntegratedCircuit(11))
.itemOutputs(
GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L),
Materials.Ash.getDustTiny(1))
.fluidInputs(Materials.Oxygen.getGas(1000L)).duration(5 * SECONDS).eut(TierEU.RECIPE_MV)
.metadata(COIL_HEAT, 1000).addTo(blastFurnaceRecipes);
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), Materials.Ash.getDust(1))
.outputChances(10000, 1111).fluidInputs(Materials.Oxygen.getGas(1000L)).duration(5 * SECONDS)
.eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 1000).addTo(blastFurnaceRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.WroughtIron, 1L),
GTUtility.getIntegratedCircuit(11))
.itemOutputs(
GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L),
Materials.Ash.getDustTiny(1))
.fluidInputs(Materials.Oxygen.getGas(1000L)).duration(5 * SECONDS).eut(TierEU.RECIPE_MV)
.metadata(COIL_HEAT, 1000).addTo(blastFurnaceRecipes);
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), Materials.Ash.getDust(1))
.outputChances(10000, 1111).fluidInputs(Materials.Oxygen.getGas(1000L)).duration(5 * SECONDS)
.eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 1000).addTo(blastFurnaceRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
Expand Down Expand Up @@ -1533,20 +1519,23 @@ public void run() {
.itemInputs(
Materials.Sapphire.getDust(1),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L))
.itemOutputs(Materials.Aluminiumoxide.getDust(1), Materials.DarkAsh.getDustTiny(1))
.duration(30 * SECONDS).eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(blastFurnaceRecipes);
.itemOutputs(Materials.Aluminiumoxide.getDust(1), Materials.DarkAsh.getDust(1))
.outputChances(10000, 1111).duration(30 * SECONDS).eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200)
.addTo(blastFurnaceRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
Materials.GreenSapphire.getDust(1),
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L))
.itemOutputs(Materials.Aluminiumoxide.getDust(1), Materials.DarkAsh.getDustTiny(1))
.duration(30 * SECONDS).eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(blastFurnaceRecipes);
.itemOutputs(Materials.Aluminiumoxide.getDust(1), Materials.DarkAsh.getDust(1))
.outputChances(10000, 1111).duration(30 * SECONDS).eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200)
.addTo(blastFurnaceRecipes);

GTValues.RA.stdBuilder()
.itemInputs(Materials.Ruby.getDust(1), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L))
.itemOutputs(Materials.Aluminiumoxide.getDust(1), Materials.DarkAsh.getDustTiny(1))
.duration(30 * SECONDS).eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(blastFurnaceRecipes);
.itemOutputs(Materials.Aluminiumoxide.getDust(1), Materials.DarkAsh.getDust(1))
.outputChances(10000, 1111).duration(30 * SECONDS).eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200)
.addTo(blastFurnaceRecipes);

if (TinkerConstruct.isModLoaded()) {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/dreammaster/gthandler/recipes/CircuitAssemblerRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ public void solderingMaterials() {
GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Phenolic_Good.get(1L),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2),
GTModHandler.getModItem(IndustrialCraft2.ID, "itemPartCircuit", 1L, 0),
ItemList.Circuit_Parts_Diode.get(2L),
GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 2))
.itemOutputs(ItemList.Circuit_Good.get(1L)).fluidInputs(tMat.getMolten(144L * tMultiplier / 2L))
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bauxite, 1L))
.outputChances(10000, 1000).duration(20 * SECONDS).eut(2).addTo(maceratorRecipes);

GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "GravelOre", 1L, 0))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushed, Materials.Iron, 2L))
.duration(15 * SECONDS).eut(2).addTo(maceratorRecipes);

GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "materials", 1L, 12))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1L))
.outputChances(10000).duration(15 * SECONDS).eut(2).addTo(maceratorRecipes);
Expand Down
56 changes: 56 additions & 0 deletions src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@

import static gregtech.api.enums.Mods.AE2FluidCraft;
import static gregtech.api.enums.Mods.AppliedEnergistics2;
import static gregtech.api.enums.Mods.Avaritia;
import static gregtech.api.enums.Mods.EternalSingularity;
import static gregtech.api.enums.Mods.GTNHIntergalactic;
import static gregtech.api.enums.Mods.IndustrialCraft2;
import static gregtech.api.enums.Mods.OpenComputers;
import static gregtech.api.enums.Mods.SuperSolarPanels;
import static gregtech.api.enums.Mods.Thaumcraft;
import static gregtech.api.enums.Mods.ThaumicEnergistics;
import static gregtech.api.util.GTModHandler.getModItem;
import static gregtech.api.util.GTRecipeBuilder.MINUTES;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
Expand Down Expand Up @@ -383,6 +387,22 @@ public void run() {
(int) TierEU.RECIPE_UXV,
null,
null);

// Digital Singularity ME Storage Cell
IG_RecipeAdder.addSpaceAssemblerRecipe(
new ItemStack[] { getModItem(EternalSingularity.ID, "eternal_singularity", 1),
getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 12, 60),
ItemList.Quantum_Chest_IV.get(8L),
GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 4L),
getModItem(Avaritia.ID, "Resource", 4, 5),
GTOreDictUnificator.get(OrePrefixes.block, Materials.CosmicNeutronium, 12L) },
new FluidStack[] { new FluidStack(solderUEV, 2304) },
getModItem(AppliedEnergistics2.ID, "item.ItemExtremeStorageCell.Singularity", 1),
1,
10 * SECONDS,
(int) TierEU.RECIPE_UHV,
null,
null);
}
if (AE2FluidCraft.isModLoaded()) {
// Artificial Fluid Universe Cell
Expand All @@ -400,6 +420,42 @@ public void run() {
(int) TierEU.RECIPE_UXV,
null,
null);

// ME Fluid Digital Singularity Storage Cell
IG_RecipeAdder.addSpaceAssemblerRecipe(
new ItemStack[] { getModItem(EternalSingularity.ID, "eternal_singularity", 1),
new ItemStack(Loaders.yottaFluidTankCell, 4, 6),
getModItem(AE2FluidCraft.ID, "fluid_part", 8, 7), ItemList.Quantum_Tank_IV.get(8L),
GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 4L),
getModItem(Avaritia.ID, "Resource", 4, 5),
GTOreDictUnificator.get(OrePrefixes.block, Materials.CosmicNeutronium, 12L) },
new FluidStack[] { new FluidStack(solderUEV, 2304) },
getModItem(AE2FluidCraft.ID, "fluid_storage.singularity", 1, 0),
1,
10 * SECONDS,
(int) TierEU.RECIPE_UHV,
null,
null);

// ME Essentia Digital Singularity Storage Cell
if (ThaumicEnergistics.isModLoaded()) {
IG_RecipeAdder
.addSpaceAssemblerRecipe(
new ItemStack[] { getModItem(EternalSingularity.ID, "eternal_singularity", 1),
getModItem(ThaumicEnergistics.ID, "storage.component", 12, 8),
getModItem(Thaumcraft.ID, "blockEssentiaReservoir", 8, 0),
GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 4L),
getModItem(Avaritia.ID, "Resource", 4, 5),
GTOreDictUnificator
.get(OrePrefixes.block, Materials.CosmicNeutronium, 12L) },
new FluidStack[] { new FluidStack(solderUEV, 2304) },
getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 10),
1,
10 * SECONDS,
(int) TierEU.RECIPE_UHV,
null,
null);
}
}
}
}
Expand Down
Loading

0 comments on commit dc5d531

Please sign in to comment.