Skip to content

Commit

Permalink
fix: swap to "dustWet"
Browse files Browse the repository at this point in the history
  • Loading branch information
bruberu committed Oct 6, 2024
1 parent 9929694 commit 4a32eaa
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 19 deletions.
Original file line number Diff line number Diff line change
@@ -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");
Expand All @@ -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");
}
22 changes: 11 additions & 11 deletions src/main/java/supersymmetry/api/unification/ore/SusyOrePrefix.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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

Expand All @@ -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));
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gregtech:items/material_sets/dull/dust_wet"
}
}

This file was deleted.

0 comments on commit 4a32eaa

Please sign in to comment.