From 52c2b32393bda8ff5a5ce0b86286b62aebce120a Mon Sep 17 00:00:00 2001 From: TechLord22 <37029404+TechLord22@users.noreply.github.com> Date: Wed, 22 Dec 2021 09:25:38 -0500 Subject: [PATCH 1/7] fusion overclocks are 2 and 2 --- .../api/capability/impl/MultiblockRecipeLogic.java | 8 +------- .../multi/electric/MetaTileEntityFusionReactor.java | 11 +++++++++++ src/main/resources/assets/gregtech/lang/en_us.lang | 1 + 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java b/src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java index 460641198f2..5d742abd951 100644 --- a/src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java +++ b/src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java @@ -10,6 +10,7 @@ import gregtech.api.recipes.MatchingMode; import gregtech.api.recipes.Recipe; import gregtech.api.recipes.RecipeMap; +import gregtech.api.util.GTUtility; import net.minecraft.util.Tuple; import net.minecraftforge.items.IItemHandlerModifiable; @@ -240,13 +241,6 @@ protected int[] runOverclockingLogic(@Nonnull Recipe recipe, boolean negativeEU, return overclock; } - @Override - protected int[] performOverclocking(Recipe recipe, boolean negativeEU) { - int maxOverclocks = getOverclockingTier(getMaxVoltage()) - 1; // exclude ULV overclocking - - return runOverclockingLogic(recipe, negativeEU, maxOverclocks); - } - protected Tuple getMaintenanceValues() { MultiblockWithDisplayBase displayBase = this.metaTileEntity instanceof MultiblockWithDisplayBase ? (MultiblockWithDisplayBase) metaTileEntity : null; int numMaintenanceProblems = displayBase == null || !displayBase.hasMaintenanceMechanics() ? 0 : displayBase.getNumMaintenanceProblems(); diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFusionReactor.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFusionReactor.java index b23e1e2f430..83c8faa12a6 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFusionReactor.java +++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFusionReactor.java @@ -278,6 +278,7 @@ protected void addDisplayText(List textList) { public void addInformation(ItemStack stack, @Nullable World player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); tooltip.add(I18n.format("gregtech.machine.fusion_reactor.capacity", calculateEnergyStorageFactor(16) / 1000000L)); + tooltip.add(I18n.format("gregtech.machine.fusion_reactor.overclocking")); } @Nonnull @@ -301,6 +302,16 @@ public FusionRecipeLogic(MetaTileEntityFusionReactor tileEntity) { super(tileEntity); } + @Override + protected double getOverclockingDurationDivisor() { + return 2.0D; + } + + @Override + protected double getOverclockingVoltageMultiplier() { + return 2.0D; + } + @Override protected long getMaxVoltage() { return Math.min(GTValues.V[tier], super.getMaxVoltage()); diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index a9270f33b41..bb05f41a1ef 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -3698,6 +3698,7 @@ gregtech.machine.fusion_reactor.luv.name=Fusion Reactor Computer Mark 1 gregtech.machine.fusion_reactor.zpm.name=Fusion Reactor Computer Mark 2 gregtech.machine.fusion_reactor.uv.name=Fusion Reactor Computer Mark 3 gregtech.machine.fusion_reactor.capacity=§7Maximum Energy Storage: §e%sM EU +gregtech.machine.fusion_reactor.overclocking=Overclocks double energy and halve duration. gregtech.machine.miner.lv.name=Basic Miner gregtech.machine.miner.mv.name=Advanced Miner From 0924361e89f8f4ed0431b7f4568fb98aedc1a12d Mon Sep 17 00:00:00 2001 From: tech22 <37029404+TechLord22@users.noreply.github.com> Date: Wed, 22 Dec 2021 16:55:57 -0500 Subject: [PATCH 2/7] new superconductor coil --- .../fusion/machine_coil_superconductor.png | Bin 1822 -> 5708 bytes .../machine_coil_superconductor.png.mcmeta | 13 ------------- .../machine_coil_superconductor_ctm.png | Bin 2933 -> 0 bytes 3 files changed, 13 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/casings/fusion/machine_coil_superconductor.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/casings/fusion/machine_coil_superconductor_ctm.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/fusion/machine_coil_superconductor.png b/src/main/resources/assets/gregtech/textures/blocks/casings/fusion/machine_coil_superconductor.png index f6bcc85400a2539030142441b96a1ce08330f97b..7aea137f52684d56d0a9b525b50a93427a0b72d2 100644 GIT binary patch literal 5708 zcmeHKd0Z3M77nQF?i(uL7`399J%J<=5E6t4p-3ViA~H!PVI;|fB#?-Ri1I8hxD_mr zx*)Eo6)FNED$43YMO<10Ma2~mS1J|sO@g9!d9VK7>whM{nPkpA_dDl&=iGDWrUdwV z540L+de+e`C zUGJHxs!up>o0-}+bJBy$up^Hhlxnio>{%Y}4&TPT@Nfb9YQbh*Bh}&hrAPYsu6EPx z;E@Rje14P-+$y|daw;{eMq*>JHHnLn_1w_vLR+T{>)$d@U+ZKtXM8|YJy&}`&q_G7 z$7#O*y%9?+^WE?AS$S?!XmHQqpYXL?8(Xs+c2|dGyFb1W)%JR8-kLU7&-VMfuLgBG z+>j#h8id6S%d$=ZOTp482J}Q)v_vEp2hG$8k#ZPIZxwe&+(XWox6A$l*}{yS9!*=$vz~RXEntSTA!%Fn>7fGA#-&Xre&yrU4f=e(sQoMcs=!w7 zDdS{1o9yo@@`G|R)A7&4qEbnsYo7IX{o9+UF||J=@2V^S4(`ex{EdI^xGvhORn?Im zug!iL+tSclN12^VSry2%%S583YwTIMQ{LBpDcr@!<(>on$cvRhn9%h~4x?{e!Sk`mUHvHearrY_#_Vo~$_u9Gg} z(znF0U~a|2wKu0N{H^lm=+qOPH}{_u6TW}=dis(p3APh+k4!(wT7TkAsPBWxnLnm~ zv&38~z#nrm3*Hxh!sP`Ix5K^@DabjLoOjZ*r6)Jc>3XKpzO)WmjP3 zwRgy(1G%f$>}(EIJ`v?TYQB9ScSSB>k&swa%$R!2C*`fL6;9|%e_U0v zWPOP?F@Qk1@W|Gj+T_enDf+JF(CP(0Scot^79JZip!3|oVJGgiI+&ceQK3tJTkP(= zKJ!Q0AwyE68DK;Cxbpg}qh*V?(NC|=pB?Y-D!DWuWqk1=U3X=1bN(sHLrRaon4|k}NBa zyu!`fkljX;~i9MXV*PA*fZnK~BMh|5I(8^i=GU{ujWv9KY$0Dz6C zAb^Ue;)ysf9UM!>x>*6PDzSta$eHyH0)1j(BQ+W&lR(gFwRkNBkEo;s5`)1Y5Xl5G z8HZ}%)Qc4wP=`~fCmJAnF*uM~q=Jde6F-I!i~8m(V^lI@ zIARe2l0kA*RgGFDePYs^%M0k6VW2|>WS zu;c^FpUg3g{6QVH`{x$klV-$5wRk)x2NA^>;^J~xSX6=+!(yh8=t7|}Bs3h6EEJBA7(Vgq{L+E`e1ptmQ$^DpN5>KA0uqf$L4nW`_yi6O2$n4VZ`y_>4!HK#mk+GgAgaYiQSZ9v zL(#oYy^k{3xZnZ6xOADIs5fAdF-)=1QxvUt5dM=&``g9ZhoVL#8ZD@TJftYUEUbs2 zvjPF{*Cs$F;mLqwFsu+GTJ_XV9neNXhK&Cu?S#J(nHr3ReixT05>!Ybw0pm67yl_< zF;PS&GC&EA0ujkLDoseiq3el`V^D<>iHndbAya>c{=0a+(e`Al0>IH&_kSHCiHswY z1te!CnaZTN;D|IsWxWg0m0;-E?{n!&_(QgP6+UY6C^fw@bn`&>B0}G0^o}z$KmX+C zU6uWlCIH}zkKCkUnHS z#@e2e`)a?+I}NiOElk-t-6U_~pem%i`O@tAa|qm!QF8 NxL*F8L!J>y{{}tZgDe05 delta 900 zcmX@3GmmeAq#_do1H*)g8D>C=v%n*=n1O-s2naJy)#j6CU|?Y4;bDI2+O>VLkhvwu8cAd$W*iCs9Dspr3imfVg3w(ViJF?5M z7XZo>SUDG^CYIzEh2-bwOwQ$2oGi(uJ$V`sr*Y}(DWoJ@rR5jpCYIPLW#%TPr|K8v zr7I~EWaO9R7iZ)HHRtE#7y0I=q}nPOD^0%2sX2KihxBAUZq>!E!FC#mPmP1t23~%7a|oK+FnIP~@hTBmz116$OdO*{LN8 zsd*{3N<~WccHxcjNem2(>pWc?Lp09!1{wN4HV|3oDjmLSS?BE=8<~An>xJL??>%>6 z?e&$hRa3hhm>h+~W;rPDSSy>*wDgP0EZvU>i(eQTJdLb7|L@bw+PaJFZi^@WQQvHG z)@WvGrPtLqRn-MXq2FZ!pY!mt?LYST{?sDL{ud^xJHI>bQG0a)lBp>&-6&iChKAj`%RC7PQNAU6!rW=jE zD;+sz`T0vM<|8#u;-7w_(jLry|W$)*XmC_bn{GB)JZi(U!nWQb_L$P zsrml>`@8=u7x>=F+IpeD;!bHo3MWk=t=VZ{ejHyX`uw5@{)wr5?aP1SYZk0NtzA;0U9zWi^QUbg>&~s^iJNxnd8F2M d?f)wF3{{RwvsTpp@&;x!22WQ%mvv4FO#mKDW8DA% diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/fusion/machine_coil_superconductor.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/casings/fusion/machine_coil_superconductor.png.mcmeta deleted file mode 100644 index 72194f10077..00000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/casings/fusion/machine_coil_superconductor.png.mcmeta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ctm": { - "ctm_version": 1, - "type": "CTM", - "layer": "CUTOUT", - "textures": [ - "gregtech:blocks/casings/fusion/machine_coil_superconductor_ctm" - ], - "extra": { - "connect_inside": true - } - } -} diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/fusion/machine_coil_superconductor_ctm.png b/src/main/resources/assets/gregtech/textures/blocks/casings/fusion/machine_coil_superconductor_ctm.png deleted file mode 100644 index 1d66ec8c22bbbef9a2ee5daa9e122561ff7ec89c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2933 zcmbVO4R93I9lxMbMeXQ-PUwv7x+qfQ-G06OBnJ(5ft=&TE8GCibUM7Dx{w+dk=*T`_HsxmCk@H`+Az-!C;C=asUjIxCo_KckE`nHp$ z0*gp@n*9h(kQPJ8xD~TmuaqW|FeZ;&h6}SnNCiRDsK~j^xpcv~X)rjAGdSyeM3$?_ zx=oJncumeYrYqC`;eezzk*N5%ES5~B;==RmT1XhBgj`nIOSQR}S&TiWIcMOy76Nld z5RI!va~SzfF6B7sa-ouC$W$~+3d5@=D17B5;r#p|LHr%Dpw!(0JwBB8~zo{zEyj>jT2 z$xqm}P0bQHU1UWLSe79JnS};WB^?9P;8_EyGB23KQK4vB%rTk+76kgm1z|b{v2h6= z5;&;KDhpHt3&2pI2~>_#fW;F6OES_0Y?Q4%kh95}MCq|s15_rl$cr+;qZ4f`B48pY z17xxyz)&|V%Mu7^C1Cy~&t)sMBtDN6-7BrE1*oy~mbT|zJ?I)HSX9JBalMXf%i<-O zB#xvLN+N(Jlz?vO95At>@T_8CNl^aV*8das1lp3KNEVBMtcwsR3Q3wGs}jH}Mmo#t z91q#?wV|x53M7QFERzq2fB+Iy1t{3yM2j~~84D9>TMEaKKt&PrKv08%Ar%2$fe>=0 z#L3VYUt8j!q!>g;Co}=%3j(AD`GdTw8>R|bUL0Rr4HO`60vQt?8zK~mZ(SufC_tzv zrYy>1vH z-`a$U(FuA`(YxnZek;o1+D5W6ucXZ}LREDkU3H?6|1CSC{V$W z<4x6s<><$vhk%z;9H)t*Ci3MDdX?x)$uXKxwh@z!oT0Bio-6BpMWE$)#%=Rg6c5jZ z`LR1rQRy4O6bM@68S_mF7Ust6^`w@CA##8SUMnXT@=-ba;4H~gj+|_Ihfh8h3RQg> zkJYB?`-V5ocaA5g9UPrLee2x|>nFc?%f=s2U*Gy+)vYhSB~99V?M?O7XK$ahgI)*d zQ{SHT(hvLhA3wdJ>-VYiRqY#gZu-NkOD6yHosqL&eN}Vulb-iGU)g!)_)p&8J8pPm z_nCpA84Eri7;s+f{Zo3*zz1;AI`_i+yV{Q(-L@O|+W+WyWX{SPM>_|5+6PbWe9rAW zxV!m|We>bHsL!1jUUlJ@eeW87;m%d>y>9ZSf6M3Rrj8Ciy4}~d{r1G~j=j3;=*#Eg zvwpsJ_S5%$aov`Ip%2ca=nh4V9JE3o&FdWb#a*Kx-g(E4Cm!G5)t%R#dV9r#e|>an zUG2slOLy)3`=M2{+aGfJ__xGWH4zGUa;`ci2<8QOw7kj=H?ymVbJo8@>ciYg#FHarb{wDX> z^ZO4y+!xBMIx<eC>~)9GZEeXZ`x=%(;`<)~@9%gz60o zd%D*=x4I_Y+`nr5JzEYhoqe0zc_PvDY{Sf_9@g({e`xLD=l?u%V9$*B#_hAT*nva8 z?mM#Lk6r8+O2f3R=$?D`eRAv+RXqg>PY!)__(I~9rBmy=4xNAInICl}51pQGzP9=N uXKgjNKk?l~2SyIOmt=3bKDmBccwH~ovL?T$e_u;*Fpk$X#C9)OvG(85>-Qu8 From 56728904f85f3cdb976d39811a28e75d25d227c5 Mon Sep 17 00:00:00 2001 From: tech22 <37029404+TechLord22@users.noreply.github.com> Date: Wed, 22 Dec 2021 21:30:13 -0500 Subject: [PATCH 3/7] new fusion recipes --- .../material/materials/ElementMaterials.java | 10 +- .../gregtech/loaders/MaterialInfoLoader.java | 2 +- .../loaders/recipe/CraftingComponent.java | 4 +- .../gregtech/loaders/recipe/FuelRecipes.java | 8 +- .../gregtech/loaders/recipe/FusionLoader.java | 157 ++++++++---------- .../loaders/recipe/MachineRecipeLoader.java | 2 +- .../loaders/recipe/MetaTileEntityLoader.java | 8 +- .../MetaTileEntityMachineRecipeLoader.java | 4 + 8 files changed, 86 insertions(+), 109 deletions(-) diff --git a/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java b/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java index 711c47aae7d..e42bdda057e 100644 --- a/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java @@ -54,7 +54,7 @@ public static void register() { .build(); Arsenic = new Material.Builder(6, "arsenic") - .dust() + .dust().fluid() .color(0x676756) .element(Elements.As) .build(); @@ -206,9 +206,9 @@ public static void register() { Darmstadtium = new Material.Builder(27, "darmstadtium") .ingot().fluid() - .color(0xAAAAAA) + .color(0x578062) + .flags(EXT2_METAL, GENERATE_ROTOR, GENERATE_DENSE) .element(Elements.Ds) - .setHidden() .build(); Deuterium = new Material.Builder(28, "deuterium") @@ -428,9 +428,9 @@ public static void register() { Livermorium = new Material.Builder(57, "livermorium") .ingot().fluid() - .color(0x578062).iconSet(SHINY) - .flags(EXT2_METAL, GENERATE_ROTOR, GENERATE_DENSE) + .color(0xAAAAAA).iconSet(SHINY) .element(Elements.Lv) + .setHidden() .build(); Lutetium = new Material.Builder(58, "lutetium") diff --git a/src/main/java/gregtech/loaders/MaterialInfoLoader.java b/src/main/java/gregtech/loaders/MaterialInfoLoader.java index 7f9ac199b65..5b5a53388ca 100644 --- a/src/main/java/gregtech/loaders/MaterialInfoLoader.java +++ b/src/main/java/gregtech/loaders/MaterialInfoLoader.java @@ -101,7 +101,7 @@ public static void init() { new MaterialStack(Materials.Rubber, OrePrefix.plate.materialAmount * 2))); OreDictUnifier.registerOre(MetaTileEntities.HULL[8].getStackForm(), new ItemMaterialInfo( - new MaterialStack(Materials.Livermorium, OrePrefix.plate.materialAmount * 8), + new MaterialStack(Materials.Darmstadtium, OrePrefix.plate.materialAmount * 8), new MaterialStack(Materials.YttriumBariumCuprate, OrePrefix.cableGtSingle.materialAmount * 2), new MaterialStack(Materials.Rubber, OrePrefix.plate.materialAmount * 2))); diff --git a/src/main/java/gregtech/loaders/recipe/CraftingComponent.java b/src/main/java/gregtech/loaders/recipe/CraftingComponent.java index 7c23fb7fcac..71496aafc46 100644 --- a/src/main/java/gregtech/loaders/recipe/CraftingComponent.java +++ b/src/main/java/gregtech/loaders/recipe/CraftingComponent.java @@ -341,7 +341,7 @@ public static void initializeComponents() { {5, new UnificationEntry(OrePrefix.plate, Materials.TungstenSteel)}, {6, new UnificationEntry(OrePrefix.plate, Materials.RhodiumPlatedPalladium)}, {7, new UnificationEntry(OrePrefix.plate, Materials.NaquadahAlloy)}, - {8, new UnificationEntry(OrePrefix.plate, Materials.Livermorium)}, + {8, new UnificationEntry(OrePrefix.plate, Materials.Darmstadtium)}, {9, new UnificationEntry(OrePrefix.plate, Materials.Neutronium)}, }).collect(Collectors.toMap(data -> (Integer) data[0], data -> data[1]))); @@ -399,7 +399,7 @@ public static void initializeComponents() { {5, new UnificationEntry(OrePrefix.rotor, Materials.TungstenSteel)}, {6, new UnificationEntry(OrePrefix.rotor, Materials.RhodiumPlatedPalladium)}, {7, new UnificationEntry(OrePrefix.rotor, Materials.NaquadahAlloy)}, - {8, new UnificationEntry(OrePrefix.rotor, Materials.Livermorium)}, + {8, new UnificationEntry(OrePrefix.rotor, Materials.Darmstadtium)}, }).collect(Collectors.toMap(data -> (Integer) data[0], data -> data[1]))); diff --git a/src/main/java/gregtech/loaders/recipe/FuelRecipes.java b/src/main/java/gregtech/loaders/recipe/FuelRecipes.java index 2b479e9dcb2..76f4e83f0bc 100644 --- a/src/main/java/gregtech/loaders/recipe/FuelRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/FuelRecipes.java @@ -65,10 +65,10 @@ public static void registerFuels() { //plasma turbine registerPlasmaFuel(Helium.getPlasma(1), 2560, LV); - registerPlasmaFuel(Nitrogen.getPlasma(1), 4032, LV); - registerPlasmaFuel(Oxygen.getPlasma(1), 4096, LV); - registerPlasmaFuel(Iron.getPlasma(16), 103219, LV); - registerPlasmaFuel(Nickel.getPlasma(16), 106905, LV); + registerPlasmaFuel(Oxygen.getPlasma(1), 3072, LV); + registerPlasmaFuel(Nitrogen.getPlasma(1), 4096, LV); + registerPlasmaFuel(Iron.getPlasma(1), 6144, LV); + registerPlasmaFuel(Nickel.getPlasma(1), 12288, LV); } diff --git a/src/main/java/gregtech/loaders/recipe/FusionLoader.java b/src/main/java/gregtech/loaders/recipe/FusionLoader.java index 1c52d514d88..97031bb734a 100644 --- a/src/main/java/gregtech/loaders/recipe/FusionLoader.java +++ b/src/main/java/gregtech/loaders/recipe/FusionLoader.java @@ -15,16 +15,7 @@ public static void init() { .fluidOutputs(Materials.Helium.getPlasma(125)) .duration(16) .EUt(4096) - .EUToStart(40000000) - .buildAndRegister(); - - RecipeMaps.FUSION_RECIPES.recipeBuilder() - .fluidInputs(Materials.Deuterium.getFluid(125)) - .fluidInputs(Materials.Helium3.getFluid(125)) - .fluidOutputs(Materials.Helium.getPlasma(125)) - .duration(16) - .EUt(VA[EV]) - .EUToStart(60000000) + .EUToStart(40_000_000) .buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder() @@ -33,133 +24,124 @@ public static void init() { .fluidOutputs(Materials.Oxygen.getPlasma(125)) .duration(32) .EUt(4096) - .EUToStart(80000000) + .EUToStart(180_000_000) .buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder() .fluidInputs(Materials.Beryllium.getFluid(16)) .fluidInputs(Materials.Deuterium.getFluid(375)) - .fluidOutputs(Materials.Nitrogen.getPlasma(175)) + .fluidOutputs(Materials.Nitrogen.getPlasma(125)) .duration(16) .EUt(16384) - .EUToStart(180000000) + .EUToStart(280_000_000) .buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder() .fluidInputs(Materials.Silicon.getFluid(16)) .fluidInputs(Materials.Magnesium.getFluid(16)) - .fluidOutputs(Materials.Iron.getPlasma(125)) + .fluidOutputs(Materials.Iron.getPlasma(16)) .duration(32) .EUt(VA[IV]) - .EUToStart(360000000) + .EUToStart(360_000_000) .buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder() .fluidInputs(Materials.Potassium.getFluid(16)) .fluidInputs(Materials.Fluorine.getFluid(125)) - .fluidOutputs(Materials.Nickel.getPlasma(125)) + .fluidOutputs(Materials.Nickel.getPlasma(16)) .duration(16) .EUt(VA[LuV]) - .EUToStart(480000000) + .EUToStart(480_000_000) .buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder() - .fluidInputs(Materials.Beryllium.getFluid(16)) - .fluidInputs(Materials.Tungsten.getFluid(16)) - .fluidOutputs(Materials.Platinum.getFluid(16)) + .fluidInputs(Materials.Carbon.getFluid(16)) + .fluidInputs(Materials.Magnesium.getFluid(16)) + .fluidOutputs(Materials.Argon.getPlasma(125)) .duration(32) - .EUt(VA[LuV]) - .EUToStart(150000000) + .EUt(24576) + .EUToStart(180_000_000) .buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder() .fluidInputs(Materials.Neodymium.getFluid(16)) - .fluidInputs(Materials.Hydrogen.getFluid(48)) + .fluidInputs(Materials.Hydrogen.getFluid(375)) .fluidOutputs(Materials.Europium.getFluid(16)) .duration(64) .EUt(24576) - .EUToStart(150000000) + .EUToStart(150_000_000) .buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder() - .fluidInputs(Materials.Lutetium.getFluid(16)) - .fluidInputs(Materials.Chrome.getFluid(16)) - .fluidOutputs(Materials.Americium.getFluid(16)) - .duration(96) - .EUt(49152) - .EUToStart(200000000) - .buildAndRegister(); - - RecipeMaps.FUSION_RECIPES.recipeBuilder() - .fluidInputs(Materials.Plutonium239.getFluid(16)) - .fluidInputs(Materials.Thorium.getFluid(16)) - .fluidOutputs(Materials.Naquadah.getFluid(16)) + .fluidInputs(Materials.Lutetium.getFluid(32)) + .fluidInputs(Materials.Chrome.getFluid(32)) + .fluidOutputs(Materials.Americium.getFluid(32)) .duration(64) - .EUt(VA[LuV]) - .EUToStart(300000000) + .EUt(49152) + .EUToStart(200_000_000) .buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder() - .fluidInputs(Materials.Americium.getFluid(16)) - .fluidInputs(Materials.Naquadria.getFluid(16)) - .fluidOutputs(Materials.Neutronium.getFluid(2)) + .fluidInputs(Materials.Americium.getFluid(128)) + .fluidInputs(Materials.Naquadria.getFluid(128)) + .fluidOutputs(Materials.Neutronium.getFluid(32)) .duration(200) .EUt(98304) - .EUToStart(600000000) + .EUToStart(600_000_000) .buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder() - .fluidInputs(Materials.Tungsten.getFluid(16)) - .fluidInputs(Materials.Helium.getFluid(16)) + .fluidInputs(Materials.Silver.getFluid(16)) + .fluidInputs(Materials.Copper.getFluid(16)) .fluidOutputs(Materials.Osmium.getFluid(16)) .duration(64) .EUt(24578) - .EUToStart(150000000) - .buildAndRegister(); - - RecipeMaps.FUSION_RECIPES.recipeBuilder() - .fluidInputs(Materials.Manganese.getFluid(16)) - .fluidInputs(Materials.Hydrogen.getFluid(16)) - .fluidOutputs(Materials.Iron.getFluid(16)) - .duration(64) - .EUt(VA[IV]) - .EUToStart(120000000) + .EUToStart(150_000_000) .buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder() - .fluidInputs(Materials.Mercury.getFluid(16)) + .fluidInputs(Materials.Mercury.getFluid(125)) .fluidInputs(Materials.Magnesium.getFluid(16)) - .fluidOutputs(Materials.Uranium238.getFluid(16)) - .duration(64) - .EUt(49152) - .EUToStart(240000000) + .fluidOutputs(Materials.Uranium235.getFluid(16)) + .duration(128) + .EUt(24576) + .EUToStart(140_000_000) .buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder() .fluidInputs(Materials.Gold.getFluid(16)) .fluidInputs(Materials.Aluminium.getFluid(16)) .fluidOutputs(Materials.Uranium238.getFluid(16)) - .duration(64) - .EUt(49152) - .EUToStart(240000000) + .duration(128) + .EUt(24576) + .EUToStart(140_000_000) .buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder() - .fluidInputs(Materials.Uranium238.getFluid(16)) - .fluidInputs(Materials.Helium.getFluid(16)) + .fluidInputs(Materials.Xenon.getFluid(125)) + .fluidInputs(Materials.Zinc.getFluid(16)) .fluidOutputs(Materials.Plutonium239.getFluid(16)) .duration(128) .EUt(49152) - .EUToStart(480000000) + .EUToStart(120_000_000) + .buildAndRegister(); + + RecipeMaps.FUSION_RECIPES.recipeBuilder() + .fluidInputs(Materials.Krypton.getFluid(125)) + .fluidInputs(Materials.Cerium.getFluid(16)) + .fluidOutputs(Materials.Plutonium241.getFluid(16)) + .duration(128) + .EUt(49152) + .EUToStart(240_000_000) .buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder() - .fluidInputs(Materials.Vanadium.getFluid(16)) .fluidInputs(Materials.Hydrogen.getFluid(125)) + .fluidInputs(Materials.Vanadium.getFluid(16)) .fluidOutputs(Materials.Chrome.getFluid(16)) .duration(64) .EUt(24576) - .EUToStart(140000000) + .EUToStart(140_000_000) .buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder() @@ -168,16 +150,16 @@ public static void init() { .fluidOutputs(Materials.Duranium.getFluid(16)) .duration(64) .EUt(16384) - .EUToStart(140000000) + .EUToStart(140_000_000) .buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder() - .fluidInputs(Materials.Titanium.getFluid(48)) + .fluidInputs(Materials.Titanium.getFluid(32)) .fluidInputs(Materials.Duranium.getFluid(32)) .fluidOutputs(Materials.Tritanium.getFluid(16)) .duration(64) .EUt(VA[LuV]) - .EUToStart(200000000) + .EUToStart(200_000_000) .buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder() @@ -186,34 +168,25 @@ public static void init() { .fluidOutputs(Materials.Radon.getFluid(125)) .duration(64) .EUt(VA[LuV]) - .EUToStart(200000000) + .EUToStart(200_000_000) .buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder() - .fluidInputs(Materials.Tantalum.getFluid(16)) - .fluidInputs(Materials.Tritium.getFluid(16)) - .fluidOutputs(Materials.Tungsten.getFluid(16)) + .fluidInputs(Materials.Silver.getFluid(144)) + .fluidInputs(Materials.Lithium.getFluid(144)) + .fluidOutputs(Materials.Indium.getFluid(144)) .duration(16) .EUt(24576) - .EUToStart(200000000) - .buildAndRegister(); - - RecipeMaps.FUSION_RECIPES.recipeBuilder() - .fluidInputs(Materials.Silver.getFluid(16)) - .fluidInputs(Materials.Lithium.getFluid(16)) - .fluidOutputs(Materials.Indium.getFluid(16)) - .duration(32) - .EUt(24576) - .EUToStart(380000000) + .EUToStart(280_000_000) .buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder() - .fluidInputs(Materials.NaquadahEnriched.getFluid(15)) + .fluidInputs(Materials.NaquadahEnriched.getFluid(16)) .fluidInputs(Materials.Radon.getFluid(125)) - .fluidOutputs(Materials.Naquadria.getFluid(3)) + .fluidOutputs(Materials.Naquadria.getFluid(4)) .duration(64) .EUt(49152) - .EUToStart(400000000) + .EUToStart(400_000_000) .buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder() @@ -222,16 +195,16 @@ public static void init() { .fluidOutputs(Materials.Lutetium.getFluid(16)) .duration(16) .EUt(VA[IV]) - .EUToStart(80000000) + .EUToStart(80_000_000) .buildAndRegister(); RecipeMaps.FUSION_RECIPES.recipeBuilder() - .fluidInputs(Materials.Plutonium241.getFluid(16)) - .fluidInputs(Materials.Titanium.getFluid(16)) - .fluidOutputs(Materials.Livermorium.getFluid(16)) + .fluidInputs(Materials.Arsenic.getFluid(32)) + .fluidInputs(Materials.Ruthenium.getFluid(16)) + .fluidOutputs(Materials.Darmstadtium.getFluid(16)) .duration(32) .EUt(VA[LuV]) - .EUToStart(200000000) + .EUToStart(200_000_000) .buildAndRegister(); } diff --git a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java index c590ea900a5..46a147bc6de 100644 --- a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java @@ -541,7 +541,7 @@ private static void registerAssemblerRecipes() { RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(16).input(OrePrefix.plate, TungstenSteel, 8).outputs(MetaBlocks.MACHINE_CASING.getItemVariant(MachineCasingType.IV)).circuitMeta(8).duration(50).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(16).input(OrePrefix.plate, RhodiumPlatedPalladium, 8).outputs(MetaBlocks.MACHINE_CASING.getItemVariant(MachineCasingType.LuV)).circuitMeta(8).duration(50).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(16).input(OrePrefix.plate, NaquadahAlloy, 8).outputs(MetaBlocks.MACHINE_CASING.getItemVariant(MachineCasingType.ZPM)).circuitMeta(8).duration(50).buildAndRegister(); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(16).input(OrePrefix.plate, Livermorium, 8).outputs(MetaBlocks.MACHINE_CASING.getItemVariant(MachineCasingType.UV)).circuitMeta(8).duration(50).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(16).input(OrePrefix.plate, Darmstadtium, 8).outputs(MetaBlocks.MACHINE_CASING.getItemVariant(MachineCasingType.UV)).circuitMeta(8).duration(50).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(16).input(OrePrefix.plate, Neutronium, 8).outputs(MetaBlocks.MACHINE_CASING.getItemVariant(MachineCasingType.UHV)).circuitMeta(8).duration(50).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(VA[LV]).input(OrePrefix.wireGtDouble, Materials.Cupronickel, 8).input(OrePrefix.foil, Materials.Bronze, 8).fluidInputs(Materials.TinAlloy.getFluid(GTValues.L)).outputs(MetaBlocks.WIRE_COIL.getItemVariant(CoilType.CUPRONICKEL)).duration(200).buildAndRegister(); diff --git a/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java b/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java index f020f0fd5b3..f98291e9dac 100644 --- a/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java @@ -50,7 +50,7 @@ public static void init() { ModHandler.addShapedRecipe(true, "casing_iv", MetaBlocks.MACHINE_CASING.getItemVariant(IV), "PPP", "PwP", "PPP", 'P', new UnificationEntry(OrePrefix.plate, Materials.TungstenSteel)); ModHandler.addShapedRecipe(true, "casing_luv", MetaBlocks.MACHINE_CASING.getItemVariant(LuV), "PPP", "PwP", "PPP", 'P', new UnificationEntry(OrePrefix.plate, Materials.RhodiumPlatedPalladium)); ModHandler.addShapedRecipe(true, "casing_zpm", MetaBlocks.MACHINE_CASING.getItemVariant(ZPM), "PPP", "PwP", "PPP", 'P', new UnificationEntry(OrePrefix.plate, Materials.NaquadahAlloy)); - ModHandler.addShapedRecipe(true, "casing_uv", MetaBlocks.MACHINE_CASING.getItemVariant(UV), "PPP", "PwP", "PPP", 'P', new UnificationEntry(OrePrefix.plate, Materials.Livermorium)); + ModHandler.addShapedRecipe(true, "casing_uv", MetaBlocks.MACHINE_CASING.getItemVariant(UV), "PPP", "PwP", "PPP", 'P', new UnificationEntry(OrePrefix.plate, Materials.Darmstadtium)); ModHandler.addShapedRecipe(true, "casing_uhv", MetaBlocks.MACHINE_CASING.getItemVariant(UHV), "PPP", "PwP", "PPP", 'P', new UnificationEntry(OrePrefix.plate, Materials.Neutronium)); // If these recipes are changed, change the values in MaterialInfoLoader.java @@ -342,7 +342,7 @@ public static void init() { ModHandler.addShapedRecipe(true, "hermetic_casing_iv", MetaBlocks.HERMETIC_CASING.getItemVariant(HERMETIC_IV), "PPP", "PFP", "PPP", 'P', new UnificationEntry(OrePrefix.plate, Materials.TungstenSteel), 'F', new UnificationEntry(OrePrefix.pipeLargeFluid, Materials.Titanium)); ModHandler.addShapedRecipe(true, "hermetic_casing_luv", MetaBlocks.HERMETIC_CASING.getItemVariant(HERMETIC_LUV), "PPP", "PFP", "PPP", 'P', new UnificationEntry(OrePrefix.plate, Materials.RhodiumPlatedPalladium), 'F', new UnificationEntry(OrePrefix.pipeLargeFluid, Materials.TungstenSteel)); ModHandler.addShapedRecipe(true, "hermetic_casing_zpm", MetaBlocks.HERMETIC_CASING.getItemVariant(HERMETIC_ZPM), "PPP", "PFP", "PPP", 'P', new UnificationEntry(OrePrefix.plate, Materials.NaquadahAlloy), 'F', new UnificationEntry(OrePrefix.pipeLargeFluid, Materials.NiobiumTitanium)); - ModHandler.addShapedRecipe(true, "hermetic_casing_uv", MetaBlocks.HERMETIC_CASING.getItemVariant(HERMETIC_UV), "PPP", "PFP", "PPP", 'P', new UnificationEntry(OrePrefix.plate, Materials.Livermorium), 'F', new UnificationEntry(OrePrefix.pipeLargeFluid, Materials.Naquadah)); + ModHandler.addShapedRecipe(true, "hermetic_casing_uv", MetaBlocks.HERMETIC_CASING.getItemVariant(HERMETIC_UV), "PPP", "PFP", "PPP", 'P', new UnificationEntry(OrePrefix.plate, Materials.Darmstadtium), 'F', new UnificationEntry(OrePrefix.pipeLargeFluid, Materials.Naquadah)); ModHandler.addShapedRecipe(true, "hermetic_casing_max", MetaBlocks.HERMETIC_CASING.getItemVariant(HERMETIC_UHV), "PPP", "PFP", "PPP", 'P', new UnificationEntry(OrePrefix.plate, Materials.Neutronium), 'F', new UnificationEntry(OrePrefix.pipeLargeFluid, Materials.Duranium)); // Super / Quantum Chests @@ -355,7 +355,7 @@ public static void init() { ModHandler.addShapedRecipe(true, "quantum_chest_iv", MetaTileEntities.QUANTUM_CHEST[5].getStackForm(), "CPC", "PHP", "CFC", 'C', new UnificationEntry(OrePrefix.circuit, Tier.Elite), 'P', new UnificationEntry(OrePrefix.plateDense, Materials.TungstenSteel), 'F', MetaItems.FIELD_GENERATOR_EV.getStackForm(), 'H', MetaTileEntities.HULL[5].getStackForm()); ModHandler.addShapedRecipe(true, "quantum_chest_luv", MetaTileEntities.QUANTUM_CHEST[6].getStackForm(), "CPC", "PHP", "CFC", 'C', new UnificationEntry(OrePrefix.circuit, Tier.Master), 'P', new UnificationEntry(OrePrefix.plateDense, Materials.RhodiumPlatedPalladium), 'F', MetaItems.FIELD_GENERATOR_IV.getStackForm(), 'H', MetaTileEntities.HULL[6].getStackForm()); ModHandler.addShapedRecipe(true, "quantum_chest_zpm", MetaTileEntities.QUANTUM_CHEST[7].getStackForm(), "CPC", "PHP", "CFC", 'C', new UnificationEntry(OrePrefix.circuit, Tier.Ultimate), 'P', new UnificationEntry(OrePrefix.plateDense, Materials.NaquadahAlloy), 'F', MetaItems.FIELD_GENERATOR_LUV.getStackForm(), 'H', MetaTileEntities.HULL[7].getStackForm()); - ModHandler.addShapedRecipe(true, "quantum_chest_uv", MetaTileEntities.QUANTUM_CHEST[8].getStackForm(), "CPC", "PHP", "CFC", 'C', new UnificationEntry(OrePrefix.circuit, Tier.Super), 'P', new UnificationEntry(OrePrefix.plateDense, Materials.Livermorium), 'F', MetaItems.FIELD_GENERATOR_ZPM.getStackForm(), 'H', MetaTileEntities.HULL[8].getStackForm()); + ModHandler.addShapedRecipe(true, "quantum_chest_uv", MetaTileEntities.QUANTUM_CHEST[8].getStackForm(), "CPC", "PHP", "CFC", 'C', new UnificationEntry(OrePrefix.circuit, Tier.Super), 'P', new UnificationEntry(OrePrefix.plateDense, Materials.Darmstadtium), 'F', MetaItems.FIELD_GENERATOR_ZPM.getStackForm(), 'H', MetaTileEntities.HULL[8].getStackForm()); ModHandler.addShapedRecipe(true, "quantum_chest_uhv", MetaTileEntities.QUANTUM_CHEST[9].getStackForm(), "CPC", "PHP", "CFC", 'C', new UnificationEntry(OrePrefix.circuit, Tier.Infinite), 'P', new UnificationEntry(OrePrefix.plate, Materials.Neutronium), 'F', MetaItems.FIELD_GENERATOR_UV.getStackForm(), 'H', MetaTileEntities.HULL[9].getStackForm()); // Super / Quantum Tanks @@ -368,7 +368,7 @@ public static void init() { ModHandler.addShapedRecipe(true, "quantum_tank_iv", MetaTileEntities.QUANTUM_TANK[5].getStackForm(), "CGC", "PHP", "CUC", 'C', new UnificationEntry(OrePrefix.circuit, Tier.Elite), 'P', new UnificationEntry(OrePrefix.plateDense, Materials.TungstenSteel), 'U', MetaItems.ELECTRIC_PUMP_IV.getStackForm(), 'G', MetaItems.FIELD_GENERATOR_EV.getStackForm(), 'H', MetaBlocks.HERMETIC_CASING.getItemVariant(HERMETIC_IV)); ModHandler.addShapedRecipe(true, "quantum_tank_luv", MetaTileEntities.QUANTUM_TANK[6].getStackForm(), "CGC", "PHP", "CUC", 'C', new UnificationEntry(OrePrefix.circuit, Tier.Master), 'P', new UnificationEntry(OrePrefix.plateDense, Materials.RhodiumPlatedPalladium), 'U', MetaItems.ELECTRIC_PUMP_LUV.getStackForm(), 'G', MetaItems.FIELD_GENERATOR_IV.getStackForm(), 'H', MetaBlocks.HERMETIC_CASING.getItemVariant(HERMETIC_LUV)); ModHandler.addShapedRecipe(true, "quantum_tank_zpm", MetaTileEntities.QUANTUM_TANK[7].getStackForm(), "CGC", "PHP", "CUC", 'C', new UnificationEntry(OrePrefix.circuit, Tier.Ultimate), 'P', new UnificationEntry(OrePrefix.plateDense, Materials.NaquadahAlloy), 'U', MetaItems.ELECTRIC_PUMP_ZPM.getStackForm(), 'G', MetaItems.FIELD_GENERATOR_LUV.getStackForm(), 'H', MetaBlocks.HERMETIC_CASING.getItemVariant(HERMETIC_ZPM)); - ModHandler.addShapedRecipe(true, "quantum_tank_uv", MetaTileEntities.QUANTUM_TANK[8].getStackForm(), "CGC", "PHP", "CUC", 'C', new UnificationEntry(OrePrefix.circuit, Tier.Super), 'P', new UnificationEntry(OrePrefix.plateDense, Materials.Livermorium), 'U', MetaItems.ELECTRIC_PUMP_UV.getStackForm(), 'G', MetaItems.FIELD_GENERATOR_ZPM.getStackForm(), 'H', MetaBlocks.HERMETIC_CASING.getItemVariant(HERMETIC_UV)); + ModHandler.addShapedRecipe(true, "quantum_tank_uv", MetaTileEntities.QUANTUM_TANK[8].getStackForm(), "CGC", "PHP", "CUC", 'C', new UnificationEntry(OrePrefix.circuit, Tier.Super), 'P', new UnificationEntry(OrePrefix.plateDense, Materials.Darmstadtium), 'U', MetaItems.ELECTRIC_PUMP_UV.getStackForm(), 'G', MetaItems.FIELD_GENERATOR_ZPM.getStackForm(), 'H', MetaBlocks.HERMETIC_CASING.getItemVariant(HERMETIC_UV)); ModHandler.addShapedRecipe(true, "quantum_tank_uhv", MetaTileEntities.QUANTUM_TANK[9].getStackForm(), "CGC", "PHP", "CUC", 'C', new UnificationEntry(OrePrefix.circuit, Tier.Infinite), 'P', new UnificationEntry(OrePrefix.plate, Materials.Neutronium), 'U', MetaItems.ELECTRIC_PUMP_UV.getStackForm(), 'G', MetaItems.FIELD_GENERATOR_UV.getStackForm(), 'H', MetaBlocks.HERMETIC_CASING.getItemVariant(HERMETIC_UHV)); ModHandler.addShapedRecipe(true, "buffer_lv", MetaTileEntities.BUFFER[0].getStackForm(), "HP", "CV", 'H', MetaTileEntities.HULL[GTValues.LV].getStackForm(), 'P', MetaItems.ELECTRIC_PUMP_LV.getStackForm(), 'V', MetaItems.CONVEYOR_MODULE_LV.getStackForm(), 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Basic)); diff --git a/src/main/java/gregtech/loaders/recipe/MetaTileEntityMachineRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MetaTileEntityMachineRecipeLoader.java index 8e7f2d9ed96..5bdbb4e69c3 100644 --- a/src/main/java/gregtech/loaders/recipe/MetaTileEntityMachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MetaTileEntityMachineRecipeLoader.java @@ -482,6 +482,7 @@ public static void init() { .input(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT) .input(VOLTAGE_COIL_UV) .input(wireGtQuadruple, YttriumBariumCuprate, 2) + .input(plate, Darmstadtium, 2) .output(ENERGY_INPUT_HATCH_4A[3]) .duration(100).EUt(VA[ZPM]).buildAndRegister(); @@ -528,6 +529,7 @@ public static void init() { .input(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 2) .input(VOLTAGE_COIL_UV) .input(wireGtOctal, YttriumBariumCuprate, 2) + .input(plate, Darmstadtium, 4) .output(ENERGY_INPUT_HATCH_16A[3]) .duration(200).EUt(VA[ZPM]).buildAndRegister(); @@ -574,6 +576,7 @@ public static void init() { .input(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT) .input(VOLTAGE_COIL_UV) .input(wireGtQuadruple, YttriumBariumCuprate, 2) + .input(plate, Darmstadtium, 2) .output(ENERGY_OUTPUT_HATCH_4A[3]) .duration(100).EUt(VA[ZPM]).buildAndRegister(); @@ -620,6 +623,7 @@ public static void init() { .input(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 2) .input(VOLTAGE_COIL_UV) .input(wireGtOctal, YttriumBariumCuprate, 2) + .input(plate, Darmstadtium, 4) .output(ENERGY_OUTPUT_HATCH_16A[3]) .duration(200).EUt(VA[ZPM]).buildAndRegister(); From 86b476518cd1f459604b6c6268211d5046aef3b5 Mon Sep 17 00:00:00 2001 From: tech22 <37029404+TechLord22@users.noreply.github.com> Date: Wed, 22 Dec 2021 21:58:58 -0500 Subject: [PATCH 4/7] new fusion reactor recipes --- .../material/materials/ElementMaterials.java | 2 +- .../loaders/recipe/AssemblyLineLoader.java | 25 ++++++++++--------- .../loaders/recipe/MachineRecipeLoader.java | 18 ++++++------- .../loaders/recipe/MetaTileEntityLoader.java | 5 ---- 4 files changed, 22 insertions(+), 28 deletions(-) diff --git a/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java b/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java index e42bdda057e..a9ba15706db 100644 --- a/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java @@ -1003,7 +1003,7 @@ public static void register() { .flags(GENERATE_FOIL) .element(Elements.Ke) .cableProperties(GTValues.V[7], 6, 4) - .blastTemp(7500, GasTier.HIGH, VA[LuV], 1500) + .blastTemp(7200, GasTier.HIGH, VA[LuV], 1500) .build(); Adamantium = new Material.Builder(131, "adamantium") diff --git a/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java b/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java index c8ea10c3056..bdf82a06b43 100644 --- a/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java +++ b/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java @@ -2,7 +2,6 @@ import gregtech.api.GTValues; import gregtech.api.recipes.RecipeMaps; -import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.material.MarkerMaterials; import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; @@ -22,10 +21,10 @@ public static void init() { .input(OrePrefix.circuit, MarkerMaterials.Tier.Ultimate) .input(OrePrefix.circuit, MarkerMaterials.Tier.Ultimate) .input(OrePrefix.circuit, MarkerMaterials.Tier.Ultimate) - .input(OrePrefix.plate, Materials.Plutonium241) - .input(OrePrefix.plate, Materials.Trinium) + .input(OrePrefix.plateDouble, Materials.Plutonium241) + .input(OrePrefix.plateDouble, Materials.Osmiridium) .inputs(MetaItems.FIELD_GENERATOR_IV.getStackForm(2)) - .inputs(MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(32)) + .inputs(MetaItems.ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(64)) .input(OrePrefix.wireGtSingle, Materials.IndiumTinBariumTitaniumCuprate, 32) .fluidInputs(Materials.SolderingAlloy.getFluid(GTValues.L * 8)) .fluidInputs(Materials.NiobiumTitanium.getFluid(GTValues.L * 8)) @@ -35,33 +34,35 @@ public static void init() { .buildAndRegister(); RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder() - .inputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.SUPERCONDUCTOR_COIL)) + .inputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_COIL)) .input(OrePrefix.circuit, MarkerMaterials.Tier.Super) .input(OrePrefix.circuit, MarkerMaterials.Tier.Super) .input(OrePrefix.circuit, MarkerMaterials.Tier.Super) .input(OrePrefix.circuit, MarkerMaterials.Tier.Super) - .input(OrePrefix.plate, Materials.Naquadria) - .input(OrePrefix.plate, Materials.Europium) + .input(OrePrefix.plateDouble, Materials.Naquadria) + .input(OrePrefix.plateDouble, Materials.Europium) .inputs(MetaItems.FIELD_GENERATOR_LUV.getStackForm(2)) - .inputs(MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(48)) + .inputs(MetaItems.ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(48)) + .inputs(MetaItems.ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(48)) .input(OrePrefix.wireGtSingle, Materials.UraniumRhodiumDinaquadide, 32) .fluidInputs(Materials.SolderingAlloy.getFluid(GTValues.L * 8)) - .fluidInputs(Materials.NaquadahAlloy.getFluid(GTValues.L * 8)) + .fluidInputs(Materials.VanadiumGallium.getFluid(GTValues.L * 8)) .outputs(MetaTileEntities.FUSION_REACTOR[1].getStackForm()) .duration(1000) .EUt(61440) .buildAndRegister(); RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder() - .inputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.SUPERCONDUCTOR_COIL)) + .inputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_COIL)) .input(OrePrefix.circuit, MarkerMaterials.Tier.Infinite) .input(OrePrefix.circuit, MarkerMaterials.Tier.Infinite) .input(OrePrefix.circuit, MarkerMaterials.Tier.Infinite) .input(OrePrefix.circuit, MarkerMaterials.Tier.Infinite) .input(OrePrefix.plate, Materials.NetherStar) - .input(OrePrefix.plate, Materials.Americium) + .input(OrePrefix.plateDouble, Materials.Americium) .inputs(MetaItems.FIELD_GENERATOR_ZPM.getStackForm(2)) - .inputs(MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(64)) + .inputs(MetaItems.ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(64)) + .inputs(MetaItems.ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(64)) .input(OrePrefix.wireGtSingle, Materials.EnrichedNaquadahTriniumEuropiumDuranide, 32) .fluidInputs(Materials.SolderingAlloy.getFluid(GTValues.L * 8)) .fluidInputs(Materials.YttriumBariumCuprate.getFluid(GTValues.L * 8)) diff --git a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java index 46a147bc6de..b2c45f2a447 100644 --- a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java @@ -563,19 +563,17 @@ private static void registerAssemblerRecipes() { RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(16).inputs(MetaBlocks.METAL_CASING.getItemVariant(MetalCasingType.STEEL_SOLID)).fluidInputs(Materials.Polytetrafluoroethylene.getFluid(216)).notConsumable(new IntCircuitIngredient(6)).outputs(MetaBlocks.METAL_CASING.getItemVariant(MetalCasingType.PTFE_INERT_CASING)).duration(50).buildAndRegister(); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(VA[LuV]).input(OrePrefix.wireGtDouble, Materials.IndiumTinBariumTitaniumCuprate, 32).input(OrePrefix.foil, Materials.NiobiumTitanium, 32).fluidInputs(Materials.Ruthenium.getFluid(GTValues.L)).outputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.SUPERCONDUCTOR_COIL)).duration(100).buildAndRegister(); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(VA[ZPM]).input(OrePrefix.wireGtDouble, Materials.UraniumRhodiumDinaquadide, 16).input(OrePrefix.foil, Materials.NiobiumTitanium, 16).fluidInputs(Materials.Ruthenium.getFluid(GTValues.L)).outputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.SUPERCONDUCTOR_COIL)).duration(100).buildAndRegister(); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(VA[UV]).input(OrePrefix.wireGtDouble, Materials.EnrichedNaquadahTriniumEuropiumDuranide, 8).input(OrePrefix.foil, Materials.NiobiumTitanium, 8).fluidInputs(Materials.Ruthenium.getFluid(GTValues.L)).outputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.SUPERCONDUCTOR_COIL)).duration(100).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(VA[LuV]).input(OrePrefix.wireGtDouble, Materials.IndiumTinBariumTitaniumCuprate, 32).input(OrePrefix.foil, Materials.NiobiumTitanium, 32).fluidInputs(Materials.Trinium.getFluid(GTValues.L * 24)).outputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.SUPERCONDUCTOR_COIL)).duration(100).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(VA[ZPM]).input(OrePrefix.wireGtDouble, Materials.UraniumRhodiumDinaquadide, 16).input(OrePrefix.foil, Materials.NiobiumTitanium, 16).fluidInputs(Materials.Trinium.getFluid(GTValues.L * 16)).outputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.SUPERCONDUCTOR_COIL)).duration(100).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(VA[UV]).input(OrePrefix.wireGtDouble, Materials.EnrichedNaquadahTriniumEuropiumDuranide, 8).input(OrePrefix.foil, Materials.NiobiumTitanium, 8).fluidInputs(Materials.Trinium.getFluid(GTValues.L * 8)).outputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.SUPERCONDUCTOR_COIL)).duration(100).buildAndRegister(); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(VA[ZPM]).inputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.SUPERCONDUCTOR_COIL)).inputs(MetaItems.FIELD_GENERATOR_HV.getStackForm(2)).inputs(MetaItems.NEUTRON_REFLECTOR.getStackForm(2)).input(OrePrefix.circuit, MarkerMaterials.Tier.Master, 4).fluidInputs(Materials.Osmium.getFluid(GTValues.L)).outputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_COIL)).duration(100).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(VA[ZPM]).inputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.SUPERCONDUCTOR_COIL)).inputs(MetaItems.FIELD_GENERATOR_IV.getStackForm(2)).inputs(MetaItems.ELECTRIC_PUMP_IV.getStackForm()).inputs(MetaItems.NEUTRON_REFLECTOR.getStackForm(2)).input(OrePrefix.circuit, MarkerMaterials.Tier.Master, 4).input(OrePrefix.pipeSmallFluid, Materials.Naquadah, 4).input(OrePrefix.plate, Materials.Europium, 4).fluidInputs(Materials.VanadiumGallium.getFluid(GTValues.L * 4)).outputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_COIL)).duration(100).buildAndRegister(); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(16).input(OrePrefix.frameGt, Materials.HSSE).inputs(MetaBlocks.TRANSPARENT_CASING.getItemVariant( - BlockGlassCasing.CasingType.TEMPERED_GLASS, 2)).input(OrePrefix.plate, Materials.NiobiumNitride, 2).inputs(MetaItems.NEUTRON_REFLECTOR.getStackForm(2)).outputs(MetaBlocks.TRANSPARENT_CASING.getItemVariant( - BlockGlassCasing.CasingType.FUSION_GLASS, 2)).duration(50).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(VA[LuV]).inputs(MetaBlocks.TRANSPARENT_CASING.getItemVariant(BlockGlassCasing.CasingType.TEMPERED_GLASS)).input(OrePrefix.plate, Materials.Naquadah, 4).inputs(MetaItems.NEUTRON_REFLECTOR.getStackForm(4)).outputs(MetaBlocks.TRANSPARENT_CASING.getItemVariant(BlockGlassCasing.CasingType.FUSION_GLASS, 2)).fluidInputs(Materials.Polybenzimidazole.getFluid(GTValues.L)).duration(50).buildAndRegister(); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(VA[LuV]).inputs(MetaBlocks.MACHINE_CASING.getItemVariant(MachineCasingType.LuV)).inputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.SUPERCONDUCTOR_COIL)).inputs(MetaItems.NEUTRON_REFLECTOR.getStackForm()).input(OrePrefix.plate, Materials.TungstenSteel, 6).fluidInputs(Materials.Polybenzimidazole.getFluid(GTValues.L)).outputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_CASING, 2)).duration(100).buildAndRegister(); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(VA[ZPM]).inputs(MetaBlocks.MACHINE_CASING.getItemVariant(MachineCasingType.ZPM)).inputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_COIL)).inputs(MetaItems.VOLTAGE_COIL_ZPM.getStackForm(2)).input(OrePrefix.plate, Materials.Europium, 6).fluidInputs(Materials.Polybenzimidazole.getFluid(GTValues.L * 2)).outputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_CASING_MK2, 2)).duration(100).buildAndRegister(); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(VA[UV]).inputs(MetaBlocks.MACHINE_CASING.getItemVariant(MachineCasingType.UV)).inputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_COIL)).inputs(MetaItems.VOLTAGE_COIL_UV.getStackForm(2)).input(OrePrefix.plate, Materials.Americium, 6).fluidInputs(Materials.Polybenzimidazole.getFluid(GTValues.L * 4)).outputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_CASING_MK3, 2)).duration(100).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(VA[LuV]).inputs(MetaBlocks.MACHINE_CASING.getItemVariant(MachineCasingType.LuV)).inputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.SUPERCONDUCTOR_COIL)).inputs(MetaItems.NEUTRON_REFLECTOR.getStackForm()).inputs(MetaItems.ELECTRIC_PUMP_LUV.getStackForm()).input(OrePrefix.plate, Materials.TungstenSteel, 6).fluidInputs(Materials.Polybenzimidazole.getFluid(GTValues.L)).outputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_CASING, 2)).duration(100).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(VA[ZPM]).inputs(MetaBlocks.MACHINE_CASING.getItemVariant(MachineCasingType.ZPM)).inputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_COIL)).inputs(MetaItems.VOLTAGE_COIL_ZPM.getStackForm(2)).inputs(MetaItems.FIELD_GENERATOR_LUV.getStackForm()).input(OrePrefix.plate, Materials.Europium, 6).fluidInputs(Materials.Polybenzimidazole.getFluid(GTValues.L * 2)).outputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_CASING_MK2, 2)).duration(100).buildAndRegister(); + RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(VA[UV]).inputs(MetaBlocks.MACHINE_CASING.getItemVariant(MachineCasingType.UV)).inputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_COIL)).inputs(MetaItems.VOLTAGE_COIL_UV.getStackForm(2)).inputs(MetaItems.FIELD_GENERATOR_ZPM.getStackForm()).input(OrePrefix.plate, Materials.Americium, 6).fluidInputs(Materials.Polybenzimidazole.getFluid(GTValues.L * 4)).outputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_CASING_MK3, 2)).duration(100).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(16).input(OrePrefix.plate, Materials.Magnalium, 6).input(OrePrefix.frameGt, Materials.BlueSteel, 1).outputs(MetaBlocks.TURBINE_CASING.getItemVariant(TurbineCasingType.STEEL_TURBINE_CASING, 2)).duration(50).buildAndRegister(); RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(16).inputs(MetaBlocks.TURBINE_CASING.getItemVariant(TurbineCasingType.STEEL_TURBINE_CASING)).input(OrePrefix.plate, Materials.StainlessSteel, 6).outputs(MetaBlocks.TURBINE_CASING.getItemVariant(TurbineCasingType.STAINLESS_TURBINE_CASING, 2)).duration(50).buildAndRegister(); diff --git a/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java b/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java index f98291e9dac..a9e5992fd67 100644 --- a/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java @@ -13,7 +13,6 @@ import gregtech.api.unification.ore.OrePrefix; import gregtech.api.unification.stack.UnificationEntry; import gregtech.common.ConfigHolder; -import gregtech.common.blocks.BlockGlassCasing; import gregtech.common.blocks.BlockMetalCasing.MetalCasingType; import gregtech.common.blocks.BlockMultiblockCasing; import gregtech.common.blocks.BlockMultiblockCasing.MultiblockCasingType; @@ -91,10 +90,6 @@ public static void init() { ModHandler.addShapedRecipe(true, "casing_assembly_control", MetaBlocks.MULTIBLOCK_CASING.getItemVariant(ASSEMBLY_CONTROL, 2), "CPC", "SFE", "CMC", 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.Extreme), 'P', MetaItems.HIGH_POWER_INTEGRATED_CIRCUIT, 'S', MetaItems.SENSOR_IV.getStackForm(), 'F', new UnificationEntry(OrePrefix.frameGt, Materials.TungstenSteel), 'E', MetaItems.EMITTER_IV.getStackForm(), 'M', MetaItems.ELECTRIC_MOTOR_IV); ModHandler.addShapedRecipe(true, "casing_assembly_line", MetaBlocks.MULTIBLOCK_CASING.getItemVariant(ASSEMBLY_LINE_CASING, 2), "PGP", "AFA", "PGP", 'P', new UnificationEntry(OrePrefix.plate, Materials.Steel), 'G', new UnificationEntry(OrePrefix.gear, Materials.Ruridit), 'A', MetaItems.ROBOT_ARM_IV.getStackForm(), 'F', OreDictUnifier.get(OrePrefix.frameGt, Materials.TungstenSteel)); - ModHandler.addShapedRecipe(true, "fusion_glass", MetaBlocks.TRANSPARENT_CASING.getItemVariant( - BlockGlassCasing.CasingType.FUSION_GLASS, 2), "PhP", "GFG", "NwN", 'P', new UnificationEntry(OrePrefix.plate, Materials.NiobiumNitride), 'G', MetaBlocks.TRANSPARENT_CASING.getItemVariant( - BlockGlassCasing.CasingType.TEMPERED_GLASS), 'F', new UnificationEntry(OrePrefix.frameGt, Materials.HSSE), 'N', MetaItems.NEUTRON_REFLECTOR.getStackForm()); - ModHandler.addShapedRecipe(true, "warning_sign_yellow_stripes", MetaBlocks.WARNING_SIGN.getItemVariant(YELLOW_STRIPES), "Y ", " M ", " B", 'M', MetaBlocks.METAL_CASING.getItemVariant(STEEL_SOLID), 'Y', "dyeYellow", 'B', "dyeBlack"); ModHandler.addShapedRecipe(true, "warning_sign_small_yellow_stripes", MetaBlocks.WARNING_SIGN.getItemVariant(SMALL_YELLOW_STRIPES), " Y", " M ", "B ", 'M', MetaBlocks.METAL_CASING.getItemVariant(STEEL_SOLID), 'Y', "dyeYellow", 'B', "dyeBlack"); ModHandler.addShapedRecipe(true, "warning_sign_radioactive_hazard", MetaBlocks.WARNING_SIGN.getItemVariant(RADIOACTIVE_HAZARD), " YB", " M ", " ", 'M', MetaBlocks.METAL_CASING.getItemVariant(STEEL_SOLID), 'Y', "dyeYellow", 'B', "dyeBlack"); From 6ab4c340a931352c2454f893e81f401f3e534c9e Mon Sep 17 00:00:00 2001 From: tech22 <37029404+TechLord22@users.noreply.github.com> Date: Wed, 22 Dec 2021 22:39:10 -0500 Subject: [PATCH 5/7] change to quantum star --- src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java b/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java index bdf82a06b43..a0545cf80ce 100644 --- a/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java +++ b/src/main/java/gregtech/loaders/recipe/AssemblyLineLoader.java @@ -58,7 +58,7 @@ public static void init() { .input(OrePrefix.circuit, MarkerMaterials.Tier.Infinite) .input(OrePrefix.circuit, MarkerMaterials.Tier.Infinite) .input(OrePrefix.circuit, MarkerMaterials.Tier.Infinite) - .input(OrePrefix.plate, Materials.NetherStar) + .inputs(MetaItems.QUANTUM_STAR.getStackForm()) .input(OrePrefix.plateDouble, Materials.Americium) .inputs(MetaItems.FIELD_GENERATOR_ZPM.getStackForm(2)) .inputs(MetaItems.ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT.getStackForm(64)) From 52ba21566a9b35494851278ebf6dc3896e8e7872 Mon Sep 17 00:00:00 2001 From: tech22 <37029404+TechLord22@users.noreply.github.com> Date: Wed, 22 Dec 2021 22:41:56 -0500 Subject: [PATCH 6/7] only use argon plasma in the arc furnace --- .../java/gregtech/api/recipes/RecipeMaps.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/main/java/gregtech/api/recipes/RecipeMaps.java b/src/main/java/gregtech/api/recipes/RecipeMaps.java index 60cac589ca4..f0e5e2de4bd 100644 --- a/src/main/java/gregtech/api/recipes/RecipeMaps.java +++ b/src/main/java/gregtech/api/recipes/RecipeMaps.java @@ -8,7 +8,6 @@ import gregtech.api.recipes.builders.*; import gregtech.api.recipes.machines.*; import gregtech.api.sound.GTSounds; -import gregtech.api.unification.material.Material; import gregtech.api.unification.material.Materials; import net.minecraft.init.SoundEvents; import stanhebben.zenscript.annotations.ZenClass; @@ -34,17 +33,15 @@ public class RecipeMaps { .onRecipeBuild(recipeBuilder -> { if (recipeBuilder.getFluidInputs().isEmpty()) { recipeBuilder.fluidInputs(Materials.Oxygen.getFluid(recipeBuilder.duration)); - for (Material material : new Material[]{Materials.Argon, Materials.Nitrogen}) { - int plasmaAmount = (int) Math.max(1L, recipeBuilder.duration / (material.getMass() * 16L)); - RecipeMaps.ARC_FURNACE_RECIPES.recipeBuilder() - .inputsIngredients(recipeBuilder.getInputs()) - .outputs(recipeBuilder.getOutputs()) - .duration(Math.max(1, recipeBuilder.duration / 16)) - .EUt(recipeBuilder.EUt / 3) - .fluidInputs(material.getPlasma(plasmaAmount)) - .fluidOutputs(material.getFluid(plasmaAmount)) - .buildAndRegister(); - } + int plasmaAmount = (int) Math.max(1L, recipeBuilder.duration / (Materials.Argon.getMass() * 16L)); + RecipeMaps.ARC_FURNACE_RECIPES.recipeBuilder() + .inputsIngredients(recipeBuilder.getInputs()) + .outputs(recipeBuilder.getOutputs()) + .duration(Math.max(1, recipeBuilder.duration / 16)) + .EUt(recipeBuilder.EUt / 3) + .fluidInputs(Materials.Argon.getPlasma(plasmaAmount)) + .fluidOutputs(Materials.Argon.getFluid(plasmaAmount)) + .buildAndRegister(); } }); From 77d707571416866f9b513cd0629060df64b39d2d Mon Sep 17 00:00:00 2001 From: tech22 <37029404+TechLord22@users.noreply.github.com> Date: Wed, 22 Dec 2021 22:45:13 -0500 Subject: [PATCH 7/7] fix rebase --- .../loaders/recipe/MetaTileEntityMachineRecipeLoader.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/gregtech/loaders/recipe/MetaTileEntityMachineRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MetaTileEntityMachineRecipeLoader.java index 5bdbb4e69c3..8e7f2d9ed96 100644 --- a/src/main/java/gregtech/loaders/recipe/MetaTileEntityMachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MetaTileEntityMachineRecipeLoader.java @@ -482,7 +482,6 @@ public static void init() { .input(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT) .input(VOLTAGE_COIL_UV) .input(wireGtQuadruple, YttriumBariumCuprate, 2) - .input(plate, Darmstadtium, 2) .output(ENERGY_INPUT_HATCH_4A[3]) .duration(100).EUt(VA[ZPM]).buildAndRegister(); @@ -529,7 +528,6 @@ public static void init() { .input(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 2) .input(VOLTAGE_COIL_UV) .input(wireGtOctal, YttriumBariumCuprate, 2) - .input(plate, Darmstadtium, 4) .output(ENERGY_INPUT_HATCH_16A[3]) .duration(200).EUt(VA[ZPM]).buildAndRegister(); @@ -576,7 +574,6 @@ public static void init() { .input(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT) .input(VOLTAGE_COIL_UV) .input(wireGtQuadruple, YttriumBariumCuprate, 2) - .input(plate, Darmstadtium, 2) .output(ENERGY_OUTPUT_HATCH_4A[3]) .duration(100).EUt(VA[ZPM]).buildAndRegister(); @@ -623,7 +620,6 @@ public static void init() { .input(ULTRA_HIGH_POWER_INTEGRATED_CIRCUIT, 2) .input(VOLTAGE_COIL_UV) .input(wireGtOctal, YttriumBariumCuprate, 2) - .input(plate, Darmstadtium, 4) .output(ENERGY_OUTPUT_HATCH_16A[3]) .duration(200).EUt(VA[ZPM]).buildAndRegister();