Merge pull request #11 from Zereff06/scribing_tools_v2

fix-> scribing tools can't form the table (more 2 ScribeTools)
This commit is contained in:
Martin Robertz authored and GitHub committed 2023-02-12 11:43:10 +01:00
commit c670abe13c
2 files changed
+4 -4

No files matched your search

@@ -5,13 +5,13 @@ import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import thaumcraft.api.IScribeTools;
import thaumcraft.common.items.ItemInkwell;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import cpw.mods.fml.relauncher.Side;
@@ -19,7 +19,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import fox.spiteful.forbidden.Forbidden;
import fox.spiteful.forbidden.compat.Compat;
public class ItemBloodwell extends Item implements IScribeTools, IBindable {
public class ItemBloodwell extends ItemInkwell implements IScribeTools, IBindable {
@SideOnly(Side.CLIENT)
public IIcon icon;
@@ -6,7 +6,6 @@ import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
@@ -15,6 +14,7 @@ import net.minecraft.world.World;
import thaumcraft.api.IScribeTools;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.common.Thaumcraft;
import thaumcraft.common.items.ItemInkwell;
import thaumcraft.common.lib.network.PacketHandler;
import thaumcraft.common.lib.network.playerdata.PacketAspectPool;
import thaumcraft.common.lib.research.ResearchManager;
@@ -24,7 +24,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import fox.spiteful.forbidden.Forbidden;
public class ItemBoundwell extends Item implements IScribeTools, IBindable {
public class ItemBoundwell extends ItemInkwell implements IScribeTools, IBindable {
@SideOnly(Side.CLIENT)
public IIcon icon;