aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
diff options
context:
space:
mode:
authorDotJason <SOleg413@mail.ru>2023-07-09 11:34:26 +0300
committerGitHub <noreply@github.com>2023-07-09 10:34:26 +0200
commit7afca0b302c15777c10c4ad47f3341c5d492193f (patch)
tree4b027bdf2507ff8cfa82317218d2baf72a96eea7 /src/main/java/gregtech/api/enums
parent3f83b54ca64cc14f835e4d527ebf05597e4afaeb (diff)
downloadGT5-Unofficial-7afca0b302c15777c10c4ad47f3341c5d492193f.tar.gz
GT5-Unofficial-7afca0b302c15777c10c4ad47f3341c5d492193f.tar.bz2
GT5-Unofficial-7afca0b302c15777c10c4ad47f3341c5d492193f.zip
Add soft material subtag (#2124)
* add soft subtag * add soft subtag to Gaia Spirit * clean code style
Diffstat (limited to 'src/main/java/gregtech/api/enums')
-rw-r--r--src/main/java/gregtech/api/enums/MaterialsBotania.java1
-rw-r--r--src/main/java/gregtech/api/enums/SubTag.java4
2 files changed, 5 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/enums/MaterialsBotania.java b/src/main/java/gregtech/api/enums/MaterialsBotania.java
index 7728351bbc..6fe538a0bc 100644
--- a/src/main/java/gregtech/api/enums/MaterialsBotania.java
+++ b/src/main/java/gregtech/api/enums/MaterialsBotania.java
@@ -211,6 +211,7 @@ public class MaterialsBotania {
Dreamwood.add(SubTag.WOOD, SubTag.FLAMMABLE, SubTag.NO_SMELTING, SubTag.NO_SMASHING);
ManaDiamond.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING);
BotaniaDragonstone.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING);
+ GaiaSpirit.add(SubTag.SOFT);
// Botania native items
ingot.mNotGeneratedItems.add(Manasteel);
diff --git a/src/main/java/gregtech/api/enums/SubTag.java b/src/main/java/gregtech/api/enums/SubTag.java
index c1ec1712cd..e62e5437f8 100644
--- a/src/main/java/gregtech/api/enums/SubTag.java
+++ b/src/main/java/gregtech/api/enums/SubTag.java
@@ -189,6 +189,10 @@ public final class SubTag implements ICondition<ISubTagContainer> {
*/
public static final SubTag STRETCHY = getNewSubTag("STRETCHY");
/**
+ * If this Material is soft (and can be made into a Soft Mallet even if it's not wooden or bouncy)
+ */
+ public static final SubTag SOFT = getNewSubTag("SOFT");
+ /**
* If this Material is grindable with a simple Mortar
*/
public static final SubTag MORTAR_GRINDABLE = getNewSubTag("MORTAR_GRINDABLE");