diff --git a/src/main/java/supersymmetry/api/unification/material/info/SuSyMaterialFlags.java b/src/main/java/supersymmetry/api/unification/material/info/SuSyMaterialFlags.java index e61165968..dfbf3fab9 100644 --- a/src/main/java/supersymmetry/api/unification/material/info/SuSyMaterialFlags.java +++ b/src/main/java/supersymmetry/api/unification/material/info/SuSyMaterialFlags.java @@ -39,6 +39,11 @@ public class SuSyMaterialFlags { .requireProps(new PropertyKey[]{SuSyPropertyKey.FIBER}) .build(); + public static MaterialFlag GENERATE_WET_DUST = (new MaterialFlag.Builder("generate_wet_dust")) + .requireProps(new PropertyKey[]{PropertyKey.DUST}) + .build(); + + public SuSyMaterialFlags() {} } diff --git a/src/main/java/supersymmetry/api/unification/material/info/SuSyMaterialIconType.java b/src/main/java/supersymmetry/api/unification/material/info/SuSyMaterialIconType.java index 9a5732de2..b75200093 100644 --- a/src/main/java/supersymmetry/api/unification/material/info/SuSyMaterialIconType.java +++ b/src/main/java/supersymmetry/api/unification/material/info/SuSyMaterialIconType.java @@ -14,4 +14,5 @@ public class SuSyMaterialIconType { public static MaterialIconType thread = new MaterialIconType("thread"); public static MaterialIconType slurry = new MaterialIconType("slurry"); public static MaterialIconType supercritical = new MaterialIconType("supercritical"); + public static MaterialIconType dustWet = new MaterialIconType("dustWet"); } diff --git a/src/main/java/supersymmetry/api/unification/ore/SusyOrePrefix.java b/src/main/java/supersymmetry/api/unification/ore/SusyOrePrefix.java index 3b6ad9221..ad56e26f1 100644 --- a/src/main/java/supersymmetry/api/unification/ore/SusyOrePrefix.java +++ b/src/main/java/supersymmetry/api/unification/ore/SusyOrePrefix.java @@ -6,12 +6,12 @@ import gregtech.api.unification.ore.OrePrefix; import supersymmetry.api.unification.material.info.SuSyMaterialFlags; import supersymmetry.api.unification.material.info.SuSyMaterialIconType; + import static gregtech.api.unification.ore.OrePrefix.Flags.ENABLE_UNIFICATION; -import static gregtech.api.unification.ore.OrePrefix.Conditions.*; public class SusyOrePrefix { - public static OrePrefix oreGabbro = new OrePrefix("oreGabbro", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty); - public static OrePrefix oreGneiss = new OrePrefix("oreGneiss", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty); + public static OrePrefix oreGabbro = new OrePrefix("oreGabbro", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty); + public static OrePrefix oreGneiss = new OrePrefix("oreGneiss", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty); public static OrePrefix oreLimestone = new OrePrefix("oreLimestone", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty); public static OrePrefix orePhyllite = new OrePrefix("orePhyllite", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty); public static OrePrefix oreQuartzite = new OrePrefix("oreQuartzite", -1L, null, MaterialIconType.ore, OrePrefix.Flags.ENABLE_UNIFICATION, OrePrefix.Conditions.hasOreProperty); @@ -25,7 +25,7 @@ public class SusyOrePrefix { // Sheeted Frames (10 ingots of materials in, 12 sheeted frames out) //M *10 / 12 [5/6] = materialAmount (I do not know what M means), 1L = ENABLE_UNIFICATION //public static OrePrefix frameGt = new OrePrefix("frameGt", M * 2, null, null, ENABLE_UNIFICATION, material -> material.hasFlag(GENERATE_FRAME)); [for reference] - public static OrePrefix sheetedFrame = new OrePrefix("sheetedFrame", (GTValues.M * 5) /6, null, SuSyMaterialIconType.sheetedFrame, ENABLE_UNIFICATION, (material) -> material.hasFlag(MaterialFlags.GENERATE_FRAME)); + public static OrePrefix sheetedFrame = new OrePrefix("sheetedFrame", (GTValues.M * 5) / 6, null, SuSyMaterialIconType.sheetedFrame, ENABLE_UNIFICATION, (material) -> material.hasFlag(MaterialFlags.GENERATE_FRAME)); // Tiered Catalysts Beds @@ -43,12 +43,15 @@ public class SusyOrePrefix { // Ore Processing Intermediates - public static final OrePrefix sifted = new OrePrefix("dustSifted", -1, null, SuSyMaterialIconType.sifted, OrePrefix.Flags.ENABLE_UNIFICATION , mat -> mat.hasFlag(SuSyMaterialFlags.GENERATE_SIFTED)); - public static final OrePrefix flotated = new OrePrefix("dustFlotated", -1, null, SuSyMaterialIconType.flotated, OrePrefix.Flags.ENABLE_UNIFICATION , mat -> mat.hasFlag(SuSyMaterialFlags.GENERATE_FLOTATED)); - public static final OrePrefix concentrate = new OrePrefix("dustConcentrate", -1, null, SuSyMaterialIconType.concentrate, OrePrefix.Flags.ENABLE_UNIFICATION , mat -> mat.hasFlag(SuSyMaterialFlags.GENERATE_CONCENTRATE)); + public static final OrePrefix sifted = new OrePrefix("dustSifted", -1, null, SuSyMaterialIconType.sifted, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> mat.hasFlag(SuSyMaterialFlags.GENERATE_SIFTED)); + public static final OrePrefix flotated = new OrePrefix("dustFlotated", -1, null, SuSyMaterialIconType.flotated, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> mat.hasFlag(SuSyMaterialFlags.GENERATE_FLOTATED)); + public static final OrePrefix concentrate = new OrePrefix("dustConcentrate", -1, null, SuSyMaterialIconType.concentrate, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> mat.hasFlag(SuSyMaterialFlags.GENERATE_CONCENTRATE)); // Fiber - public static final OrePrefix fiber = new OrePrefix("fiber", GTValues.M / 8, null, SuSyMaterialIconType.fiber, OrePrefix.Flags.ENABLE_UNIFICATION , mat -> mat.hasFlag(SuSyMaterialFlags.GENERATE_FIBER)); - public static final OrePrefix wetFiber = new OrePrefix("fiberWet", GTValues.M / 8, null, SuSyMaterialIconType.wetFiber, OrePrefix.Flags.ENABLE_UNIFICATION , mat -> mat.hasFlag(SuSyMaterialFlags.GENERATE_WET_FIBER)); - public static final OrePrefix thread = new OrePrefix("thread", GTValues.M / 8, null, SuSyMaterialIconType.thread, OrePrefix.Flags.ENABLE_UNIFICATION , mat -> mat.hasFlag(SuSyMaterialFlags.GENERATE_THREAD)); + public static final OrePrefix fiber = new OrePrefix("fiber", GTValues.M / 8, null, SuSyMaterialIconType.fiber, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> mat.hasFlag(SuSyMaterialFlags.GENERATE_FIBER)); + public static final OrePrefix wetFiber = new OrePrefix("fiberWet", GTValues.M / 8, null, SuSyMaterialIconType.wetFiber, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> mat.hasFlag(SuSyMaterialFlags.GENERATE_WET_FIBER)); + public static final OrePrefix thread = new OrePrefix("thread", GTValues.M / 8, null, SuSyMaterialIconType.thread, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> mat.hasFlag(SuSyMaterialFlags.GENERATE_THREAD)); + + // Wet dust + public static final OrePrefix dustWet = new OrePrefix("dustWet", -1, null, SuSyMaterialIconType.dustWet, OrePrefix.Flags.ENABLE_UNIFICATION, mat -> mat.hasFlag(SuSyMaterialFlags.GENERATE_WET_DUST)); } diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust_wet.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust_wet.json new file mode 100644 index 000000000..adb2b8261 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/dust_wet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/dull/dust_wet" + } +} diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/dull/dust_wet.png b/src/main/resources/assets/gregtech/textures/items/material_sets/dull/dust_wet.png new file mode 100755 index 000000000..119af9e32 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/material_sets/dull/dust_wet.png differ