aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums/Materials.java
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2022-08-07 21:51:36 +0900
committerGitHub <noreply@github.com>2022-08-07 19:51:36 +0700
commit32bab54aa65bba9dcd91db50f29e384a6fab969e (patch)
tree6dae478aca55715882b42b60615fe1f2ea085e37 /src/main/java/gregtech/api/enums/Materials.java
parent53f4d593d91c1caa9b156bbc4259de062b441fac (diff)
downloadGT5-Unofficial-32bab54aa65bba9dcd91db50f29e384a6fab969e.tar.gz
GT5-Unofficial-32bab54aa65bba9dcd91db50f29e384a6fab969e.tar.bz2
GT5-Unofficial-32bab54aa65bba9dcd91db50f29e384a6fab969e.zip
Botania adjustments (#1224)
Diffstat (limited to 'src/main/java/gregtech/api/enums/Materials.java')
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index df479a79d0..948e7ac600 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -3,6 +3,7 @@ package gregtech.api.enums;
import cpw.mods.fml.common.Loader;
import gregtech.GT_Mod;
import gregtech.api.GregTech_API;
+import gregtech.api.enums.MaterialsBotania;
import gregtech.api.enums.TC_Aspects.TC_AspectStack;
import gregtech.api.interfaces.IColorModulationContainer;
import gregtech.api.interfaces.IMaterialHandler;
@@ -24,7 +25,6 @@ import java.util.stream.IntStream;
import static gregtech.api.enums.GT_Values.M;
import static gregtech.api.enums.GT_Values.MOD_ID_DC;
-import static gregtech.api.enums.MaterialsBotania.*;
@SuppressWarnings("ALL")
public class Materials implements IColorModulationContainer, ISubTagContainer {
@@ -1682,14 +1682,6 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
Quartzite.mChemicalFormula = "SiO\u2082";
CertusQuartz.mChemicalFormula = "SiO\u2082";
SpaceTime.mChemicalFormula = "Reality itself distilled into liquid form";
- GaiaSpirit.mChemicalFormula = "Gs";
- Manasteel.mChemicalFormula = "Ms";
- Livingwood.mChemicalFormula = "Lw";
- Dreamwood.mChemicalFormula = "Dw";
- BotaniaDragonstone.mChemicalFormula = "Dg";
- Livingrock.mChemicalFormula = "Lv";
- Terrasteel.mChemicalFormula = "Tr";
- ElvenElementium.mChemicalFormula = "Ef";
}
private static void initSubTags() {
@@ -2162,13 +2154,6 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
Force.add(SubTag.CRYSTAL, SubTag.MAGICAL, SubTag.UNBURNABLE);
Magic.add(SubTag.CRYSTAL, SubTag.MAGICAL, SubTag.UNBURNABLE);
- // Botania
- Livingrock.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
- Livingwood.add(SubTag.WOOD, SubTag.FLAMMABLE, SubTag.NO_SMELTING, SubTag.NO_SMASHING);
- 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);
-
Primitive.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
Basic.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);
Good.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);