Skip to content
This repository was archived by the owner on May 26, 2024. It is now read-only.

Commit 67b4869

Browse files
miozunemiozune
authored
Deprecation cleanup (#637)
1 parent 69791bd commit 67b4869

File tree

237 files changed

+733
-3519
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+733
-3519
lines changed

‎.git-blame-ignore-revs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# Ignore spotlessApply reformat
2-
ac338f526b49fbc41f49fd1c825f990fbb1576dc
2+
55f64675b42ac8d3c557cc850f78664bee006f6f
3+
7d1f51a8937e0a86486267437d444696e81e8aa0

‎dependencies.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
dependencies {
2-
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.36:dev')
3-
api("com.github.GTNewHorizons:bartworks:0.7.7:dev")
2+
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.50:dev')
3+
api("com.github.GTNewHorizons:bartworks:0.7.11:dev")
44

55
implementation('curse.maven:cofh-core-69162:2388751')
66
// https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels
77
implementation('curse.maven:advsolar-362768:2885953')
88

99
compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') {transitive=false}
10-
compileOnly('com.github.GTNewHorizons:EnderCore:0.2.13:dev') {transitive=false}
10+
compileOnly('com.github.GTNewHorizons:EnderCore:0.2.14:dev') {transitive=false}
1111
compileOnly('com.github.GTNewHorizons:SC2:2.0.2:dev') {transitive=false}
12-
compileOnly('com.github.GTNewHorizons:Binnie:2.1.0:dev') {transitive = false}
12+
compileOnly('com.github.GTNewHorizons:Binnie:2.1.1:dev') {transitive = false}
1313
compileOnly('curse.maven:PlayerAPI-228969:2248928') {transitive=false}
1414
compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false}
1515
compileOnly('com.github.GTNewHorizons:Chisel:2.11.0-GTNH:dev') {transitive=false}

‎src/main/java/gregtech/api/util/GTPP_Recipe.java

+37-55
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package gregtech.api.util;
22

33
import static gregtech.api.enums.GT_Values.E;
4-
import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
5-
import static gregtech.api.enums.Mods.GTPlusPlus;
64
import static net.minecraft.util.EnumChatFormatting.GRAY;
75

86
import java.util.ArrayList;
@@ -146,7 +144,7 @@ public static class GTPP_Recipe_Map {
146144
"gtpp.recipe.cokeoven",
147145
"Coke Oven",
148146
null,
149-
RES_PATH_GUI + "basicmachines/Dehydrator",
147+
"",
150148
2,
151149
9,
152150
1,
@@ -162,7 +160,7 @@ public static class GTPP_Recipe_Map {
162160
"gtpp.recipe.matterfab2",
163161
"Matter Fabricator",
164162
null,
165-
RES_PATH_GUI + "basicmachines/Default",
163+
"",
166164
2,
167165
0,
168166
0,
@@ -179,7 +177,7 @@ public static class GTPP_Recipe_Map {
179177
"gtpp.recipe.rocketenginefuel",
180178
"Rocket Engine Fuel",
181179
null,
182-
RES_PATH_GUI + "basicmachines/Default",
180+
"",
183181
0,
184182
0,
185183
0,
@@ -196,7 +194,7 @@ public static class GTPP_Recipe_Map {
196194
"gtpp.recipe.quantumforcesmelter",
197195
"Quantum Force Transformer",
198196
null,
199-
RES_PATH_GUI + "basicmachines/LCRNEI",
197+
"",
200198
6,
201199
6,
202200
1,
@@ -214,7 +212,7 @@ public static class GTPP_Recipe_Map {
214212
"gtpp.recipe.geothermalfuel",
215213
"GeoThermal Fuel",
216214
null,
217-
RES_PATH_GUI + "basicmachines/Default",
215+
"",
218216
1,
219217
1,
220218
0,
@@ -230,7 +228,7 @@ public static class GTPP_Recipe_Map {
230228
"gtpp.recipe.chemicaldehydrator",
231229
"Dehydrator",
232230
null,
233-
RES_PATH_GUI + "basicmachines/Dehydrator",
231+
"",
234232
2,
235233
9,
236234
0,
@@ -246,7 +244,7 @@ public static class GTPP_Recipe_Map {
246244
"gtpp.recipe.vacfurnace",
247245
"Vacuum Furnace",
248246
null,
249-
RES_PATH_GUI + "basicmachines/FissionFuel",
247+
"",
250248
9,
251249
9,
252250
1,
@@ -262,7 +260,7 @@ public static class GTPP_Recipe_Map {
262260
"gtpp.recipe.alloyblastsmelter",
263261
"Alloy Blast Smelter",
264262
null,
265-
RES_PATH_GUI + "basicmachines/FissionFuel",
263+
"",
266264
9,
267265
9,
268266
1,
@@ -278,7 +276,7 @@ public static class GTPP_Recipe_Map {
278276
"gtpp.recipe.steamturbinefuel",
279277
"GeoThermal Fuel",
280278
null,
281-
RES_PATH_GUI + "basicmachines/Default",
279+
"",
282280
1,
283281
1,
284282
0,
@@ -296,7 +294,7 @@ public static class GTPP_Recipe_Map {
296294
"gtpp.recipe.lftr",
297295
"Liquid Fluoride Thorium Reactor",
298296
null,
299-
RES_PATH_GUI + "basicmachines/FissionFuel",
297+
"",
300298
0,
301299
0,
302300
0,
@@ -321,7 +319,7 @@ public static class GTPP_Recipe_Map {
321319
"gtpp.recipe.nuclearsaltprocessingplant",
322320
"Nuclear Salt Processing Plant",
323321
null,
324-
RES_PATH_GUI + "basicmachines/FissionFuel",
322+
"",
325323
0,
326324
6,
327325
0,
@@ -339,7 +337,7 @@ public static class GTPP_Recipe_Map {
339337
"gtpp.recipe.oremill",
340338
"Milling",
341339
null,
342-
RES_PATH_GUI + "basicmachines/LFTR",
340+
"",
343341
3,
344342
3,
345343
1,
@@ -377,7 +375,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
377375
"gtpp.recipe.fissionfuel",
378376
"Nuclear Fuel Processing",
379377
null,
380-
RES_PATH_GUI + "basicmachines/FissionFuel",
378+
"",
381379
0,
382380
0,
383381
0,
@@ -395,7 +393,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
395393
"gtpp.recipe.coldtrap",
396394
"Cold Trap",
397395
null,
398-
RES_PATH_GUI + "basicmachines/Dehydrator",
396+
"",
399397
2,
400398
9,
401399
0,
@@ -413,7 +411,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
413411
"gtpp.recipe.reactorprocessingunit",
414412
"Reactor Processing Unit",
415413
null,
416-
RES_PATH_GUI + "basicmachines/Dehydrator",
414+
"",
417415
2,
418416
9,
419417
0,
@@ -431,7 +429,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
431429
"gtpp.recipe.simplewasher",
432430
"Simple Dust Washer",
433431
null,
434-
RES_PATH_GUI + "basicmachines/PotionBrewer",
432+
"",
435433
1,
436434
1,
437435
0,
@@ -450,7 +448,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
450448
"gtpp.recipe.moleculartransformer",
451449
"Molecular Transformer",
452450
null,
453-
RES_PATH_GUI + "basicmachines/Scanner",
451+
"",
454452
1,
455453
1,
456454
0,
@@ -468,7 +466,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
468466
"gtpp.recipe.elementaldupe",
469467
"Elemental Duplicator",
470468
null,
471-
RES_PATH_GUI + "basicmachines/Replicator",
469+
"",
472470
1,
473471
1,
474472
0,
@@ -485,7 +483,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
485483
"gtpp.recipe.fluidchemicaleactor",
486484
"Chemical Plant",
487485
null,
488-
GTPlusPlus.ID + ":textures/gui/FluidReactor",
486+
"",
489487
4,
490488
4,
491489
0,
@@ -503,7 +501,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
503501
"gtpp.recipe.RTGgenerators",
504502
"RTG",
505503
null,
506-
"gregtech:textures/gui/basicmachines/Default",
504+
"",
507505
1,
508506
0,
509507
0,
@@ -521,7 +519,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
521519
"gtpp.recipe.thermalgeneratorfuel",
522520
"Thermal Generator Fuel",
523521
null,
524-
RES_PATH_GUI + "basicmachines/FissionFuel",
522+
"",
525523
9,
526524
9,
527525
0,
@@ -539,7 +537,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
539537
"gtpp.recipe.solartower",
540538
"Solar Tower",
541539
null,
542-
RES_PATH_GUI + "basicmachines/FissionFuel",
540+
"",
543541
0,
544542
0,
545543
0,
@@ -561,7 +559,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
561559
"gtpp.recipe.cyclotron",
562560
"COMET - Compact Cyclotron",
563561
null,
564-
RES_PATH_GUI + "basicmachines/BlastSmelter",
562+
"",
565563
9,
566564
9,
567565
0,
@@ -579,7 +577,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
579577
"gtpp.recipe.slowfusionreactor",
580578
"Mimir - Slow Fusion",
581579
null,
582-
"gregtech:textures/gui/basicmachines/LFTR",
580+
"",
583581
0,
584582
0,
585583
0,
@@ -591,31 +589,13 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
591589
true,
592590
true).useModularUI(true);
593591

594-
// Component Assembler
595-
public static final GT_Recipe_Map sComponentAssemblerRecipes = new GT_Recipe_Map_Assembler(
596-
new HashSet<>(300),
597-
"gtpp.recipe.componentassembler",
598-
"Component Assembler",
599-
null,
600-
RES_PATH_GUI + "basicmachines/Assembler",
601-
6,
602-
1,
603-
1,
604-
0,
605-
1,
606-
E,
607-
1,
608-
E,
609-
true,
610-
true).useModularUI(true);
611-
612592
// Special Maps for Multis
613593
public static final GT_Recipe_Map sFishPondRecipes = new GT_Recipe_Map(
614594
new HashSet<>(3),
615595
"gtpp.recipe.fishpond",
616596
"Zhuhai - Fishing Port",
617597
null,
618-
RES_PATH_GUI + "basicmachines/PotionBrewer",
598+
"",
619599
1,
620600
1,
621601
0,
@@ -632,7 +612,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
632612
"gtpp.recipe.spargetower",
633613
"Sparging",
634614
null,
635-
RES_PATH_GUI + "basicmachines/FissionFuel",
615+
"",
636616
9,
637617
9,
638618
0,
@@ -649,7 +629,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
649629
"gtpp.recipe.cryogenicfreezer",
650630
"Cryogenic Freezer",
651631
null,
652-
RES_PATH_GUI + "basicmachines/FissionFuel",
632+
"",
653633
1,
654634
1,
655635
0,
@@ -665,7 +645,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
665645
"gtpp.recipe.multicentrifuge",
666646
"Multiblock Centrifuge",
667647
null,
668-
RES_PATH_GUI + "basicmachines/FissionFuel",
648+
"",
669649
6,
670650
6,
671651
0,
@@ -682,7 +662,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
682662
"gtpp.recipe.multielectro",
683663
"Multiblock Electrolyzer",
684664
null,
685-
RES_PATH_GUI + "basicmachines/FissionFuel",
665+
"",
686666
6,
687667
6,
688668
0,
@@ -701,7 +681,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
701681
"gtpp.recipe.temp4",
702682
"temp4",
703683
null,
704-
RES_PATH_GUI + "basicmachines/PotionBrewer",
684+
"",
705685
0,
706686
0,
707687
0,
@@ -717,7 +697,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
717697
"gtpp.recipe.multimixer",
718698
"Multiblock Mixer",
719699
null,
720-
RES_PATH_GUI + "basicmachines/FissionFuel",
700+
"",
721701
9,
722702
9,
723703
0,
@@ -735,7 +715,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
735715
"gtpp.recipe.multidehydrator",
736716
"Multiblock Dehydrator",
737717
null,
738-
RES_PATH_GUI + "basicmachines/FissionFuel",
718+
"",
739719
6,
740720
9,
741721
0,
@@ -753,7 +733,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
753733
"gtpp.recipe.semifluidgeneratorfuels",
754734
"Semifluid Generator Fuels",
755735
null,
756-
RES_PATH_GUI + "basicmachines/Default",
736+
"",
757737
0,
758738
0,
759739
0,
@@ -771,7 +751,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
771751
"gtpp.recipe.flotationcell",
772752
"Flotation Cell",
773753
null,
774-
RES_PATH_GUI + "basicmachines/LFTR",
754+
"",
775755
6,
776756
0,
777757
1,
@@ -789,7 +769,7 @@ protected void drawNEIOverlayForInput(FixedPositionedStack stack) {
789769
"gtpp.recipe.treefarm",
790770
"Tree Growth Simulator",
791771
null,
792-
RES_PATH_GUI + "basicmachines/FissionFuel",
772+
"",
793773
1,
794774
2,
795775
1,
@@ -810,6 +790,7 @@ protected void drawNEIDurationInfo(NEIRecipeInfo recipeInfo) {}
810790
@Override
811791
protected List<String> handleNEIItemOutputTooltip(List<String> currentTip, FixedPositionedStack pStack) {
812792
if (ModItems.fluidFertBasic != null && pStack.isChanceBased()) {
793+
// noinspection deprecation
813794
currentTip
814795
.add(GRAY + "Outputted if " + ModItems.fluidFertBasic.getLocalizedName() + " is provided");
815796
} else {
@@ -824,6 +805,7 @@ protected void drawNEIOverlayForOutput(FixedPositionedStack stack) {}
824805
List<String> result = new ArrayList<>();
825806
if (ModItems.fluidFertBasic != null) {
826807
result.add("The sapling is not consumed.");
808+
// noinspection deprecation
827809
result.add("If " + ModItems.fluidFertBasic.getLocalizedName() + " is provided,");
828810
result.add("Saplings are made instead");
829811
}

0 commit comments

Comments
 (0)