aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2022-08-20 09:52:49 +0000
committerGitHub <noreply@github.com>2022-08-20 09:52:49 +0000
commitc2cb49c2b7776a437d9105ac8a3f616754ace4b1 (patch)
tree4de734f0cc22c443918a829c111ddcee3f953f86
parent3226d5aef49a22161fa3c2ce94d7ef3d8cbc85ed (diff)
parent6fb31e5e496f37453639b07aa7f4a4dddb6811ef (diff)
downloadGT5-Unofficial-c2cb49c2b7776a437d9105ac8a3f616754ace4b1.tar.gz
GT5-Unofficial-c2cb49c2b7776a437d9105ac8a3f616754ace4b1.tar.bz2
GT5-Unofficial-c2cb49c2b7776a437d9105ac8a3f616754ace4b1.zip
Merge 6fb31e5e496f37453639b07aa7f4a4dddb6811ef into 3226d5aef49a22161fa3c2ce94d7ef3d8cbc85ed
Diffstat
-rw-r--r--dependencies.gradle2
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java142
2 files changed, 108 insertions, 36 deletions
diff --git a/dependencies.gradle b/dependencies.gradle
index 9e2ff3e98a..00870aa896 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -2,7 +2,7 @@
dependencies {
shadowImplementation('com.github.GTNewHorizons:AVRcore:master-SNAPSHOT')
- compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.00:dev')
+ compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.05:dev')
compile('com.github.GTNewHorizons:Yamcl:0.5.82:dev')
compile('com.github.GTNewHorizons:NotEnoughItems:2.2.22:dev')
compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev')
diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
index d01ad3f43b..bf66ec7dc0 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
@@ -3463,41 +3463,113 @@ public class DreamCraftRecipeLoader {
2000000);
// Draconic Evolution Fusion Crafter Controller
- if (Loader.isModLoaded("AWWayofTime") && Loader.isModLoaded("EMT")) {
- TT_recipeAdder.addResearchableAssemblylineRecipe(
- GT_ModHandler.getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 8),
- 16_777_216,
- 1024,
- 2_000_000,
- 8,
- new Object[] {
- GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 10783),
- GT_ModHandler.getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 8),
- GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsBotania.GaiaSpirit, 1L),
- ItemList.Casing_Coil_AwakenedDraconium.get(8L),
- ItemList.Electric_Motor_UHV.get(8L),
- ItemList.Robot_Arm_UHV.get(4L),
- new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4},
- ItemList.Gravistar.get(4, new Object() {}),
- GT_ModHandler.getModItem("Thaumcraft", "ItemEldritchObject", 1, 3),
- GT_ModHandler.getModItem("AWWayofTime", "bloodMagicBaseItems", 8, 29),
- GT_ModHandler.getModItem("AWWayofTime", "bloodMagicBaseItems", 8, 28),
- },
- new FluidStack[] {
- new FluidStack(solderIndalloy, 2880),
- Materials.Void.getMolten(2880L),
- Materials.DraconiumAwakened.getMolten(1440),
- },
- GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 5001),
- 1500,
- 8_000_000);
- }
-
- // region singleblocks
-
- // Tesla Transceiver LV 1A
- GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {ItemList.Battery_Buffer_1by1_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)},
+ if (Loader.isModLoaded("AWWayofTime")&&Loader.isModLoaded("EMT")){
+ TT_recipeAdder.addResearchableAssemblylineRecipe(GT_ModHandler.getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 8),
+ 16_777_216, 1024, 2_000_000, 8, new Object[]{
+ GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 10783),
+ GT_ModHandler.getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 8),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsBotania.GaiaSpirit, 1L),
+ ItemList.Casing_Coil_AwakenedDraconium.get(8L),
+ ItemList.Electric_Motor_UHV.get(8L),
+ ItemList.Robot_Arm_UHV.get(4L),
+ new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 4},
+ ItemList.Gravistar.get(4, new Object(){}),
+ GT_ModHandler.getModItem("Thaumcraft", "ItemEldritchObject", 1, 3),
+ GT_ModHandler.getModItem("AWWayofTime", "bloodMagicBaseItems", 8, 29),
+ GT_ModHandler.getModItem("AWWayofTime", "bloodMagicBaseItems", 8, 28),
+ }, new FluidStack[]{
+ new FluidStack(solderIndalloy, 2880),
+ Materials.Void.getMolten(2880L),
+ Materials.DraconiumAwakened.getMolten(1440),
+ }, GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 5001), 1500, 8_000_000);
+ if (Loader.isModLoaded("DraconicEvolution")) {
+ // DE Schematics Cores Tier 1
+ TT_recipeAdder.addResearchableAssemblylineRecipe(
+ GT_ModHandler.getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 9),
+ 500_000,
+ 1024,
+ 1_000_000,
+ 4,
+ new Object[] {
+ GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 1L),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 1L),
+ new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 1},
+ },
+ new FluidStack[] {
+ Materials.Sunnarium.getMolten(14400L), Materials.Void.getMolten(28800L),
+ },
+ GT_ModHandler.getModItem("EMT", "EMTItems", 1, 16),
+ 12000,
+ 500_000);
+
+ // DE Schematics Cores Tier 2
+ TT_recipeAdder.addResearchableAssemblylineRecipe(
+ GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0),
+ 5_000_000,
+ 2048,
+ 4_000_000,
+ 8,
+ new Object[] {
+ GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 4, 0),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 1L),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 1L),
+ new Object[] {OrePrefixes.circuit.get(Materials.Bio), 1},
+ },
+ new FluidStack[] {
+ Materials.Neutronium.getMolten(14400L), Materials.Void.getMolten(57600L),
+ },
+ GT_ModHandler.getModItem("EMT", "EMTItems", 1, 17),
+ 24000,
+ 2_000_000);
+
+ // DE Schematics Cores Tier 3
+ TT_recipeAdder.addResearchableAssemblylineRecipe(
+ GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 1, 0),
+ 50_000_000,
+ 4096,
+ 16_000_000,
+ 16,
+ new Object[] {
+ GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 4, 0),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 1L),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 1L),
+ new Object[] {OrePrefixes.circuit.get(Materials.Nano), 1},
+ },
+ new FluidStack[] {
+ Materials.Infinity.getMolten(14400L), Materials.Void.getMolten(115200L),
+ },
+ GT_ModHandler.getModItem("EMT", "EMTItems", 1, 18),
+ 36000,
+ 8_000_000);
+ // DE Schematics Cores Tier 4
+ TT_recipeAdder.addResearchableAssemblylineRecipe(
+ GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 1, 0),
+ 500_000_000,
+ 8192,
+ 64_000_000,
+ 64,
+ new Object[] {
+ GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 8, 0),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 4L),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 1L),
+ new Object[] {OrePrefixes.circuit.get(Materials.Piko), 1},
+ },
+ new FluidStack[] {
+ Materials.SpaceTime.getMolten(14400L), Materials.Void.getMolten(230400L),
+ },
+ GT_ModHandler.getModItem("EMT", "EMTItems", 1, 19),
+ 72000,
+ 32_000_000);
+ }
+ }
+
+ //region singleblocks
+
+ //Tesla Transceiver LV 1A
+ GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+ ItemList.Battery_Buffer_1by1_LV.get(1),
+ CustomItemList.teslaCover.getWithDamage(1, 0)},
Materials.Lead.getMolten(576),
CustomItemList.Machine_TeslaCoil_1by1_LV.get(1),
400,
generated by cgit (git 2.46.0) at 2025-03-10 19:25:40 +0000