Browse Source

Fixed a few Recipes

Gregorius Techneticies 2 months ago
parent
commit
44fdbb3aac
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 1B693EA14F2FD70F

+ 71
- 72
src/main/java/gregtech/compat/Compat_Recipes_Railcraft.java View File

@@ -101,7 +101,7 @@ public class Compat_Recipes_Railcraft extends CompatMods {
101 101
 		CR.shaped(ST.make(MD.RC, "machine.alpha"          , 4,  3), tBits                                                 , "PPP"          , "PFP"              , "PPP"              , 'P', OP.plate.dat(ANY.Steel)                  , 'F', OD.craftingFurnace);
102 102
 		CR.shaped(ST.make(MD.RC, "machine.alpha"          , 1,  5), tBits                                                 , " N "          , "RCR"                                   , 'R', OD.itemRedstone                          , 'N', OP.stone.dat(MT.Netherrack), 'C', Items.cauldron);
103 103
 		CR.shaped(ST.make(MD.RC, "machine.alpha"          , 1,  6), tBits                                                 , "PGP"          , "EDE"              , "PGP"              , 'E', OP.gem.dat(ANY.Emerald)                  , 'P', OP.plate.dat(ANY.Steel), 'G', OD.paneGlassColorless, 'D', Blocks.dispenser);
104
-		CR.shaped(ST.make(MD.RC, "machine.alpha"          , 1,  8), tBits                                                 , "IPI"          , "PCP"              , "IPI"              , 'P', OD.craftingPiston                        , 'I', tIngot.dat(ANY.Fe), 'C', Blocks.crafting_table);
104
+		CR.shaped(ST.make(MD.RC, "machine.alpha"          , 1,  8), tBits                                                 , "IPI"          , "PCP"              , "IPI"              , 'P', OD.craftingPiston                        , 'I', tIngot.dat(ANY.Fe), 'C', OD.craftingWorkBench);
105 105
 		CR.shaped(ST.make(MD.RC, "machine.alpha"          , 1,  9), tBits                                                 , " I "          , " T "              , " D "              , 'I', Blocks.iron_bars                         , 'T', ST.make(MD.RC, "machine.beta", 1, 4), 'D', Blocks.dispenser);
106 106
 		CR.shaped(ST.make(MD.RC, "machine.alpha"          , 1, 10), tBits                                                 , " I "          , "RTR"              , " D "              , 'I', Blocks.iron_bars                         , 'T', ST.make(MD.RC, "machine.beta", 1, 4), 'D', Blocks.dispenser, 'R', OD.itemRedstone);
107 107
 		CR.shaped(ST.make(MD.RC, "machine.alpha"          , 1, 10), DEF                                                   , "RTR"                                                    , 'R', OD.itemRedstone                          , 'T', ST.make(MD.RC, "machine.alpha", 1, 9));
@@ -111,7 +111,7 @@ public class Compat_Recipes_Railcraft extends CompatMods {
111 111
 		CR.shaped(ST.make(MD.RC, "machine.alpha"          , 4, 15), tBits                                                 , "PDP"          , "DBD"              , "PDP"              , 'P', OD.craftingPiston                        , 'B', OP.blockSolid.dat(ANY.Steel), 'D', OP.gem.dat(ANY.Diamond));
112 112
 		
113 113
 		CR.shaped(ST.make(MD.RC, "machine.epsilon"        , 1,  0), tBits                                                 , "PWP"          , "WWW"              , "PWP"              , 'P', OP.plate.dat(ANY.Fe)                     , 'W', OP.wireGt02.dat(ANY.Cu));
114
-		CR.shaped(ST.make(MD.RC, "machine.epsilon"        , 1,  5), tBits                                                 , "TSB"          , "SCS"              , "PSP"              , 'P', OD.craftingPiston                        , 'S', OP.plate.dat(ANY.Steel), 'B', OD.craftingBook, 'C', Blocks.crafting_table, 'T', ST.make(Items.diamond_pickaxe, 1, 0));
114
+		CR.shaped(ST.make(MD.RC, "machine.epsilon"        , 1,  5), tBits                                                 , "TSB"          , "SCS"              , "PSP"              , 'P', OD.craftingPiston                        , 'S', OP.plate.dat(ANY.Steel), 'B', OD.craftingBook, 'C', OD.craftingWorkBench, 'T', ST.make(Items.diamond_pickaxe, 1, 0));
115 115
 		
116 116
 		CR.shaped(ST.make(MD.RC, "tool.crowbar"           , 1,  0), tBits                                                 , tHammer+"DS"   , "DSD"              , "SD"+tFile         , 'S', OP.ingot.dat(ANY.Fe)                     , 'D', DYE_OREDICTS[DYE_INDEX_Red]);
117 117
 		CR.shaped(ST.make(MD.RC, "tool.crowbar.reinforced", 1,  0), tBits                                                 , tHammer+"DS"   , "DSD"              , "SD"+tFile         , 'S', OP.ingot.dat(ANY.Steel)                  , 'D', DYE_OREDICTS[DYE_INDEX_Red]);
@@ -147,82 +147,81 @@ public class Compat_Recipes_Railcraft extends CompatMods {
147 147
 			RM.Mixer.addRecipe2(T, 16, 16, aEvent.mStack, OM.dust(MT.Bone, U*3), ST.make(MD.RC, "part.bleached.clay", 1, 0));
148 148
 		}});
149 149
 		addListener(DYE_OREDICTS_LENS[DYE_INDEX_Cyan], new IOreDictListenerEvent() {@Override public void onOreRegistration(OreDictRegistrationContainer aEvent) {
150
-			RM.LaserEngraver    .addRecipe2(T,512,512, OP.gem.mat(MT.Firestone, 1), ST.amount(0, aEvent.mStack), IL.RC_Firestone_Cut.get(1));
150
+			RM.LaserEngraver.addRecipe2(T,512,512, OP.gem.mat(MT.Firestone, 1), ST.amount(0, aEvent.mStack), IL.RC_Firestone_Cut.get(1));
151 151
 		}});
152 152
 		}};
153 153
 		
154 154
 		
155
-		RM.Press.addRecipeX(F, 16, 16, ST.array(IL.RC_Rail_Standard.get(1), OP.railGt.mat(MT.Cu            , 1)), IL.RC_Rail_Electric.get(1));
156
-		RM.Press.addRecipeX(F, 16, 16, ST.array(IL.RC_Rail_Standard.get(1), OP.railGt.mat(MT.AnnealedCopper, 1)), IL.RC_Rail_Electric.get(1));
157
-		
158
-		RM.Press.addRecipeX(F, 16, 64, ST.array(IL.RC_Rail_Standard.get(4), OP.railGt.mat(MT.Ag            , 4), OP.dust     .mat(MT.Redstone, 1)), IL.RC_Rail_Adv.get(4));
159
-		RM.Press.addRecipeX(F, 16, 16, ST.array(IL.RC_Rail_Standard.get(1), OP.railGt.mat(MT.Ag            , 1), OP.dustSmall.mat(MT.Redstone, 1)), IL.RC_Rail_Adv.get(1));
160
-		RM.Press.addRecipeX(F, 16, 64, ST.array(IL.RC_Rail_Standard.get(4), OP.railGt.mat(MT.Au            , 4), OP.dust     .mat(MT.Redstone, 1)), IL.RC_Rail_Adv.get(4));
161
-		RM.Press.addRecipeX(F, 16, 16, ST.array(IL.RC_Rail_Standard.get(1), OP.railGt.mat(MT.Au            , 1), OP.dustSmall.mat(MT.Redstone, 1)), IL.RC_Rail_Adv.get(1));
162
-		RM.Press.addRecipeX(F, 16, 64, ST.array(IL.RC_Rail_Standard.get(4), OP.railGt.mat(MT.Electrum      , 4), OP.dust     .mat(MT.Redstone, 1)), IL.RC_Rail_Adv.get(4));
163
-		RM.Press.addRecipeX(F, 16, 16, ST.array(IL.RC_Rail_Standard.get(1), OP.railGt.mat(MT.Electrum      , 1), OP.dustSmall.mat(MT.Redstone, 1)), IL.RC_Rail_Adv.get(1));
164
-		RM.Press.addRecipeX(F, 16, 64, ST.array(IL.RC_Rail_Standard.get(4), OP.railGt.mat(MT.Pt            , 4), OP.dust     .mat(MT.Redstone, 1)), IL.RC_Rail_Adv.get(8));
165
-		RM.Press.addRecipeX(F, 16, 16, ST.array(IL.RC_Rail_Standard.get(1), OP.railGt.mat(MT.Pt            , 1), OP.dustSmall.mat(MT.Redstone, 1)), IL.RC_Rail_Adv.get(2));
155
+		RM.Press.addRecipeX(F, 16, 64, ST.array(IL.RC_Rail_Standard.get(4), OP.railGt.mat(MT.Ag      , 4), OP.dust     .mat(MT.Redstone, 1)), IL.RC_Rail_Adv.get(4));
156
+		RM.Press.addRecipeX(F, 16, 16, ST.array(IL.RC_Rail_Standard.get(1), OP.railGt.mat(MT.Ag      , 1), OP.dustSmall.mat(MT.Redstone, 1)), IL.RC_Rail_Adv.get(1));
157
+		RM.Press.addRecipeX(F, 16, 64, ST.array(IL.RC_Rail_Standard.get(4), OP.railGt.mat(MT.Au      , 4), OP.dust     .mat(MT.Redstone, 1)), IL.RC_Rail_Adv.get(4));
158
+		RM.Press.addRecipeX(F, 16, 16, ST.array(IL.RC_Rail_Standard.get(1), OP.railGt.mat(MT.Au      , 1), OP.dustSmall.mat(MT.Redstone, 1)), IL.RC_Rail_Adv.get(1));
159
+		RM.Press.addRecipeX(F, 16, 64, ST.array(IL.RC_Rail_Standard.get(4), OP.railGt.mat(MT.Electrum, 4), OP.dust     .mat(MT.Redstone, 1)), IL.RC_Rail_Adv.get(4));
160
+		RM.Press.addRecipeX(F, 16, 16, ST.array(IL.RC_Rail_Standard.get(1), OP.railGt.mat(MT.Electrum, 1), OP.dustSmall.mat(MT.Redstone, 1)), IL.RC_Rail_Adv.get(1));
161
+		RM.Press.addRecipeX(F, 16, 64, ST.array(IL.RC_Rail_Standard.get(4), OP.railGt.mat(MT.Pt      , 4), OP.dust     .mat(MT.Redstone, 1)), IL.RC_Rail_Adv.get(8));
162
+		RM.Press.addRecipeX(F, 16, 16, ST.array(IL.RC_Rail_Standard.get(1), OP.railGt.mat(MT.Pt      , 1), OP.dustSmall.mat(MT.Redstone, 1)), IL.RC_Rail_Adv.get(2));
163
+		for (OreDictMaterial tMat : ANY.Cu.mToThis)
164
+		RM.Press.addRecipeX(F, 16, 16, ST.array(IL.RC_Rail_Standard.get(1), OP.railGt.mat(tMat       , 1)), IL.RC_Rail_Electric.get(1));
166 165
 		for (OreDictMaterial tMat : ANY.Blaze.mToThis) {
167
-		RM.Press.addRecipeX(F, 16, 64, ST.array(IL.RC_Rail_Standard.get(4), OP.railGt.mat(MT.Ag            , 4), OP.dustTiny .mat(tMat, 1)), IL.RC_Rail_HS.get(4));
168
-		RM.Press.addRecipeX(F, 16, 64, ST.array(IL.RC_Rail_Standard.get(4), OP.railGt.mat(MT.Au            , 4), OP.dustTiny .mat(tMat, 1)), IL.RC_Rail_HS.get(4));
169
-		RM.Press.addRecipeX(F, 16, 64, ST.array(IL.RC_Rail_Standard.get(4), OP.railGt.mat(MT.Electrum      , 4), OP.dustTiny .mat(tMat, 1)), IL.RC_Rail_HS.get(4));
170
-		RM.Press.addRecipeX(F, 16, 64, ST.array(IL.RC_Rail_Standard.get(4), OP.railGt.mat(MT.Pt            , 4), OP.dustTiny .mat(tMat, 1)), IL.RC_Rail_HS.get(8));
166
+		RM.Press.addRecipeX(F, 16, 64, ST.array(IL.RC_Rail_Standard.get(4), OP.railGt.mat(MT.Ag      , 4), OP.dustTiny .mat(tMat, 1)), IL.RC_Rail_HS.get(4));
167
+		RM.Press.addRecipeX(F, 16, 64, ST.array(IL.RC_Rail_Standard.get(4), OP.railGt.mat(MT.Au      , 4), OP.dustTiny .mat(tMat, 1)), IL.RC_Rail_HS.get(4));
168
+		RM.Press.addRecipeX(F, 16, 64, ST.array(IL.RC_Rail_Standard.get(4), OP.railGt.mat(MT.Electrum, 4), OP.dustTiny .mat(tMat, 1)), IL.RC_Rail_HS.get(4));
169
+		RM.Press.addRecipeX(F, 16, 64, ST.array(IL.RC_Rail_Standard.get(4), OP.railGt.mat(MT.Pt      , 4), OP.dustTiny .mat(tMat, 1)), IL.RC_Rail_HS.get(8));
171 170
 		}
172 171
 		
173
-		RM.RollFormer.addRecipe1(T, 16,  16, OP.railGt.mat(MT.Al                ,  6), IL.RC_Rail_Standard.get( 1));
174
-		RM.RollFormer.addRecipe1(T, 16,  16, OP.railGt.mat(MT.Magnalium         ,  3), IL.RC_Rail_Standard.get( 2));
175
-		RM.RollFormer.addRecipe1(T, 16,  16, OP.railGt.mat(MT.Fe                ,  3), IL.RC_Rail_Standard.get( 1));
176
-		RM.RollFormer.addRecipe1(T, 16,  16, OP.railGt.mat(MT.WroughtIron       ,  2), IL.RC_Rail_Standard.get( 1));
177
-		RM.RollFormer.addRecipe1(T, 16,  16, OP.railGt.mat(MT.MeteoricIron      ,  3), IL.RC_Rail_Standard.get( 2));
178
-		RM.RollFormer.addRecipe1(T, 16,  16, OP.railGt.mat(MT.Bronze            ,  4), IL.RC_Rail_Standard.get( 1));
179
-		RM.RollFormer.addRecipe1(T, 16,  32, OP.railGt.mat(MT.HSLA              ,  3), IL.RC_Rail_Standard.get( 2));
180
-		RM.RollFormer.addRecipe1(T, 16,  32, OP.railGt.mat(MT.Steel             ,  3), IL.RC_Rail_Standard.get( 2));
181
-		RM.RollFormer.addRecipe1(T, 16,  32, OP.railGt.mat(MT.MeteoricSteel     ,  1), IL.RC_Rail_Standard.get( 1));
182
-		RM.RollFormer.addRecipe1(T, 16,  16, OP.railGt.mat(MT.StainlessSteel    ,  1), IL.RC_Rail_Standard.get( 1));
183
-		RM.RollFormer.addRecipe1(T, 16,  64, OP.railGt.mat(MT.Ti                ,  3), IL.RC_Rail_Standard.get( 4));
184
-		RM.RollFormer.addRecipe1(T, 16,  64, OP.railGt.mat(MT.W                 ,  3), IL.RC_Rail_Standard.get( 4));
185
-		RM.RollFormer.addRecipe1(T, 16,  64, OP.railGt.mat(MT.TungstenSintered  ,  3), IL.RC_Rail_Standard.get( 4));
186
-		RM.RollFormer.addRecipe1(T, 64,  32, OP.railGt.mat(MT.Meteorite         ,  1), IL.RC_Rail_Reinforced.get( 1));
187
-		RM.RollFormer.addRecipe1(T, 64,  32, OP.railGt.mat(MT.ObsidianSteel     ,  1), IL.RC_Rail_Reinforced.get( 1));
188
-		RM.RollFormer.addRecipe1(T, 64,  64, OP.railGt.mat(MT.TungstenSteel     ,  1), IL.RC_Rail_Reinforced.get( 2));
189
-		RM.RollFormer.addRecipe1(T, 64,  64, OP.railGt.mat(MT.TungstenCarbide   ,  1), IL.RC_Rail_Reinforced.get( 2));
190
-		RM.RollFormer.addRecipe1(T, 64,  96, OP.railGt.mat(MT.HSSG              ,  1), IL.RC_Rail_Reinforced.get( 3));
191
-		RM.RollFormer.addRecipe1(T, 64, 128, OP.railGt.mat(MT.HSSE              ,  1), IL.RC_Rail_Reinforced.get( 4));
192
-		RM.RollFormer.addRecipe1(T, 64, 128, OP.railGt.mat(MT.HSSS              ,  1), IL.RC_Rail_Reinforced.get( 4));
193
-		
194
-		RM.RollFormer.addRecipe1(T, 16,  64, OP.stick.mat(MT.Al                 ,  3), IL.RC_Rebar.get( 1));
195
-		RM.RollFormer.addRecipe1(T, 16, 256, OP.stick.mat(MT.Magnalium          ,  3), IL.RC_Rebar.get( 4));
196
-		RM.RollFormer.addRecipe1(T, 16, 128, OP.stick.mat(MT.Fe                 ,  3), IL.RC_Rebar.get( 2));
197
-		RM.RollFormer.addRecipe1(T, 16, 320, OP.stick.mat(MT.WroughtIron        ,  6), IL.RC_Rebar.get( 5));
198
-		RM.RollFormer.addRecipe1(T, 16,  64, OP.stick.mat(MT.Bronze             ,  2), IL.RC_Rebar.get( 1));
199
-		RM.RollFormer.addRecipe1(T, 16, 256, OP.stick.mat(MT.Steel              ,  3), IL.RC_Rebar.get( 4));
200
-		RM.RollFormer.addRecipe1(T, 16, 256, OP.stick.mat(MT.HSLA               ,  3), IL.RC_Rebar.get( 4));
201
-		RM.RollFormer.addRecipe1(T, 16, 128, OP.stick.mat(MT.StainlessSteel     ,  1), IL.RC_Rebar.get( 2));
202
-		RM.RollFormer.addRecipe1(T, 16, 512, OP.stick.mat(MT.Ti                 ,  3), IL.RC_Rebar.get( 8));
203
-		RM.RollFormer.addRecipe1(T, 16, 512, OP.stick.mat(MT.W                  ,  3), IL.RC_Rebar.get( 8));
204
-		RM.RollFormer.addRecipe1(T, 16, 512, OP.stick.mat(MT.TungstenSintered   ,  3), IL.RC_Rebar.get( 8));
205
-		RM.RollFormer.addRecipe1(T, 16, 256, OP.stick.mat(MT.TungstenSteel      ,  1), IL.RC_Rebar.get( 4));
206
-		RM.RollFormer.addRecipe1(T, 16, 256, OP.stick.mat(MT.TungstenCarbide    ,  1), IL.RC_Rebar.get( 4));
207
-		RM.RollFormer.addRecipe1(T, 16, 384, OP.stick.mat(MT.HSSG               ,  1), IL.RC_Rebar.get( 6));
208
-		RM.RollFormer.addRecipe1(T, 16, 512, OP.stick.mat(MT.HSSE               ,  1), IL.RC_Rebar.get( 8));
209
-		RM.RollFormer.addRecipe1(T, 16, 512, OP.stick.mat(MT.HSSS               ,  1), IL.RC_Rebar.get( 8));
210
-		
211
-		RM.RollFormer.addRecipe1(T, 16,  64, OP.ingot.mat(MT.Al                 ,  3), IL.RC_Post_Metal.get( 4));
212
-		RM.RollFormer.addRecipe1(T, 16, 256, OP.ingot.mat(MT.Magnalium          ,  3), IL.RC_Post_Metal.get(16));
213
-		RM.RollFormer.addRecipe1(T, 16, 128, OP.ingot.mat(MT.Fe                 ,  3), IL.RC_Post_Metal.get( 8));
214
-		RM.RollFormer.addRecipe1(T, 16, 192, OP.ingot.mat(MT.WroughtIron        ,  3), IL.RC_Post_Metal.get(12));
215
-		RM.RollFormer.addRecipe1(T, 16,  96, OP.ingot.mat(MT.Bronze             ,  3), IL.RC_Post_Metal.get( 6));
216
-		RM.RollFormer.addRecipe1(T, 16, 256, OP.ingot.mat(MT.Steel              ,  3), IL.RC_Post_Metal.get(16));
217
-		RM.RollFormer.addRecipe1(T, 16, 256, OP.ingot.mat(MT.HSLA               ,  3), IL.RC_Post_Metal.get(16));
218
-		RM.RollFormer.addRecipe1(T, 16, 384, OP.ingot.mat(MT.StainlessSteel     ,  3), IL.RC_Post_Metal.get(24));
219
-		RM.RollFormer.addRecipe1(T, 16, 448, OP.ingot.mat(MT.Ti                 ,  3), IL.RC_Post_Metal.get(28));
220
-		RM.RollFormer.addRecipe1(T, 16, 448, OP.ingot.mat(MT.W                  ,  3), IL.RC_Post_Metal.get(28));
221
-		RM.RollFormer.addRecipe1(T, 16, 448, OP.ingot.mat(MT.TungstenSintered   ,  3), IL.RC_Post_Metal.get(28));
222
-		RM.RollFormer.addRecipe1(T, 16, 512, OP.ingot.mat(MT.TungstenSteel      ,  3), IL.RC_Post_Metal.get(32));
223
-		RM.RollFormer.addRecipe1(T, 16, 512, OP.ingot.mat(MT.TungstenCarbide    ,  3), IL.RC_Post_Metal.get(32));
224
-		RM.RollFormer.addRecipe1(T, 16, 768, OP.ingot.mat(MT.HSSG               ,  3), IL.RC_Post_Metal.get(48));
225
-		RM.RollFormer.addRecipe1(T, 16,1024, OP.ingot.mat(MT.HSSE               ,  3), IL.RC_Post_Metal.get(64));
226
-		RM.RollFormer.addRecipe1(T, 16,1024, OP.ingot.mat(MT.HSSS               ,  3), IL.RC_Post_Metal.get(64));
172
+		RM.RollFormer.addRecipe1(T, 16,  16, OP.railGt.mat(MT.Al              ,  6), IL.RC_Rail_Standard.get( 1));
173
+		RM.RollFormer.addRecipe1(T, 16,  16, OP.railGt.mat(MT.Magnalium       ,  3), IL.RC_Rail_Standard.get( 2));
174
+		RM.RollFormer.addRecipe1(T, 16,  16, OP.railGt.mat(MT.Fe              ,  3), IL.RC_Rail_Standard.get( 1));
175
+		RM.RollFormer.addRecipe1(T, 16,  16, OP.railGt.mat(MT.WroughtIron     ,  2), IL.RC_Rail_Standard.get( 1));
176
+		RM.RollFormer.addRecipe1(T, 16,  16, OP.railGt.mat(MT.MeteoricIron    ,  3), IL.RC_Rail_Standard.get( 2));
177
+		RM.RollFormer.addRecipe1(T, 16,  16, OP.railGt.mat(MT.Bronze          ,  4), IL.RC_Rail_Standard.get( 1));
178
+		RM.RollFormer.addRecipe1(T, 16,  32, OP.railGt.mat(MT.HSLA            ,  3), IL.RC_Rail_Standard.get( 2));
179
+		RM.RollFormer.addRecipe1(T, 16,  32, OP.railGt.mat(MT.Steel           ,  3), IL.RC_Rail_Standard.get( 2));
180
+		RM.RollFormer.addRecipe1(T, 16,  32, OP.railGt.mat(MT.MeteoricSteel   ,  1), IL.RC_Rail_Standard.get( 1));
181
+		RM.RollFormer.addRecipe1(T, 16,  16, OP.railGt.mat(MT.StainlessSteel  ,  1), IL.RC_Rail_Standard.get( 1));
182
+		RM.RollFormer.addRecipe1(T, 16,  64, OP.railGt.mat(MT.Ti              ,  3), IL.RC_Rail_Standard.get( 4));
183
+		RM.RollFormer.addRecipe1(T, 16,  64, OP.railGt.mat(MT.W               ,  3), IL.RC_Rail_Standard.get( 4));
184
+		RM.RollFormer.addRecipe1(T, 16,  64, OP.railGt.mat(MT.TungstenSintered,  3), IL.RC_Rail_Standard.get( 4));
185
+		RM.RollFormer.addRecipe1(T, 64,  32, OP.railGt.mat(MT.Meteorite       ,  1), IL.RC_Rail_Reinforced.get( 1));
186
+		RM.RollFormer.addRecipe1(T, 64,  32, OP.railGt.mat(MT.ObsidianSteel   ,  1), IL.RC_Rail_Reinforced.get( 1));
187
+		RM.RollFormer.addRecipe1(T, 64,  64, OP.railGt.mat(MT.TungstenSteel   ,  1), IL.RC_Rail_Reinforced.get( 2));
188
+		RM.RollFormer.addRecipe1(T, 64,  64, OP.railGt.mat(MT.TungstenCarbide ,  1), IL.RC_Rail_Reinforced.get( 2));
189
+		RM.RollFormer.addRecipe1(T, 64,  96, OP.railGt.mat(MT.HSSG            ,  1), IL.RC_Rail_Reinforced.get( 3));
190
+		RM.RollFormer.addRecipe1(T, 64, 128, OP.railGt.mat(MT.HSSE            ,  1), IL.RC_Rail_Reinforced.get( 4));
191
+		RM.RollFormer.addRecipe1(T, 64, 128, OP.railGt.mat(MT.HSSS            ,  1), IL.RC_Rail_Reinforced.get( 4));
192
+		
193
+		RM.RollFormer.addRecipe1(T, 16,  64, OP.stick.mat(MT.Al               ,  3), IL.RC_Rebar.get( 1));
194
+		RM.RollFormer.addRecipe1(T, 16, 256, OP.stick.mat(MT.Magnalium        ,  3), IL.RC_Rebar.get( 4));
195
+		RM.RollFormer.addRecipe1(T, 16, 128, OP.stick.mat(MT.Fe               ,  3), IL.RC_Rebar.get( 2));
196
+		RM.RollFormer.addRecipe1(T, 16, 320, OP.stick.mat(MT.WroughtIron      ,  6), IL.RC_Rebar.get( 5));
197
+		RM.RollFormer.addRecipe1(T, 16,  64, OP.stick.mat(MT.Bronze           ,  2), IL.RC_Rebar.get( 1));
198
+		RM.RollFormer.addRecipe1(T, 16, 256, OP.stick.mat(MT.Steel            ,  3), IL.RC_Rebar.get( 4));
199
+		RM.RollFormer.addRecipe1(T, 16, 256, OP.stick.mat(MT.HSLA             ,  3), IL.RC_Rebar.get( 4));
200
+		RM.RollFormer.addRecipe1(T, 16, 128, OP.stick.mat(MT.StainlessSteel   ,  1), IL.RC_Rebar.get( 2));
201
+		RM.RollFormer.addRecipe1(T, 16, 512, OP.stick.mat(MT.Ti               ,  3), IL.RC_Rebar.get( 8));
202
+		RM.RollFormer.addRecipe1(T, 16, 512, OP.stick.mat(MT.W                ,  3), IL.RC_Rebar.get( 8));
203
+		RM.RollFormer.addRecipe1(T, 16, 512, OP.stick.mat(MT.TungstenSintered ,  3), IL.RC_Rebar.get( 8));
204
+		RM.RollFormer.addRecipe1(T, 16, 256, OP.stick.mat(MT.TungstenSteel    ,  1), IL.RC_Rebar.get( 4));
205
+		RM.RollFormer.addRecipe1(T, 16, 256, OP.stick.mat(MT.TungstenCarbide  ,  1), IL.RC_Rebar.get( 4));
206
+		RM.RollFormer.addRecipe1(T, 16, 384, OP.stick.mat(MT.HSSG             ,  1), IL.RC_Rebar.get( 6));
207
+		RM.RollFormer.addRecipe1(T, 16, 512, OP.stick.mat(MT.HSSE             ,  1), IL.RC_Rebar.get( 8));
208
+		RM.RollFormer.addRecipe1(T, 16, 512, OP.stick.mat(MT.HSSS             ,  1), IL.RC_Rebar.get( 8));
209
+		
210
+		RM.RollFormer.addRecipe1(T, 16,  64, OP.ingot.mat(MT.Al               ,  3), IL.RC_Post_Metal.get( 4));
211
+		RM.RollFormer.addRecipe1(T, 16, 256, OP.ingot.mat(MT.Magnalium        ,  3), IL.RC_Post_Metal.get(16));
212
+		RM.RollFormer.addRecipe1(T, 16, 128, OP.ingot.mat(MT.Fe               ,  3), IL.RC_Post_Metal.get( 8));
213
+		RM.RollFormer.addRecipe1(T, 16, 192, OP.ingot.mat(MT.WroughtIron      ,  3), IL.RC_Post_Metal.get(12));
214
+		RM.RollFormer.addRecipe1(T, 16,  96, OP.ingot.mat(MT.Bronze           ,  3), IL.RC_Post_Metal.get( 6));
215
+		RM.RollFormer.addRecipe1(T, 16, 256, OP.ingot.mat(MT.Steel            ,  3), IL.RC_Post_Metal.get(16));
216
+		RM.RollFormer.addRecipe1(T, 16, 256, OP.ingot.mat(MT.HSLA             ,  3), IL.RC_Post_Metal.get(16));
217
+		RM.RollFormer.addRecipe1(T, 16, 384, OP.ingot.mat(MT.StainlessSteel   ,  3), IL.RC_Post_Metal.get(24));
218
+		RM.RollFormer.addRecipe1(T, 16, 448, OP.ingot.mat(MT.Ti               ,  3), IL.RC_Post_Metal.get(28));
219
+		RM.RollFormer.addRecipe1(T, 16, 448, OP.ingot.mat(MT.W                ,  3), IL.RC_Post_Metal.get(28));
220
+		RM.RollFormer.addRecipe1(T, 16, 448, OP.ingot.mat(MT.TungstenSintered ,  3), IL.RC_Post_Metal.get(28));
221
+		RM.RollFormer.addRecipe1(T, 16, 512, OP.ingot.mat(MT.TungstenSteel    ,  3), IL.RC_Post_Metal.get(32));
222
+		RM.RollFormer.addRecipe1(T, 16, 512, OP.ingot.mat(MT.TungstenCarbide  ,  3), IL.RC_Post_Metal.get(32));
223
+		RM.RollFormer.addRecipe1(T, 16, 768, OP.ingot.mat(MT.HSSG             ,  3), IL.RC_Post_Metal.get(48));
224
+		RM.RollFormer.addRecipe1(T, 16,1024, OP.ingot.mat(MT.HSSE             ,  3), IL.RC_Post_Metal.get(64));
225
+		RM.RollFormer.addRecipe1(T, 16,1024, OP.ingot.mat(MT.HSSS             ,  3), IL.RC_Post_Metal.get(64));
227 226
 	}
228 227
 }

+ 2
- 2
src/main/java/gregtech/items/MultiItemTechnological.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -165,7 +165,7 @@ public class MultiItemTechnological extends MultiItemRandom {
165 165
 		CR.shaped(IL.Cover_Controller               .get(1), CR.DEF_REV, "BW" , "CQ"        , 'Q', IL.Cover_Blank, 'C', OD_CIRCUITS[2], 'W', MT.DATA.CABLES_01[1], 'B', Items.comparator);
166 166
 		CR.shaped(IL.Cover_Shutter                  .get(1), CR.DEF_REV, "TwT", "PQP", "TdT", 'Q', IL.Cover_Blank, 'P', OP.plate.dat(MT.StainlessSteel), 'T', OP.screw.dat(MT.StainlessSteel));
167 167
 		CR.shaped(IL.Cover_Button_Selector          .get(1), CR.DEF_REV, "BXB", "BQB", "BCB", 'Q', IL.Cover_Blank, 'C', OD_CIRCUITS[1], 'B', OD.button, 'X', IL.Circuit_Selector.wild(1));
168
-		CR.shaped(IL.Cover_Warning                  .get(1), CR.DEF_REV, "GB" , "YQ"        , 'Q', IL.Cover_Blank, 'C', OD.craftingWorkBench, 'G', OD.itemGlue);
168
+		CR.shaped(IL.Cover_Warning                  .get(1), CR.DEF_REV, "GB" , "YQ"        , 'Q', IL.Cover_Blank, 'Y', DYE_OREDICTS[DYE_INDEX_Yellow], 'G', OD.itemGlue);
169 169
 		CR.shaped(IL.Cover_Redstone_Conductor_IN    .get(1), CR.DEF_REV,  "R" ,  "Q"        , 'Q', IL.Cover_Blank, 'R', OP.wireGt01.dat(MT.RedAlloy));
170 170
 		CR.shaped(IL.Cover_Redstone_Conductor_OUT   .get(1), CR.DEF_REV,  "Q" ,  "R"        , 'Q', IL.Cover_Blank, 'R', OP.wireGt01.dat(MT.RedAlloy));
171 171
 		CR.shaped(IL.Cover_Retriever_Item           .get(1), CR.DEF_REV, "RPR", "CQC"       , 'Q', IL.Cover_Filter_Item, 'P', IL.PISTONS[1], 'C', OD_CIRCUITS[3], 'R', OP.plateCurved.dat(MT.Electrum));

Loading…
Cancel
Save