mirror of
https://github.com/GTNewHorizons/BloodArsenal.git
synced 2026-11-19 03:49:32 +00:00
FIXED THE DARN BAUBLES BUG
Don't know how, nor care
This commit is contained in:
1 parent
71fa3d319e
commit
2f64c4f0ad
5 files changed
+22
-19
No files matched your search
@@ -143,10 +143,6 @@ public class BloodArsenal
|
||||
isBaublesLoaded = true;
|
||||
logger.info("Loaded Baubles integration");
|
||||
|
||||
ModItems.vampire_ring = new VampireRing();
|
||||
ModItems.self_sacrifice_amulet = new SelfSacrificeAmulet();
|
||||
ModItems.sacrifice_amulet = new SacrificeAmulet();
|
||||
|
||||
GameRegistry.registerItem(ModItems.vampire_ring, "vampire_ring");
|
||||
GameRegistry.registerItem(ModItems.self_sacrifice_amulet, "self_sacrifice_amulet");
|
||||
GameRegistry.registerItem(ModItems.sacrifice_amulet, "sacrifice_amulet");
|
||||
|
||||
@@ -5,6 +5,7 @@ import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry;
|
||||
import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe;
|
||||
import baubles.api.BaublesApi;
|
||||
import baubles.common.Baubles;
|
||||
import baubles.common.Config;
|
||||
import com.arc.bloodarsenal.block.ModBlocks;
|
||||
import com.arc.bloodarsenal.items.ModItems;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
@@ -87,6 +88,13 @@ public class BloodArsenalRecipes
|
||||
addOreDictBloodOrbRecipe(new ItemStack(ModItems.sigil_of_divinity), "aba", "cde", "fgf", 'a', ModBlocks.blood_infused_glowstone, 'b', new ItemStack(Items.golden_apple, 1, 1), 'c', Items.nether_star, 'd', WayofTime.alchemicalWizardry.ModItems.sigilOfElementalAffinity, 'e', ModItems.blood_infused_diamond_bound, 'f', ModItems.amorphic_catalyst, 'g', transcendentOrb);
|
||||
addOreDictBloodOrbRecipe(new ItemStack(ModItems.blood_burned_string, 4), "aaa", "aba", "aaa", 'a', Items.string, 'b', weakOrb);
|
||||
|
||||
if (BloodArsenal.isBaublesLoaded)
|
||||
{
|
||||
addOreDictBloodOrbRecipe(new ItemStack(ModItems.vampire_ring), "ab ", "bcb", " b ", 'a', ModItems.blood_infused_diamond_bound, 'b', Blocks.stone, 'c', masterOrb);
|
||||
addOreDictBloodOrbRecipe(new ItemStack(ModItems.sacrifice_amulet), "aaa", "aba", "caa", 'a', ModItems.blood_burned_string, 'b', weakOrb, 'c', Items.gold_ingot);
|
||||
addOreDictBloodOrbRecipe(new ItemStack(ModItems.self_sacrifice_amulet), "aaa", "aba", "caa", 'a', ModItems.blood_burned_string, 'b', weakOrb, 'c', Items.glowstone_dust);
|
||||
}
|
||||
|
||||
addOreDictRecipe(new ItemStack(ModBlocks.blood_stone), "aaa", "aaa", "aaa", 'a', blankSlate);
|
||||
addOreDictRecipe(new ItemStack(ModBlocks.blood_stone, 1, 1), "aaa", "aaa", "aaa", 'a', reinforcedSlate);
|
||||
addOreDictRecipe(new ItemStack(ModBlocks.blood_stone, 1, 2), "aaa", "aaa", "aaa", 'a', imbuedSlate);
|
||||
@@ -119,21 +127,6 @@ public class BloodArsenalRecipes
|
||||
addShapelessOreDictRecipe(new ItemStack(ModItems.blood_infused_iron, 9), ModBlocks.blood_infused_iron_block);
|
||||
addShapelessOreDictRecipe(new ItemStack(ModItems.orange_juice), ModItems.blood_orange, Items.glass_bottle);
|
||||
addShapelessOreDictRecipe(new ItemStack(ModItems.juice_and_cookies), Items.cookie, ModItems.orange_juice);
|
||||
|
||||
if (BloodArsenal.isBaublesLoaded)
|
||||
{
|
||||
// addOreDictBloodOrbRecipe(new ItemStack(ModItems.vampire_ring), "ab ", "bcb", " b ", 'a', ModItems.blood_infused_diamond_bound, 'b', Blocks.stone, 'c', masterOrb);
|
||||
GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.self_sacrifice_amulet), "aaa", "aba", "caa", 'a', ModItems.blood_burned_string, 'b', weakOrb, 'c', WayofTime.alchemicalWizardry.ModBlocks.runeOfSelfSacrifice));
|
||||
// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.sacrifice_amulet), "aaa", "aba", "caa", 'a', ModItems.blood_burned_string, 'b', weakOrb, 'c', WayofTime.alchemicalWizardry.ModBlocks.runeOfSacrifice));
|
||||
// GameRegistry.addRecipe(new ItemStack(ModItems.self_sacrifice_amulet), "a", 'a', new ItemStack(Items.slime_ball));
|
||||
}
|
||||
|
||||
{
|
||||
// ItemStack igniter = new ItemStack(ModItems.bound_igniter);
|
||||
|
||||
// GameRegistry.addRecipe(new ItemStack(ModBlocks.blood_torch), "a", "b", 'a', igniter, 'b', ModItems.blood_infused_stick);
|
||||
// GameRegistry.addRecipe(new ItemStack(ModItems.blood_burned_string, 4), "aaa", "aba", "aaa", 'a', Items.string, 'b', igniter);
|
||||
}
|
||||
}
|
||||
|
||||
private static void addOreDictRecipe(ItemStack output, Object... recipe)
|
||||
|
||||
@@ -4,6 +4,9 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import com.arc.bloodarsenal.BloodArsenal;
|
||||
import com.arc.bloodarsenal.block.ModBlocks;
|
||||
import com.arc.bloodarsenal.items.armor.VampireCostume;
|
||||
import com.arc.bloodarsenal.items.bauble.SacrificeAmulet;
|
||||
import com.arc.bloodarsenal.items.bauble.SelfSacrificeAmulet;
|
||||
import com.arc.bloodarsenal.items.bauble.VampireRing;
|
||||
import com.arc.bloodarsenal.items.block.*;
|
||||
import com.arc.bloodarsenal.items.sigil.SigilDivinity;
|
||||
import com.arc.bloodarsenal.items.sigil.SigilEnder;
|
||||
@@ -114,6 +117,9 @@ public class ModItems
|
||||
wolf_hide = new ItemBloodArsenal().setUnlocalizedName("wolf_hide");
|
||||
blood_money = new ItemBloodMoney();
|
||||
blood_burned_string = new ItemBloodArsenal().setUnlocalizedName("blood_burned_string");
|
||||
vampire_ring = new VampireRing();
|
||||
self_sacrifice_amulet = new SelfSacrificeAmulet();
|
||||
sacrifice_amulet = new SacrificeAmulet();
|
||||
}
|
||||
|
||||
public static void registerItems()
|
||||
|
||||
@@ -5,12 +5,18 @@ import baubles.common.container.InventoryBaubles;
|
||||
import baubles.common.lib.PlayerHandler;
|
||||
import com.arc.bloodarsenal.BloodArsenal;
|
||||
import cpw.mods.fml.common.Optional;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles")
|
||||
public abstract class ItemBauble extends Item implements IBauble
|
||||
{
|
||||
@@ -19,6 +25,7 @@ public abstract class ItemBauble extends Item implements IBauble
|
||||
super();
|
||||
setMaxStackSize(1);
|
||||
setMaxDamage(0);
|
||||
setHasSubtypes(true);
|
||||
setCreativeTab(BloodArsenal.BA_TAB);
|
||||
}
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ public class VampireRing extends ItemBauble implements IBauble
|
||||
{
|
||||
super();
|
||||
setMaxStackSize(1);
|
||||
setHasSubtypes(true);
|
||||
setUnlocalizedName("vampire_ring");
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user