From 9929694cd93356d77afea5ed70c0e6c911effcb5 Mon Sep 17 00:00:00 2001 From: bruberu <80226372+bruberu@users.noreply.github.com> Date: Sat, 5 Oct 2024 16:10:18 -0500 Subject: [PATCH 1/3] feat: wet dust material type --- .../material/info/SuSyMaterialFlags.java | 5 +++++ .../material/info/SuSyMaterialIconType.java | 2 ++ .../api/unification/ore/SusyOrePrefix.java | 3 +++ .../models/item/material_sets/dull/wet_dust.json | 6 ++++++ .../items/material_sets/dull/wet_dust.png | Bin 0 -> 4476 bytes 5 files changed, 16 insertions(+) create mode 100644 src/main/resources/assets/gregtech/models/item/material_sets/dull/wet_dust.json create mode 100755 src/main/resources/assets/gregtech/textures/items/material_sets/dull/wet_dust.png 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..de67f47e3 100644 --- a/src/main/java/supersymmetry/api/unification/material/info/SuSyMaterialIconType.java +++ b/src/main/java/supersymmetry/api/unification/material/info/SuSyMaterialIconType.java @@ -1,6 +1,7 @@ package supersymmetry.api.unification.material.info; import gregtech.api.unification.material.info.MaterialIconType; +import org.jetbrains.annotations.Nullable; public class SuSyMaterialIconType { public static MaterialIconType catalystBed = new MaterialIconType("catalystBed"); @@ -14,4 +15,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 wetDust = new MaterialIconType("wetDust"); } diff --git a/src/main/java/supersymmetry/api/unification/ore/SusyOrePrefix.java b/src/main/java/supersymmetry/api/unification/ore/SusyOrePrefix.java index 3b6ad9221..1da0495e9 100644 --- a/src/main/java/supersymmetry/api/unification/ore/SusyOrePrefix.java +++ b/src/main/java/supersymmetry/api/unification/ore/SusyOrePrefix.java @@ -51,4 +51,7 @@ public class SusyOrePrefix { 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 wetDust = new OrePrefix("wetDust", -1, null, SuSyMaterialIconType.wetDust, OrePrefix.Flags.ENABLE_UNIFICATION , mat -> mat.hasFlag(SuSyMaterialFlags.GENERATE_WET_DUST)); } diff --git a/src/main/resources/assets/gregtech/models/item/material_sets/dull/wet_dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/wet_dust.json new file mode 100644 index 000000000..13b92ec23 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/material_sets/dull/wet_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/material_sets/dull/wet_dust" + } +} diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/dull/wet_dust.png b/src/main/resources/assets/gregtech/textures/items/material_sets/dull/wet_dust.png new file mode 100755 index 0000000000000000000000000000000000000000..119af9e32151fec40973d7382ae71fb74254c118 GIT binary patch literal 4476 zcmeHKdr(x@8DB(PN`VAXzt#7ce%1Jb}#Hg zTqOube2vmhnp#4P;vmxyyT!nT|8ff9%YC zo%8#C=lg!&cfQ$EWysD94~q@s@p$37taKxI&fu=lY2ZGu{~H24T1!nUStH?vTyCd@ zvC$A);-Vqi$5?ng-wnGVH6l16^lbl@Zi&t zBQtY!#?6Gy;b{K(~fVv6JbfzB-RRcBpu0k`s`>& zSTFp^+Wi-D{e3YReK$VFIuCE!*(!JkN-NtI`|+Wsw3_1WQIQP3%=d&pr!huJi3|NtMKzM$*-@4 zyIi5$W+%Pb-P7Iuo@a0%yI_6FONhH_w(4yIs5>76>T9KbDNZ`=LV|LdX`#>V0)@xp zsZx9{f-Im}$V^)qhg$IEnMMJ`P-?+zQa!47Y3O_=tJF=eD9tvJr3Ivt5~L)DseCvf zu+uC7`Rq1_2luH30bU%ubHj)L3P9KbwP2;*0BM|V8j=VlLKN2em|{$j90sY}lm$1Y zXADz-FSQ__WnDOec)ebsS1fe8t%yjeR3a#bU>FP#u&2bq5AQF@1GSOuU5;v-y$NQfeKJ2KwF!)l8G$*@D;Y2h(} zZHgFakF&^4(%NF$!OkB~L6M{Ot|GTB5DrBmw2ig{s0XYnny_T1PHz~s;3Tjzc2~d( zh&=(xGL|v1Ciuq91i~5b2rwVzoq!&RJpcwMy&g|@l0}?*x^%UGTOX&KBtzkWSCXX7 z1WHI?rI=8{5{klLrNttL6_i{lqZJ}4CQ*!|(m6aV;UH;_3XlsKz@t!LlvpgmUL7?tAa zIJ}c$EG7R7&21h?HI(u!#sk(b2@DPGs1q z4NZ~xgu_aM?lD}hBje0>l!DlzFw3PfkU9c0!xD=Kg%yMugT(}a$>nCVLL!$>WcN5N zte0@psaBvP&6U-#^Ma`z`r0bI4te2O{@b4t!d^Znd!XQ;4Qhcy!D^p`2$y0j)%vKXyLA)Hs>J< z4Dwl>Udz81781>$`?rXhJ>WE*s7p^ZDLT5VkMAfq%+S7YzlT`8ZBzNCj78z$8_cQn zZT{o9Gix*lE2Zz9ly2W1l2B5$^G^vEyUg>K@3qyR&z4`j`Fro9IZtjyYj;)cZJ&N= zbHd}&KQz=^8gH%o@NV+wZ}liLlC-D6)>4mB0lTwdJKfQNYR zUZl=FUH9m-8>h4dmstG#fWJ@GcIsho)LdtFb;Tu1i%)gnSb?KH&iKl)&P6+V*d?_~ zAN0m=O5pWBjVGu7qNDP};=d=c|4D&#`59+`8QdQmQL`*tOWw iy0&N8Uw2ub`TfCD6#fSY{_r%=kf+mTryomuqx`=OsbgLM literal 0 HcmV?d00001 From 4a32eaa61bd25cccaed9b59ddf5ef3b67f8313e5 Mon Sep 17 00:00:00 2001 From: bruberu <80226372+bruberu@users.noreply.github.com> Date: Sun, 6 Oct 2024 14:11:12 -0500 Subject: [PATCH 2/3] fix: swap to "dustWet" --- .../material/info/SuSyMaterialIconType.java | 3 +-- .../api/unification/ore/SusyOrePrefix.java | 22 +++++++++--------- .../item/material_sets/dull/dust_wet.json | 6 +++++ .../item/material_sets/dull/wet_dust.json | 6 ----- .../dull/{wet_dust.png => dust_wet.png} | Bin 5 files changed, 18 insertions(+), 19 deletions(-) create mode 100644 src/main/resources/assets/gregtech/models/item/material_sets/dull/dust_wet.json delete mode 100644 src/main/resources/assets/gregtech/models/item/material_sets/dull/wet_dust.json rename src/main/resources/assets/gregtech/textures/items/material_sets/dull/{wet_dust.png => dust_wet.png} (100%) 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 de67f47e3..d8b94abf6 100644 --- a/src/main/java/supersymmetry/api/unification/material/info/SuSyMaterialIconType.java +++ b/src/main/java/supersymmetry/api/unification/material/info/SuSyMaterialIconType.java @@ -1,7 +1,6 @@ package supersymmetry.api.unification.material.info; import gregtech.api.unification.material.info.MaterialIconType; -import org.jetbrains.annotations.Nullable; public class SuSyMaterialIconType { public static MaterialIconType catalystBed = new MaterialIconType("catalystBed"); @@ -15,5 +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 wetDust = new MaterialIconType("wetDust"); + public static MaterialIconType dustWet = new MaterialIconType("wetDust"); } diff --git a/src/main/java/supersymmetry/api/unification/ore/SusyOrePrefix.java b/src/main/java/supersymmetry/api/unification/ore/SusyOrePrefix.java index 1da0495e9..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,15 +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 wetDust = new OrePrefix("wetDust", -1, null, SuSyMaterialIconType.wetDust, OrePrefix.Flags.ENABLE_UNIFICATION , mat -> mat.hasFlag(SuSyMaterialFlags.GENERATE_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/models/item/material_sets/dull/wet_dust.json b/src/main/resources/assets/gregtech/models/item/material_sets/dull/wet_dust.json deleted file mode 100644 index 13b92ec23..000000000 --- a/src/main/resources/assets/gregtech/models/item/material_sets/dull/wet_dust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/material_sets/dull/wet_dust" - } -} diff --git a/src/main/resources/assets/gregtech/textures/items/material_sets/dull/wet_dust.png b/src/main/resources/assets/gregtech/textures/items/material_sets/dull/dust_wet.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/material_sets/dull/wet_dust.png rename to src/main/resources/assets/gregtech/textures/items/material_sets/dull/dust_wet.png From 0565a76e88a6367125c3fb368e43f32be29e9dc8 Mon Sep 17 00:00:00 2001 From: bruberu <80226372+bruberu@users.noreply.github.com> Date: Sun, 6 Oct 2024 14:43:16 -0500 Subject: [PATCH 3/3] fix: missed a spot --- .../api/unification/material/info/SuSyMaterialIconType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d8b94abf6..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,5 +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("wetDust"); + public static MaterialIconType dustWet = new MaterialIconType("dustWet"); }