Skip to content

Commit

Permalink
Merge branch 'master' into 2.7-stargate
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dream-Master
Dream-Master authored Sep 7, 2024
2 parents 2f5faf9 + c2e6c0f commit 5c58b7b
Show file tree
Hide file tree
Showing 7 changed files with 291 additions and 417 deletions.
4 changes: 2 additions & 2 deletions dependencies.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Add your dependencies here

dependencies {
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.68:dev")
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.76:dev")
api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
api("com.github.GTNewHorizons:Baubles:1.0.4:dev")

Expand All @@ -16,7 +16,7 @@ dependencies {
compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")
compileOnly("com.github.GTNewHorizons:Chisel:2.15.2-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.3:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.5:dev") { transitive = false }
compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
compileOnly("com.github.GTNewHorizons:amunra:0.6.0:dev") { transitive = false }
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.dreammaster.gthandler;

import static com.dreammaster.gthandler.enums.MetaTileEntityIDs.*;
import static gregtech.api.enums.GTValues.VP;
import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
import static gregtech.api.recipe.RecipeMaps.slicerRecipes;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
Expand Down Expand Up @@ -1187,10 +1188,10 @@ public void recipes() {
for (int aTier = 10; aTier < 15; aTier++) {
GTValues.RA.stdBuilder().itemInputs(flInputs[aTier - 10]).itemOutputs(inHatches[aTier - 10])
.fluidInputs(Materials.RadoxPolymer.getMolten((long) (2.25 * Math.pow(2, (aTier - 9)))))
.duration(24 * SECONDS).eut((int) (30 * Math.pow(4, (aTier - 1)))).addTo(assemblerRecipes);
.duration(24 * SECONDS).eut(VP[aTier]).addTo(assemblerRecipes);
GTValues.RA.stdBuilder().itemInputs(flInputs2[aTier - 10]).itemOutputs(outHatches[aTier - 10])
.fluidInputs(Materials.RadoxPolymer.getMolten((long) (2.25 * Math.pow(2, (aTier - 9)))))
.duration(24 * SECONDS).eut((int) (30 * Math.pow(4, (aTier - 1)))).addTo(assemblerRecipes);
.duration(24 * SECONDS).eut(VP[aTier]).addTo(assemblerRecipes);
}

}
Expand Down
54 changes: 27 additions & 27 deletions src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ public void run() {
GTModHandler.getModItem(OpenComputers.ID, "item", 1, 91),
192_000,
512,
8_000_000,
(int) TierEU.RECIPE_UEV,
16,
new Object[] { ItemList.Cover_SolarPanel_LuV.get(4),
GTModHandler.getModItem(GalaxySpace.ID, "item.DysonSwarmParts", 8, 3),
Expand All @@ -358,7 +358,7 @@ public void run() {
ItemList.Circuit_Chip_QPIC.get(1),
192_000,
512,
2_000_000,
(int) TierEU.RECIPE_UHV,
32,
new ItemStack[] { GTUtility.copyAmount(4, ItemRegistry.energyDistributor[9]),
ItemList.Circuit_Chip_QPIC.get(64),
Expand All @@ -376,7 +376,7 @@ public void run() {
GTModHandler.getModItem(GalaxySpace.ID, "item.DysonSwarmParts", 1, 3),
192000,
512,
2000000,
(int) TierEU.RECIPE_UHV,
32,
new ItemStack[] { GTModHandler.getModItem(GalaxySpace.ID, "item.DysonSwarmParts", 64, 3),
ItemRefer.Advanced_Radiation_Protection_Plate.get(64), ItemList.Reactor_Coolant_Sp_6.get(1),
Expand All @@ -396,7 +396,7 @@ public void run() {
ItemList.Quantum_Chest_IV.get(1),
192_000,
512,
2_000_000,
(int) TierEU.RECIPE_UHV,
32,
new ItemStack[] { ItemList.Hull_UIV.get(4),
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UMV, 4),
Expand All @@ -414,7 +414,7 @@ public void run() {
new ItemStack(Blocks.dropper),
192_000,
512,
2_000_000,
(int) TierEU.RECIPE_UHV,
32,
new ItemStack[] { ItemList.Hull_UIV.get(4), ItemList.Conveyor_Module_UIV.get(32),
ItemList.Robot_Arm_UIV.get(32), ItemList.Electric_Piston_UIV.get(32),
Expand All @@ -432,7 +432,7 @@ public void run() {
ItemList.PolarizerUEV.get(1),
192_000,
512,
2_000_000,
(int) TierEU.RECIPE_UHV,
32,
new ItemStack[] { ItemList.Hull_UIV.get(4),
GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 16),
Expand All @@ -450,7 +450,7 @@ public void run() {
tectech.thing.CustomItemList.Machine_Multi_Computer.get(1),
192_000,
512,
2_000_000,
(int) TierEU.RECIPE_UHV,
32,
new ItemStack[] { ItemList.Hull_UIV.get(4),
GTModHandler.getModItem(OpenComputers.ID, "item", 4, 103),
Expand All @@ -467,7 +467,7 @@ public void run() {
tectech.thing.CustomItemList.tM_TeslaPrimary_6.get(1),
192_000,
512,
2_000_000,
(int) TierEU.RECIPE_UHV,
32,
new ItemStack[] { ItemList.Circuit_Chip_QPIC.get(4), CustomItemList.MicaInsulatorFoil.get(64),
CustomItemList.MicaInsulatorFoil.get(64), CustomItemList.MicaInsulatorFoil.get(64),
Expand All @@ -485,7 +485,7 @@ public void run() {
tectech.thing.CustomItemList.tM_TeslaSecondary.get(1),
192_000,
512,
2_000_000,
(int) TierEU.RECIPE_UHV,
32,
new ItemStack[] { ItemList.Circuit_Chip_QPIC.get(4), CustomItemList.MicaInsulatorFoil.get(64),
CustomItemList.MicaInsulatorFoil.get(64), CustomItemList.MicaInsulatorFoil.get(64),
Expand All @@ -503,7 +503,7 @@ public void run() {
tectech.thing.CustomItemList.tM_TeslaToroid.get(1),
192_000,
512,
2_000_000,
(int) TierEU.RECIPE_UHV,
32,
new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 4),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.Neutronium, 8),
Expand All @@ -519,7 +519,7 @@ public void run() {
GTModHandler.getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1),
192_000,
512,
8_000_000,
(int) TierEU.RECIPE_UEV,
16,
new ItemStack[] { ItemList.Hull_UIV.get(4),
CustomItemList.IrradiantReinforcedBedrockiumPlate.get(4),
Expand All @@ -541,7 +541,7 @@ public void run() {
ItemList.Circuit_Biomainframe.get(1L),
192_000,
512,
2_000_000,
(int) TierEU.RECIPE_UHV,
32,
new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 8),
ItemList.Circuit_Biomainframe.get(2L), ItemList.Circuit_Parts_CapacitorASMD.get(32L),
Expand All @@ -563,7 +563,7 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.foil, Materials.Infinity, 1L),
192_000,
512,
2_000_000,
(int) TierEU.RECIPE_UHV,
32,
new ItemStack[] { GTModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 1L),
ItemList.Sensor_UV.get(16L),
Expand All @@ -584,7 +584,7 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 1L),
192_000,
512,
2_000_000,
(int) TierEU.RECIPE_UHV,
32,
new ItemStack[] { ItemList.Electric_Piston_UV.get(16L), ItemList.Electric_Motor_UV.get(64L),
GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 16L),
Expand All @@ -607,7 +607,7 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 1L),
192_000,
512,
2_000_000,
(int) TierEU.RECIPE_UHV,
32,
new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 64L),
GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 64L),
Expand All @@ -625,7 +625,7 @@ public void run() {
com.dreammaster.item.ItemList.NanoCircuitOrigin.getIS(1),
192000 * 2,
512 * 2,
2_000_000 * 2,
4_000_000,
32 * 2,
new Object[] { ItemList.Circuit_Board_Bio_Ultra.get(1L),
com.dreammaster.item.ItemList.PicoWafer.getIS(4),
Expand All @@ -647,7 +647,7 @@ public void run() {
com.dreammaster.item.ItemList.PikoCircuitPolychrome.getIS(1),
192000 * 4,
512 * 4,
2_000_000 * 4,
(int) TierEU.RECIPE_UEV,
32 * 4,
new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 16),
com.dreammaster.item.ItemList.PikoCircuitPolychrome.getIS(2),
Expand All @@ -668,7 +668,7 @@ public void run() {
com.dreammaster.item.ItemList.GatePlateOrigin.getIS(1),
32_000_000 * 12,
8192,
32_000_000,
(int) TierEU.RECIPE_UIV,
64,
new ItemStack[] { GTModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 1L),
ItemList.Sensor_UEV.get(16L),
Expand All @@ -689,7 +689,7 @@ public void run() {
com.dreammaster.item.ItemList.ChevronOrigin.getIS(1),
32_000_000 * 12,
8192,
32_000_000,
(int) TierEU.RECIPE_UIV,
64,
new ItemStack[] { ItemList.Electric_Piston_UEV.get(16L), ItemList.Electric_Motor_UEV.get(64L),
GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 16L),
Expand All @@ -712,7 +712,7 @@ public void run() {
com.dreammaster.item.ItemList.FramePartOrigin.getIS(1),
32_000_000 * 12,
8192,
32_000_000,
(int) TierEU.RECIPE_UIV,
64,
new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 64L),
GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 64L),
Expand All @@ -730,7 +730,7 @@ public void run() {
ItemList.Circuit_Wafer_NPIC.get(1L),
192_000,
512,
2_000_000,
(int) TierEU.RECIPE_UEV,
32,
new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 8),
ItemList.Circuit_Biomainframe.get(2L), ItemList.Circuit_Parts_CapacitorXSMD.get(32L),
Expand Down Expand Up @@ -774,7 +774,7 @@ public void run() {
com.dreammaster.item.ItemList.PikoCircuitDimensional.getIS(1),
720_000,
2_048,
8_000_000,
(int) TierEU.RECIPE_UEV,
128,
new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 16),
com.dreammaster.item.ItemList.PikoCircuitDimensional.getIS(2),
Expand All @@ -795,7 +795,7 @@ public void run() {
com.dreammaster.item.ItemList.GatePlatePolychrome.getIS(1),
2_000_000_000,
32_768,
500_000_000,
(int) TierEU.RECIPE_UXV,
64,
new ItemStack[] { ItemList.Casing_Dim_Bridge.get(64),
GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L),
Expand All @@ -821,7 +821,7 @@ public void run() {
com.dreammaster.item.ItemList.ChevronPolychrome.getIS(1),
2_000_000_000,
32_768,
500_000_000,
(int) TierEU.RECIPE_UXV,
64,
new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L),
GTOreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L),
Expand Down Expand Up @@ -849,7 +849,7 @@ public void run() {
com.dreammaster.item.ItemList.FramePartPolychrome.getIS(1),
2_000_000_000,
32_768,
500_000_000,
(int) TierEU.RECIPE_UXV,
64,
new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 64L),
GTOreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.SpaceTime, 64L),
Expand Down Expand Up @@ -1425,14 +1425,14 @@ public void run() {
Materials.Osmium.getMolten(1152L) },
com.dreammaster.item.ItemList.PikoCircuit.getIS(1),
10000,
128_000_000);
(int) TierEU.RECIPE_UMV);

// Quantum Circuit
TTRecipeAdder.addResearchableAssemblylineRecipe(
CustomItemList.PikoCircuit.get(1L),
720000,
2048,
8000000,
(int) TierEU.RECIPE_UEV,
128,
new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 16),
CustomItemList.PikoCircuit.get(2L), ItemList.Circuit_Parts_CapacitorXSMD.get(64L),
Expand Down
15 changes: 14 additions & 1 deletion src/main/java/com/dreammaster/gthandler/recipes/FluidHeaterRecipes.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
package com.dreammaster.gthandler.recipes;

import static gregtech.api.recipe.RecipeMaps.fluidHeaterRecipes;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;

import gregtech.api.enums.GTValues;
import gregtech.api.enums.TierEU;
import gtPlusPlus.core.util.minecraft.FluidUtils;

public class FluidHeaterRecipes implements Runnable {

@Override
public void run() {}
public void run() {

GTValues.RA.stdBuilder().fluidInputs(FluidUtils.getSteam(3840))
.fluidOutputs(FluidUtils.getSuperHeatedSteam(3840)).duration(5 * SECONDS).eut(TierEU.RECIPE_LuV)
.noOptimize().addTo(fluidHeaterRecipes);

}
}
2 changes: 1 addition & 1 deletion src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void run() {
GTValues.RA.stdBuilder().itemInputs(ItemList.Tesseract.get(1), GregtechItemList.Laser_Lens_Special.get(0))
.itemOutputs(ItemList.EnergisedTesseract.get(1))
.fluidOutputs(MaterialsUEVplus.ExcitedDTEC.getFluid(100)).requiresCleanRoom().duration(30 * SECONDS)
.eut(32_000_000).noOptimize().addTo(laserEngraverRecipes);
.eut(TierEU.RECIPE_UIV).noOptimize().addTo(laserEngraverRecipes);

// Mysterious crystal upgrading

Expand Down
9 changes: 6 additions & 3 deletions src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,8 @@ public void run() {
GTUtility.getIntegratedCircuit(2))
.itemOutputs(
GTOreDictUnificator.getDust(Materials.NaquadahAlloy, 4L * OrePrefixes.dust.mMaterialAmount))
.duration((int) (400L * OrePrefixes.dust.mMaterialAmount / 3628800L)).eut(8000).addTo(mixerRecipes);
.duration((int) (400L * OrePrefixes.dust.mMaterialAmount / 3628800L)).eut(TierEU.RECIPE_IV)
.addTo(mixerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
Expand All @@ -653,7 +654,8 @@ public void run() {
GTOreDictUnificator
.getDust(Materials.YttriumBariumCuprate, 13L * OrePrefixes.dust.mMaterialAmount))
.fluidInputs(Materials.Oxygen.getGas(7000))
.duration((int) (600L * OrePrefixes.dust.mMaterialAmount / 3628800L)).eut(2000).addTo(mixerRecipes);
.duration((int) (600L * OrePrefixes.dust.mMaterialAmount / 3628800L)).eut(TierEU.RECIPE_EV)
.addTo(mixerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
Expand All @@ -663,7 +665,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 1L),
GTUtility.getIntegratedCircuit(3))
.itemOutputs(GTOreDictUnificator.getDust(Materials.Duralumin, 9L * OrePrefixes.dust.mMaterialAmount))
.duration((int) (900L * OrePrefixes.dust.mMaterialAmount / 3628800L)).eut(2000).addTo(mixerRecipes);
.duration((int) (900L * OrePrefixes.dust.mMaterialAmount / 3628800L)).eut(TierEU.RECIPE_EV)
.addTo(mixerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
Expand Down
Loading

0 comments on commit 5c58b7b

Please sign in to comment.