Skip to content

Commit c064d58

Browse files
ghzdudeghzdude
committed
set mui2 for map ui
spotless
1 parent 5d504e3 commit c064d58

2 files changed

Lines changed: 38 additions & 71 deletions

File tree

‎src/main/java/gregtech/api/recipes/RecipeMaps.java‎

Lines changed: 37 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
package gregtech.api.recipes;
22

3-
import com.cleanroommc.modularui.widgets.ProgressWidget.Direction;
4-
53
import gregtech.api.GTValues;
64
import gregtech.api.gui.GuiTextures;
75
import gregtech.api.gui.widgets.ProgressWidget;
8-
import gregtech.api.gui.widgets.ProgressWidget.MoveType;
96
import gregtech.api.mui.GTGuiTextures;
107
import gregtech.api.recipes.builders.AssemblerRecipeBuilder;
118
import gregtech.api.recipes.builders.AssemblyLineRecipeBuilder;
@@ -42,6 +39,7 @@
4239
import net.minecraft.init.SoundEvents;
4340
import net.minecraft.item.ItemStack;
4441

42+
import com.cleanroommc.modularui.widgets.ProgressWidget.Direction;
4543
import crafttweaker.annotations.ZenRegister;
4644
import stanhebben.zenscript.annotations.ZenClass;
4745
import stanhebben.zenscript.annotations.ZenProperty;
@@ -378,10 +376,10 @@ public final class RecipeMaps {
378376
.fluidInputs(1)
379377
.fluidOutputs(6)
380378
.uiBuilder(b -> b
381-
.itemSlotOverlay(GTGuiTextures.EXTRACTOR_OVERLAY, false, false)
382-
.itemSlotOverlay(GTGuiTextures.CANISTER_OVERLAY, false, true)
383-
.fluidSlotOverlay(GTGuiTextures.CENTRIFUGE_OVERLAY, false, true)
384-
.progressBar(GTGuiTextures.PROGRESS_BAR_EXTRACT))
379+
.itemSlotOverlay(GTGuiTextures.EXTRACTOR_OVERLAY, false, false)
380+
.itemSlotOverlay(GTGuiTextures.CANISTER_OVERLAY, false, true)
381+
.fluidSlotOverlay(GTGuiTextures.CENTRIFUGE_OVERLAY, false, true)
382+
.progressBar(GTGuiTextures.PROGRESS_BAR_EXTRACT))
385383
.sound(GTSoundEvents.CENTRIFUGE)
386384
.build();
387385

@@ -448,8 +446,7 @@ public final class RecipeMaps {
448446
.fluidSlotOverlay(GTGuiTextures.MOLECULAR_OVERLAY_3, false, false)
449447
.fluidSlotOverlay(GTGuiTextures.MOLECULAR_OVERLAY_4, false, true)
450448
.fluidSlotOverlay(GTGuiTextures.VIAL_OVERLAY_2, true)
451-
.progressBar(GTGuiTextures.PROGRESS_BAR_ARROW_MULTIPLE)
452-
)
449+
.progressBar(GTGuiTextures.PROGRESS_BAR_ARROW_MULTIPLE))
453450
.sound(GTValues.FOOLS.get() ? GTSoundEvents.SCIENCE : GTSoundEvents.CHEMICAL_REACTOR)
454451
.onBuild(gregtechId("lcr_copy"), recipeBuilder -> RecipeMaps.LARGE_CHEMICAL_RECIPES.recipeBuilder()
455452
.inputs(recipeBuilder.getInputs().toArray(new GTRecipeInput[0]))
@@ -499,8 +496,7 @@ public final class RecipeMaps {
499496
.fluidInputs(1)
500497
.uiBuilder(b -> b
501498
.itemSlotOverlay(GTGuiTextures.CIRCUIT_OVERLAY, false)
502-
.progressBar(GTGuiTextures.PROGRESS_BAR_CIRCUIT_ASSEMBLER)
503-
)
499+
.progressBar(GTGuiTextures.PROGRESS_BAR_CIRCUIT_ASSEMBLER))
504500
.sound(GTSoundEvents.ASSEMBLER)
505501
.onBuild(gregtechId("circuit_assembler_solder"), recipeBuilder -> {
506502
if (recipeBuilder.getFluidInputs().isEmpty()) {
@@ -564,8 +560,7 @@ public final class RecipeMaps {
564560
.itemOutputs(1)
565561
.uiBuilder(b -> b
566562
.itemSlotOverlay(GTGuiTextures.COMPRESSOR_OVERLAY, false)
567-
.progressBar(GTGuiTextures.PROGRESS_BAR_COMPRESS)
568-
)
563+
.progressBar(GTGuiTextures.PROGRESS_BAR_COMPRESS))
569564
.sound(GTSoundEvents.COMPRESSOR)
570565
.build();
571566

@@ -625,8 +620,7 @@ public final class RecipeMaps {
625620
.itemSlotOverlay(GTGuiTextures.SAWBLADE_OVERLAY, false)
626621
.itemSlotOverlay(GTGuiTextures.CUTTER_OVERLAY, true, false)
627622
.itemSlotOverlay(GTGuiTextures.DUST_OVERLAY, true, true)
628-
.progressBar(GTGuiTextures.PROGRESS_BAR_SLICE)
629-
)
623+
.progressBar(GTGuiTextures.PROGRESS_BAR_SLICE))
630624
.sound(GTSoundEvents.CUT)
631625
.onBuild(gregtechId("cutter_fluid"), recipeBuilder -> {
632626
if (recipeBuilder.getFluidInputs().isEmpty()) {
@@ -720,8 +714,7 @@ public final class RecipeMaps {
720714
.itemSlotOverlay(GTGuiTextures.DUST_OVERLAY, true)
721715
.fluidSlotOverlay(GTGuiTextures.BEAKER_OVERLAY_1, false)
722716
.fluidSlotOverlay(GTGuiTextures.BEAKER_OVERLAY_4, true)
723-
.progressBar(GTGuiTextures.PROGRESS_BAR_ARROW_MULTIPLE)
724-
)
717+
.progressBar(GTGuiTextures.PROGRESS_BAR_ARROW_MULTIPLE))
725718
.sound(GTSoundEvents.BOILER)
726719
.build();
727720

@@ -750,8 +743,7 @@ public final class RecipeMaps {
750743
.itemSlotOverlay(GTGuiTextures.LIGHTNING_OVERLAY_1, false, false)
751744
.itemSlotOverlay(GTGuiTextures.CANISTER_OVERLAY, false, true)
752745
.fluidSlotOverlay(GTGuiTextures.LIGHTNING_OVERLAY_2, false)
753-
.progressBar(GTGuiTextures.PROGRESS_BAR_EXTRACT)
754-
)
746+
.progressBar(GTGuiTextures.PROGRESS_BAR_EXTRACT))
755747
.sound(GTSoundEvents.ELECTROLYZER)
756748
.build();
757749

@@ -777,8 +769,7 @@ public final class RecipeMaps {
777769
.uiBuilder(b -> b
778770
.itemSlotOverlay(GTGuiTextures.CRUSHED_ORE_OVERLAY, false)
779771
.itemSlotOverlay(GTGuiTextures.DUST_OVERLAY, true)
780-
.progressBar(GTGuiTextures.PROGRESS_BAR_MAGNET)
781-
)
772+
.progressBar(GTGuiTextures.PROGRESS_BAR_MAGNET))
782773
.sound(GTSoundEvents.ARC)
783774
.build();
784775

@@ -804,8 +795,7 @@ public final class RecipeMaps {
804795
.fluidOutputs(1)
805796
.uiBuilder(b -> b
806797
.itemSlotOverlay(GTGuiTextures.EXTRACTOR_OVERLAY, false)
807-
.progressBar(GTGuiTextures.PROGRESS_BAR_EXTRACT)
808-
)
798+
.progressBar(GTGuiTextures.PROGRESS_BAR_EXTRACT))
809799
.sound(GTSoundEvents.COMPRESSOR)
810800
.build();
811801

@@ -829,8 +819,7 @@ public final class RecipeMaps {
829819
.itemOutputs(1)
830820
.uiBuilder(b -> b
831821
.itemSlotOverlay(GTGuiTextures.MOLD_OVERLAY, false, true)
832-
.progressBar(GTGuiTextures.PROGRESS_BAR_EXTRUDER)
833-
)
822+
.progressBar(GTGuiTextures.PROGRESS_BAR_EXTRUDER))
834823
.sound(GTSoundEvents.ARC)
835824
.build();
836825

@@ -856,8 +845,7 @@ public final class RecipeMaps {
856845
.fluidOutputs(1)
857846
.uiBuilder(b -> b
858847
.itemSlotOverlay(GTGuiTextures.DUST_OVERLAY, false, true)
859-
.itemSlotOverlay(GTGuiTextures.DUST_OVERLAY, true, true)
860-
)
848+
.itemSlotOverlay(GTGuiTextures.DUST_OVERLAY, true, true))
861849
.sound(GTSoundEvents.CHEMICAL_REACTOR)
862850
.build();
863851

@@ -883,8 +871,7 @@ public final class RecipeMaps {
883871
.uiBuilder(b -> b
884872
.itemSlotOverlay(GTGuiTextures.INT_CIRCUIT_OVERLAY, false, true)
885873
.fluidSlotOverlay(GTGuiTextures.HEATING_OVERLAY_1, false)
886-
.fluidSlotOverlay(GTGuiTextures.HEATING_OVERLAY_2, true)
887-
)
874+
.fluidSlotOverlay(GTGuiTextures.HEATING_OVERLAY_2, true))
888875
.sound(GTSoundEvents.BOILER)
889876
.build();
890877

@@ -908,8 +895,7 @@ public final class RecipeMaps {
908895
.itemOutputs(1)
909896
.fluidInputs(1)
910897
.uiBuilder(b -> b
911-
.itemSlotOverlay(GTGuiTextures.SOLIDIFIER_OVERLAY, false)
912-
)
898+
.itemSlotOverlay(GTGuiTextures.SOLIDIFIER_OVERLAY, false))
913899
.sound(GTSoundEvents.COOLING)
914900
.build();
915901

@@ -933,8 +919,7 @@ public final class RecipeMaps {
933919
.uiBuilder(b -> b
934920
.itemSlotOverlay(GTGuiTextures.HAMMER_OVERLAY, false)
935921
.specialTexture(GTGuiTextures.PROGRESS_BAR_HAMMER_BASE, 78, 42, 20, 6)
936-
.progressBar(GTGuiTextures.PROGRESS_BAR_HAMMER, Direction.DOWN)
937-
)
922+
.progressBar(GTGuiTextures.PROGRESS_BAR_HAMMER, Direction.DOWN))
938923
.sound(GTSoundEvents.FORGE_HAMMER)
939924
.build();
940925

@@ -1025,8 +1010,7 @@ public final class RecipeMaps {
10251010
.uiBuilder(b -> b
10261011
.itemSlotOverlay(GTGuiTextures.INT_CIRCUIT_OVERLAY, false, true)
10271012
.fluidSlotOverlay(GTGuiTextures.CENTRIFUGE_OVERLAY, true)
1028-
.progressBar(GTGuiTextures.PROGRESS_BAR_GAS_COLLECTOR)
1029-
)
1013+
.progressBar(GTGuiTextures.PROGRESS_BAR_GAS_COLLECTOR))
10301014
.sound(GTSoundEvents.COOLING)
10311015
.build();
10321016

@@ -1135,8 +1119,7 @@ public final class RecipeMaps {
11351119
.itemInputs(2)
11361120
.itemOutputs(1)
11371121
.uiBuilder(b -> b
1138-
.itemSlotOverlay(GTGuiTextures.LENS_OVERLAY, false, true)
1139-
)
1122+
.itemSlotOverlay(GTGuiTextures.LENS_OVERLAY, false, true))
11401123
.sound(GTSoundEvents.ELECTROLYZER)
11411124
.build();
11421125

@@ -1162,8 +1145,7 @@ public final class RecipeMaps {
11621145
.itemSlotOverlay(GTGuiTextures.PIPE_OVERLAY_2, true, false)
11631146
.itemSlotOverlay(GTGuiTextures.DUST_OVERLAY, true, true)
11641147
.specialTexture(GTGuiTextures.PROGRESS_BAR_LATHE_BASE, 98, 24, 5, 18)
1165-
.progressBar(GTGuiTextures.PROGRESS_BAR_LATHE)
1166-
)
1148+
.progressBar(GTGuiTextures.PROGRESS_BAR_LATHE))
11671149
.sound(GTSoundEvents.CUT)
11681150
.build();
11691151

@@ -1189,8 +1171,7 @@ public final class RecipeMaps {
11891171
.uiBuilder(b -> b
11901172
.itemSlotOverlay(GTGuiTextures.CRUSHED_ORE_OVERLAY, false)
11911173
.itemSlotOverlay(GTGuiTextures.DUST_OVERLAY, true)
1192-
.progressBar(GTGuiTextures.PROGRESS_BAR_MACERATE)
1193-
)
1174+
.progressBar(GTGuiTextures.PROGRESS_BAR_MACERATE))
11941175
.sound(GTSoundEvents.MACERATOR)
11951176
.build();
11961177

@@ -1209,8 +1190,7 @@ public final class RecipeMaps {
12091190
.fluidSlotOverlay(GTGuiTextures.ATOMIC_OVERLAY_2, false)
12101191
.fluidSlotOverlay(GTGuiTextures.POSITIVE_MATTER_OVERLAY, true)
12111192
.fluidSlotOverlay(GTGuiTextures.NEUTRAL_MATTER_OVERLAY, true, true)
1212-
.progressBar(GTGuiTextures.PROGRESS_BAR_MASS_FAB)
1213-
)
1193+
.progressBar(GTGuiTextures.PROGRESS_BAR_MASS_FAB))
12141194
.sound(GTSoundEvents.REPLICATOR)
12151195
.build();
12161196

@@ -1237,8 +1217,7 @@ public final class RecipeMaps {
12371217
.uiBuilder(b -> b
12381218
.itemSlotOverlay(GTGuiTextures.DUST_OVERLAY, false)
12391219
.itemSlotOverlay(GTGuiTextures.DUST_OVERLAY, true)
1240-
.progressBar(GTGuiTextures.PROGRESS_BAR_MIXER, Direction.CIRCULAR_CW)
1241-
)
1220+
.progressBar(GTGuiTextures.PROGRESS_BAR_MIXER, Direction.CIRCULAR_CW))
12421221
.sound(GTSoundEvents.MIXER)
12431222
.build();
12441223

@@ -1266,8 +1245,7 @@ public final class RecipeMaps {
12661245
.uiBuilder(b -> b
12671246
.itemSlotOverlay(GTGuiTextures.CRUSHED_ORE_OVERLAY, false)
12681247
.itemSlotOverlay(GTGuiTextures.DUST_OVERLAY, true)
1269-
.progressBar(GTGuiTextures.PROGRESS_BAR_BATH, Direction.CIRCULAR_CW)
1270-
)
1248+
.progressBar(GTGuiTextures.PROGRESS_BAR_BATH, Direction.CIRCULAR_CW))
12711249
.sound(GTSoundEvents.BATH)
12721250
.build();
12731251

@@ -1294,8 +1272,7 @@ public final class RecipeMaps {
12941272
.uiBuilder(b -> b
12951273
.itemSlotOverlay(GTGuiTextures.BOX_OVERLAY, false, true)
12961274
.itemSlotOverlay(GTGuiTextures.BOXED_OVERLAY, true)
1297-
.progressBar(GTGuiTextures.PROGRESS_BAR_UNPACKER)
1298-
)
1275+
.progressBar(GTGuiTextures.PROGRESS_BAR_UNPACKER))
12991276
.sound(GTSoundEvents.ASSEMBLER)
13001277
.build();
13011278

@@ -1317,8 +1294,7 @@ public final class RecipeMaps {
13171294
.itemInputs(1)
13181295
.itemOutputs(1)
13191296
.uiBuilder(b -> b
1320-
.progressBar(GTGuiTextures.PROGRESS_BAR_MAGNET)
1321-
)
1297+
.progressBar(GTGuiTextures.PROGRESS_BAR_MAGNET))
13221298
.sound(GTSoundEvents.ARC)
13231299
.build();
13241300

@@ -1392,8 +1368,7 @@ public final class RecipeMaps {
13921368
.fluidSlotOverlay(GTGuiTextures.NEUTRAL_MATTER_OVERLAY, false)
13931369
.fluidSlotOverlay(GTGuiTextures.POSITIVE_MATTER_OVERLAY, false, true)
13941370
.fluidSlotOverlay(GTGuiTextures.ATOMIC_OVERLAY_2, true)
1395-
.progressBar(GTGuiTextures.PROGRESS_BAR_REPLICATOR)
1396-
)
1371+
.progressBar(GTGuiTextures.PROGRESS_BAR_REPLICATOR))
13971372
.sound(GTSoundEvents.REPLICATOR)
13981373
.build();
13991374

@@ -1409,8 +1384,7 @@ public final class RecipeMaps {
14091384
.uiBuilder(b -> b
14101385
.itemSlotOverlay(GTGuiTextures.DUST_OVERLAY, false)
14111386
.itemSlotOverlay(GTGuiTextures.CRUSHED_ORE_OVERLAY, true)
1412-
.progressBar(GTGuiTextures.PROGRESS_BAR_MACERATE)
1413-
)
1387+
.progressBar(GTGuiTextures.PROGRESS_BAR_MACERATE))
14141388
.sound(GTSoundEvents.FIRE)
14151389
.build();
14161390

@@ -1460,8 +1434,7 @@ public final class RecipeMaps {
14601434
.itemInputs(1)
14611435
.itemOutputs(6)
14621436
.uiBuilder(b -> b
1463-
.progressBar(GTGuiTextures.PROGRESS_BAR_SIFT, Direction.DOWN)
1464-
)
1437+
.progressBar(GTGuiTextures.PROGRESS_BAR_SIFT, Direction.DOWN))
14651438
.sound(SoundEvents.BLOCK_SAND_PLACE)
14661439
.build();
14671440

@@ -1490,8 +1463,7 @@ public final class RecipeMaps {
14901463
.uiBuilder(b -> b
14911464
.itemSlotOverlay(GTGuiTextures.CRUSHED_ORE_OVERLAY, false)
14921465
.itemSlotOverlay(GTGuiTextures.DUST_OVERLAY, true)
1493-
.progressBar(GTGuiTextures.PROGRESS_BAR_MACERATE)
1494-
)
1466+
.progressBar(GTGuiTextures.PROGRESS_BAR_MACERATE))
14951467
.sound(GTSoundEvents.CENTRIFUGE)
14961468
.build();
14971469

@@ -1538,8 +1510,7 @@ public final class RecipeMaps {
15381510
.uiBuilder(b -> b
15391511
.itemSlotOverlay(GTGuiTextures.WIREMILL_OVERLAY, false)
15401512
.itemSlotOverlay(GTGuiTextures.INT_CIRCUIT_OVERLAY, false, true)
1541-
.progressBar(GTGuiTextures.PROGRESS_BAR_WIREMILL)
1542-
)
1513+
.progressBar(GTGuiTextures.PROGRESS_BAR_WIREMILL))
15431514
.sound(GTSoundEvents.MOTOR)
15441515
.build();
15451516

@@ -1553,8 +1524,7 @@ public final class RecipeMaps {
15531524
.fluidInputs(1)
15541525
.uiBuilder(b -> b
15551526
.fluidSlotOverlay(GTGuiTextures.FURNACE_OVERLAY_2, false)
1556-
.progressBar(GTGuiTextures.PROGRESS_BAR_ARROW_MULTIPLE)
1557-
)
1527+
.progressBar(GTGuiTextures.PROGRESS_BAR_ARROW_MULTIPLE))
15581528
.sound(GTSoundEvents.COMBUSTION)
15591529
.allowEmptyOutputs()
15601530
.generator()
@@ -1566,8 +1536,7 @@ public final class RecipeMaps {
15661536
.fluidInputs(1)
15671537
.uiBuilder(b -> b
15681538
.fluidSlotOverlay(GTGuiTextures.DARK_CANISTER_OVERLAY, false)
1569-
.progressBar(GTGuiTextures.PROGRESS_BAR_GAS_COLLECTOR)
1570-
)
1539+
.progressBar(GTGuiTextures.PROGRESS_BAR_GAS_COLLECTOR))
15711540
.sound(GTSoundEvents.TURBINE)
15721541
.allowEmptyOutputs()
15731542
.generator()
@@ -1580,8 +1549,7 @@ public final class RecipeMaps {
15801549
.fluidOutputs(1)
15811550
.uiBuilder(b -> b
15821551
.fluidSlotOverlay(GTGuiTextures.CENTRIFUGE_OVERLAY, false)
1583-
.progressBar(GTGuiTextures.PROGRESS_BAR_GAS_COLLECTOR)
1584-
)
1552+
.progressBar(GTGuiTextures.PROGRESS_BAR_GAS_COLLECTOR))
15851553
.sound(GTSoundEvents.TURBINE)
15861554
.allowEmptyOutputs()
15871555
.generator()
@@ -1593,8 +1561,7 @@ public final class RecipeMaps {
15931561
.fluidInputs(1)
15941562
.uiBuilder(b -> b
15951563
.fluidSlotOverlay(GTGuiTextures.FURNACE_OVERLAY_2, false)
1596-
.progressBar(GTGuiTextures.PROGRESS_BAR_ARROW_MULTIPLE)
1597-
)
1564+
.progressBar(GTGuiTextures.PROGRESS_BAR_ARROW_MULTIPLE))
15981565
.sound(GTSoundEvents.COMBUSTION)
15991566
.allowEmptyOutputs()
16001567
.generator()
@@ -1607,8 +1574,7 @@ public final class RecipeMaps {
16071574
.fluidOutputs(1)
16081575
.uiBuilder(b -> b
16091576
.fluidSlotOverlay(GTGuiTextures.CENTRIFUGE_OVERLAY, false)
1610-
.progressBar(GTGuiTextures.PROGRESS_BAR_GAS_COLLECTOR)
1611-
)
1577+
.progressBar(GTGuiTextures.PROGRESS_BAR_GAS_COLLECTOR))
16121578
.sound(GTSoundEvents.TURBINE)
16131579
.allowEmptyOutputs()
16141580
.generator()

‎src/main/java/gregtech/api/recipes/ui/RecipeMapUIBuilder.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public class RecipeMapUIBuilder {
1414

1515
public RecipeMapUIBuilder(RecipeMapUI<?> mapUI) {
1616
this.mapUI = mapUI;
17+
this.mapUI.setUsesMui2();
1718
}
1819

1920
/**

0 commit comments

Comments
 (0)