diff --git a/src/main/java/mod/icarus/crimsonrevelations/NewCrimsonRevelations.java b/src/main/java/mod/icarus/crimsonrevelations/NewCrimsonRevelations.java index 36f3594..f62156e 100644 --- a/src/main/java/mod/icarus/crimsonrevelations/NewCrimsonRevelations.java +++ b/src/main/java/mod/icarus/crimsonrevelations/NewCrimsonRevelations.java @@ -37,6 +37,7 @@ public void preInit(FMLPreInitializationEvent event) { @EventHandler public void init(FMLInitializationEvent event) { CRCompatHandler.init(); + CRResearchRegistry.init(); CRRecipes.initArcaneCrafting(); @@ -47,6 +48,7 @@ public void init(FMLInitializationEvent event) { @EventHandler public void postinit(FMLPostInitializationEvent event) { CREntities.registerEntitySpawns(); + CRCompatHandler.postInit(); } @@ -54,6 +56,7 @@ public void postinit(FMLPostInitializationEvent event) { @EventHandler public void preInitClient(FMLPreInitializationEvent event) { MinecraftForge.EVENT_BUS.register(new CRClientEvents()); + CRRenderRegistry.preInit(); } @@ -62,11 +65,14 @@ public void preInitClient(FMLPreInitializationEvent event) { public void initClient(FMLInitializationEvent event) { IItemColor itemCrystalPlanterColourHandler = (stack, tintIndex) -> { Item item = stack.getItem(); + if (item == CRItems.MANA_BEAN) { return ((CRItemManaBean) item).getColor(stack, tintIndex); } + return 16777215; }; + Minecraft.getMinecraft().getItemColors().registerItemColorHandler(itemCrystalPlanterColourHandler, CRItems.MANA_BEAN); } diff --git a/src/main/java/mod/icarus/crimsonrevelations/init/CRResearchRegistry.java b/src/main/java/mod/icarus/crimsonrevelations/init/CRResearchRegistry.java index 1e0c987..902572d 100644 --- a/src/main/java/mod/icarus/crimsonrevelations/init/CRResearchRegistry.java +++ b/src/main/java/mod/icarus/crimsonrevelations/init/CRResearchRegistry.java @@ -18,6 +18,7 @@ import thaumcraft.api.golems.parts.GolemMaterial; import thaumcraft.api.items.ItemsTC; import thaumcraft.api.research.ResearchCategories; +import thaumcraft.api.research.ScanBlock; import thaumcraft.api.research.ScanEntity; import thaumcraft.api.research.ScanningManager; import thaumcraft.common.entities.monster.cult.EntityCultistCleric; @@ -60,10 +61,14 @@ public static void init() { ThaumcraftApi.registerResearchLocation(new ResourceLocation(NewCrimsonRevelations.MODID, "research/research")); ThaumcraftApi.registerResearchLocation(new ResourceLocation(NewCrimsonRevelations.MODID, "research/revelations")); + ThaumcraftApi.registerResearchLocation(new ResourceLocation(NewCrimsonRevelations.MODID, "research/compat/thaumcraft")); + // Research ScanningManager.addScannableThing(new ScanEntity("!CR_CRIMSON_CLERIC", EntityCultistCleric.class, true)); ScanningManager.addScannableThing(new ScanEntity("!CR_CRIMSON_KNIGHT", EntityCultistKnight.class, true)); + ScanningManager.addScannableThing(new ScanBlock("!CR_MANA_POD", CRBlocks.MANA_POD)); + if (Loader.isModLoaded("thaumicaugmentation") && CRConfig.mod_integration_settings.TA_INTEGRATION) { // Focus Effects FocusEngine.registerElement(FocusEffectTaintPoison.class, new ResourceLocation(NewCrimsonRevelations.MODID, "textures/foci/taint_poison.png"), 10354925); diff --git a/src/main/resources/assets/crimsonrevelations/lang/en_us.lang b/src/main/resources/assets/crimsonrevelations/lang/en_us.lang index 9a4113c..88c7082 100644 --- a/src/main/resources/assets/crimsonrevelations/lang/en_us.lang +++ b/src/main/resources/assets/crimsonrevelations/lang/en_us.lang @@ -116,6 +116,10 @@ crimsonrevelations.research.focus_taint_poison.stage.0=Taint Poison is much more crimsonrevelations.research.overgrown_taintacle.title=Overgrown Taintacle crimsonrevelations.research.overgrown_taintacle.stage.0=During one of my treks in the Emptiness, I have discovered a significantly stronger and more aggressive Taintacle variant. It seems to have a symbiotic relationship with the environment, which would explain the main source of its power.
Hunting these larger Taintacles would be ideal, I should be able to harvest whatever congealed energy it leaves off for my own purposes. +# Research: Fundamentals +crimsonrevelations.research.mana_pods.title=Mana Pods +crimsonrevelations.research.mana_pods.stage.0=This strange, pod-like plant is only found growing on trees in Magical Forests. They grow very slowly and when harvested, usually only yield one or two colorful beans.
These beans, that I call Mana Beans, contain concentrated amounts of essentia. They can also be consumed for more knowledge on research, though the results afterwards are often a bit unpredictable.They can be replanted on the roof of a block in a Magical Forest, but cultivation proves to be difficult and time-consuming. Bone meal also seems to have no effect on them unlike other plants.
Wild mana pods usually only produce primal aspects, though it is said that planting beans adjacent to existing ones sometimes result in beans with compound aspects.
Fully learning the proper way to farm a specific aspect that I really need would be useful for my studies. + # Research: Bestiary crimsonrevelations.research.cult_bestiary.title=The Cult Bestiary crimsonrevelations.research.cult_bestiary.stage.0=I am dedicating this side of the Revelations chapter for any of the different types of Crimson Cult members I encounter. The cultists seem to be human or at least related to humans. However, something is off about them. Their eyes are of a striking glowing red, and their bodies seem to have a higher constitution than a normal body would, surviving wounds that I would not be able to.Whatever process they use to "enhance" themselves is both curious, and at the same time strangely sinister. Interestingly, I can't help but notice the similarity of Angry Zombies to them. Perhaps the remains of failed expeditions?
Of particularly interesting note, they seem to have some form of rank system, or at least that's what I was able to translate. I will note down more about each of the members upon scanning any of them with my Thaumometer. @@ -126,7 +130,7 @@ crimsonrevelations.research.crimson_cleric.stage.0=The most honored of the low r crimsonrevelations.research.crimson_knight.title=Crimson Knight crimsonrevelations.research.crimson_knight.stage.0=These are the main foot soldiers of the Crimson Cult as said by the Crimson Rites, the knights mostly do basic mundane tasks such as protecting Crimson Clerics from harm during their rituals and scouting various areas within the Overworld.
Despite not knowing dangerous spells like the clerics, the knights are actually a very §osneaky§r type, the swords that they carry are tipped with a potent poison. I should thus be careful when dealing with them especially in larger numbers, as even the toughest diamond armor won't protect me from being poisoned.
These tipped swords were recently provided to the knights after a recent arsenal change, the iron swords they had previously were not working too well for them apparently... -crimsonrevelations.research.crimson_knight.addenda.0=It looks like the knights also have their own subrank system based on skill and loyalty. They are promoted to a sergeant after some time and don a stronger sword imbued with magic, they also don't cover their head for clearer vision. Finally, they become commanders which is just one small step before becoming a cleric, I can easily recognize them by their own hoods that they wear and voidified swords that they carry.Encountering these types of knights are more of a rare anomaly, but it is interesting to see how the Crimson Cult has this system in place. +crimsonrevelations.research.crimson_knight.addenda.0=It looks like the knights also have their own subrank system based on skill and loyalty. They are promoted to a sergeant after some time and don a stronger sword imbued with magic, they also don't cover their head for clearer vision. Finally, they become commanders which is just one small step before becoming a cleric, I can easily recognize them by their own hoods that they wear and the voidified swords that they carry.Encountering these types of knights are more of a rare anomaly, but it is interesting to see how the Crimson Cult has this system in place. crimsonrevelations.text.overgrown_taintacle=You have absorbed some of the Overgrown Taintacle's power. diff --git a/src/main/resources/assets/crimsonrevelations/research/compat/thaumcraft.json b/src/main/resources/assets/crimsonrevelations/research/compat/thaumcraft.json new file mode 100644 index 0000000..fef416a --- /dev/null +++ b/src/main/resources/assets/crimsonrevelations/research/compat/thaumcraft.json @@ -0,0 +1,29 @@ +{ + "entries": [ + { + "key": "!CR_MANA_POD", + "name": "crimsonrevelations.research.mana_pods.title", + "icons": [ + "crimsonrevelations:mana_bean" + ], + "category": "BASICS", + "parents": [], + "siblings": [], + "meta": [ + "ROUND", + "HIDDEN" + ], + "location": [ + -2, + 0 + ], + "reward_item": [], + "reward_knowledge": [], + "stages": [ + { + "text": "crimsonrevelations.research.mana_pods.stage.0" + } + ] + } + ] +}