diff options
| author | GDCloud <93287602+GDCloudstrike@users.noreply.github.com> | 2023-01-28 15:24:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-28 15:24:07 +0100 |
| commit | 869ac3db5c1598c7537242630c22eedd8a5b94f5 (patch) | |
| tree | 4d92010750f7a30c771a86c50ba0cb8d4d8630be | |
| parent | b0d2190027d20ea572c958496822711509c60400 (diff) | |
| download | GT5-Unofficial-869ac3db5c1598c7537242630c22eedd8a5b94f5.tar.gz GT5-Unofficial-869ac3db5c1598c7537242630c22eedd8a5b94f5.tar.bz2 GT5-Unofficial-869ac3db5c1598c7537242630c22eedd8a5b94f5.zip | |
Nano -> any UIV (#132)
3 files changed, 5 insertions, 14 deletions
diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java index aecb719d92..f754ac1064 100644 --- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java +++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java @@ -37,7 +37,7 @@ public class ComponentAssemblyLineMiscRecipes { "Superconductor", "Infinite", "Bio", - "Nano", + "Optical", "Piko", "Quantum" }; @@ -387,7 +387,7 @@ public class ComponentAssemblyLineMiscRecipes { } private static void generateWrapRecipes() { - for (int i = 0; i <= 10; i++) { + for (int i = 0; i <= 11; i++) { GT_Values.RA.addAssemblerRecipe( new ItemStack[] {getCircuit(i, 16), GT_Utility.getIntegratedCircuit(16)}, Materials.SolderingAlloy.getMolten(72L), @@ -397,15 +397,6 @@ public class ComponentAssemblyLineMiscRecipes { } GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GameRegistry.findItemStack("dreamcraft", "item.NanoCircuit", 16), - GT_Utility.getIntegratedCircuit(16) - }, - Materials.SolderingAlloy.getMolten(72L), - new ItemStack(Loaders.circuitWrap, 1, 11), - 30 * 20, - 30); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GameRegistry.findItemStack("dreamcraft", "item.PikoCircuit", 16), GT_Utility.getIntegratedCircuit(16) }, diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java index d520f017b8..bd6545ff59 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader.java @@ -738,7 +738,7 @@ public class RecipeLoader { GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 8), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Infinity, 16), ItemList.Circuit_Wafer_PPIC.get(64), - new Object[] {"circuitNano", 1}, + new Object[] {OrePrefixes.circuit.get(Materials.Optical), 1L}, }, new FluidStack[] { WerkstoffLoader.Oganesson.getFluidOrGas(1000), diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java index 4e8452ad27..8ef8c405d9 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java @@ -659,8 +659,8 @@ public class RecipeLoader_02 { new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), ItemRefer.Fluid_Storage_Core_T8.get(2), - new Object[] {OrePrefixes.circuit.get(Materials.Nano), 4L}, - new Object[] {OrePrefixes.circuit.get(Materials.Nano), 4L}, + new Object[] {OrePrefixes.circuit.get(Materials.Optical), 4L}, + new Object[] {OrePrefixes.circuit.get(Materials.Optical), 4L}, ItemList.Electric_Pump_UEV.get(8), GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 12), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12), |