diff options
| author | Raven Szewczyk <git@eigenraven.me> | 2023-02-10 14:32:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-10 14:32:09 +0000 |
| commit | ce3825fdbc4bacb5efe6cf18a445719c02b53fa4 (patch) | |
| tree | 46d81e34516b2cc044653d97c2b426f70fb11d20 /src/main/java/gregtech/loaders/postload | |
| parent | f069e4fa8875869cc07a7613e593903aa1a51d50 (diff) | |
| download | GT5-Unofficial-ce3825fdbc4bacb5efe6cf18a445719c02b53fa4.tar.gz GT5-Unofficial-ce3825fdbc4bacb5efe6cf18a445719c02b53fa4.tar.bz2 GT5-Unofficial-ce3825fdbc4bacb5efe6cf18a445719c02b53fa4.zip | |
Rfg cleanup (#1726)
* Update buildscript, add all recently added gradle.properties entries
* Dependency version bumps and cleanup
* Bump eternal singularity version
* Update buildscript
* Make AE2 a required dependency
* Switch version to class generation from token replacement
Diffstat (limited to 'src/main/java/gregtech/loaders/postload')
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 4 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java | 69 |
2 files changed, 36 insertions, 37 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 3607df541c..ca518cd4a3 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -35,7 +35,9 @@ public class GT_MachineRecipeLoader implements Runnable { public static final Boolean isTinkersConstructLoaded = Loader.isModLoaded("TConstruct"); public static final Boolean isHardcoreEnderExpansionLoaded = Loader.isModLoaded("HardcoreEnderExpansion"); public static final Boolean isForestryLoaded = Loader.isModLoaded(MOD_ID_FR); - public static final Boolean isAE2Loaded = Loader.isModLoaded("appliedenergistics2"); + /** @deprecated AE2 is a required dependency now */ + @Deprecated + public static final Boolean isAE2Loaded = true; @Override public void run() { diff --git a/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java index 8af72a84e1..a7f3ec3202 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java @@ -2,7 +2,6 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.GT_Values.MOD_ID_TC; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.loaders.postload.GT_MachineRecipeLoader.isAE2Loaded; import static gregtech.loaders.postload.GT_MachineRecipeLoader.isThaumcraftLoaded; import java.util.Arrays; @@ -553,41 +552,39 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))) }); - if (isAE2Loaded) { - tKey = "GT_TRANSSKYSTONE"; - GT_LanguageManager.addStringLocalization( - GT_MachineRecipeLoader.aTextTCGTPage + tKey, - "You have discovered a way to convert obsidian to skystone.<BR><BR>Not sure why you'd want to do this, unless skystone is somehow unavailable in your world."); - GregTech_API.sThaumcraftCompat.addResearch( - tKey, - "Skystone Transmutation", - "Transformation of obsidian into skystone", - new String[] { "GT_ADVANCEDMETALLURGY" }, - "ALCHEMY", - getModItem("appliedenergistics2", "tile.BlockSkyStone", 1), - 4, - 0, - 19, - 15, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L), - new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 3L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 3L), - new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 3L)), - null, - new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, - GregTech_API.sThaumcraftCompat.addCrucibleRecipe( - tKey, - new ItemStack(Blocks.obsidian), - getModItem("appliedenergistics2", "tile.BlockSkyStone", 1), - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 1L), - new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 1L))) }); - } + tKey = "GT_TRANSSKYSTONE"; + GT_LanguageManager.addStringLocalization( + GT_MachineRecipeLoader.aTextTCGTPage + tKey, + "You have discovered a way to convert obsidian to skystone.<BR><BR>Not sure why you'd want to do this, unless skystone is somehow unavailable in your world."); + GregTech_API.sThaumcraftCompat.addResearch( + tKey, + "Skystone Transmutation", + "Transformation of obsidian into skystone", + new String[] { "GT_ADVANCEDMETALLURGY" }, + "ALCHEMY", + getModItem("appliedenergistics2", "tile.BlockSkyStone", 1), + 4, + 0, + 19, + 15, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L), + new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 3L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 3L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 3L), + new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 3L)), + null, + new Object[] { GT_MachineRecipeLoader.aTextTCGTPage + tKey, + GregTech_API.sThaumcraftCompat.addCrucibleRecipe( + tKey, + new ItemStack(Blocks.obsidian), + getModItem("appliedenergistics2", "tile.BlockSkyStone", 1), + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 1L), + new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 1L))) }); tKey = "GT_TRANSMINERAL"; GT_LanguageManager.addStringLocalization( |