Add Embellished Crimson Fabric

-Remove crimson banner arcane workbench recipe. Replace with a normal recipe
-Replace crimson banners in recipes with embellished crimson fabric
-Update mod info and credits
-Update erythurgy icon
-Improved bow of bone page
-Minor code cleanup

src/main/java/mod/icarus/crimsonrevelations/init/RecipeHandler.java

@@ -14,21 +14,19 @@
 import thaumcraft.api.crafting.CrucibleRecipe;
 import thaumcraft.api.crafting.InfusionRecipe;
 import thaumcraft.api.crafting.ShapedArcaneRecipe;
+import thaumcraft.api.crafting.ShapelessArcaneRecipe;
 import thaumcraft.api.items.ItemsTC;
 
 public class RecipeHandler {
     public static void initArcaneCrafting() {
         // defaultGroup is meant for recipe books and is not really needed here.
         ResourceLocation defaultGroup = new ResourceLocation("");
 
-        ThaumcraftApi.addArcaneCraftingRecipe(new ResourceLocation(CrimsonRevelations.MODID, "crimsonbanner"), new ShapedArcaneRecipe(
-                defaultGroup, "CRIMSON_REVELATIONS", 10,
+        ThaumcraftApi.addArcaneCraftingRecipe(new ResourceLocation(CrimsonRevelations.MODID, "embellished_crimson_fabric"), new ShapelessArcaneRecipe(
+                defaultGroup, "CRIMSON_REVELATIONS_BASE", 10,
                 new AspectList(),
-                new ItemStack(BlocksTC.bannerCrimsonCult),
-                "FS",
-                "PS",
-                "FD",
-                'S', "stickWood", 'D', "slabWood", 'F', RegistryHandler.crimsonFabric, 'P', RegistryHandler.crimsonPlate));
+                new ItemStack(RegistryHandler.embellishedCrimsonFabric),
+                new Object[]{RegistryHandler.crimsonFabric, RegistryHandler.crimsonPlate}));
         ThaumcraftApi.addArcaneCraftingRecipe(new ResourceLocation(CrimsonRevelations.MODID, "glyphstone"), new ShapedArcaneRecipe(
                 defaultGroup, "ANCIENT_STONE", 15,
                 new AspectList(),
@@ -51,7 +49,7 @@ public static void initArcaneCrafting() {
                 "P P",
                 "FBF",
                 "PFP",
-                'F', RegistryHandler.crimsonFabric, 'B', new ItemStack(BlocksTC.bannerCrimsonCult), 'P', RegistryHandler.crimsonPlate));
+                'F', RegistryHandler.crimsonFabric, 'B', new ItemStack(RegistryHandler.embellishedCrimsonFabric), 'P', RegistryHandler.crimsonPlate));
         ThaumcraftApi.addArcaneCraftingRecipe(new ResourceLocation(CrimsonRevelations.MODID, "crimson_greaves"), new ShapedArcaneRecipe(
                 defaultGroup, "CRIMSON_ARMOR", 50,
                 new AspectList(),
@@ -74,7 +72,7 @@ public static void initArcaneCrafting() {
                 "F F",
                 "PBP",
                 "FPF",
-                'F', RegistryHandler.crimsonFabric, 'B', new ItemStack(BlocksTC.bannerCrimsonCult), 'P', RegistryHandler.crimsonPlate));
+                'F', RegistryHandler.crimsonFabric, 'B', new ItemStack(RegistryHandler.embellishedCrimsonFabric), 'P', RegistryHandler.crimsonPlate));
         ThaumcraftApi.addArcaneCraftingRecipe(new ResourceLocation(CrimsonRevelations.MODID, "crimson_leggings"), new ShapedArcaneRecipe(
                 defaultGroup, "CRIMSON_ARMOR", 50,
                 new AspectList(),
@@ -172,11 +170,11 @@ public static void initInfusion() {
                 new InfusionRecipe("PRAETOR_ARMOR", new ItemStack(ItemsTC.crimsonPraetorChest), 2,
                         new AspectList().add(Aspect.METAL, 50).add(Aspect.ELDRITCH, 25).add(Aspect.PROTECT, 30),
                         new ItemStack(ItemsTC.crimsonPlateChest),
-                        RegistryHandler.crimsonPlate, RegistryHandler.crimsonPlate, RegistryHandler.crimsonPlate, RegistryHandler.crimsonPlate, RegistryHandler.crimsonPlate, BlocksTC.bannerCrimsonCult));
+                        RegistryHandler.crimsonPlate, RegistryHandler.crimsonPlate, RegistryHandler.crimsonPlate, RegistryHandler.crimsonPlate, RegistryHandler.crimsonPlate, RegistryHandler.embellishedCrimsonFabric));
         ThaumcraftApi.addInfusionCraftingRecipe(new ResourceLocation(CrimsonRevelations.MODID, "praetor_greaves"),
                 new InfusionRecipe("PRAETOR_ARMOR", new ItemStack(ItemsTC.crimsonPraetorLegs), 2,
                         new AspectList().add(Aspect.METAL, 50).add(Aspect.ELDRITCH, 25).add(Aspect.PROTECT, 25),
                         new ItemStack(ItemsTC.crimsonPlateLegs),
-                        RegistryHandler.crimsonPlate, RegistryHandler.crimsonPlate, RegistryHandler.crimsonPlate, RegistryHandler.crimsonPlate, BlocksTC.bannerCrimsonCult));
+                        RegistryHandler.crimsonPlate, RegistryHandler.crimsonPlate, RegistryHandler.crimsonPlate, RegistryHandler.crimsonPlate, RegistryHandler.embellishedCrimsonFabric));
     }
 }

src/main/java/mod/icarus/crimsonrevelations/init/RegistryHandler.java

@@ -46,6 +46,7 @@
 
 import javax.annotation.Nonnull;
 
+// TODO: Organize and split this class
 @SuppressWarnings("deprecation")
 @EventBusSubscriber(modid = CrimsonRevelations.MODID)
 @GameRegistry.ObjectHolder(CrimsonRevelations.MODID)
@@ -64,6 +65,8 @@ public class RegistryHandler {
     public static Item crimsonPlate;
     @GameRegistry.ObjectHolder("crimson_sword")
     public static Item crimsonSword;
+    @GameRegistry.ObjectHolder("embellished_crimson_fabric")
+    public static Item embellishedCrimsonFabric;
 
     public static ArmorMaterial ARMOR_CULTIST_ARCHER = EnumHelper.addArmorMaterial("CULTIST_ARCHER", "CULTIST_ARCHER", 17, new int[]{2, 5, 5, 2}, 13, SoundEvents.ITEM_ARMOR_EQUIP_CHAIN, 0.0F).setRepairItem(new ItemStack(crimsonPlate));
 
@@ -73,6 +76,7 @@ public class RegistryHandler {
     public static void registerItems(RegistryEvent.Register<Item> event) {
         event.getRegistry().registerAll(
                 setup(new ItemCR(EnumRarity.UNCOMMON), "crimson_fabric"),
+                setup(new ItemCR(EnumRarity.UNCOMMON), "embellished_crimson_fabric"),
                 setup(new ItemCR(EnumRarity.UNCOMMON), "crimson_plate"),
                 setup(new ItemCRSword(TOOL_CULTIST, EnumRarity.UNCOMMON), "crimson_sword"),
 
@@ -98,7 +102,7 @@ public static void registerEntities(RegistryEvent.Register<EntityEntry> event) {
         //entityRegistryHelper("cultist_archer", EntityCultistArcher.class, id++, 64, 3, true, 0x1C1A2F, 0x5649B4);
 
         if (Loader.isModLoaded("thaumicaugmentation") && CRConfig.general_settings.TA_INTEGRATION)
-            entityRegistryHelper("overgrown_taintacle", EntityOvergrownTaintacle.class, id++, 64, 3, true, 0x1C1A2F, 0x5649B4);
+            registerEntity("overgrown_taintacle", EntityOvergrownTaintacle.class, id++, 64, 3, true, 0x1C1A2F, 0x5649B4);
     }
 
     @SubscribeEvent
@@ -107,12 +111,12 @@ public static void registerAspects(AspectRegistryEvent event) {
             ThaumcraftApi.registerEntityTag(CrimsonRevelations.MODID + ".overgrown_taintacle", new AspectList().add(Aspect.FLUX, 30).add(Aspect.ELDRITCH, 30).add(Aspect.AVERSION, 30).add(Aspect.PLANT, 30));
     }
 
-    public static void entityRegistryHelper(String name, Class<? extends Entity> clazz, int id, int trackingRange, int updateFrequency, boolean sendVelocityUpdates, int eggColor1, int eggColor2) {
+    public static void registerEntity(String name, Class<? extends Entity> clazz, int id, int trackingRange, int updateFrequency, boolean sendVelocityUpdates, int eggColor1, int eggColor2) {
         EntityRegistry.registerModEntity(new ResourceLocation(CrimsonRevelations.MODID, name), clazz, CrimsonRevelations.MODID + "." + name, id, CrimsonRevelations.instance, trackingRange,
                 updateFrequency, sendVelocityUpdates, eggColor1, eggColor2);
     }
 
-    public static void egglessEntityRegistryHelper(String name, Class<? extends Entity> clazz, int id, int trackingRange, int updateFrequency, boolean sendVelocityUpdates) {
+    public static void registerEntity(String name, Class<? extends Entity> clazz, int id, int trackingRange, int updateFrequency, boolean sendVelocityUpdates) {
         EntityRegistry.registerModEntity(new ResourceLocation(CrimsonRevelations.MODID, name), clazz, CrimsonRevelations.MODID + "." + name, id, CrimsonRevelations.instance, trackingRange,
                 updateFrequency, sendVelocityUpdates);
     }

src/main/resources/assets/crimsonrevelations/lang/en_us.lang

@@ -7,14 +7,15 @@ item.crimsonrevelations.bone_bow.name=Bow of Bone
 item.crimsonrevelations.crimson_archer_helmet.name=Crimson Archer Helm
 item.crimsonrevelations.crimson_archer_chestplate.name=Crimson Archer Chestplate
 item.crimsonrevelations.crimson_archer_leggings.name=Crimson Archer Leggings
+item.crimsonrevelations.embellished_crimson_fabric.name=Embellished Crimson Fabric
 item.crimsonrevelations.crimson_fabric.name=Crimson Fabric
 item.crimsonrevelations.crimson_plate.name=Crimson Plate
 item.crimsonrevelations.crimson_sword.name=Crimson Cult Sword
 
 tc.research_category.REVELATIONS=Revelations
 
 crimsonrevelations.research.crimson_revelations.title=Crimson Revelations
-crimsonrevelations.research.crimson_revelations.stage.0=While most of the Crimson Rites is written in an unintelligible script, there are patterns in the symbols which suggest I might be able to translate a bit more than I first thought. That's not to say it will be an easy task, but I may know where to start.<BR>On close inspection, the markings on the Crimson Cult's banners bear a strong resemblance to certain thaumaturgical sigils. Maybe their meanings will become clear as I expand my thaumaturgical knowledge?<BR>In the meantime, I've spent so long studying the banners that it would be easy to make a few of my own. The crimson plates in particular are already fairly similar to the symbols on the banner, so I just need to repurpose one and use Vis to work it into the fabric.<PAGE>§lCrimson Materials§r<DIV><IMG>crimsonrevelations:textures/items/crimson_fabric.png:0:0:255:255:0.125</IMG><IMG>crimsonrevelations:textures/items/crimson_plate.png:0:0:255:255:0.125</IMG>I've caught my eye on the components used for the Crimson Cult's armor. They appear to be made from unknown materials that I have been perplexed trying to figure out the origins of.<PAGE>The main components consist of a blood red fabric that is rather cold to the touch, and a dark gray plate made out of a lightweight yet strong metal that also bears the same familiar sigil.<BR>Unfortunately, replicating these items for my own use is impossible at this rate and I would have to get them from the Crimson Cultists themselves for now.
+crimsonrevelations.research.crimson_revelations.stage.0=While most of the Crimson Rites is written in an unintelligible script, there are patterns in the symbols which suggest I might be able to translate a bit more than I first thought. That's not to say it will be an easy task, but I may know where to start.<BR>On close inspection, the markings on the Crimson Cult's banners bear a strong resemblance to certain thaumaturgical sigils. Maybe their meanings will become clear as I expand my thaumaturgical knowledge?<BR>In the meantime, I've spent so long studying the banners that it would be easy to make a few of my own. Using Vis, I'll be able to work the Crimson Cult's components together to create an embellished fabric, I've also noted down the materials I discovered on the next page.<PAGE>§lCrimson Materials§r<DIV><IMG>crimsonrevelations:textures/items/crimson_fabric.png:0:0:255:255:0.125</IMG><IMG>crimsonrevelations:textures/items/crimson_plate.png:0:0:255:255:0.125</IMG>I've caught my eye on the components used for the Crimson Cult's armor. They appear to be made from unknown materials that I have been perplexed trying to figure out the origins of.<PAGE>The main components consist of a blood red fabric that is rather cold to the touch, and a dark gray plate made out of a lightweight yet strong metal that also bears the same familiar sigil.<BR>Unfortunately, replicating these items for my own use is impossible at this rate and I would have to get them from the Crimson Cultists themselves for now.
 
 crimsonrevelations.research.ancient_stone.title=Manufacturing Ancient Stone
 crimsonrevelations.research.ancient_stone.stage.0=Upon translating more of the Crimson Rites, "Apertis Oculis" seems to be the creation of a portal to another dimension. The Crimson Cultists describe it as an eldritch labyrinth made of strange, ancient stonework and inhabited by monstrous guardians.<BR>My studies into thaumaturgy lead me to believe that this dimension, if it ever existed, can no longer be accessed.<BR>However, the labyrinth's stonework is said to have interesting properties which may be worth replicating.
@@ -60,7 +61,7 @@ crimsonrevelations.research.overgrown_taintacle.stage.0=During one of my treks i
 
 crimsonrevelations.research.bone_bow.title=Bow of Bone
 crimsonrevelations.research.bone_bow.stage.0=I've managed to find some old schematics of a strange looking bow in the Crimson Rites. From the language I was able to translate, it is constructed very similarly to the elemental tools I have discovered earlier.<PAGE>Oddly the bow drawn in the schematics is very ancient in origin and must have been kept in secret for a very long time.<BR>I wonder what else I'll end up discovering from these cultists?
-crimsonrevelations.research.bone_bow.stage.1=That was unexpected...<BR>After struggling to construct it at an Arcane Workbench as detailed in these schematics, I've decided that infusion would be the best way to go like how I did for my elemental tools, it ended up being a success after much trial and error.<BR>The 'Bow of Bone' as they call it is able to quickly shoot stronger arrows that go farther than arrows fired from a regular bow, it also has its own autofire mechanism. This will be quite useful against those pesky skeletons.
+crimsonrevelations.research.bone_bow.stage.1=That was unexpected...<BR>After struggling to construct it at an Arcane Workbench as detailed in these schematics, I've decided that infusion would be the best way to go like how I did for my elemental tools, it ended up being a success after much trial and error.<BR>The 'Bow of Bone' as they call it is able to shoot arrows more quickly in comparison to a regular bow, the arrows fired are also stronger and will go farther than normal.<BR>The bow has its own autofire mechanism, simply hold right-click and it will keep firing without having to charge it again manually. This will be quite useful against those pesky skeletons.
 
 crimsonrevelations.text.overgrown_taintacle=You have absorbed some of the Overgrown Taintacle's power.
 

src/main/resources/assets/crimsonrevelations/models/item/embellished_crimson_fabric.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "crimsonrevelations:items/embellished_crimson_fabric"
+  }
+}

src/main/resources/assets/crimsonrevelations/recipes/crimson_banner.json

@@ -0,0 +1,27 @@
+{
+  "type": "forge:ore_shaped",
+  "pattern": [
+    "FS",
+    "ES",
+    "FD"
+  ],
+  "key": {
+    "S": {
+      "type": "forge:ore_dict",
+      "ore": "stickWood"
+    },
+    "D": {
+      "type": "forge:ore_dict",
+      "ore": "slabWood"
+    },
+    "F": {
+      "item": "crimsonrevelations:crimson_fabric"
+    },
+    "E": {
+      "item": "crimsonrevelations:embellished_crimson_fabric"
+    }
+  },
+  "result": {
+    "item": "thaumcraft:banner_crimson_cult"
+  }
+}

src/main/resources/assets/crimsonrevelations/research/revelations.json

@@ -26,7 +26,8 @@
         {
           "text": "crimsonrevelations.research.crimson_revelations.stage.0",
           "recipes": [
-            "crimsonrevelations:crimsonbanner"
+            "crimsonrevelations:crimson_banner",
+            "crimsonrevelations:embellished_crimson_fabric"
           ]
         }
       ]
@@ -238,7 +239,7 @@
       "key": "ERYTHURGY",
       "name": "crimsonrevelations.research.erythurgy.title",
       "icons": [
-        "thaumcraft:textures/research/r_enchant.png"
+        "crimsonrevelations:textures/research/r_erythurgy.png"
       ],
       "category": "REVELATIONS",
       "parents": [

src/main/resources/mcmod.info

@@ -5,12 +5,14 @@
     "description": "A Thaumcraft addon that allows you to research more about the Crimson Cult.",
     "version": "${version}",
     "mcversion": "${mcversion}",
+    "url": "https://github.com/Elite-Modding-Team/NewCrimsonRevelations",
     "authorList": [
       "IcarussOne",
+      "J. Carver",
       "ACGaming",
       "xJon"
     ],
-    "credits": "Azanor for making Thaumcraft and MobiusFlip for making the original Crimson Revelations mod.",
+    "credits": "Azanor for making Thaumcraft, MobiusFlip for making the original Crimson Revelations mod, and Carver for a lot of ideas and amazing models/textures.",
     "dependencies": [
       "thaumcraft"
     ]