Skip to content

Commit 967358b

Browse files
MCTian-miMCTian-mi
authored
Merge pull request #501 from SymmetricDevs/tm/finalization
Finalization
2 parents bb71518 + ff8e36f commit 967358b

File tree

5 files changed

+59
-59
lines changed

5 files changed

+59
-59
lines changed

‎src/main/java/supersymmetry/api/unification/material/info/SuSyMaterialFlags.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,40 @@
1010
public class SuSyMaterialFlags {
1111

1212

13-
public static MaterialFlag GENERATE_CATALYST_PELLET = (new MaterialFlag.Builder("generate_catalyst_pellet"))
13+
public static final MaterialFlag GENERATE_CATALYST_PELLET = (new MaterialFlag.Builder("generate_catalyst_pellet"))
1414
.requireProps(new PropertyKey[]{PropertyKey.DUST})
1515
.build();
1616

17-
public static MaterialFlag GENERATE_CATALYST_BED = (new MaterialFlag.Builder("generate_catalyst_bed"))
17+
public static final MaterialFlag GENERATE_CATALYST_BED = (new MaterialFlag.Builder("generate_catalyst_bed"))
1818
.requireProps(PropertyKey.DUST)
1919
.requireFlags(GENERATE_CATALYST_PELLET)
2020
.build();
2121

22-
public static MaterialFlag GENERATE_SIFTED = (new MaterialFlag.Builder("generate_sifted"))
22+
public static final MaterialFlag GENERATE_SIFTED = (new MaterialFlag.Builder("generate_sifted"))
2323
.requireProps(new PropertyKey[]{PropertyKey.ORE})
2424
.build();
2525

26-
public static MaterialFlag GENERATE_FLOTATED = (new MaterialFlag.Builder("generate_flotated"))
26+
public static final MaterialFlag GENERATE_FLOTATED = (new MaterialFlag.Builder("generate_flotated"))
2727
.requireProps(new PropertyKey[]{PropertyKey.ORE})
2828
.build();
2929

30-
public static MaterialFlag GENERATE_CONCENTRATE = (new MaterialFlag.Builder("generate_concentrate"))
30+
public static final MaterialFlag GENERATE_CONCENTRATE = (new MaterialFlag.Builder("generate_concentrate"))
3131
.requireProps(new PropertyKey[]{PropertyKey.ORE})
3232
.build();
3333

34-
public static MaterialFlag GENERATE_FIBER = (new MaterialFlag.Builder("generate_fiber"))
34+
public static final MaterialFlag GENERATE_FIBER = (new MaterialFlag.Builder("generate_fiber"))
3535
.requireProps(new PropertyKey[]{SuSyPropertyKey.FIBER})
3636
.build();
3737

38-
public static MaterialFlag GENERATE_WET_FIBER = (new MaterialFlag.Builder("generate_wet_fiber"))
38+
public static final MaterialFlag GENERATE_WET_FIBER = (new MaterialFlag.Builder("generate_wet_fiber"))
3939
.requireProps(new PropertyKey[]{SuSyPropertyKey.FIBER})
4040
.build();
4141

42-
public static MaterialFlag GENERATE_THREAD = (new MaterialFlag.Builder("generate_thread"))
42+
public static final MaterialFlag GENERATE_THREAD = (new MaterialFlag.Builder("generate_thread"))
4343
.requireProps(new PropertyKey[]{SuSyPropertyKey.FIBER})
4444
.build();
4545

46-
public static MaterialFlag GENERATE_WET_DUST = (new MaterialFlag.Builder("generate_wet_dust"))
46+
public static final MaterialFlag GENERATE_WET_DUST = (new MaterialFlag.Builder("generate_wet_dust"))
4747
.requireProps(new PropertyKey[]{PropertyKey.DUST})
4848
.build();
4949

‎src/main/java/supersymmetry/api/unification/material/info/SuSyMaterialIconSets.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44

55
public class SuSyMaterialIconSets {
66

7-
public static MaterialIconSet ULV = new MaterialIconSet("ulv",MaterialIconSet.DULL);
8-
public static MaterialIconSet LV = new MaterialIconSet("lv",MaterialIconSet.DULL);
9-
public static MaterialIconSet MV = new MaterialIconSet("mv",MaterialIconSet.DULL);
10-
public static MaterialIconSet HV = new MaterialIconSet("hv",MaterialIconSet.DULL);
11-
public static MaterialIconSet EV = new MaterialIconSet("ev",MaterialIconSet.DULL);
12-
public static MaterialIconSet IV = new MaterialIconSet("iv",MaterialIconSet.DULL);
13-
public static MaterialIconSet LuV = new MaterialIconSet("luv",MaterialIconSet.DULL);
14-
public static MaterialIconSet ZPM = new MaterialIconSet("zpm",MaterialIconSet.DULL);
15-
public static MaterialIconSet UV = new MaterialIconSet("uv",MaterialIconSet.DULL);
16-
public static MaterialIconSet UHV = new MaterialIconSet("uhv",MaterialIconSet.DULL);
17-
public static MaterialIconSet UEV = new MaterialIconSet("uev",MaterialIconSet.DULL);
18-
public static MaterialIconSet UIV = new MaterialIconSet("uiv",MaterialIconSet.DULL);
19-
public static MaterialIconSet UXV = new MaterialIconSet("uxv",MaterialIconSet.DULL);
20-
public static MaterialIconSet OpV = new MaterialIconSet("opv",MaterialIconSet.DULL);
21-
public static MaterialIconSet[] TIERS = new MaterialIconSet[] { ULV, LV, MV, HV, EV, IV, LuV, ZPM, UV, UHV, UEV, UIV, UXV, OpV };
7+
public static final MaterialIconSet ULV = new MaterialIconSet("ulv",MaterialIconSet.DULL);
8+
public static final MaterialIconSet LV = new MaterialIconSet("lv",MaterialIconSet.DULL);
9+
public static final MaterialIconSet MV = new MaterialIconSet("mv",MaterialIconSet.DULL);
10+
public static final MaterialIconSet HV = new MaterialIconSet("hv",MaterialIconSet.DULL);
11+
public static final MaterialIconSet EV = new MaterialIconSet("ev",MaterialIconSet.DULL);
12+
public static final MaterialIconSet IV = new MaterialIconSet("iv",MaterialIconSet.DULL);
13+
public static final MaterialIconSet LuV = new MaterialIconSet("luv",MaterialIconSet.DULL);
14+
public static final MaterialIconSet ZPM = new MaterialIconSet("zpm",MaterialIconSet.DULL);
15+
public static final MaterialIconSet UV = new MaterialIconSet("uv",MaterialIconSet.DULL);
16+
public static final MaterialIconSet UHV = new MaterialIconSet("uhv",MaterialIconSet.DULL);
17+
public static final MaterialIconSet UEV = new MaterialIconSet("uev",MaterialIconSet.DULL);
18+
public static final MaterialIconSet UIV = new MaterialIconSet("uiv",MaterialIconSet.DULL);
19+
public static final MaterialIconSet UXV = new MaterialIconSet("uxv",MaterialIconSet.DULL);
20+
public static final MaterialIconSet OpV = new MaterialIconSet("opv",MaterialIconSet.DULL);
21+
public static final MaterialIconSet[] TIERS = new MaterialIconSet[] { ULV, LV, MV, HV, EV, IV, LuV, ZPM, UV, UHV, UEV, UIV, UXV, OpV };
2222
}

‎src/main/java/supersymmetry/api/unification/material/info/SuSyMaterialIconType.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
import org.jetbrains.annotations.Nullable;
55

66
public class SuSyMaterialIconType {
7-
public static MaterialIconType catalystBed = new MaterialIconType("catalystBed");
8-
public static MaterialIconType catalystPellet = new MaterialIconType("catalystPellet");
9-
public static MaterialIconType sheetedFrame = new MaterialIconType("sheetedFrame");
10-
public static MaterialIconType sifted = new MaterialIconType("sifted");
11-
public static MaterialIconType flotated = new MaterialIconType("flotated");
12-
public static MaterialIconType concentrate = new MaterialIconType("concentrate");
13-
public static MaterialIconType fiber = new MaterialIconType("fiber");
14-
public static MaterialIconType wetFiber = new MaterialIconType("wetFiber");
15-
public static MaterialIconType thread = new MaterialIconType("thread");
16-
public static MaterialIconType slurry = new MaterialIconType("slurry");
17-
public static MaterialIconType supercritical = new MaterialIconType("supercritical");
18-
public static MaterialIconType dustWet = new MaterialIconType("dustWet");
19-
public static MaterialIconType electrode = new MaterialIconType("electrode");
7+
public static final MaterialIconType catalystBed = new MaterialIconType("catalystBed");
8+
public static final MaterialIconType catalystPellet = new MaterialIconType("catalystPellet");
9+
public static final MaterialIconType sheetedFrame = new MaterialIconType("sheetedFrame");
10+
public static final MaterialIconType sifted = new MaterialIconType("sifted");
11+
public static final MaterialIconType flotated = new MaterialIconType("flotated");
12+
public static final MaterialIconType concentrate = new MaterialIconType("concentrate");
13+
public static final MaterialIconType fiber = new MaterialIconType("fiber");
14+
public static final MaterialIconType wetFiber = new MaterialIconType("wetFiber");
15+
public static final MaterialIconType thread = new MaterialIconType("thread");
16+
public static final MaterialIconType slurry = new MaterialIconType("slurry");
17+
public static final MaterialIconType supercritical = new MaterialIconType("supercritical");
18+
public static final MaterialIconType dustWet = new MaterialIconType("dustWet");
19+
public static final MaterialIconType electrode = new MaterialIconType("electrode");
2020
}

‎src/main/java/supersymmetry/api/unification/material/properties/SuSyPropertyKey.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
import gregtech.api.unification.material.properties.PropertyKey;
44
import gregtech.api.unification.material.properties.IMaterialProperty;
55

6-
public class SuSyPropertyKey<T extends IMaterialProperty> {
6+
public class SuSyPropertyKey {
77
public static final PropertyKey<FiberProperty> FIBER = new PropertyKey<>("fiber", FiberProperty.class);
88
}

‎src/main/java/supersymmetry/api/unification/ore/SusyOrePrefix.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,39 @@
1010
import static gregtech.api.unification.ore.OrePrefix.Flags.ENABLE_UNIFICATION;
1111

1212
public class SusyOrePrefix {
13-
public static OrePrefix oreGabbro = new OrePrefix("oreGabbro", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty);
14-
public static OrePrefix oreGneiss = new OrePrefix("oreGneiss", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty);
15-
public static OrePrefix oreLimestone = new OrePrefix("oreLimestone", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty);
16-
public static OrePrefix orePhyllite = new OrePrefix("orePhyllite", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty);
17-
public static OrePrefix oreQuartzite = new OrePrefix("oreQuartzite", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty);
18-
public static OrePrefix oreShale = new OrePrefix("oreShale", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty);
19-
public static OrePrefix oreSlate = new OrePrefix("oreSlate", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty);
20-
public static OrePrefix oreSoapstone = new OrePrefix("oreSoapstone", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty);
21-
public static OrePrefix oreKimberlite = new OrePrefix("oreKimberlite", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty);
22-
public static OrePrefix oreAnorthosite = new OrePrefix("oreAnorthosite", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty);
13+
public static final OrePrefix oreGabbro = new OrePrefix("oreGabbro", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty);
14+
public static final OrePrefix oreGneiss = new OrePrefix("oreGneiss", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty);
15+
public static final OrePrefix oreLimestone = new OrePrefix("oreLimestone", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty);
16+
public static final OrePrefix orePhyllite = new OrePrefix("orePhyllite", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty);
17+
public static final OrePrefix oreQuartzite = new OrePrefix("oreQuartzite", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty);
18+
public static final OrePrefix oreShale = new OrePrefix("oreShale", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty);
19+
public static final OrePrefix oreSlate = new OrePrefix("oreSlate", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty);
20+
public static final OrePrefix oreSoapstone = new OrePrefix("oreSoapstone", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty);
21+
public static final OrePrefix oreKimberlite = new OrePrefix("oreKimberlite", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty);
22+
public static final OrePrefix oreAnorthosite = new OrePrefix("oreAnorthosite", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty);
2323

2424

25-
public static OrePrefix catalystBed = new OrePrefix("catalystBed", GTValues.M * 4, null, SuSyMaterialIconType.catalystBed, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> mat.hasFlag(SuSyMaterialFlags.GENERATE_CATALYST_BED));
26-
public static OrePrefix catalystPellet = new OrePrefix("catalystPellet", GTValues.M / 4, null, SuSyMaterialIconType.catalystPellet, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> mat.hasFlag(SuSyMaterialFlags.GENERATE_CATALYST_PELLET));
25+
public static final OrePrefix catalystBed = new OrePrefix("catalystBed", GTValues.M * 4, null, SuSyMaterialIconType.catalystBed, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> mat.hasFlag(SuSyMaterialFlags.GENERATE_CATALYST_BED));
26+
public static final OrePrefix catalystPellet = new OrePrefix("catalystPellet", GTValues.M / 4, null, SuSyMaterialIconType.catalystPellet, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> mat.hasFlag(SuSyMaterialFlags.GENERATE_CATALYST_PELLET));
2727

2828
// Sheeted Frames (10 ingots of materials in, 12 sheeted frames out)
2929
//M *10 / 12 [5/6] = materialAmount (I do not know what M means), 1L = ENABLE_UNIFICATION
3030
//public static OrePrefix frameGt = new OrePrefix("frameGt", M * 2, null, null, ENABLE_UNIFICATION, material -> material.hasFlag(GENERATE_FRAME)); [for reference]
31-
public static OrePrefix sheetedFrame = new OrePrefix("sheetedFrame", (GTValues.M * 5) / 6, null, SuSyMaterialIconType.sheetedFrame, ENABLE_UNIFICATION, (material) -> material.hasFlag(MaterialFlags.GENERATE_FRAME));
31+
public static final OrePrefix sheetedFrame = new OrePrefix("sheetedFrame", (GTValues.M * 5) / 6, null, SuSyMaterialIconType.sheetedFrame, ENABLE_UNIFICATION, (material) -> material.hasFlag(MaterialFlags.GENERATE_FRAME));
3232

3333
// Tiered Catalysts Beds
3434

35-
public static OrePrefix catalystBedReduction = new OrePrefix("catalystBedReduction", GTValues.M, null, SuSyMaterialIconType.catalystBed, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> false);
36-
public static OrePrefix catalystBedOxidation = new OrePrefix("catalystBedOxidation", GTValues.M, null, SuSyMaterialIconType.catalystBed, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> false);
37-
public static OrePrefix catalystBedCracking = new OrePrefix("catalystBedCracking", GTValues.M, null, SuSyMaterialIconType.catalystBed, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> false);
38-
public static OrePrefix catalystBedZieglerNatta = new OrePrefix("catalystBedZieglerNatta", GTValues.M, null, SuSyMaterialIconType.catalystBed, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> false);
35+
public static final OrePrefix catalystBedReduction = new OrePrefix("catalystBedReduction", GTValues.M, null, SuSyMaterialIconType.catalystBed, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> false);
36+
public static final OrePrefix catalystBedOxidation = new OrePrefix("catalystBedOxidation", GTValues.M, null, SuSyMaterialIconType.catalystBed, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> false);
37+
public static final OrePrefix catalystBedCracking = new OrePrefix("catalystBedCracking", GTValues.M, null, SuSyMaterialIconType.catalystBed, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> false);
38+
public static final OrePrefix catalystBedZieglerNatta = new OrePrefix("catalystBedZieglerNatta", GTValues.M, null, SuSyMaterialIconType.catalystBed, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> false);
3939

4040
// Tiered Catalyst Pellets
4141

42-
public static OrePrefix catalystPelletReduction = new OrePrefix("catalystPelletReduction", GTValues.M * 4, null, SuSyMaterialIconType.catalystPellet, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> false);
43-
public static OrePrefix catalystPelletOxidation = new OrePrefix("catalystPelletOxidation", GTValues.M * 4, null, SuSyMaterialIconType.catalystPellet, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> false);
44-
public static OrePrefix catalystPelletCracking = new OrePrefix("catalystPelletCracking", GTValues.M * 4, null, SuSyMaterialIconType.catalystPellet, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> false);
45-
public static OrePrefix catalystPelletZieglerNatta = new OrePrefix("catalystPelletZieglerNatta", GTValues.M * 4, null, SuSyMaterialIconType.catalystPellet, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> false);
42+
public static final OrePrefix catalystPelletReduction = new OrePrefix("catalystPelletReduction", GTValues.M * 4, null, SuSyMaterialIconType.catalystPellet, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> false);
43+
public static final OrePrefix catalystPelletOxidation = new OrePrefix("catalystPelletOxidation", GTValues.M * 4, null, SuSyMaterialIconType.catalystPellet, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> false);
44+
public static final OrePrefix catalystPelletCracking = new OrePrefix("catalystPelletCracking", GTValues.M * 4, null, SuSyMaterialIconType.catalystPellet, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> false);
45+
public static final OrePrefix catalystPelletZieglerNatta = new OrePrefix("catalystPelletZieglerNatta", GTValues.M * 4, null, SuSyMaterialIconType.catalystPellet, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> false);
4646

4747
// Ore Processing Intermediates
4848

0 commit comments

Comments
 (0)