This repository was archived by the owner on Nov 2, 2025. It is now read-only.
forked from GTNewHorizons/NewHorizonsCoreMod
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathpatch.diff
More file actions
2851 lines (2547 loc) · 175 KB
/
patch.diff
File metadata and controls
2851 lines (2547 loc) · 175 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
From a435ecef44e276ed73d38d19fad70c0b11a14a73 Mon Sep 17 00:00:00 2001
From: Dream-Master <dream-master@gmx.net>
Date: Sat, 7 Oct 2017 13:34:25 +0200
Subject: [PATCH] Add new recipe for Natural Compass mod
---
src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java | 2 ++
src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
index 15c549e..331805f 100644
--- a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
+++ b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
@@ -140,6 +140,8 @@ public class GT_CraftingRecipeLoader extends gregtech.loaders.postload.GT_Crafti
GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getModItem("StevesCarts", "ModuleComponents", 1L, 16), true, false, true);
//Vanilla
GT_ModHandler.removeRecipeByOutput(new ItemStack(Blocks.iron_bars, 1, 32767), true, false, true);
+ //Natural Compass
+ GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getModItem("naturescompass", "NaturesCompass", 1L, 0), true, false, true);
//Add recipes
diff --git a/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
index 7391510..36dafb2 100644
--- a/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
+++ b/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
@@ -234,6 +234,8 @@ public class GT_MachineRecipeLoader implements Runnable{
GT_Values.RA.addAssemblerRecipe(ItemList.Firebrick.get(24, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gypsum, 8L), new FluidStack(FluidRegistry.getFluid("concrete"), 4608), ItemList.Casing_Firebricks.get(4L),200, 30);
GT_Values.RA.addAssemblerRecipe(ItemList.Firebrick.get(24, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gypsum, 8L), Materials.Concrete.getMolten(4608), ItemList.Casing_Firebricks.get(4L),200, 30);
+ GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 4L), GT_OreDictUnificator.get(OrePrefixes.treeSapling, 4L), new ItemStack(Items.compass, 1, 0)}, Materials.Glue.getFluid(144L), GT_ModHandler.getModItem("naturescompass", "NaturesCompass", 1L, 0), 200, 30);
+
GT_Values.RA.addAutoclaveRecipe(CustomItemList.LapotronDust.get(30L), Materials.EnergeticAlloy.getMolten(576), CustomItemList.RawLapotronCrystal.get(1L), 10000, 2400, 480);
GT_Values.RA.addAutoclaveRecipe(CustomItemList.LapotronDust.get(30L), Materials.VibrantAlloy.getMolten(288), CustomItemList.RawLapotronCrystal.get(1L), 10000, 1200, 480);
--
1.9.5.msysgit.0
From 65c6c3e8ba8073c2fd734ee7ee92381a9c4ecd33 Mon Sep 17 00:00:00 2001
From: Dream-Master <dream-master@gmx.net>
Date: Sat, 7 Oct 2017 00:19:01 +0200
Subject: [PATCH] bump version
---
build.properties | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build.properties b/build.properties
index f874830..f15e682 100644
--- a/build.properties
+++ b/build.properties
@@ -1,6 +1,6 @@
minecraft.version=1.7.10
forge.version=10.13.4.1614
-coremod.version=1.7.10-1.5.9
+coremod.version=1.7.10-1.5.10
yamcore.version=0.5.77
baubles.version=1.0.1.10
@@ -14,8 +14,8 @@ forestry.version=4.2.10.58
enderio.version=2.3.0.429_beta
endercore.version=0.2.0.39_beta
-gregtech.jenkinsbuild=852
-gregtech.version=5.09.32.05
+gregtech.jenkinsbuild=872
+gregtech.version=5.09.32.06
ggreg.jenkinsbuild=8
ggreg.version=0.9.6
--
1.9.5.msysgit.0
From 5409588aece98b171c2f7f00043bde7d15b4bc75 Mon Sep 17 00:00:00 2001
From: Technus <daniel112092@gmail.com>
Date: Thu, 5 Oct 2017 06:53:31 +0200
Subject: [PATCH] Small changes in tooltip.
---
.../transformers/GT_MetaTileEntity_WetTransformer.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/dreammaster/gthandler/transformers/GT_MetaTileEntity_WetTransformer.java b/src/main/java/com/dreammaster/gthandler/transformers/GT_MetaTileEntity_WetTransformer.java
index 91132a8..f9e9189 100644
--- a/src/main/java/com/dreammaster/gthandler/transformers/GT_MetaTileEntity_WetTransformer.java
+++ b/src/main/java/com/dreammaster/gthandler/transformers/GT_MetaTileEntity_WetTransformer.java
@@ -5,6 +5,7 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer;
+import gtPlusPlus.core.lib.CORE;
import static gregtech.api.enums.GT_Values.V;
@@ -43,6 +44,11 @@ public class GT_MetaTileEntity_WetTransformer extends GT_MetaTileEntity_Transfor
}
@Override
+ public String[] getDescription() {
+ return new String[]{this.mDescription, "Accepts 16A and outputs 64A", CORE.GT_Tooltip};
+ }
+
+ @Override
public long getMinimumStoredEU() {
return V[mTier + 1];
}
@@ -55,11 +61,11 @@ public class GT_MetaTileEntity_WetTransformer extends GT_MetaTileEntity_Transfor
@Override
public long maxAmperesOut() {
- return getBaseMetaTileEntity().isActive() ? 64 : 16;
+ return getBaseMetaTileEntity().isAllowedToWork() ? 64 : 16;
}
@Override
public long maxAmperesIn() {
- return getBaseMetaTileEntity().isActive() ? 16 : 64;
+ return getBaseMetaTileEntity().isAllowedToWork() ? 16 : 64;
}
}
\ No newline at end of file
--
1.9.5.msysgit.0
From 38b60e8c972be64bb8c79a8122010dbd5f1b9a7d Mon Sep 17 00:00:00 2001
From: Technus <daniel112092@gmail.com>
Date: Wed, 27 Sep 2017 18:22:44 +0200
Subject: [PATCH] update GT++
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index d1cdfbf..786a1f5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -157,7 +157,7 @@ task getGtPlusPlus(type: Download, dependsOn: "getRailCraft") {
onlyIf {
!file("libs/GT-PlusPlus-1.5.9-release.jar").exists()
}
- src 'https://addons-origin.cursecdn.com/files/2462/348/GT-PlusPlus-1.5.9-release.jar'
+ src 'https://addons-origin.cursecdn.com/files/2478/265/GT-PlusPlus-1.6.02-release.jar'
dest file("libs/GT-PlusPlus-1.5.9-release.jar")
mustRunAfter "deobfBinJar"
mustRunAfter "repackMinecraft"
--
1.9.5.msysgit.0
From 38b60e8c972be64bb8c79a8122010dbd5f1b9a7d Mon Sep 17 00:00:00 2001
From: Technus <daniel112092@gmail.com>
Date: Wed, 27 Sep 2017 18:22:44 +0200
Subject: [PATCH] update GT++
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index d1cdfbf..786a1f5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -157,7 +157,7 @@ task getGtPlusPlus(type: Download, dependsOn: "getRailCraft") {
onlyIf {
!file("libs/GT-PlusPlus-1.5.9-release.jar").exists()
}
- src 'https://addons-origin.cursecdn.com/files/2462/348/GT-PlusPlus-1.5.9-release.jar'
+ src 'https://addons-origin.cursecdn.com/files/2478/265/GT-PlusPlus-1.6.02-release.jar'
dest file("libs/GT-PlusPlus-1.5.9-release.jar")
mustRunAfter "deobfBinJar"
mustRunAfter "repackMinecraft"
--
1.9.5.msysgit.0
From 4fee795d34c61b39b24f647c5d87fb026fb45f9f Mon Sep 17 00:00:00 2001
From: Dream-Master <dream-master@gmx.net>
Date: Wed, 4 Oct 2017 23:00:44 +0200
Subject: [PATCH] GT++ Hi-Amp transformers - they are too cheap #1942
https://github.com/GTNewHorizons/NewHorizons/issues/1942 @Technus this works
---
.../com/dreammaster/gthandler/GT_Loader_Machines.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java
index 7af6a09..906a6d8 100644
--- a/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java
+++ b/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java
@@ -3316,7 +3316,7 @@ public class GT_Loader_Machines
'X', OrePrefixes.cableGt08.get(Materials.Tin),
'O', OrePrefixes.cell.get(Materials.Lubricant),
'P', ItemList.Electric_Pump_LV,
- 'T', GregtechItemList.Transformer_HA_LV_ULV});
+ 'T', GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 877)});
GT_ModHandler.addCraftingRecipe(CustomItemList.WetTransformer_MV_LV.get(1L),
bitsd,
@@ -3327,7 +3327,7 @@ public class GT_Loader_Machines
'X', OrePrefixes.cableGt08.get(Materials.AnyCopper),
'O', OrePrefixes.cell.get(Materials.Lubricant),
'P', ItemList.Electric_Pump_LV,
- 'T', GregtechItemList.Transformer_HA_MV_LV});
+ 'T', GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 878)});
GT_ModHandler.addCraftingRecipe(CustomItemList.WetTransformer_HV_MV.get(1L),
bitsd,
@@ -3338,7 +3338,7 @@ public class GT_Loader_Machines
'X', OrePrefixes.cableGt08.get(Materials.Gold),
'O', OrePrefixes.cell.get(Materials.Lubricant),
'P', ItemList.Electric_Pump_LV,
- 'T', GregtechItemList.Transformer_HA_HV_MV});
+ 'T', GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 879)});
GT_ModHandler.addCraftingRecipe(CustomItemList.WetTransformer_EV_HV.get(1L),
bitsd,
@@ -3349,7 +3349,7 @@ public class GT_Loader_Machines
'X', OrePrefixes.cableGt08.get(Materials.Aluminium),
'O', OrePrefixes.cell.get(Materials.Lubricant),
'P', ItemList.Electric_Pump_LV,
- 'T', GregtechItemList.Transformer_HA_EV_HV});
+ 'T', GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 880)});
GT_ModHandler.addCraftingRecipe(CustomItemList.WetTransformer_IV_EV.get(1L),
bitsd,
@@ -3360,7 +3360,7 @@ public class GT_Loader_Machines
'X', OrePrefixes.cableGt08.get(Materials.Tungsten),
'O', OrePrefixes.cell.get(Materials.Lubricant),
'P', ItemList.Electric_Pump_LV,
- 'T', GregtechItemList.Transformer_HA_IV_EV});
+ 'T', GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 881)});
GT_ModHandler.addCraftingRecipe(CustomItemList.WetTransformer_LuV_IV.get(1L),
bitsd,
@@ -3371,7 +3371,7 @@ public class GT_Loader_Machines
'X', OrePrefixes.cableGt08.get(Materials.VanadiumGallium),
'O', OrePrefixes.cell.get(Materials.Lubricant),
'P', ItemList.Electric_Pump_LV,
- 'T', GregtechItemList.Transformer_HA_LuV_IV});
+ 'T', GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 882)});
GT_ModHandler.addCraftingRecipe(CustomItemList.WetTransformer_ZPM_LuV.get(1L),
bitsd,
@@ -3382,7 +3382,7 @@ public class GT_Loader_Machines
'X', OrePrefixes.cableGt08.get(Materials.Naquadah),
'O', OrePrefixes.cell.get(Materials.Lubricant),
'P', ItemList.Electric_Pump_LV,
- 'T', GregtechItemList.Transformer_HA_ZPM_LuV});
+ 'T', GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 883)});
GT_ModHandler.addCraftingRecipe(CustomItemList.WetTransformer_UV_ZPM.get(1L),
bitsd,
@@ -3393,7 +3393,7 @@ public class GT_Loader_Machines
'X', OrePrefixes.cableGt08.get(Materials.NaquadahAlloy),
'O', OrePrefixes.cell.get(Materials.Lubricant),
'P', ItemList.Electric_Pump_LV,
- 'T', GregtechItemList.Transformer_HA_UV_ZPM});
+ 'T', GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 884)});
GT_ModHandler.addCraftingRecipe(CustomItemList.WetTransformer_UHV_UV.get(1L),
bitsd,
@@ -3404,7 +3404,7 @@ public class GT_Loader_Machines
'X', OrePrefixes.wireGt08.get(Materials.Superconductor),
'O', OrePrefixes.cell.get(Materials.Lubricant),
'P', ItemList.Electric_Pump_LV,
- 'T', GregtechItemList.Transformer_HA_MAX_UV});
+ 'T', GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 885)});
GT_ModHandler.addCraftingRecipe(CustomItemList.WetTransformer_UEV_UHV.get(1L),
bitsd,
--
1.9.5.msysgit.0
From 990d2074dc8944366a2ed46d747da628e74730cb Mon Sep 17 00:00:00 2001
From: Dream-Master <dream-master@gmx.net>
Date: Wed, 4 Oct 2017 22:02:36 +0200
Subject: [PATCH] [1.5.1.2] Advanced Nanochestplate/Jetpack recepies #1938
https://github.com/GTNewHorizons/NewHorizons/issues/1938
---
src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
index 7f2aa78..15c549e 100644
--- a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
+++ b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
@@ -345,7 +345,7 @@ public class GT_CraftingRecipeLoader extends gregtech.loaders.postload.GT_Crafti
if (Loader.isModLoaded("GraviSuite")) {
GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getModItem("GraviSuite", "advJetpack", 1));
- GT_ModHandler.addCraftingRecipe(GT_ModHandler.getModItem("GraviSuite", "advJetpack", 1), new Object[]{"PJP", "BLB", "WCW", 'P', OrePrefixes.plateAlloy.get(Materials.Carbon), 'J', GT_ModHandler.getIC2Item("electricJetpack", 1), 'B', OrePrefixes.plate.get(Materials.TungstenSteel), 'L', GT_ModHandler.getModItem("IC2", "itemArmorNanoChestplate", 1, GT_Values.W), 'W', OrePrefixes.wireGt12.get(Materials.Platinum), 'C', OrePrefixes.circuit.get(Materials.Elite)});
+ GT_ModHandler.addCraftingRecipe(GT_ModHandler.getModItem("GraviSuite", "advJetpack", 1), new Object[]{"PJP", "BLB", "WCW", 'P', OrePrefixes.plateAlloy.get(Materials.Carbon), 'J', GT_ModHandler.getIC2Item("electricJetpack", 1, GT_Values.W), 'B', OrePrefixes.plate.get(Materials.TungstenSteel), 'L', GT_ModHandler.getModItem("IC2", "itemArmorNanoChestplate", 1, GT_Values.W), 'W', OrePrefixes.wireGt12.get(Materials.Platinum), 'C', OrePrefixes.circuit.get(Materials.Elite)});
GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getModItem("GraviSuite", "itemSimpleItem", 1, 3));
GT_ModHandler.addCraftingRecipe(GT_ModHandler.getModItem("GraviSuite", "itemSimpleItem", 1, 3), new Object[]{"OCO", "XWX", "OCO", 'C', GT_ModHandler.getModItem("GraviSuite", "itemSimpleItem", 1, 1), 'X', GT_ModHandler.getModItem("GraviSuite", "itemSimpleItem", 1, 2), 'O', GT_ModHandler.getModItem("IC2", "blockMachine2", 1, 1), 'W', ItemList.Transformer_LuV_IV.get(1, o)});
--
1.9.5.msysgit.0
From 05bbd8d9d094f15c2c14ac84150bd13e15f57034 Mon Sep 17 00:00:00 2001
From: Dream-Master <dream-master@gmx.net>
Date: Wed, 4 Oct 2017 16:45:55 +0200
Subject: [PATCH] Recipe Suggestion: Universal Storage Housing #2038
https://github.com/GTNewHorizons/NewHorizons/issues/2038
---
src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
index 0f63737..7391510 100644
--- a/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
+++ b/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
@@ -224,7 +224,8 @@ public class GT_MachineRecipeLoader implements Runnable{
GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.MysteriousCrystal, 1L), CustomItemList.BedrockiumPlate.get(8L), ItemList.Casing_Tank_10.get(1L), 100, 16);
- GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.paneGlass, Materials.Glass, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CertusQuartz, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L)}, GT_Values.NF, GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 39), 100, 16);
+ GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_ModHandler.getModItem("TConstruct", "GlassPane", 1L, 0), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CertusQuartz, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L)}, GT_Values.NF, GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 39), 100, 16);
+ GT_Values.RA.addAssemblerRecipe(new ItemStack[]{new ItemStack(Blocks.glass_pane, 1, 0), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CertusQuartz, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L)}, GT_Values.NF, GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 39), 100, 16);
GT_Values.RA.addAssemblerRecipe(CustomItemList.RawLapotronCrystal.get(1L), GT_ModHandler.getIC2Item("itemPartCircuitAdv", 2L), ItemList.IC2_LapotronCrystal.get(1L), 600, 1024);
GT_Values.RA.addAssemblerRecipe(CustomItemList.RawLapotronCrystal.get(1L), ItemList.Circuit_Advanced.get(2L), ItemList.IC2_LapotronCrystal.get(1L), 600, 1024);
--
1.9.5.msysgit.0
From 8a28243c7e5b20bb9f17f3e6957e6e16fd46f7c8 Mon Sep 17 00:00:00 2001
From: Dream-Master <dream-master@gmx.net>
Date: Wed, 4 Oct 2017 15:54:54 +0200
Subject: [PATCH] Recipe Suggestion: Universal Storage Housing #2038
https://github.com/GTNewHorizons/NewHorizons/issues/2038
---
src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
index 8b103a1..0f63737 100644
--- a/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
+++ b/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
@@ -224,6 +224,8 @@ public class GT_MachineRecipeLoader implements Runnable{
GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.MysteriousCrystal, 1L), CustomItemList.BedrockiumPlate.get(8L), ItemList.Casing_Tank_10.get(1L), 100, 16);
+ GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.paneGlass, Materials.Glass, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CertusQuartz, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L)}, GT_Values.NF, GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 39), 100, 16);
+
GT_Values.RA.addAssemblerRecipe(CustomItemList.RawLapotronCrystal.get(1L), GT_ModHandler.getIC2Item("itemPartCircuitAdv", 2L), ItemList.IC2_LapotronCrystal.get(1L), 600, 1024);
GT_Values.RA.addAssemblerRecipe(CustomItemList.RawLapotronCrystal.get(1L), ItemList.Circuit_Advanced.get(2L), ItemList.IC2_LapotronCrystal.get(1L), 600, 1024);
GT_Values.RA.addAssemblerRecipe(CustomItemList.RawLapotronCrystal.get(1L), ItemList.Circuit_Nanoprocessor.get(2L), ItemList.IC2_LapotronCrystal.get(1L), 600, 1024);
--
1.9.5.msysgit.0
From 8b90755bfc21a4c2dd4d8573470c1d2ea4b16d96 Mon Sep 17 00:00:00 2001
From: Dream-Master <dream-master@gmx.net>
Date: Wed, 4 Oct 2017 14:43:51 +0200
Subject: [PATCH] Iron and Steel Bars now in code recipes
---
.../java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
index eab8c22..7f2aa78 100644
--- a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
+++ b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
@@ -138,6 +138,8 @@ public class GT_CraftingRecipeLoader extends gregtech.loaders.postload.GT_Crafti
//Steve Carts
GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getModItem("StevesCarts", "ModuleComponents", 1L, 9), true, false, true);
GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getModItem("StevesCarts", "ModuleComponents", 1L, 16), true, false, true);
+ //Vanilla
+ GT_ModHandler.removeRecipeByOutput(new ItemStack(Blocks.iron_bars, 1, 32767), true, false, true);
//Add recipes
@@ -300,6 +302,9 @@ public class GT_CraftingRecipeLoader extends gregtech.loaders.postload.GT_Crafti
GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{CustomItemList.SandDust, OrePrefixes.dustTiny.get(Materials.Flint)});
+ GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.iron_bars, 3, 32767), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{" h ", "SSS", "SSS", 'S', GT_OreDictUnificator.get(OrePrefixes.stick, Materials.AnyIron, 1)});
+ GT_ModHandler.addCraftingRecipe(CustomItemList.SteelBars.get(3L, o), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{" h ", "SSS", "SSS", 'S', GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 1)});
+
//Solar Panels 1-128 EU
GT_ModHandler.addCraftingRecipe(ItemList.Cover_SolarPanel.get(1L, o), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SGS", "CPC", "TRT", 'C', OrePrefixes.circuit.get(Materials.Basic), 'G', GT_ModHandler.getIC2Item("reinforcedGlass", 1L), 'P', OrePrefixes.plateAlloy.get(Materials.Carbon), 'S', ItemList.Circuit_Silicon_Wafer, 'T', OrePrefixes.wireGt01.get(Materials.RedAlloy), 'R', CustomItemList.AluminiumIronPlate});
GT_ModHandler.addCraftingRecipe(ItemList.Cover_SolarPanel_8V.get(1L, o), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SGS", "CRC", "PAP", 'C', OrePrefixes.circuit.get(Materials.Good), 'G', ItemList.Cover_SolarPanel.get(1L, o), 'P', OrePrefixes.wireGt01.get(Materials.Tin), 'S', ItemList.Circuit_Silicon_Wafer, 'R', OrePrefixes.plate.get(Materials.GalliumArsenide), 'A', CustomItemList.ReinforcedAluminiumIronPlate});
@@ -310,7 +315,7 @@ public class GT_CraftingRecipeLoader extends gregtech.loaders.postload.GT_Crafti
GT_ModHandler.addShapelessCraftingRecipe(ItemList.Circuit_Board_Coated.get(1, o), new Object[]{GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1), ItemList.IC2_Resin.get(1, o), ItemList.IC2_Resin.get(1, o)});
GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Board_Coated.get(3, o), new Object[]{"RRR", "PPP", "RRR", 'P', GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1), 'R', ItemList.IC2_Resin.get(1, o)});
GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Board_Coated_Basic.get(1, o), new Object[]{"FFF", "FCF", "FFF", 'C', ItemList.Circuit_Board_Coated.get(1, o), 'F', GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 1)});
- GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Good.get(1, o), new Object[]{"PAP", "CBC", "DCD", 'D', ItemList.Circuit_Parts_Diode.get(1, o), 'C', Ic2Items.electronicCircuit, 'A', ItemList.IC2_Item_Casing_Steel.get(1, o), 'P', GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 1), 'B', ItemList.Circuit_Board_Phenolic_Good.get(1, o),});
+ GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Good.get(1, o), new Object[]{"PAP", "CBC", "DCD", 'D', ItemList.Circuit_Parts_Diode.get(1, o), 'C', Ic2Items.electronicCircuit, 'A', ItemList.IC2_Item_Casing_Steel.get(1, o), 'P', GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 1), 'B', ItemList.Circuit_Board_Phenolic_Good.get(1, o)});
GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Board_Phenolic_Good.get(1, o), new Object[]{"FFF", "FCF", "FFF", 'C', ItemList.Circuit_Board_Phenolic.get(1, o), 'F', GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 1)});
GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Parts_Resistor.get(1, o), new Object[]{"RPR", "FCF", " P ", 'F', OrePrefixes.wireGt01.get(Materials.Copper), 'P', OrePrefixes.wireFine.get(Materials.Copper), 'C', OrePrefixes.dust.get(Materials.Coal), 'R', ItemList.IC2_Resin.get(1, o)});
GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Parts_Resistor.get(1, o), new Object[]{"RPR", "FCF", " P ", 'F', OrePrefixes.wireGt01.get(Materials.Copper), 'P', OrePrefixes.wireFine.get(Materials.Copper), 'C', OrePrefixes.dust.get(Materials.Carbon), 'R', ItemList.IC2_Resin.get(1, o)});
--
1.9.5.msysgit.0
From da53990fc8e621fea178cfc7b1af490337a977dd Mon Sep 17 00:00:00 2001
From: Dream-Master <dream-master@gmx.net>
Date: Wed, 4 Oct 2017 12:55:39 +0200
Subject: [PATCH] Laptronic Crystals - Require Advanced Circuits - No options
#2047 https://github.com/GTNewHorizons/NewHorizons/issues/2047
---
src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
index 054f3f7..8b103a1 100644
--- a/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
+++ b/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
@@ -224,7 +224,9 @@ public class GT_MachineRecipeLoader implements Runnable{
GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.MysteriousCrystal, 1L), CustomItemList.BedrockiumPlate.get(8L), ItemList.Casing_Tank_10.get(1L), 100, 16);
- GT_Values.RA.addAssemblerRecipe(CustomItemList.RawLapotronCrystal.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2L), ItemList.IC2_LapotronCrystal.get(1L), 600, 1024);
+ GT_Values.RA.addAssemblerRecipe(CustomItemList.RawLapotronCrystal.get(1L), GT_ModHandler.getIC2Item("itemPartCircuitAdv", 2L), ItemList.IC2_LapotronCrystal.get(1L), 600, 1024);
+ GT_Values.RA.addAssemblerRecipe(CustomItemList.RawLapotronCrystal.get(1L), ItemList.Circuit_Advanced.get(2L), ItemList.IC2_LapotronCrystal.get(1L), 600, 1024);
+ GT_Values.RA.addAssemblerRecipe(CustomItemList.RawLapotronCrystal.get(1L), ItemList.Circuit_Nanoprocessor.get(2L), ItemList.IC2_LapotronCrystal.get(1L), 600, 1024);
GT_Values.RA.addAssemblerRecipe(ItemList.Firebrick.get(24, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gypsum, 8L), new FluidStack(FluidRegistry.getFluid("concrete"), 4608), ItemList.Casing_Firebricks.get(4L),200, 30);
GT_Values.RA.addAssemblerRecipe(ItemList.Firebrick.get(24, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gypsum, 8L), Materials.Concrete.getMolten(4608), ItemList.Casing_Firebricks.get(4L),200, 30);
--
1.9.5.msysgit.0
From 4e02d816506b5097bb7ae471d38ccab4e75c7548 Mon Sep 17 00:00:00 2001
From: Dream-Master <dream-master@gmx.net>
Date: Wed, 4 Oct 2017 12:30:08 +0200
Subject: [PATCH] Empty Shape Plate in Bending Machine #2050
https://github.com/GTNewHorizons/NewHorizons/issues/2050
---
src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
index 9047098..054f3f7 100644
--- a/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
+++ b/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
@@ -700,7 +700,7 @@ public class GT_MachineRecipeLoader implements Runnable{
GT_Values.RA.addFormingPressRecipe(CustomItemList.MicaBasedPulp.get(4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Asbestos, 1L), CustomItemList.MicaBasedSheet.get(4L), 400, 28);
- GT_Values.RA.addBenderRecipe(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Steel, 8L), ItemList.Shape_Empty.get(1L), 200, 120);
+ GT_Values.RA.addBenderRecipe(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Steel, 1L), ItemList.Shape_Empty.get(1L), 200, 120);
GT_Values.RA.addFormingPressRecipe(ItemList.Shape_Empty.get(1L),ItemList.Shape_Mold_Plate.get(0L), ItemList.Shape_Mold_Plate.get(1L), 200, 256);
GT_Values.RA.addFormingPressRecipe(ItemList.Shape_Empty.get(1L),ItemList.Shape_Mold_Casing.get(0L), ItemList.Shape_Mold_Casing.get(1L), 200, 256);
--
1.9.5.msysgit.0
From 99b73175ea7d07ff720c943c18cbd5013fd3f0de Mon Sep 17 00:00:00 2001
From: Dream-Master <dream-master@gmx.net>
Date: Sat, 30 Sep 2017 10:44:09 +0200
Subject: [PATCH] Cant craft gregtech tools (Pickaxe Axe Sword etc) #2032
https://github.com/GTNewHorizons/NewHorizons/issues/2032
---
.../java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
index 90999be..9047098 100644
--- a/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
+++ b/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
@@ -743,11 +743,11 @@ public class GT_MachineRecipeLoader implements Runnable{
GT_Values.RA.addFormingPressRecipe(ItemList.Shape_Empty.get(1L),ItemList.Shape_Extruder_Pipe_Large.get(0L), ItemList.Shape_Extruder_Pipe_Large.get(1L), 200, 256);
GT_Values.RA.addFormingPressRecipe(ItemList.Shape_Empty.get(1L),ItemList.Shape_Extruder_Pipe_Huge.get(0L), ItemList.Shape_Extruder_Pipe_Huge.get(1L), 200, 256);
GT_Values.RA.addFormingPressRecipe(ItemList.Shape_Empty.get(1L),ItemList.Shape_Extruder_Block.get(0L), ItemList.Shape_Extruder_Block.get(1L), 200, 256);
- GT_Values.RA.addFormingPressRecipe(ItemList.Shape_Empty.get(1L),ItemList.Shape_Extruder_Sword.get(0L), ItemList.Shape_Extruder_Sword.get(1L), 200, 256);
- GT_Values.RA.addFormingPressRecipe(ItemList.Shape_Empty.get(1L),ItemList.Shape_Extruder_Pickaxe.get(0L), ItemList.Shape_Extruder_Pickaxe.get(1L), 200, 256);
- GT_Values.RA.addFormingPressRecipe(ItemList.Shape_Empty.get(1L),ItemList.Shape_Extruder_Shovel.get(0L), ItemList.Shape_Extruder_Shovel.get(1L), 200, 256);
- GT_Values.RA.addFormingPressRecipe(ItemList.Shape_Empty.get(1L),ItemList.Shape_Extruder_Axe.get(0L), ItemList.Shape_Extruder_Axe.get(1L), 200, 256);
- GT_Values.RA.addFormingPressRecipe(ItemList.Shape_Empty.get(1L),ItemList.Shape_Extruder_Hoe.get(0L), ItemList.Shape_Extruder_Hoe.get(1L), 200, 256);
+ //GT_Values.RA.addFormingPressRecipe(ItemList.Shape_Empty.get(1L),ItemList.Shape_Extruder_Sword.get(0L), ItemList.Shape_Extruder_Sword.get(1L), 200, 256);
+ //GT_Values.RA.addFormingPressRecipe(ItemList.Shape_Empty.get(1L),ItemList.Shape_Extruder_Pickaxe.get(0L), ItemList.Shape_Extruder_Pickaxe.get(1L), 200, 256);
+ //GT_Values.RA.addFormingPressRecipe(ItemList.Shape_Empty.get(1L),ItemList.Shape_Extruder_Shovel.get(0L), ItemList.Shape_Extruder_Shovel.get(1L), 200, 256);
+ //GT_Values.RA.addFormingPressRecipe(ItemList.Shape_Empty.get(1L),ItemList.Shape_Extruder_Axe.get(0L), ItemList.Shape_Extruder_Axe.get(1L), 200, 256);
+ //GT_Values.RA.addFormingPressRecipe(ItemList.Shape_Empty.get(1L),ItemList.Shape_Extruder_Hoe.get(0L), ItemList.Shape_Extruder_Hoe.get(1L), 200, 256);
GT_Values.RA.addFormingPressRecipe(ItemList.Shape_Empty.get(1L),ItemList.Shape_Extruder_Hammer.get(0L), ItemList.Shape_Extruder_Hammer.get(1L), 200, 256);
GT_Values.RA.addFormingPressRecipe(ItemList.Shape_Empty.get(1L),ItemList.Shape_Extruder_File.get(0L), ItemList.Shape_Extruder_File.get(1L), 200, 256);
GT_Values.RA.addFormingPressRecipe(ItemList.Shape_Empty.get(1L),ItemList.Shape_Extruder_Saw.get(0L), ItemList.Shape_Extruder_Saw.get(1L), 200, 256);
--
1.9.5.msysgit.0
From f715bb6d11f25ab7d229428a619b0d96b21d9a18 Mon Sep 17 00:00:00 2001
From: Dream-Master <dream-master@gmx.net>
Date: Wed, 27 Sep 2017 22:35:13 +0200
Subject: [PATCH] bump version and dependencies
---
build.properties | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build.properties b/build.properties
index b66bbfa..f874830 100644
--- a/build.properties
+++ b/build.properties
@@ -1,6 +1,6 @@
minecraft.version=1.7.10
forge.version=10.13.4.1614
-coremod.version=1.7.10-1.5.7
+coremod.version=1.7.10-1.5.9
yamcore.version=0.5.77
baubles.version=1.0.1.10
@@ -14,8 +14,8 @@ forestry.version=4.2.10.58
enderio.version=2.3.0.429_beta
endercore.version=0.2.0.39_beta
-gregtech.jenkinsbuild=789
-gregtech.version=5.09.32.00
+gregtech.jenkinsbuild=852
+gregtech.version=5.09.32.05
ggreg.jenkinsbuild=8
ggreg.version=0.9.6
--
1.9.5.msysgit.0
From df3e96ff8a6150bd2e93f927fd90619df791a1a9 Mon Sep 17 00:00:00 2001
From: Technus <daniel112092@gmail.com>
Date: Wed, 27 Sep 2017 18:22:44 +0200
Subject: [PATCH] update GT++
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index d1cdfbf..786a1f5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -157,7 +157,7 @@ task getGtPlusPlus(type: Download, dependsOn: "getRailCraft") {
onlyIf {
!file("libs/GT-PlusPlus-1.5.9-release.jar").exists()
}
- src 'https://addons-origin.cursecdn.com/files/2462/348/GT-PlusPlus-1.5.9-release.jar'
+ src 'https://addons-origin.cursecdn.com/files/2478/265/GT-PlusPlus-1.6.02-release.jar'
dest file("libs/GT-PlusPlus-1.5.9-release.jar")
mustRunAfter "deobfBinJar"
mustRunAfter "repackMinecraft"
--
1.9.5.msysgit.0
From 9e504e6b3a0ad436bb35b062fd4fecc329be078c Mon Sep 17 00:00:00 2001
From: Dream-Master <dream-master@gmx.net>
Date: Fri, 22 Sep 2017 20:14:16 +0200
Subject: [PATCH] cherry pick Commit: 065abe8506bf6e4f8b6708f5d5c9e069d4a0bf48
[065abe8]
change custom brewing recipes to match with new method.
---
src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
index 4f8e1f6..90999be 100644
--- a/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
+++ b/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
@@ -554,8 +554,8 @@ public class GT_MachineRecipeLoader implements Runnable{
GT_Values.RA.addBrewingRecipe(GT_ModHandler.getModItem("IC2", "itemBiochaff", 1L, 0), FluidRegistry.getFluid("water"), FluidRegistry.getFluid("ic2biomass"), false);
- GT_Values.RA.addBrewingRecipeCustom(GT_ModHandler.getModItem("Genetics", "misc", 6L, 4), FluidRegistry.getFluid("water"), FluidRegistry.getFluid("binnie.growthmedium"), 600, 480, false);
- GT_Values.RA.addBrewingRecipeCustom(GT_ModHandler.getModItem("IC2", "itemBiochaff", 16L, 0), FluidRegistry.getFluid("binnie.growthmedium"), FluidRegistry.getFluid("binnie.bacteria"), 1200, 480, false);
+ GT_Values.RA.addBrewingRecipeCustom(GT_ModHandler.getModItem("Genetics", "misc", 6L, 4), FluidRegistry.getFluidStack("water", 750), FluidRegistry.getFluidStack("binnie.growthmedium", 750), 600, 480, false);
+ GT_Values.RA.addBrewingRecipeCustom(GT_ModHandler.getModItem("IC2", "itemBiochaff", 16L, 0), FluidRegistry.getFluidStack("binnie.growthmedium", 750), FluidRegistry.getFluidStack("binnie.bacteria", 750), 1200, 480, false);
if (Loader.isModLoaded("gendustry")) {
GT_Values.RA.addFluidExtractionRecipe(GT_ModHandler.getModItem("gendustry", "HoneyDrop", 1L, 2005), CustomItemList.SnowQueenBloodDrop.get(1L), Materials.FierySteel.getFluid(200L), 1500, 1600, 2);
--
1.9.5.msysgit.0
From 4ddd378782c89240c494b82b93e71d8783d9bb0a Mon Sep 17 00:00:00 2001
From: Dream-Master <dream-master@gmx.net>
Date: Thu, 21 Sep 2017 18:21:02 +0200
Subject: [PATCH] Glass fiber recipe fix #1228
https://github.com/Blood-Asp/GT5-Unofficial/pull/1228/commits/7b6bbb6a7c387e8017541c301bc4a27625e22081
---
src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
index 3f3f4a5..4f8e1f6 100644
--- a/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
+++ b/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
@@ -1114,7 +1114,7 @@ public class GT_MachineRecipeLoader implements Runnable{
GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 2)}, Materials.Plastic.getMolten(144), ItemList.Circuit_Parts_CapacitorSMD.get(16), 320, 120);
GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.foil, Materials.PolyvinylChloride, 4), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 2)},Materials.Plastic.getMolten(144), ItemList.Circuit_Parts_CapacitorSMD.get(24), 320, 120);
- GT_Values.RA.addExtruderRecipe(Materials.BorosilicateGlass.getIngots(1), ItemList.Shape_Extruder_Wire.get(1, new Object[0]), ItemList.Circuit_Parts_GlassFiber.get(8, new Object[0]), 160, 96);
+ GT_Values.RA.addExtruderRecipe(Materials.BorosilicateGlass.getIngots(1), ItemList.Shape_Extruder_Wire.get(0, new Object[0]), ItemList.Circuit_Parts_GlassFiber.get(8, new Object[0]), 160, 96);
GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.lens, Materials.EnderPearl, 1)), ItemList.Circuit_Wafer_NAND.get(1), 900, 480, true);
GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.lens, Materials.EnderPearl, 1)), ItemList.Circuit_Wafer_NAND.get(4), 600, 1920, true);
--
1.9.5.msysgit.0
From 304e812addcac02dc66962046d0d78ddc91caed5 Mon Sep 17 00:00:00 2001
From: Technus <daniel112092@gmail.com>
Date: Wed, 27 Sep 2017 18:22:44 +0200
Subject: [PATCH] update GT++
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index d1cdfbf..786a1f5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -157,7 +157,7 @@ task getGtPlusPlus(type: Download, dependsOn: "getRailCraft") {
onlyIf {
!file("libs/GT-PlusPlus-1.5.9-release.jar").exists()
}
- src 'https://addons-origin.cursecdn.com/files/2462/348/GT-PlusPlus-1.5.9-release.jar'
+ src 'https://addons-origin.cursecdn.com/files/2478/265/GT-PlusPlus-1.6.02-release.jar'
dest file("libs/GT-PlusPlus-1.5.9-release.jar")
mustRunAfter "deobfBinJar"
mustRunAfter "repackMinecraft"
--
1.9.5.msysgit.0
From e4a0c723430b093a553966392eb3e47ca476e1a6 Mon Sep 17 00:00:00 2001
From: Technus <daniel112092@gmail.com>
Date: Wed, 27 Sep 2017 17:19:14 +0200
Subject: [PATCH] No longer needed as fixed by alkalus.
---
.../java/com/dreammaster/main/MainRegistry.java | 9 --------
src/main/java/com/dreammaster/main/gtppCompat.java | 25 ----------------------
2 files changed, 34 deletions(-)
delete mode 100644 src/main/java/com/dreammaster/main/gtppCompat.java
diff --git a/src/main/java/com/dreammaster/main/MainRegistry.java b/src/main/java/com/dreammaster/main/MainRegistry.java
index 417edab..ad7bddd 100644
--- a/src/main/java/com/dreammaster/main/MainRegistry.java
+++ b/src/main/java/com/dreammaster/main/MainRegistry.java
@@ -335,13 +335,4 @@ public class MainRegistry
if (CoreConfig.ModCustomDrops_Enabled) pEvent.registerServerCommand(new CustomDropsCommand());
if (YAMCore.isDebug()) pEvent.registerServerCommand( new AllPurposeDebugCommand() );
}
-
- private static boolean oneTimeFix=false;
- @EventHandler
- public void onServerAboutToStart(FMLServerAboutToStartEvent e) {
- if (!oneTimeFix) {
- oneTimeFix = true;
- if(Loader.isModLoaded("miscutils")) new gtppCompat().run();
- }
- }
}
diff --git a/src/main/java/com/dreammaster/main/gtppCompat.java b/src/main/java/com/dreammaster/main/gtppCompat.java
deleted file mode 100644
index f679de5..0000000
--- a/src/main/java/com/dreammaster/main/gtppCompat.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.dreammaster.main;
-
-import gregtech.api.enums.Materials;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.Recipe_GT;
-import net.minecraftforge.fluids.FluidStack;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class gtppCompat implements Runnable {
- @Override
- public void run() {
- Set<Integer> fluidIDs=new HashSet<>();
- for(Materials mat: Materials.getAll()){
- FluidStack molten=mat.getMolten(144);
- if(molten!=null && mat.mBlastFurnaceRequired && mat.mBlastFurnaceTemp>=4000) fluidIDs.add(molten.getFluidID());
- }
- for(GT_Recipe alloyRecipe: Recipe_GT.Gregtech_Recipe_Map.sAlloyBlastSmelterRecipes.mRecipeList.toArray(new GT_Recipe[0])){//array to avoid concurrency
- if(alloyRecipe.mFluidOutputs[0]!=null && fluidIDs.contains(alloyRecipe.mFluidOutputs[0].getFluidID())){
- Recipe_GT.Gregtech_Recipe_Map.sAlloyBlastSmelterRecipes.mRecipeList.remove(alloyRecipe);
- }
- }
- }
-}
--
1.9.5.msysgit.0
From e4a0c723430b093a553966392eb3e47ca476e1a6 Mon Sep 17 00:00:00 2001
From: Technus <daniel112092@gmail.com>
Date: Wed, 27 Sep 2017 17:19:14 +0200
Subject: [PATCH] No longer needed as fixed by alkalus.
---
.../java/com/dreammaster/main/MainRegistry.java | 9 --------
src/main/java/com/dreammaster/main/gtppCompat.java | 25 ----------------------
2 files changed, 34 deletions(-)
delete mode 100644 src/main/java/com/dreammaster/main/gtppCompat.java
diff --git a/src/main/java/com/dreammaster/main/MainRegistry.java b/src/main/java/com/dreammaster/main/MainRegistry.java
index 417edab..ad7bddd 100644
--- a/src/main/java/com/dreammaster/main/MainRegistry.java
+++ b/src/main/java/com/dreammaster/main/MainRegistry.java
@@ -335,13 +335,4 @@ public class MainRegistry
if (CoreConfig.ModCustomDrops_Enabled) pEvent.registerServerCommand(new CustomDropsCommand());
if (YAMCore.isDebug()) pEvent.registerServerCommand( new AllPurposeDebugCommand() );
}
-
- private static boolean oneTimeFix=false;
- @EventHandler
- public void onServerAboutToStart(FMLServerAboutToStartEvent e) {
- if (!oneTimeFix) {
- oneTimeFix = true;
- if(Loader.isModLoaded("miscutils")) new gtppCompat().run();
- }
- }
}
diff --git a/src/main/java/com/dreammaster/main/gtppCompat.java b/src/main/java/com/dreammaster/main/gtppCompat.java
deleted file mode 100644
index f679de5..0000000
--- a/src/main/java/com/dreammaster/main/gtppCompat.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.dreammaster.main;
-
-import gregtech.api.enums.Materials;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.Recipe_GT;
-import net.minecraftforge.fluids.FluidStack;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class gtppCompat implements Runnable {
- @Override
- public void run() {
- Set<Integer> fluidIDs=new HashSet<>();
- for(Materials mat: Materials.getAll()){
- FluidStack molten=mat.getMolten(144);
- if(molten!=null && mat.mBlastFurnaceRequired && mat.mBlastFurnaceTemp>=4000) fluidIDs.add(molten.getFluidID());
- }
- for(GT_Recipe alloyRecipe: Recipe_GT.Gregtech_Recipe_Map.sAlloyBlastSmelterRecipes.mRecipeList.toArray(new GT_Recipe[0])){//array to avoid concurrency
- if(alloyRecipe.mFluidOutputs[0]!=null && fluidIDs.contains(alloyRecipe.mFluidOutputs[0].getFluidID())){
- Recipe_GT.Gregtech_Recipe_Map.sAlloyBlastSmelterRecipes.mRecipeList.remove(alloyRecipe);
- }
- }
- }
-}
--
1.9.5.msysgit.0
From 979e75ddd556ba8b6cddeb33864f4b9672e1c139 Mon Sep 17 00:00:00 2001
From: Technus <daniel112092@gmail.com>
Date: Wed, 27 Sep 2017 07:13:53 +0200
Subject: [PATCH] Move hi-amp trafos to coremod
---
.../com/dreammaster/gthandler/CustomItemList.java | 2 +-
.../dreammaster/gthandler/GT_Loader_Machines.java | 373 ++++++++++-----------
2 files changed, 184 insertions(+), 191 deletions(-)
diff --git a/src/main/java/com/dreammaster/gthandler/CustomItemList.java b/src/main/java/com/dreammaster/gthandler/CustomItemList.java
index 1d816b2..9c4989d 100644
--- a/src/main/java/com/dreammaster/gthandler/CustomItemList.java
+++ b/src/main/java/com/dreammaster/gthandler/CustomItemList.java
@@ -26,7 +26,7 @@ public enum CustomItemList implements IItemContainer
Casing_UEV, Casing_UIV, Casing_UMV, Casing_UXV, Casing_OPV, Casing_MAXV,//since Hull_MAX is in gt
Transformer_UEV_UHV, Transformer_UIV_UEV, Transformer_UMV_UIV, Transformer_UXV_UMV, Transformer_OPV_UXV, Transformer_MAXV_OPV,
WetTransformer_LV_ULV, WetTransformer_MV_LV, WetTransformer_HV_MV, WetTransformer_EV_HV, WetTransformer_IV_EV, WetTransformer_LuV_IV, WetTransformer_ZPM_LuV, WetTransformer_UV_ZPM, WetTransformer_UHV_UV, WetTransformer_UEV_UHV, WetTransformer_UIV_UEV, WetTransformer_UMV_UIV, WetTransformer_UXV_UMV, WetTransformer_OPV_UXV, WetTransformer_MAXV_OPV,
-
+ Transformer_HA_UEV_UHV, Transformer_HA_UIV_UEV, Transformer_HA_UMV_UIV, Transformer_HA_UXV_UMV, Transformer_HA_OPV_UXV, Transformer_HA_MAXV_OPV,
BatteryHull_EV, BatteryHull_IV, BatteryHull_LuV, BatteryHull_ZPM, BatteryHull_UV, BatteryHull_UHV, BatteryHull_UEV, BatteryHull_UIV, BatteryHull_UMV, BatteryHull_UxV,
BatteryHull_EV_Full, BatteryHull_IV_Full, BatteryHull_LuV_Full, BatteryHull_ZPM_Full, BatteryHull_UV_Full, BatteryHull_UHV_Full, BatteryHull_UEV_Full, BatteryHull_UIV_Full, BatteryHull_UMV_Full, BatteryHull_UxV_Full,
diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java
index fed9e47..7af6a09 100644
--- a/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java
+++ b/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java
@@ -32,6 +32,9 @@ public class GT_Loader_Machines
private void registerMachines()
{
+ long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+ | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED;
+
//TODO:While adding recipes look at GT_Loader_MetaTileEntities there is some useful info
//TODO:Add recipes where u see //TODO:recipes or null in the code
@@ -62,7 +65,7 @@ public class GT_Loader_Machines
// 10757, "basicgenerator.plasmagenerator.tier.13", "Legendary Pocket Sun IV",12).getStackForm(1L));
GT_ModHandler.addCraftingRecipe(CustomItemList.Generator_Plasma_ZPMV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[] { "UCU", "FMF", "WCW",
'M', ItemList.Hull_UV,
'F', ItemList.Field_Generator_ZPM,
@@ -71,7 +74,7 @@ public class GT_Loader_Machines
'U', OrePrefixes.stick.get(Materials.Americium) });
GT_ModHandler.addCraftingRecipe(CustomItemList.Generator_Plasma_UV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[] { "UCU", "FMF", "WCW",
'M', ItemList.Hull_UV,
'F', ItemList.Field_Generator_UV,
@@ -1265,7 +1268,7 @@ public class GT_Loader_Machines
GT_ModHandler.addCraftingRecipe(CustomItemList.MassFabricatorLuV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[] { "CFC", "WMW", "CFC",
'M', ItemList.Hull_LuV,
'F', ItemList.Field_Generator_LuV,
@@ -1273,7 +1276,7 @@ public class GT_Loader_Machines
'W', AdvancedGTMaterials.LuV.getCable4()});
GT_ModHandler.addCraftingRecipe(CustomItemList.MassFabricatorZPM.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[] { "CFC", "WMW", "CFC",
'M', ItemList.Hull_ZPM,
'F', ItemList.Field_Generator_ZPM,
@@ -1281,7 +1284,7 @@ public class GT_Loader_Machines
'W', AdvancedGTMaterials.ZPM.getCable4()});
GT_ModHandler.addCraftingRecipe(CustomItemList.MassFabricatorUV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[] { "CFC", "WMW", "CFC",
'M', ItemList.Hull_UV,
'F', ItemList.Field_Generator_UV,
@@ -1337,7 +1340,7 @@ public class GT_Loader_Machines
GT_ModHandler.addCraftingRecipe(CustomItemList.MicrowaveLuV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[] { "PWC", "PHE", "PMC",
'P', OrePrefixes.plateDense.get(Materials.Lead),
'H', ItemList.Hull_LuV,
@@ -1347,7 +1350,7 @@ public class GT_Loader_Machines
'W', OrePrefixes.cableGt01.get(Materials.VanadiumGallium)});
GT_ModHandler.addCraftingRecipe(CustomItemList.MicrowaveZPM.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[] { "PWC", "PHE", "PMC",
'P', OrePrefixes.plateDense.get(Materials.Lead),
'H', ItemList.Hull_ZPM,
@@ -1357,7 +1360,7 @@ public class GT_Loader_Machines
'W', OrePrefixes.cableGt01.get(Materials.Naquadah)});
GT_ModHandler.addCraftingRecipe(CustomItemList.MicrowaveUV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[] { "PWC", "PHE", "PMC",
'P', OrePrefixes.plateDense.get(Materials.Lead),
'H', ItemList.Hull_UV,
@@ -1571,7 +1574,7 @@ public class GT_Loader_Machines
11006, "basicmachine.replicator.tier.12", "Epic Elemental Composer IV",12).getStackForm(1L));
GT_ModHandler.addCraftingRecipe(CustomItemList.ReplicatorLuV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[] { "EFE", "CMC", "EWE",
'M', ItemList.Hull_LuV,
'F', ItemList.Field_Generator_LuV,
@@ -1580,7 +1583,7 @@ public class GT_Loader_Machines
'W', AdvancedGTMaterials.LuV.getCable4() });
GT_ModHandler.addCraftingRecipe(CustomItemList.ReplicatorZPM.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[] { "EFE", "CMC", "EWE",
'M', ItemList.Hull_ZPM,
'F', ItemList.Field_Generator_ZPM,
@@ -1589,7 +1592,7 @@ public class GT_Loader_Machines
'W', AdvancedGTMaterials.ZPM.getCable4() });
GT_ModHandler.addCraftingRecipe(CustomItemList.ReplicatorUV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[] { "EFE", "CMC", "EWE",
'M', ItemList.Hull_UV,
'F', ItemList.Field_Generator_UV,
@@ -1622,7 +1625,7 @@ public class GT_Loader_Machines
11016, "basicmachine.scanner.tier.12", "Epic Electron Microscope IV",12).getStackForm(1L));
GT_ModHandler.addCraftingRecipe(CustomItemList.ScannerLuV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[] { "CTC", "WMW", "CRC",
'M', ItemList.Hull_LuV,
'T', ItemList.Emitter_LuV,
@@ -1631,7 +1634,7 @@ public class GT_Loader_Machines
'W', AdvancedGTMaterials.LuV.getCable() });
GT_ModHandler.addCraftingRecipe(CustomItemList.ScannerZPM.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[] { "CTC", "WMW", "CRC",
'M', ItemList.Hull_ZPM,
'T', ItemList.Emitter_ZPM,
@@ -1640,7 +1643,7 @@ public class GT_Loader_Machines
'W', AdvancedGTMaterials.ZPM.getCable() });
GT_ModHandler.addCraftingRecipe(CustomItemList.ScannerUV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[] { "CTC", "WMW", "CRC",
'M', ItemList.Hull_UV,
'T', ItemList.Emitter_UV,
@@ -1890,7 +1893,7 @@ public class GT_Loader_Machines
CustomItemList.PumpZPM.set(new GT_MetaTileEntity_Pump(11061, "basicmachine.pump.tier.07", "Ocean Transposer", 7).getStackForm(1L));
//CustomItemList.PumpUV.set(new GT_MetaTileEntity_Pump(11062, "basicmachine.pump.tier.08", "Reverse Terraformer", 8).getStackForm(1L));
GT_ModHandler.addCraftingRecipe(CustomItemList.PumpLuV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[] { "CPC", "PMP", "BPB",
'M', ItemList.Hull_LuV,
'B', AdvancedGTMaterials.LuV.getPipeL(),
@@ -1898,7 +1901,7 @@ public class GT_Loader_Machines
'P', ItemList.Electric_Pump_LuV});
GT_ModHandler.addCraftingRecipe(CustomItemList.PumpZPM.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[] { "CPC", "PMP", "BPB",
'M', ItemList.Hull_ZPM,
'B', AdvancedGTMaterials.ZPM.getPipeL(),
@@ -1907,7 +1910,7 @@ public class GT_Loader_Machines
// Disabled for now, as the Pump causes too much lag with the size - OK will not add any more ;]
/*GT_ModHandler.addCraftingRecipe(CustomItemList.PumpUV.get(1L, new Object[0]),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[] { "CPC", "PMP", "BPB",
'M', ItemList.Hull_UV,
'B', AdvancedGTMaterials.UV.getPipeL(),
@@ -2124,7 +2127,7 @@ public class GT_Loader_Machines
//Not adding either...
GT_ModHandler.addCraftingRecipe(CustomItemList.AcceleratorLV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[]{"RMR", "PBC", "IMI",
'R', ItemList.Robot_Arm_LV,
'M', ItemList.Electric_Motor_LV,
@@ -2134,7 +2137,7 @@ public class GT_Loader_Machines
'I', ItemList.Electric_Piston_LV});
GT_ModHandler.addCraftingRecipe(CustomItemList.AcceleratorMV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[]{"RMR", "PBC", "IMI",
'R', ItemList.Robot_Arm_MV,
'M', ItemList.Electric_Motor_MV,
@@ -2144,7 +2147,7 @@ public class GT_Loader_Machines
'I', ItemList.Electric_Piston_MV});
GT_ModHandler.addCraftingRecipe(CustomItemList.AcceleratorHV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[]{"RMR", "PBC", "IMI",
'R', ItemList.Robot_Arm_HV,
'M', ItemList.Electric_Motor_HV,
@@ -2154,7 +2157,7 @@ public class GT_Loader_Machines
'I', ItemList.Electric_Piston_HV});
GT_ModHandler.addCraftingRecipe(CustomItemList.AcceleratorEV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[]{"RMR", "PBC", "IMI",
'R', ItemList.Robot_Arm_EV,
'M', ItemList.Electric_Motor_EV,
@@ -2164,7 +2167,7 @@ public class GT_Loader_Machines
'I', ItemList.Electric_Piston_EV});
GT_ModHandler.addCraftingRecipe(CustomItemList.AcceleratorIV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[]{"RMR", "PBC", "IMI",
'R', ItemList.Robot_Arm_IV,
'M', ItemList.Electric_Motor_IV,
@@ -2174,7 +2177,7 @@ public class GT_Loader_Machines
'I', ItemList.Electric_Piston_IV});
GT_ModHandler.addCraftingRecipe(CustomItemList.AcceleratorLuV.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,
new Object[]{"RMR", "PBC", "IMI",
'R', ItemList.Robot_Arm_LuV,
'M', ItemList.Electric_Motor_LuV,
@@ -2184,7 +2187,7 @@ public class GT_Loader_Machines
'I', ItemList.Electric_Piston_LuV});
GT_ModHandler.addCraftingRecipe(CustomItemList.AcceleratorZPM.get(1L),
- GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED,
+ bitsd,