aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2023-01-31 20:01:23 +0100
committerGitHub <noreply@github.com>2023-01-31 20:01:23 +0100
commit4f67b1ca0185c18bbbb0f1ee3dcdf2ce5186a42e (patch)
tree640d8ec2c6f83b7918469d0414a4692e66e530d9 /src
parentc52e1b426a0f02a20125857e7d8cfbdd7337d041 (diff)
parentfc6607a06af7f6e57cc3cfe81d5f417f2d3cae3c (diff)
downloadGT5-Unofficial-4f67b1ca0185c18bbbb0f1ee3dcdf2ce5186a42e.tar.gz
GT5-Unofficial-4f67b1ca0185c18bbbb0f1ee3dcdf2ce5186a42e.tar.bz2
GT5-Unofficial-4f67b1ca0185c18bbbb0f1ee3dcdf2ce5186a42e.zip
Merge pull request #145 from GTNewHorizons/opticalThings
purge remaining nanos, more memory recipes
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java28
1 files changed, 26 insertions, 2 deletions
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 8df15c2f86..76ee23536e 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
@@ -3817,6 +3817,30 @@ public class DreamCraftRecipeLoader {
20 * 20,
1_966_080,
false);
+ GT_Values.RA.addCircuitAssemblerRecipe(
+ new ItemStack[] { GT_ModHandler.getModItem("OpenComputers", "item", 4L, 39), // Memory tier 3.5
+ ItemList.Circuit_Chip_Optical.get(1L), CustomItemList.DATApipe.get(16L),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUIV, 4L),
+ GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 16L),
+ GT_ModHandler.getModItem("supersolarpanel", "solarsplitter", 4L, 0) // Solar Light Splitter
+ },
+ new FluidStack(solderUEV, 576),
+ ItemList.Optically_Compatible_Memory.get(8),
+ 20 * 20,
+ 7_864_320,
+ false);
+ GT_Values.RA.addCircuitAssemblerRecipe(
+ new ItemStack[] { GT_ModHandler.getModItem("OpenComputers", "item", 16L, 39), // Memory tier 3.5
+ ItemList.Circuit_Chip_Optical.get(1L), CustomItemList.DATApipe.get(64L),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 4L),
+ GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 32L),
+ GT_ModHandler.getModItem("supersolarpanel", "solarsplitter", 16L, 0) // Solar Light Splitter
+ },
+ new FluidStack(solderUEV, 1152),
+ ItemList.Optically_Compatible_Memory.get(32),
+ 20 * 20,
+ 31_457_280,
+ false);
// Optical Processor
GT_Values.RA.addCircuitAssemblerRecipe(
@@ -4625,7 +4649,7 @@ public class DreamCraftRecipeLoader {
new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1L),
ItemList.Electric_Motor_UIV.get(1L),
GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TranscendentMetal, 16L),
- ItemList.Gravistar.get(32L), new Object[] { OrePrefixes.circuit.get(Materials.Nano), 4L },
+ ItemList.Gravistar.get(32L), new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4L },
getModItem("miscutils", "itemFoilArceusAlloy2B", 64, 0),
getModItem("miscutils", "itemFoilLafiumCompound", 64, 0),
getModItem("miscutils", "itemFoilCinobiteA243", 64, 0),
@@ -4649,7 +4673,7 @@ public class DreamCraftRecipeLoader {
new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1L),
ItemList.Electric_Motor_UIV.get(1),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 8L),
- ItemList.Gravistar.get(32), new Object[] { OrePrefixes.circuit.get(Materials.Nano), 4L },
+ ItemList.Gravistar.get(32), new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4L },
getModItem("miscutils", "itemFoilArceusAlloy2B", 64, 0),
getModItem("miscutils", "itemFoilLafiumCompound", 64, 0),
getModItem("miscutils", "itemFoilCinobiteA243", 64, 0),