Skip to content

Commit

Permalink
Remove a check and add some TODOs
Browse files Browse the repository at this point in the history
  • Loading branch information
IcarussOne committed Sep 26, 2024
1 parent 219ee53 commit 3332a6c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
13 changes: 3 additions & 10 deletions src/main/java/mod/icarus/crimsonrevelations/init/CRItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ public static void registerItems(@Nonnull final RegistryEvent.Register<Item> eve
CRRegistry.setup(new CRItemRunicBauble(BaubleType.AMULET, EnumRarity.RARE, 7), "runic_amulet_emergency"),
CRRegistry.setup(new CRItemRunicBauble(BaubleType.BELT, EnumRarity.RARE, 9), "runic_girdle_kinetic"),

CRRegistry.setup(new ItemKnowledgeScribingTools(), "knowledge_scribing_tools"),
CRRegistry.setup(new ItemSanitationScribingTools(), "sanitation_scribing_tools"),
CRRegistry.setup(new ItemPrimordialScribingTools(), "primordial_scribing_tools")
);
Expand All @@ -148,11 +149,6 @@ public static void registerItems(@Nonnull final RegistryEvent.Register<Item> eve
registry.register(CRRegistry.setup(new ItemMeteorBoots(EntityEquipmentSlot.FEET), "meteor_boots"));
}

// Do not register Scribing Tools of Knowledge if TC4 Research Port is detected. It doesn't use observations and theories for its overhauled research.
if (!Loader.isModLoaded("oldresearch")) {
registry.register(CRRegistry.setup(new ItemKnowledgeScribingTools(), "knowledge_scribing_tools"));
}

// Item Blocks
ForgeRegistries.BLOCKS.getValues().stream()
.filter(block -> block.getRegistryName().getNamespace().equals(NewCrimsonRevelations.MODID))
Expand All @@ -166,11 +162,8 @@ public static void registerRecipes(RegistryEvent.Register<IRecipe> event) {
final IForgeRegistry<IRecipe> registry = event.getRegistry();

// Special recipes go here
if (!Loader.isModLoaded("oldresearch")) {
registry.register(new ShapelessOreRecipe(new ResourceLocation(Thaumcraft.MODID, "inkwell"), knowledgeScribingTools, new ItemStack(knowledgeScribingTools, 1, OreDictionary.WILDCARD_VALUE),
ThaumcraftApiHelper.makeCrystal(Aspect.SENSES)).setRegistryName(NewCrimsonRevelations.MODID, "knowledge_scribing_tools_refill"));
}

registry.register(new ShapelessOreRecipe(new ResourceLocation(Thaumcraft.MODID, "inkwell"), knowledgeScribingTools, new ItemStack(knowledgeScribingTools, 1, OreDictionary.WILDCARD_VALUE),
ThaumcraftApiHelper.makeCrystal(Aspect.SENSES)).setRegistryName(NewCrimsonRevelations.MODID, "knowledge_scribing_tools_refill"));
registry.register(new ShapelessOreRecipe(new ResourceLocation(Thaumcraft.MODID, "inkwell"), sanitationScribingTools, new ItemStack(sanitationScribingTools, 1, OreDictionary.WILDCARD_VALUE),
ThaumcraftApiHelper.makeCrystal(Aspect.MIND)).setRegistryName(NewCrimsonRevelations.MODID, "sanitation_scribing_tools_refill"));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ public static void setDepletedState(ItemStack stack, boolean flag) {
stack.getTagCompound().setBoolean("depleted", flag);
}

// TODO: TC4 Research Port compat
@Override
public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
ItemStack stack = player.getHeldItem(hand);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLiv
});
}

// TODO: TC4 Research Port compat
@Override
public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
ItemStack stack = player.getHeldItem(hand);
Expand Down

0 comments on commit 3332a6c

Please sign in to comment.