Merge branch 'master' into plasma-arc

GTNewHorizons · Oct 13, 2024 · cf7a4cd · cf7a4cd
2 parents 118452e + f9f5acd
commit cf7a4cd
Show file tree

Hide file tree

Showing 11 changed files with 102 additions and 98 deletions.
diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java
@@ -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,

diff --git a/src/main/java/com/dreammaster/gthandler/enums/MetaTileEntityIDs.java b/src/main/java/com/dreammaster/gthandler/enums/MetaTileEntityIDs.java
@@ -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),

diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java
@@ -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() {

diff --git a/src/main/java/com/dreammaster/gthandler/recipes/CircuitAssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/CircuitAssemblerRecipes.java
@@ -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))

diff --git a/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java
@@ -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;
@@ -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
@@ -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);
+ }
  }
  }
  }

diff --git a/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java b/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java
@@ -2,7 +2,6 @@
 
 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.GTPlusPlus;
 import static gregtech.api.enums.Mods.GoodGenerator;
@@ -719,32 +718,6 @@ public void loadRecipes() {
  COMPONENT_16384,
  'e',
  AE2FC_ADVANCED_FLUID_STORAGE_HOUSING);
- // ME Digital Singularity
- ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(
- AE2FC_SINGULARITY_CELL,
- "----a----",
- "---aba---",
- "--ecdce--",
- "-acdgdca-",
- "abdgfgdba",
- "-acdgdca-",
- "--ecdce--",
- "---aba---",
- "----a----",
- 'a',
- "blockCosmicNeutronium",
- 'b',
- getModItem(Avaritia.ID, "Resource", 1, 5),
- 'c',
- ItemList.Quantum_Tank_IV.get(1L),
- 'd',
- COMPONENT_16384,
- 'e',
- "blockInfinity",
- 'f',
- getModItem(EternalSingularity.ID, "eternal_singularity", 1),
- 'g',
- T7_YOT);
 
  // level maintainer
  addShapedRecipe(

diff --git a/src/main/java/com/dreammaster/scripts/ScriptAmunRa.java b/src/main/java/com/dreammaster/scripts/ScriptAmunRa.java
@@ -220,7 +220,7 @@ public void loadRecipes() {
  'F',
  new ItemStack(machineFrames),
  'P',
- ItemList.Pump_EV.get(1));
+ ItemList.Pump_HV.get(1));
  addShapedOredictRecipe(
  new ItemStack(baseItem, 1, 14),
  "H8F",

diff --git a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java
@@ -472,31 +472,6 @@ public void loadRecipes() {
  'e',
  AE2_ADVANCED_HOUSING);
 
- // ME Digital Singularity
- ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(
- getModItem(AppliedEnergistics2.ID, "item.ItemExtremeStorageCell.Singularity", 1),
- "----a----",
- "---aba---",
- "--ecdce--",
- "-acdddca-",
- "abddfddba",
- "-acdddca-",
- "--ecdce--",
- "---aba---",
- "----a----",
- 'a',
- "blockCosmicNeutronium",
- 'b',
- getModItem(Avaritia.ID, "Resource", 1, 5),
- 'c',
- ItemList.Quantum_Chest_IV.get(1L),
- 'd',
- components[3],
- 'e',
- "blockInfinity",
- 'f',
- getModItem(EternalSingularity.ID, "eternal_singularity", 1));
-
  // ME Singularity crafting storage
  ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(
  getModItem(AppliedEnergistics2.ID, "tile.BlockSingularityCraftingStorage", 1),

diff --git a/src/main/java/com/dreammaster/scripts/ScriptArchitectureCraft.java b/src/main/java/com/dreammaster/scripts/ScriptArchitectureCraft.java
@@ -75,6 +75,18 @@ public void loadRecipes() {
  "screwIron",
  "craftingToolScrewdriver");
 
+ addShapedRecipe(
+ getModItem(ArchitectureCraft.ID, "glowbrush", 1),
+ null,
+ "materialCloth",
+ "dustGlowstone",
+ null,
+ "gearWood",
+ "materialCloth",
+ "stickWood",
+ null,
+ null);
+
  addShapelessRecipe(getModItem(ArchitectureCraft.ID, "sawblade", 1), "toolHeadBuzzSawAnyIron");
 
  addShapelessRecipe(

diff --git a/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java b/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java
@@ -949,7 +949,7 @@ public void loadRecipes() {
  'g',
  getModItem(ExtraUtilities.ID, "decorativeBlock1", 1, 1, missing),
  'h',
- ItemList.Pump_EV.get(1L),
+ ItemList.Pump_HV.get(1L),
  'i',
  getModItem(ExtraUtilities.ID, "decorativeBlock1", 1, 1, missing)));
  EnderConstructorRecipesHandler.registerRecipe(

diff --git a/src/main/java/com/dreammaster/scripts/ScriptThaumicEnergistics.java b/src/main/java/com/dreammaster/scripts/ScriptThaumicEnergistics.java
@@ -2,7 +2,6 @@
 
 import static gregtech.api.enums.Mods.AE2Stuff;
 import static gregtech.api.enums.Mods.AppliedEnergistics2;
-import static gregtech.api.enums.Mods.Avaritia;
 import static gregtech.api.enums.Mods.BartWorks;
 import static gregtech.api.enums.Mods.EternalSingularity;
 import static gregtech.api.enums.Mods.Gadomancy;
@@ -111,7 +110,7 @@ public void loadRecipes() {
  getModItem(Gadomancy.ID, "BlockEssentiaCompressor", 1) };
 
  // ItemStacks for in/out
- ItemStack SingularityDrive = getModItem(EternalSingularity.ID, "eternal_singularity", 1);
+ ItemStack DigitalSingularity = getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 10);
  // Creative Essentia Cell
  ItemStack CEC = EssentialCellCreative;
 
@@ -121,7 +120,7 @@ public void loadRecipes() {
  10,
  new AspectList().add(Aspect.AIR, 2000).add(Aspect.FIRE, 2000).add(Aspect.ORDER, 2000)
  .add(Aspect.ENTROPY, 2000).add(Aspect.EARTH, 2000).add(Aspect.WATER, 2000),
- SingularityDrive,
+ DigitalSingularity,
  CECInfusionItems);
 
  GTValues.RA.stdBuilder()
@@ -1381,30 +1380,6 @@ public void loadRecipes() {
  EssentialComponent16384K,
  'e',
  getModItem(ThaumicEnergistics.ID, "storage.casing", 1, 0, missing));
- // ME Digital Singularity
- ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(
- getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 10, missing),
- "----a----",
- "---aba---",
- "--ecdce--",
- "-acdddca-",
- "abddfddba",
- "-acdddca-",
- "--ecdce--",
- "---aba---",
- "----a----",
- 'a',
- "blockCosmicNeutronium",
- 'b',
- getModItem(Avaritia.ID, "Resource", 1, 5),
- 'c',
- getModItem(Thaumcraft.ID, "blockEssentiaReservoir", 1, 0, missing),
- 'd',
- EssentialComponent16384K,
- 'e',
- "blockInfinity",
- 'f',
- getModItem(EternalSingularity.ID, "eternal_singularity", 1));
 
  ThaumcraftApi.addArcaneCraftingRecipe(
  "thaumicenergistics.TESTORAGE",