From 00a6660b527f49999a901a433a0688f584f4359c Mon Sep 17 00:00:00 2001
From: HellFirePvP <01ecs01m>
Date: Sun, 15 Nov 2015 21:46:01 +0100
Subject: [PATCH] - Added researches for Skyblock supporting recipes
---
.../makeo/gadomancy/common/data/ModConfig.java | 4 ++--
.../registration/RegisteredResearches.java | 18 +++++++++++++++---
.../resources/assets/gadomancy/lang/en_US.lang | 4 ++++
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/main/java/makeo/gadomancy/common/data/ModConfig.java b/src/main/java/makeo/gadomancy/common/data/ModConfig.java
index 96aecec..ba113aa 100644
--- a/src/main/java/makeo/gadomancy/common/data/ModConfig.java
+++ b/src/main/java/makeo/gadomancy/common/data/ModConfig.java
@@ -18,11 +18,11 @@ public class ModConfig {
public static int golemDatawatcherId = 29;
public static int dimOuterId = -73;
- public static boolean doLightCalculations;
+ public static boolean doLightCalculations = true;
public static int maxMazeCount = -1;
//Skyblock stuff
- public static boolean ancientStoneRecipes;
+ public static boolean ancientStoneRecipes = false;
private ModConfig() {}
diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java
index d061856..10578a5 100644
--- a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java
+++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java
@@ -1,6 +1,7 @@
package makeo.gadomancy.common.registration;
import makeo.gadomancy.common.Gadomancy;
+import makeo.gadomancy.common.data.ModConfig;
import makeo.gadomancy.common.research.AlternatingResearchItem;
import makeo.gadomancy.common.research.PseudoResearchItem;
import makeo.gadomancy.common.research.SimpleResearchItem;
@@ -42,6 +43,9 @@ public class RegisteredResearches {
public static ResearchItem researchEldritchPortalCreator;
public static ResearchItem researchBlockProtector;
+ //Skyblock Helper
+ public static ResearchItem researchAncientStones;
+
//Growing nodes stuff
public static ResearchItem researchGrowingNodes;
public static ResearchItem researchGrowingNodeAgression;
@@ -129,7 +133,7 @@ public class RegisteredResearches {
.setPages(new ResearchPage("gadomancy.research_page.E_PORTAL_CREATOR.1"), new ResearchPage(RegisteredRecipes.recipeAncientPedestal), new ResearchPage("gadomancy.research_page.E_PORTAL_CREATOR.3"), new ResearchPage("gadomancy.research_page.E_PORTAL_CREATOR.4"), new ResearchPage(RegisteredRecipes.recipePortalFocus), new ResearchPage("gadomancy.research_page.E_PORTAL_CREATOR.6"), new ResearchPage(RegisteredRecipes.multiblockEldritchPortalCreator), new ResearchPage("gadomancy.research_page.E_PORTAL_CREATOR.8")).registerResearchItem();
researchBlockProtector = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".BLOCK_PROTECTOR", Gadomancy.MODID,
- new AspectList(),
+ new AspectList().add(Aspect.ORDER, 10).add(Aspect.ARMOR, 8).add(Aspect.EARTH, 12).add(Aspect.LIGHT, 10).add(Aspect.AURA, 8),
0, -8, 2, new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 2))
.setConcealed()
.setPages(new ResearchPage("gadomancy.research_page.BLOCK_PROTECTOR.1"), new ResearchPage(RegisteredRecipes.recipeBlockProtector), new ResearchPage("gadomancy.research_page.BLOCK_PROTECTOR.3"), new ResearchPage("gadomancy.research_page.BLOCK_PROTECTOR.4")).registerResearchItem();
@@ -220,6 +224,15 @@ public class RegisteredResearches {
.setParents(Gadomancy.MODID.toUpperCase() + ".FAM_RANGE_1", Gadomancy.MODID.toUpperCase() + ".FAM_ATTACK_3", researchBathSalts.key, researchPrimalFocus2.key)
.setPages(new ResearchPage("gadomancy.research_page.FAM_COOLDOWN_1.1"), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[4])).registerResearchItem();
+ if(ModConfig.ancientStoneRecipes)
+ researchAncientStones = new AlternatingResearchItem("ANCIENT_STONES",
+ -12, 1, 3,
+ new AspectList().add(Aspect.ELDRITCH, 10).add(Aspect.EARTH, 8).add(Aspect.EXCHANGE, 6).add(Aspect.ENTROPY, 8),
+ new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15))
+ .setConcealed()
+ .setParents(researchOculus.key)
+ .setPages(new ResearchPage("gadomancy.research_page.ANCIENT_STONES.1"), new ResearchPage(RegisteredRecipes.recipeAncientStone), new ResearchPage(RegisteredRecipes.recipeAncientStonePedestal)).registerResearchItem();
+
//Warpy warpy
ThaumcraftApi.addWarpToResearch(Gadomancy.MODID.toUpperCase() + ".FAM_ATTACK_3", 2);
ThaumcraftApi.addWarpToResearch(Gadomancy.MODID.toUpperCase() + ".FAM_COOLDOWN_1", 3);
@@ -232,10 +245,9 @@ public class RegisteredResearches {
public static void postInit() {
ResearchItem researchJar = PseudoResearchItem.create("JARLABEL", -3, -7).registerResearchItem();
ResearchItem researchEssentiaMirror = PseudoResearchItem.create("MIRRORESSENTIA", -6, -2).registerResearchItem();
- ResearchItem researchTubes = PseudoResearchItem.create("TUBES", -2, -9).registerResearchItem();
if(researchBlockProtector != null) {
- researchBlockProtector.setParents(researchTubes.key, researchJar.key);
+ researchBlockProtector.setParents(researchJar.key);
}
researchStickyJar = new AlternatingResearchItem("STICKYJAR", -5, -5, 2,
diff --git a/src/main/resources/assets/gadomancy/lang/en_US.lang b/src/main/resources/assets/gadomancy/lang/en_US.lang
index a313621..72ff266 100644
--- a/src/main/resources/assets/gadomancy/lang/en_US.lang
+++ b/src/main/resources/assets/gadomancy/lang/en_US.lang
@@ -85,6 +85,10 @@ gadomancy.research_page.BLOCK_PROTECTOR.1=EVERYONE. HATES. CREEPERS. It is pract
gadomancy.research_page.BLOCK_PROTECTOR.3=Turning essentia into gas directly without having it dissolve into flux is all but impossible, but some careful tinkering with various alchemical machinery components and redstone yields a device that can use a slightly different process to acquire the same effects as liquid essentia.
The Arcane Enervation Emitter diffuses a light aura of ordo across a limited area. Any creepers in that affected area will be unable to explode. The emitter is slow to start, and when it receives fuel in the form of ordo essentia and a redstone signal, it will gradually expand its area of effect until it reaches maximum size.
gadomancy.research_page.BLOCK_PROTECTOR.4=The size of its area can be controlled by changing the strength of the redstone signal used to activate the device, and monitored by placing a comparator running out of the device.
After using this device for some time, you noticed, much to your delight, that the field that the Arcane Enervation Emitter emits is strong enough to affect other mobs than just creepers. It appears to stop other mobs from breaking blocks. It isn’t strong enough to affect players though…
+tc.research_name.GADOMANCY.ANCIENT_STONES=Ancient Stones
+tc.research_text.GADOMANCY.ANCIENT_STONES=Decorations of the Eldritch
+gadomancy.research_page.ANCIENT_STONES.1=Entering the mazes of the Eldritch is not only what an experienced thaumaturge such as yourself wants; 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 might alter the stones magical properties to react more like their eldritch relatives.
+
tc.research_name.GADOMANCY.GROWING=Growing Nodes
tc.research_text.GADOMANCY.GROWING=Feed me Semour
gadomancy.research_page.GROWING.1=This node is something... different.
You did expect an Energized Node to be the only stable connection between us and the source of all Vis, but this Aura Node seems very stable too. Energizing an Aura Node channels Vis from its source into the world and breaks it down to the purest primal Aspects.
But... this node behaves much differently from others. It feels as though it's looking for something... it seems... restless. Something about this behavior is disconcerting in the extreme.