From 35bb0f7c8cf6345ce2c609fa6645677645b29cfe Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Sun, 22 Oct 2023 19:18:16 +0200 Subject: [PATCH] Eldrich recipes Added recipes for eldrich maze blocks, to an existing research of gadomancy --- .vscode/settings.json | 3 + .../common/data/config/ModConfig.java | 10 ++ .../registration/RegisteredRecipes.java | 113 ++++++++++++++++++ .../registration/RegisteredResearches.java | 9 +- .../assets/gadomancy/lang/en_US.lang | 1 + 5 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..b0b2909 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable" +} \ No newline at end of file diff --git a/src/main/java/makeo/gadomancy/common/data/config/ModConfig.java b/src/main/java/makeo/gadomancy/common/data/config/ModConfig.java index 11d2ade..5e5f321 100644 --- a/src/main/java/makeo/gadomancy/common/data/config/ModConfig.java +++ b/src/main/java/makeo/gadomancy/common/data/config/ModConfig.java @@ -48,6 +48,9 @@ public class ModConfig { // Skyblock stuff public static boolean ancientStoneRecipes; + // Decorative eldritch blocks + public static boolean eldritchdecoblocks; + private ModConfig() {} public static void init(File file) { @@ -116,6 +119,13 @@ public class ModConfig { false, "TRUE = Adds recipes for Ancient Stone and Ancient Stone Pedestal (This may be usefull for severs and skyblock packs to craft the Node Manipulator and get more primodial pearls). You have to change this client- and server-side!"); + // Eldritch decorative blocks + ModConfig.eldritchdecoblocks = ModConfig.config.getBoolean( + "eldritchdecoblocks", + "decorative", + true, + "false = Removes recipes for this blocks You have to change this client- and server-side!"); + // General stuff ModConfig.renderParticleDistance = ModConfig.config.getInt( "particleRenderDistance", diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java index 8c898aa..9460a7f 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java @@ -87,6 +87,13 @@ public class RegisteredRecipes { public static CrucibleRecipe recipeAncientStonePedestal; public static IArcaneRecipe recipeAncientStone; + public static IArcaneRecipe eldritchdecoblocks1; + public static IArcaneRecipe eldritchdecoblocks2; + public static IArcaneRecipe eldritchdecoblocks3; + public static IArcaneRecipe eldritchdecoblocks4; + public static IArcaneRecipe eldritchdecoblocks5; + public static InfusionRecipe eldritchdecoblocks6; + public static CrucibleRecipe[] recipesWashAuraCore; public static IRecipe[] recipesUndoAuraCore; public static InfusionRecipe recipeAuraCore; @@ -227,6 +234,112 @@ public class RegisteredRecipes { new ItemStack(ConfigBlocks.blockCrystal, 1, 5), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigBlocks.blockCrystal, 1, 5) }); + if (ModConfig.eldritchdecoblocks) { + + // Glowing Crusted Stone + RegisteredRecipes.eldritchdecoblocks1 = ThaumcraftApi.addArcaneCraftingRecipe( + Gadomancy.MODID.toUpperCase() + ".ANCIENT_STONES", + new ItemStack(ConfigBlocks.blockEldritch, 3, 4), + new AspectList().add(Aspect.AIR, 25).add(Aspect.EARTH, 25).add(Aspect.ENTROPY, 25) + .add(Aspect.FIRE, 25), + "GNG", + "NSN", + "GNG", + 'N', + new ItemStack(ConfigItems.itemResource, 1, 1), + 'S', + new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 14), + 'G', + new ItemStack(Items.glowstone_dust)); + + // Crusted Stone + RegisteredRecipes.eldritchdecoblocks2 = ThaumcraftApi.addArcaneCraftingRecipe( + Gadomancy.MODID.toUpperCase() + ".ANCIENT_STONES", + new ItemStack(ConfigBlocks.blockCosmeticSolid, 4, 14), + new AspectList().add(Aspect.ENTROPY, 50).add(Aspect.EARTH, 50).add(Aspect.FIRE, 50), + "GCG", + "CSC", + "GCG", + 'C', + new ItemStack(Blocks.mossy_cobblestone), + 'S', + new ItemStack(ConfigBlocks.blockCrystal, 1, 6), + 'G', + new ItemStack(Items.gunpowder)); + + // Glyphed Stone + RegisteredRecipes.eldritchdecoblocks3 = ThaumcraftApi.addArcaneCraftingRecipe( + Gadomancy.MODID.toUpperCase() + ".ANCIENT_STONES", + new ItemStack(ConfigBlocks.blockEldritch, 2, 5), + new AspectList().add(Aspect.ENTROPY, 32).add(Aspect.EARTH, 32).add(Aspect.WATER, 32) + .add(Aspect.AIR, 32).add(Aspect.ORDER, 32), + "KKK", + "KGK", + "KKK", + 'K', + new ItemStack(ConfigItems.itemResource, 1, 9), + 'G', + new ItemStack(ConfigBlocks.blockEldritch, 1, 4)); + + // Ancient Rock + RegisteredRecipes.eldritchdecoblocks4 = ThaumcraftApi.addArcaneCraftingRecipe( + Gadomancy.MODID.toUpperCase() + ".ANCIENT_STONES", + new ItemStack(ConfigBlocks.blockCosmeticSolid, 6, 12), + new AspectList().add(Aspect.ENTROPY, 12).add(Aspect.EARTH, 12).add(Aspect.FIRE, 12), + "ABA", + "CRC", + "ABA", + 'A', + new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), + 'B', + new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 7), + 'C', + new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 14), + 'R', + new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11)); + // Strange Crystals + RegisteredRecipes.eldritchdecoblocks5 = ThaumcraftApi.addArcaneCraftingRecipe( + Gadomancy.MODID.toUpperCase() + ".ANCIENT_STONES", + new ItemStack(ConfigBlocks.blockCrystal, 6, 7), + new AspectList().add(Aspect.ENTROPY, 70).add(Aspect.EARTH, 50).add(Aspect.WATER, 50) + .add(Aspect.FIRE, 50).add(Aspect.AIR, 50).add(Aspect.ORDER, 70), + " C ", + "CGC", + "SPS", + 'C', + new ItemStack(ConfigBlocks.blockCrystal, 1, 6), + 'G', + new ItemStack(ConfigBlocks.blockEldritch, 1, 4), + 'S', + new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 14), + 'P', + new ItemStack(ConfigItems.itemResource, 1, 15)); + + // Runed Stone + RegisteredRecipes.eldritchdecoblocks6 = ThaumcraftApi.addInfusionCraftingRecipe( + Gadomancy.MODID.toUpperCase() + ".ANCIENT_STONES", + new ItemStack(ConfigBlocks.blockEldritch, 1, 10), + 7, + new AspectList().add(Aspect.ELDRITCH, 40).add(Aspect.VOID, 38).add(Aspect.MECHANISM, 30) + .add(Aspect.DARKNESS, 50).add(Aspect.EARTH, 20).add(Aspect.DEATH, 26) + .add(Aspect.EXCHANGE, 30), + new ItemStack(RegisteredItems.itemAuraCore, 1, 6), + new ItemStack[] { new ItemStack(ConfigBlocks.blockCrystal, 1, 7), + new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), + new ItemStack(ConfigBlocks.blockEldritch, 1, 5), + new ItemStack(ConfigItems.itemCompassStone), + new ItemStack(ConfigBlocks.blockEldritch, 1, 5), + new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), + new ItemStack(ConfigBlocks.blockCrystal, 1, 7), + new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), + new ItemStack(ConfigBlocks.blockEldritch, 1, 5), + new ItemStack(ConfigItems.itemCompassStone), + new ItemStack(ConfigBlocks.blockEldritch, 1, 5), + new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11) + + }); + } + RegisteredRecipes.multiblockNodeManipulator = Arrays.asList( RegisteredRecipes.costsNodeManipulatorMultiblock, 3, diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java index 0e59a3d..dbcef07 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java @@ -484,7 +484,14 @@ public class RegisteredResearches { .setPages( new ResearchPage("gadomancy.research_page.ANCIENT_STONES.1"), new ResearchPage(RegisteredRecipes.recipeAncientStone), - new ResearchPage(RegisteredRecipes.recipeAncientStonePedestal)) + new ResearchPage(RegisteredRecipes.recipeAncientStonePedestal), + new ResearchPage("gadomancy.research_page.E_DECO_BLOCKS.1"), + new ResearchPage(RegisteredRecipes.eldritchdecoblocks1), + new ResearchPage(RegisteredRecipes.eldritchdecoblocks2), + new ResearchPage(RegisteredRecipes.eldritchdecoblocks3), + new ResearchPage(RegisteredRecipes.eldritchdecoblocks4), + new ResearchPage(RegisteredRecipes.eldritchdecoblocks5), + new ResearchPage(RegisteredRecipes.eldritchdecoblocks6)) .registerResearchItem(); ItemAuraCore.AuraCoreType[] coreTypes = ItemAuraCore.AuraCoreType.values(); diff --git a/src/main/resources/assets/gadomancy/lang/en_US.lang b/src/main/resources/assets/gadomancy/lang/en_US.lang index 2135037..14f6b4f 100644 --- a/src/main/resources/assets/gadomancy/lang/en_US.lang +++ b/src/main/resources/assets/gadomancy/lang/en_US.lang @@ -124,6 +124,7 @@ gadomancy.research_page.BLOCK_PROTECTOR.4=The size of its area can be controlled tc.research_name.GADOMANCY.ANCIENT_STONES=Ancient Stones tc.research_text.GADOMANCY.ANCIENT_STONES=Decorations of the Eldritch gadomancy.research_page.ANCIENT_STONES.1=There is more to the mazes of the eldritch than meets the eye. The eldritch might not be the best room designers, but the stones they used to build show enormous magic potential.
Exposing your everyday arcane stones to eldritch energies alter the stones magical properties to react more like their eldritch relatives. +gadomancy.research_page.E_DECO_BLOCKS.1=Some of these stones have unique properties, perhaps we can put them to use, and if not, we can always take advantage of them decoratively... tc.research_name.GADOMANCY.GROWING=Growing Nodes tc.research_text.GADOMANCY.GROWING=Feed me Semour