Skip to content

Commit c382110

Browse files
Make new flag DISABLE_MATERIAL_RECIPES to replace NO_UNIFICATION. (#3999)
Co-authored-by: Tar Laboratories <[email protected]>
1 parent e553db8 commit c382110

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

docs/content/Modpacks/Materials-and-Elements/Material-Flags.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,11 @@ can influence how the material behaves, as well as which items are generated for
3232
# Generic Flags
3333

3434
- `NO_UNIFICATION`
35-
- Description: Add to material to disable it's unification fully.
36-
35+
- Description: Add to material to disable automatic recipe generation for it fully. This flag is deprecated, please use DISABLE_MATERIAL_RECIPES instead.
36+
37+
- `DISABLE_MATERIAL_RECIPES`
38+
- Description: Add to material to disable automatic recipe generation for it fully. This replaces NO_UNIFICATION.
39+
3740
- `DECOMPOSITION_BY_ELECTROLYZING`
3841
- Description: Enables electrolyzer decomposition recipe generation Requires `.components(...)` to be set.
3942

src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,8 @@ public String getModid() {
171171
* @return if the material should have recipes autogenerated
172172
*/
173173
public boolean shouldGenerateRecipesFor(@NotNull TagPrefix prefix) {
174-
return !this.hasFlag(MaterialFlags.NO_UNIFICATION) && !ChemicalHelper.get(prefix, this).isEmpty();
174+
return !this.hasFlag(MaterialFlags.NO_UNIFICATION) ||
175+
!this.hasFlag(MaterialFlags.DISABLE_MATERIAL_RECIPES) && !ChemicalHelper.get(prefix, this).isEmpty();
175176
}
176177

177178
public void addFlags(MaterialFlag... flags) {

src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/info/MaterialFlags.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@ public String toString() {
4343
/**
4444
* Add to material to disable it's unification fully
4545
*/
46-
// TODO(Onion) rename to DISABLE_MATERIAL_RECIPES
46+
@Deprecated
4747
public static final MaterialFlag NO_UNIFICATION = new MaterialFlag.Builder("no_unification").build();
4848

49+
public static final MaterialFlag DISABLE_MATERIAL_RECIPES = new MaterialFlag.Builder("disable_material_recipes")
50+
.build();
4951
/**
5052
* Enables electrolyzer decomposition recipe generation
5153
*/

src/main/java/com/gregtechceu/gtceu/common/data/GTRecipes.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ public static void recipeAddition(Consumer<FinishedRecipe> originalConsumer) {
5252

5353
// com.gregtechceu.gtceu.data.recipe.generated.*
5454
for (Material material : GTCEuAPI.materialManager.getRegisteredMaterials()) {
55-
if (material.hasFlag(MaterialFlags.NO_UNIFICATION)) {
55+
if (material.hasFlag(MaterialFlags.NO_UNIFICATION) ||
56+
material.hasFlag(MaterialFlags.DISABLE_MATERIAL_RECIPES)) {
5657
continue;
5758
}
5859

src/main/java/com/gregtechceu/gtceu/common/data/materials/UnknownCompositionMaterials.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ public static void register() {
575575
Lapotron = new Material.Builder(GTCEu.id("lapotron"))
576576
.gem()
577577
.color(0x7497ea).secondaryColor(0x1c0b39).iconSet(DIAMOND)
578-
.flags(NO_UNIFICATION)
578+
.flags(DISABLE_MATERIAL_RECIPES)
579579
.ignoredTagPrefixes(dustTiny, dustSmall)
580580
.buildAndRegister();
581581

0 commit comments

Comments
 (0)