Removed Baubles support for relics

TeamMetallurgy · May 24, 2019 · 9782848 · 9782848
1 parent b0c28f9
commit 9782848
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 26 deletions.
diff --git a/src/main/java/com/teammetallurgy/atum/client/render/tileentity/RenderTileChest.java b/src/main/java/com/teammetallurgy/atum/client/render/tileentity/RenderTileChest.java
@@ -105,8 +105,6 @@ public void render(@Nonnull TileEntityChestBase te, double x, double y, double z
             GlStateManager.translate(0.5F, 0.5F, 0.5F);
             int angle = 0;
 
-            System.out.println(meta);
-
             if (meta == 2) {
                 angle = 180;
             }

diff --git a/src/main/java/com/teammetallurgy/atum/items/ItemLoot.java b/src/main/java/com/teammetallurgy/atum/items/ItemLoot.java
@@ -1,13 +1,10 @@
 package com.teammetallurgy.atum.items;
 
-import baubles.api.BaubleType;
-import baubles.api.IBauble;
 import com.google.common.base.Preconditions;
 import com.teammetallurgy.atum.Atum;
 import com.teammetallurgy.atum.utils.*;
 import net.minecraft.block.BlockCauldron;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.SoundEvents;
@@ -20,12 +17,10 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.common.Optional;
 
 import javax.annotation.Nonnull;
 
-@Optional.Interface(iface = "baubles.api.IBauble", modid = "baubles")
-public class ItemLoot extends Item implements IOreDictEntry, IBauble {
+public class ItemLoot extends Item implements IOreDictEntry {
     private static final NonNullList<LootEntry> LOOT_ENTRIES = NonNullList.create();
 
     public static void createLootItems() {
@@ -106,24 +101,6 @@ public void getOreDictEntries() {
         OreDictHelper.add(this, "relic");
     }
 
-    @Override
-    @Optional.Method(modid = "baubles")
-    public BaubleType getBaubleType(@Nonnull ItemStack stack) {
-        Type type = getType(stack.getItem());
-        if (type == Type.NECKLACE) {
-            return BaubleType.AMULET;
-        } else {
-            return BaubleType.RING;
-        }
-    }
-
-    @Override
-    @Optional.Method(modid = "baubles")
-    public boolean canEquip(@Nonnull ItemStack stack, EntityLivingBase player) {
-        Type type = getType(stack.getItem());
-        return type == Type.RING || type == Type.NECKLACE;
-    }
-
     public enum Type implements IStringSerializable {
         IDOL("idol"),
         NECKLACE("necklace"),