mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 11:49:37 +00:00
Flatten manaresource
This commit is contained in:
1 parent
25ad5cc06f
commit
4c5a058173
57 files changed
+217
-203
No files matched your search
@@ -97,9 +97,8 @@ public final class ColorHandler {
|
||||
|
||||
ItemColors items = Minecraft.getMinecraft().getItemColors();
|
||||
|
||||
items.registerItemColorHandler((s, t) -> s.getItemDamage() == 5 || s.getItemDamage() == 14
|
||||
? Color.HSBtoRGB(Botania.proxy.getWorldElapsedTicks() * 2 % 360 / 360F, 0.25F, 1F) : -1,
|
||||
ModItems.manaResource);
|
||||
items.registerItemColorHandler((s, t) -> Color.HSBtoRGB(Botania.proxy.getWorldElapsedTicks() * 2 % 360 / 360F, 0.25F, 1F),
|
||||
ModItems.lifeEssence, ModItems.gaiaIngot);
|
||||
|
||||
items.registerItemColorHandler((s, t) ->
|
||||
t == 1 ? EnumDyeColor.byMetadata(ItemTwigWand.getColor1(s)).getColorValue()
|
||||
|
||||
@@ -239,7 +239,7 @@ public class ClientProxy implements IProxy {
|
||||
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, renderManager -> new RenderSnowballStack<>(renderManager, ModItems.thornChakram, Minecraft.getMinecraft().getRenderItem(), entity -> new ItemStack(ModItems.thornChakram, 1, entity.isFire() ? 1 : 0)));
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, renderManager -> new RenderSnowball<>(renderManager, ModItems.vineBall, Minecraft.getMinecraft().getRenderItem()));
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, renderManager -> new RenderSnowballStack<>(renderManager, ModItems.manaResource, Minecraft.getMinecraft().getRenderItem(), entity -> new ItemStack(ModItems.manaResource, 1, 15)));
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, renderManager -> new RenderSnowball<>(renderManager, ModItems.enderAirBottle, Minecraft.getMinecraft().getRenderItem()));
|
||||
|
||||
ShaderHelper.initShaders();
|
||||
|
||||
|
||||
@@ -45,12 +45,7 @@ public class BlockRoot extends BlockMod implements ILexiconable {
|
||||
@Nonnull
|
||||
@Override
|
||||
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
|
||||
return ModItems.manaResource;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int damageDropped(IBlockState state) {
|
||||
return 20;
|
||||
return ModItems.livingroot;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -20,10 +20,10 @@ public final class ModBanners {
|
||||
|
||||
public static void init() {
|
||||
Class<? extends Enum<?>> clazz = BannerPattern.class;
|
||||
addPattern(clazz, "flower", "flr", new ItemStack(ModItems.manaResource, 1, 3));
|
||||
addPattern(clazz, "flower", "flr", new ItemStack(ModItems.livingwoodTwig));
|
||||
addPattern(clazz, "lexicon", "lex", new ItemStack(ModItems.lexicon));
|
||||
addPattern(clazz, "logo", "lgo", new ItemStack(ModItems.manaResource, 1, 4));
|
||||
addPattern(clazz, "sapling", "spl", new ItemStack(ModItems.manaResource, 1, 13));
|
||||
addPattern(clazz, "logo", "lgo", new ItemStack(ModItems.terrasteel));
|
||||
addPattern(clazz, "sapling", "spl", new ItemStack(ModItems.dreamwoodTwig));
|
||||
addPattern(clazz, "tiny_potato", "tpt", new ItemStack(ModBlocks.tinyPotato));
|
||||
|
||||
addPattern(clazz, "spark_dispersive", "sds", new ItemStack(ModItems.sparkUpgrade, 1, 0));
|
||||
|
||||
@@ -56,7 +56,8 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable {
|
||||
@Override
|
||||
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing s, float xs, float ys, float zs) {
|
||||
ItemStack stack = player.getHeldItem(hand);
|
||||
if(!stack.isEmpty() && stack.getItem() == ModItems.manaResource && stack.getItemDamage() < 3) {
|
||||
if(!stack.isEmpty()
|
||||
&& (stack.getItem() == ModItems.manaSteel || stack.getItem() == ModItems.manaPearl || stack.getItem() == ModItems.manaDiamond)) {
|
||||
if(!world.isRemote) {
|
||||
ItemStack target = stack.splitStack(1);
|
||||
EntityItem item = new EntityItem(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, target);
|
||||
|
||||
@@ -131,7 +131,7 @@ public class TileCraftCrate extends TileOpenCrate {
|
||||
for(int i = 0; i < 9; i++) {
|
||||
ItemStack stack = itemHandler.getStackInSlot(i);
|
||||
|
||||
if(stack.isEmpty() || isLocked(i) || stack.getItem() == ModItems.manaResource && stack.getItemDamage() == 11)
|
||||
if(stack.isEmpty() || isLocked(i) || stack.getItem() == ModItems.placeholder)
|
||||
continue;
|
||||
|
||||
craft.setInventorySlotContents(i, stack.copy());
|
||||
|
||||
@@ -54,7 +54,7 @@ public class TileHourglass extends TileSimpleInventory {
|
||||
public void update() {
|
||||
int totalTime = getTotalTime();
|
||||
ItemStack dustStack = itemHandler.getStackInSlot(0);
|
||||
dust = !dustStack.isEmpty() && dustStack.getItem() == ModItems.manaResource;
|
||||
dust = !dustStack.isEmpty() && dustStack.getItem() == ModItems.manaPowder;
|
||||
|
||||
if(totalTime > 0 || dust) {
|
||||
if(move && !dust)
|
||||
@@ -114,7 +114,7 @@ public class TileHourglass extends TileSimpleInventory {
|
||||
return stack.getItemDamage() == 1 ? 200 : 20;
|
||||
if(stack.getItem() == Item.getItemFromBlock(Blocks.SOUL_SAND))
|
||||
return 1200;
|
||||
if(stack.getItem() == ModItems.manaResource)
|
||||
if(stack.getItem() == ModItems.manaPowder)
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
@@ -127,7 +127,7 @@ public class TileHourglass extends TileSimpleInventory {
|
||||
return stack.getItemDamage() == 1 ? 0xE95800 : 0xFFEC49;
|
||||
if(stack.getItem() == Item.getItemFromBlock(Blocks.SOUL_SAND))
|
||||
return 0x5A412f;
|
||||
if(stack.getItem() == ModItems.manaResource)
|
||||
if(stack.getItem() == ModItems.manaPowder)
|
||||
return 0x03abff;
|
||||
|
||||
return 0;
|
||||
@@ -139,7 +139,7 @@ public class TileHourglass extends TileSimpleInventory {
|
||||
@Nonnull
|
||||
@Override
|
||||
public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) {
|
||||
if(!stack.isEmpty() && (stack.getItem() == Item.getItemFromBlock(Blocks.SAND) || stack.getItem() == Item.getItemFromBlock(Blocks.SOUL_SAND)) || stack.getItem() == ModItems.manaResource && stack.getItemDamage() == 23)
|
||||
if(!stack.isEmpty() && (stack.getItem() == Item.getItemFromBlock(Blocks.SAND) || stack.getItem() == Item.getItemFromBlock(Blocks.SOUL_SAND)) || stack.getItem() == ModItems.manaPowder)
|
||||
return super.insertItem(slot, stack, simulate);
|
||||
else return stack;
|
||||
}
|
||||
|
||||
@@ -102,7 +102,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable {
|
||||
for(EntityItem otherItem : items)
|
||||
if(otherItem != item)
|
||||
otherItem.setDead();
|
||||
else item.setItem(new ItemStack(ModItems.manaResource, 1, 4));
|
||||
else item.setItem(new ItemStack(ModItems.terrasteel));
|
||||
world.playSound(null, item.posX, item.posY, item.posZ, ModSounds.terrasteelCraft, SoundCategory.BLOCKS, 1, 1);
|
||||
mana = 0;
|
||||
world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock());
|
||||
@@ -128,15 +128,14 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable {
|
||||
ItemStack diamond = ItemStack.EMPTY;
|
||||
for(EntityItem item : items) {
|
||||
ItemStack stack = item.getItem();
|
||||
if(stack.getItem() != ModItems.manaResource || stack.getCount() != 1)
|
||||
if(stack.getCount() != 1)
|
||||
return false;
|
||||
|
||||
int meta = stack.getItemDamage();
|
||||
if(meta == 0)
|
||||
if(stack.getItem() == ModItems.manaSteel)
|
||||
ingot = stack;
|
||||
else if(meta == 1)
|
||||
else if(stack.getItem() == ModItems.manaPearl)
|
||||
pearl = stack;
|
||||
else if(meta == 2)
|
||||
else if(stack.getItem() == ModItems.manaDiamond)
|
||||
diamond = stack;
|
||||
else return false;
|
||||
}
|
||||
|
||||
@@ -21,6 +21,7 @@ import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.ModFluffBlocks;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.item.material.ItemManaResource;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
@@ -68,7 +69,29 @@ public final class BotaniaCreativeTab extends CreativeTabs {
|
||||
addItem(ModItems.blackLotus);
|
||||
addItem(ModItems.twigWand);
|
||||
addItem(ModItems.obedienceStick);
|
||||
addItem(ModItems.manaResource);
|
||||
addItem(ModItems.manaSteel);
|
||||
addItem(ModItems.manaPearl);
|
||||
addItem(ModItems.manaDiamond);
|
||||
addItem(ModItems.livingwoodTwig);
|
||||
addItem(ModItems.terrasteel);
|
||||
addItem(ModItems.lifeEssence);
|
||||
addItem(ModItems.redstoneRoot);
|
||||
addItem(ModItems.elementium);
|
||||
addItem(ModItems.pixieDust);
|
||||
addItem(ModItems.dragonstone);
|
||||
addItem(ModItems.placeholder);
|
||||
addItem(ModItems.redString);
|
||||
addItem(ModItems.dreamwoodTwig);
|
||||
addItem(ModItems.gaiaIngot);
|
||||
addItem(ModItems.enderAirBottle);
|
||||
addItem(ModItems.manaString);
|
||||
addItem(ModItems.manasteelNugget);
|
||||
addItem(ModItems.terrasteelNugget);
|
||||
addItem(ModItems.elementiumNugget);
|
||||
addItem(ModItems.livingroot);
|
||||
addItem(ModItems.pebble);
|
||||
addItem(ModItems.manaweaveCloth);
|
||||
addItem(ModItems.manaPowder);
|
||||
addBlock(ModBlocks.storage);
|
||||
addItem(ModItems.manaCookie);
|
||||
addItem(ModItems.rune);
|
||||
|
||||
@@ -62,7 +62,7 @@ public class ModBrewRecipes {
|
||||
nightVisionBrew = BotaniaAPI.registerBrewRecipe(ModBrews.nightVision, new ItemStack(Items.NETHER_WART), new ItemStack(Items.SPIDER_EYE), new ItemStack(Items.GOLDEN_CARROT));
|
||||
absorptionBrew = BotaniaAPI.registerBrewRecipe(ModBrews.absorption, new ItemStack(Items.NETHER_WART), new ItemStack(Items.GOLDEN_APPLE), new ItemStack(Items.POTATO));
|
||||
|
||||
overloadBrew = BotaniaAPI.registerBrewRecipe(ModBrews.overload, new ItemStack(Items.NETHER_WART), new ItemStack(Items.BLAZE_POWDER), new ItemStack(Items.SUGAR), new ItemStack(Items.GLOWSTONE_DUST), new ItemStack(ModItems.manaResource), new ItemStack(Items.SPIDER_EYE));
|
||||
overloadBrew = BotaniaAPI.registerBrewRecipe(ModBrews.overload, new ItemStack(Items.NETHER_WART), new ItemStack(Items.BLAZE_POWDER), new ItemStack(Items.SUGAR), new ItemStack(Items.GLOWSTONE_DUST), new ItemStack(ModItems.manaSteel), new ItemStack(Items.SPIDER_EYE));
|
||||
soulCrossBrew = BotaniaAPI.registerBrewRecipe(ModBrews.soulCross, new ItemStack(Items.NETHER_WART), new ItemStack(Blocks.SOUL_SAND), new ItemStack(Items.PAPER), new ItemStack(Items.APPLE), new ItemStack(Items.BONE));
|
||||
featherFeetBrew = BotaniaAPI.registerBrewRecipe(ModBrews.featherfeet, new ItemStack(Items.NETHER_WART), new ItemStack(Items.FEATHER), new ItemStack(Items.LEATHER), new ItemStack(Blocks.WOOL, 1, -1));
|
||||
emptinessBrew = BotaniaAPI.registerBrewRecipe(ModBrews.emptiness, new ItemStack(Items.NETHER_WART), new ItemStack(Items.GUNPOWDER), new ItemStack(Items.ROTTEN_FLESH), new ItemStack(Items.BONE), new ItemStack(Items.STRING), new ItemStack(Items.ENDER_PEARL));
|
||||
|
||||
@@ -25,12 +25,12 @@ public class ModElvenTradeRecipes {
|
||||
dreamwoodRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.dreamwood), LibOreDict.LIVING_WOOD);
|
||||
|
||||
elementiumRecipes = new ArrayList<>();
|
||||
elementiumRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.manaResource, 1, 7), LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL));
|
||||
elementiumRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.elementium), LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL));
|
||||
elementiumRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.storage, 1, 2), new ItemStack(ModBlocks.storage), new ItemStack(ModBlocks.storage)));
|
||||
|
||||
pixieDustRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.manaResource, 1, 8), LibOreDict.MANA_PEARL);
|
||||
pixieDustRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.pixieDust), LibOreDict.MANA_PEARL);
|
||||
dragonstoneRecipes = new ArrayList<>();
|
||||
dragonstoneRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.manaResource, 1, 9), LibOreDict.MANA_DIAMOND));
|
||||
dragonstoneRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.dragonstone), LibOreDict.MANA_DIAMOND));
|
||||
dragonstoneRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.storage, 1, 4), new ItemStack(ModBlocks.storage, 1, 3)));
|
||||
|
||||
elvenQuartzRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.quartz, 1, 5), new ItemStack(Items.QUARTZ));
|
||||
|
||||
@@ -45,22 +45,22 @@ public final class ModManaInfusionRecipes {
|
||||
|
||||
public static void init() {
|
||||
manasteelRecipes = new ArrayList<>();
|
||||
manasteelRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 0), "ingotIron", 3000));
|
||||
manasteelRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaSteel), "ingotIron", 3000));
|
||||
manasteelRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.storage, 1, 0), new ItemStack(Blocks.IRON_BLOCK), 27000));
|
||||
|
||||
manaPearlRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 1), new ItemStack(Items.ENDER_PEARL), 6000);
|
||||
manaPearlRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPearl), new ItemStack(Items.ENDER_PEARL), 6000);
|
||||
|
||||
manaDiamondRecipes = new ArrayList<>();
|
||||
manaDiamondRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 2), "gemDiamond", 10000));
|
||||
manaDiamondRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaDiamond), "gemDiamond", 10000));
|
||||
manaDiamondRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.storage, 1, 3), new ItemStack(Blocks.DIAMOND_BLOCK), 90000));
|
||||
|
||||
manaPowderRecipes = new ArrayList<>();
|
||||
manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(Items.GUNPOWDER), 500));
|
||||
manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(Items.REDSTONE), 500));
|
||||
manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(Items.GLOWSTONE_DUST), 500));
|
||||
manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(Items.SUGAR), 500));
|
||||
manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), new ItemStack(Items.GUNPOWDER), 500));
|
||||
manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), new ItemStack(Items.REDSTONE), 500));
|
||||
manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), new ItemStack(Items.GLOWSTONE_DUST), 500));
|
||||
manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), new ItemStack(Items.SUGAR), 500));
|
||||
for(int i = 0; i < 16; i++)
|
||||
manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(ModItems.dye, 1, i), 400));
|
||||
manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), new ItemStack(ModItems.dye, 1, i), 400));
|
||||
|
||||
pistonRelayRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.pistonRelay), new ItemStack(Blocks.PISTON), 15000);
|
||||
manaCookieRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaCookie), new ItemStack(Items.COOKIE), 20000);
|
||||
@@ -80,7 +80,7 @@ public final class ModManaInfusionRecipes {
|
||||
}
|
||||
|
||||
managlassRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.manaGlass), new ItemStack(Blocks.GLASS), 150);
|
||||
manaStringRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 16), new ItemStack(Items.STRING), 5000);
|
||||
manaStringRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaString), new ItemStack(Items.STRING), 5000);
|
||||
|
||||
if(Botania.gardenOfGlassLoaded)
|
||||
sugarCaneRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(Items.REEDS), new ItemStack(Blocks.HAY_BLOCK), 2000);
|
||||
|
||||
@@ -92,6 +92,8 @@ import vazkii.botania.common.item.rod.ItemSmeltRod;
|
||||
import vazkii.botania.common.item.rod.ItemTerraformRod;
|
||||
import vazkii.botania.common.item.rod.ItemTornadoRod;
|
||||
import vazkii.botania.common.item.rod.ItemWaterRod;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
import vazkii.botania.common.lib.LibOreDict;
|
||||
|
||||
@Mod.EventBusSubscriber
|
||||
@@ -101,7 +103,31 @@ public final class ModItems {
|
||||
public static final Item dye = new ItemDye();
|
||||
public static final Item pestleAndMortar = new ItemPestleAndMortar();
|
||||
public static final Item twigWand = new ItemTwigWand();
|
||||
public static final Item manaResource = new ItemManaResource();
|
||||
|
||||
public static final Item manaSteel = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[0]);
|
||||
public static final Item manaPearl = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[1]);
|
||||
public static final Item manaDiamond = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[2]);
|
||||
public static final Item livingwoodTwig = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[3]);
|
||||
public static final Item terrasteel = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[4]);
|
||||
public static final Item lifeEssence = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[5]);
|
||||
public static final Item redstoneRoot = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[6]);
|
||||
public static final Item elementium = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[7]);
|
||||
public static final Item pixieDust = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[8]);
|
||||
public static final Item dragonstone = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[9]);
|
||||
public static final Item placeholder = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[11]);
|
||||
public static final Item redString = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[12]);
|
||||
public static final Item dreamwoodTwig = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[13]);
|
||||
public static final Item gaiaIngot = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[14]);
|
||||
public static final Item enderAirBottle = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[15]);
|
||||
public static final Item manaString = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[16]);
|
||||
public static final Item manasteelNugget = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[17]);
|
||||
public static final Item terrasteelNugget = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[18]);
|
||||
public static final Item elementiumNugget = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[19]);
|
||||
public static final Item livingroot = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[20]);
|
||||
public static final Item pebble = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[21]);
|
||||
public static final Item manaweaveCloth = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[22]);
|
||||
public static final Item manaPowder = new ItemManaResource().setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_RESOURCE_NAMES[23]);
|
||||
|
||||
public static final Item lens = new ItemLens();
|
||||
public static final Item rune = new ItemRune();
|
||||
public static final Item manaTablet = new ItemManaTablet();
|
||||
@@ -257,7 +283,29 @@ public final class ModItems {
|
||||
r.register(dye);
|
||||
r.register(pestleAndMortar);
|
||||
r.register(twigWand);
|
||||
r.register(manaResource);
|
||||
r.register(manaSteel);
|
||||
r.register(manaPearl);
|
||||
r.register(manaDiamond);
|
||||
r.register(livingwoodTwig);
|
||||
r.register(terrasteel);
|
||||
r.register(lifeEssence);
|
||||
r.register(redstoneRoot);
|
||||
r.register(elementium);
|
||||
r.register(pixieDust);
|
||||
r.register(dragonstone);
|
||||
r.register(placeholder);
|
||||
r.register(redString);
|
||||
r.register(dreamwoodTwig);
|
||||
r.register(gaiaIngot);
|
||||
r.register(enderAirBottle);
|
||||
r.register(manaString);
|
||||
r.register(manasteelNugget);
|
||||
r.register(terrasteelNugget);
|
||||
r.register(elementiumNugget);
|
||||
r.register(livingroot);
|
||||
r.register(pebble);
|
||||
r.register(manaweaveCloth);
|
||||
r.register(manaPowder);
|
||||
r.register(lens);
|
||||
r.register(rune);
|
||||
r.register(manaTablet);
|
||||
@@ -419,29 +467,29 @@ public final class ModItems {
|
||||
OreDictionary.registerOre(LibOreDict.QUARTZ[i], new ItemStack(quartz, 1, i));
|
||||
|
||||
OreDictionary.registerOre(LibOreDict.PESTLE_AND_MORTAR, pestleAndMortar);
|
||||
OreDictionary.registerOre(LibOreDict.MANA_STEEL, new ItemStack(manaResource, 1, 0));
|
||||
OreDictionary.registerOre(LibOreDict.MANA_PEARL, new ItemStack(manaResource, 1, 1));
|
||||
OreDictionary.registerOre(LibOreDict.MANA_DIAMOND, new ItemStack(manaResource, 1, 2));
|
||||
OreDictionary.registerOre(LibOreDict.LIVINGWOOD_TWIG, new ItemStack(manaResource, 1, 3));
|
||||
OreDictionary.registerOre(LibOreDict.TERRA_STEEL, new ItemStack(manaResource, 1, 4));
|
||||
OreDictionary.registerOre(LibOreDict.LIFE_ESSENCE, new ItemStack(manaResource, 1, 5));
|
||||
OreDictionary.registerOre(LibOreDict.REDSTONE_ROOT, new ItemStack(manaResource, 1, 6));
|
||||
OreDictionary.registerOre(LibOreDict.ELEMENTIUM, new ItemStack(manaResource, 1, 7));
|
||||
OreDictionary.registerOre(LibOreDict.PIXIE_DUST, new ItemStack(manaResource, 1, 8));
|
||||
OreDictionary.registerOre(LibOreDict.DRAGONSTONE, new ItemStack(manaResource, 1, 9));
|
||||
OreDictionary.registerOre(LibOreDict.PLACEHOLDER, new ItemStack(manaResource, 1, 11));
|
||||
OreDictionary.registerOre(LibOreDict.RED_STRING, new ItemStack(manaResource, 1, 12));
|
||||
OreDictionary.registerOre(LibOreDict.DREAMWOOD_TWIG, new ItemStack(manaResource, 1, 13));
|
||||
OreDictionary.registerOre(LibOreDict.GAIA_INGOT, new ItemStack(manaResource, 1, 14));
|
||||
OreDictionary.registerOre(LibOreDict.ENDER_AIR_BOTTLE, new ItemStack(manaResource, 1, 15));
|
||||
OreDictionary.registerOre(LibOreDict.MANA_STRING, new ItemStack(manaResource, 1, 16));
|
||||
OreDictionary.registerOre(LibOreDict.MANASTEEL_NUGGET, new ItemStack(manaResource, 1, 17));
|
||||
OreDictionary.registerOre(LibOreDict.TERRASTEEL_NUGGET, new ItemStack(manaResource, 1, 18));
|
||||
OreDictionary.registerOre(LibOreDict.ELEMENTIUM_NUGGET, new ItemStack(manaResource, 1, 19));
|
||||
OreDictionary.registerOre(LibOreDict.ROOT, new ItemStack(manaResource, 1, 20));
|
||||
OreDictionary.registerOre(LibOreDict.PEBBLE, new ItemStack(manaResource, 1, 21));
|
||||
OreDictionary.registerOre(LibOreDict.MANAWEAVE_CLOTH, new ItemStack(manaResource, 1, 22));
|
||||
OreDictionary.registerOre(LibOreDict.MANA_POWDER, new ItemStack(manaResource, 1, 23));
|
||||
OreDictionary.registerOre(LibOreDict.MANA_STEEL, new ItemStack(manaSteel));
|
||||
OreDictionary.registerOre(LibOreDict.MANA_PEARL, new ItemStack(manaPearl));
|
||||
OreDictionary.registerOre(LibOreDict.MANA_DIAMOND, new ItemStack(manaDiamond));
|
||||
OreDictionary.registerOre(LibOreDict.LIVINGWOOD_TWIG, new ItemStack(livingwoodTwig));
|
||||
OreDictionary.registerOre(LibOreDict.TERRA_STEEL, new ItemStack(terrasteel));
|
||||
OreDictionary.registerOre(LibOreDict.LIFE_ESSENCE, new ItemStack(lifeEssence));
|
||||
OreDictionary.registerOre(LibOreDict.REDSTONE_ROOT, new ItemStack(redstoneRoot));
|
||||
OreDictionary.registerOre(LibOreDict.ELEMENTIUM, new ItemStack(elementium));
|
||||
OreDictionary.registerOre(LibOreDict.PIXIE_DUST, new ItemStack(pixieDust));
|
||||
OreDictionary.registerOre(LibOreDict.DRAGONSTONE, new ItemStack(dragonstone));
|
||||
OreDictionary.registerOre(LibOreDict.PLACEHOLDER, new ItemStack(placeholder));
|
||||
OreDictionary.registerOre(LibOreDict.RED_STRING, new ItemStack(redString));
|
||||
OreDictionary.registerOre(LibOreDict.DREAMWOOD_TWIG, new ItemStack(dreamwoodTwig));
|
||||
OreDictionary.registerOre(LibOreDict.GAIA_INGOT, new ItemStack(gaiaIngot));
|
||||
OreDictionary.registerOre(LibOreDict.ENDER_AIR_BOTTLE, new ItemStack(enderAirBottle));
|
||||
OreDictionary.registerOre(LibOreDict.MANA_STRING, new ItemStack(manaString));
|
||||
OreDictionary.registerOre(LibOreDict.MANASTEEL_NUGGET, new ItemStack(manasteelNugget));
|
||||
OreDictionary.registerOre(LibOreDict.TERRASTEEL_NUGGET, new ItemStack(terrasteelNugget));
|
||||
OreDictionary.registerOre(LibOreDict.ELEMENTIUM_NUGGET, new ItemStack(elementiumNugget));
|
||||
OreDictionary.registerOre(LibOreDict.ROOT, new ItemStack(livingroot));
|
||||
OreDictionary.registerOre(LibOreDict.PEBBLE, new ItemStack(pebble));
|
||||
OreDictionary.registerOre(LibOreDict.MANAWEAVE_CLOTH, new ItemStack(manaweaveCloth));
|
||||
OreDictionary.registerOre(LibOreDict.MANA_POWDER, new ItemStack(manaPowder));
|
||||
|
||||
OreDictionary.registerOre(LibOreDict.VIAL, new ItemStack(vial, 1, 0));
|
||||
OreDictionary.registerOre(LibOreDict.FLASK, new ItemStack(vial, 1, 1));
|
||||
|
||||
+2
-2
@@ -37,8 +37,8 @@ public abstract class ItemElementiumArmor extends ItemManasteelArmor implements
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) {
|
||||
return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 7 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
|
||||
public boolean getIsRepairable(ItemStack armor, @Nonnull ItemStack material) {
|
||||
return material.getItem() == ModItems.elementium ? true : super.getIsRepairable(armor, material);
|
||||
}
|
||||
|
||||
static ItemStack[] armorset;
|
||||
|
||||
+2
-2
@@ -162,8 +162,8 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) {
|
||||
return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
|
||||
public boolean getIsRepairable(ItemStack armor, @Nonnull ItemStack material) {
|
||||
return material.getItem() == ModItems.manaSteel ? true : super.getIsRepairable(armor, material);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+2
-2
@@ -61,8 +61,8 @@ public class ItemManaweaveArmor extends ItemManasteelArmor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) {
|
||||
return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 22 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
|
||||
public boolean getIsRepairable(ItemStack armor, @Nonnull ItemStack material) {
|
||||
return material.getItem() == ModItems.manaweaveCloth || super.getIsRepairable(armor, material);
|
||||
}
|
||||
|
||||
private static ItemStack[] armorset;
|
||||
|
||||
+2
-2
@@ -50,8 +50,8 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) {
|
||||
return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 || super.getIsRepairable(par1ItemStack, par2ItemStack);
|
||||
public boolean getIsRepairable(ItemStack armor, @Nonnull ItemStack material) {
|
||||
return material.getItem() == ModItems.terrasteel || super.getIsRepairable(armor, material);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
|
||||
@@ -46,8 +46,8 @@ public class ItemGlassPick extends ItemManasteelPick {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) {
|
||||
return par2ItemStack.getItem() == Item.getItemFromBlock(Blocks.GLASS) ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
|
||||
public boolean getIsRepairable(ItemStack pick, @Nonnull ItemStack material) {
|
||||
return material.getItem() == Item.getItemFromBlock(Blocks.GLASS) ? true : super.getIsRepairable(pick, material);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -83,7 +83,7 @@ public class ItemStarSword extends ItemManasteelSword {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) {
|
||||
return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
|
||||
public boolean getIsRepairable(ItemStack sword, @Nonnull ItemStack material) {
|
||||
return material.getItem() == ModItems.terrasteel || super.getIsRepairable(sword, material);
|
||||
}
|
||||
}
|
||||
@@ -200,8 +200,8 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModel
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
|
||||
return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 3 || super.getIsRepairable(par1ItemStack, par2ItemStack);
|
||||
public boolean getIsRepairable(ItemStack bow, ItemStack material) {
|
||||
return material.getItem() == ModItems.livingwoodTwig || super.getIsRepairable(bow, material);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+2
-2
@@ -111,8 +111,8 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) {
|
||||
return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
|
||||
public boolean getIsRepairable(ItemStack axe, @Nonnull ItemStack material) {
|
||||
return material.getItem() == ModItems.manaSteel || super.getIsRepairable(axe, material);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+2
-2
@@ -110,8 +110,8 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) {
|
||||
return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
|
||||
public boolean getIsRepairable(ItemStack pick, @Nonnull ItemStack material) {
|
||||
return material.getItem() == ModItems.manaSteel ? true : super.getIsRepairable(pick, material);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+2
-2
@@ -124,8 +124,8 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem, I
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
|
||||
return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
|
||||
public boolean getIsRepairable(ItemStack shears, ItemStack material) {
|
||||
return material.getItem() == ModItems.manaSteel || super.getIsRepairable(shears, material);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+2
-2
@@ -127,8 +127,8 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) {
|
||||
return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
|
||||
public boolean getIsRepairable(ItemStack shovel, @Nonnull ItemStack material) {
|
||||
return material.getItem() == ModItems.manaSteel ? true : super.getIsRepairable(shovel, material);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+2
-2
@@ -85,8 +85,8 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem, IMo
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) {
|
||||
return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
|
||||
public boolean getIsRepairable(ItemStack sword, @Nonnull ItemStack material) {
|
||||
return material.getItem() == ModItems.manaSteel || super.getIsRepairable(sword, material);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+2
-2
@@ -275,8 +275,8 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) {
|
||||
return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 || super.getIsRepairable(par1ItemStack, par2ItemStack);
|
||||
public boolean getIsRepairable(ItemStack pick, @Nonnull ItemStack material) {
|
||||
return material.getItem() == ModItems.terrasteel || super.getIsRepairable(pick, material);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+2
-2
@@ -143,7 +143,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) {
|
||||
return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
|
||||
public boolean getIsRepairable(ItemStack sword, @Nonnull ItemStack material) {
|
||||
return material.getItem() == ModItems.terrasteel || super.getIsRepairable(sword, material);
|
||||
}
|
||||
}
|
||||
@@ -27,6 +27,7 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
@@ -39,11 +40,13 @@ import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.entity.EntityDoppleganger;
|
||||
import vazkii.botania.common.entity.EntityEnderAirBottle;
|
||||
import vazkii.botania.common.item.ItemMod;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
@Mod.EventBusSubscriber
|
||||
public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem {
|
||||
|
||||
final int types = 24;
|
||||
@@ -51,11 +54,10 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve
|
||||
public ItemManaResource() {
|
||||
super(LibItemNames.MANA_RESOURCE);
|
||||
setHasSubtypes(true);
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) {
|
||||
public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) {
|
||||
ItemStack stack = event.getItemStack();
|
||||
boolean correctStack = !stack.isEmpty() && stack.getItem() == Items.GLASS_BOTTLE;
|
||||
boolean ender = event.getWorld().provider.getDimension() == 1;
|
||||
@@ -64,7 +66,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve
|
||||
if (event.getWorld().isRemote) {
|
||||
event.getEntityPlayer().swingArm(event.getHand());
|
||||
} else {
|
||||
ItemStack stack1 = new ItemStack(this, 1, 15);
|
||||
ItemStack stack1 = new ItemStack(ModItems.enderAirBottle);
|
||||
|
||||
ItemHandlerHelper.giveItemToPlayer(event.getEntityPlayer(), stack1);
|
||||
|
||||
@@ -83,9 +85,9 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve
|
||||
public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) {
|
||||
ItemStack stack = player.getHeldItem(hand);
|
||||
|
||||
if(stack.getItemDamage() == 4 || stack.getItemDamage() == 14)
|
||||
return EntityDoppleganger.spawn(player, stack, world, pos, stack.getItemDamage() == 14) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL;
|
||||
else if(stack.getItemDamage() == 20 && net.minecraft.item.ItemDye.applyBonemeal(stack, world, pos, player, hand)) {
|
||||
if(this == ModItems.terrasteel || this == ModItems.gaiaIngot)
|
||||
return EntityDoppleganger.spawn(player, stack, world, pos, this == ModItems.gaiaIngot) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL;
|
||||
else if(this == ModItems.livingroot && net.minecraft.item.ItemDye.applyBonemeal(stack, world, pos, player, hand)) {
|
||||
if(!world.isRemote)
|
||||
world.playEvent(2005, pos, 0);
|
||||
|
||||
@@ -99,7 +101,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve
|
||||
@Override
|
||||
public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) {
|
||||
ItemStack stack = player.getHeldItem(hand);
|
||||
if(stack.getItemDamage() == 15) {
|
||||
if(this == ModItems.enderAirBottle) {
|
||||
if(!player.capabilities.isCreativeMode)
|
||||
stack.shrink(1);
|
||||
|
||||
@@ -117,28 +119,16 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve
|
||||
return ActionResult.newResult(EnumActionResult.PASS, stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> stacks) {
|
||||
if(isInCreativeTab(tab)) {
|
||||
for(int i = 0; i < types; i++) {
|
||||
if("UNUSED".equals(LibItemNames.MANA_RESOURCE_NAMES[i]))
|
||||
continue;
|
||||
if(Botania.gardenOfGlassLoaded || i != 20 && i != 21)
|
||||
stacks.add(new ItemStack(this, 1, i));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack par1ItemStack) {
|
||||
return "item." + LibItemNames.MANA_RESOURCE_NAMES[Math.min(types - 1, par1ItemStack.getItemDamage())];
|
||||
return "item." + getRegistryName().getResourcePath(); // todo set these properly
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canFit(ItemStack stack, IPetalApothecary apothecary) {
|
||||
int meta = stack.getItemDamage();
|
||||
return meta == 6 || meta == 8 || meta == 5 || meta == 23;
|
||||
return this == ModItems.lifeEssence || this == ModItems.redstoneRoot
|
||||
|| this == ModItems.pixieDust || this == ModItems.manaPowder;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -148,27 +138,13 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve
|
||||
|
||||
@Override
|
||||
public boolean isElvenItem(ItemStack stack) {
|
||||
int meta = stack.getItemDamage();
|
||||
return meta == 7 || meta == 8 || meta == 9;
|
||||
return this == ModItems.elementium || this == ModItems.pixieDust || this == ModItems.dragonstone;
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public ItemStack getContainerItem(@Nonnull ItemStack itemStack) {
|
||||
return itemStack.getItemDamage() == 11 ? itemStack.copy() : ItemStack.EMPTY;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModels() {
|
||||
for (int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) {
|
||||
if (!"UNUSED".equals(LibItemNames.MANA_RESOURCE_NAMES[i])) {
|
||||
ModelLoader.setCustomModelResourceLocation(
|
||||
this, i,
|
||||
new ModelResourceLocation(LibMisc.MOD_ID + ":" + LibItemNames.MANA_RESOURCE_NAMES[i], "inventory")
|
||||
);
|
||||
}
|
||||
}
|
||||
return this == ModItems.placeholder ? itemStack.copy() : ItemStack.EMPTY;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -385,7 +385,7 @@ public final class LexiconData {
|
||||
terrasteel = new BasicLexiconEntry(LibLexicon.BASICS_TERRASTEEL, categoryBasics);
|
||||
terrasteel.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTerraPlate),
|
||||
new PageText("2"), new PageMultiblock("4", ModMultiblocks.terrasteelPlate), new PageTerrasteel("3"))
|
||||
.setIcon(new ItemStack(ModItems.manaResource, 1, 4));
|
||||
.setIcon(new ItemStack(ModItems.terrasteel));
|
||||
|
||||
blackLotus = new BasicLexiconEntry(LibLexicon.BASICS_BLACK_LOTUS, categoryBasics);
|
||||
blackLotus.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.blackLotus));
|
||||
@@ -405,7 +405,7 @@ public final class LexiconData {
|
||||
new PageCraftingRecipe("8", ModCraftingRecipes.recipeMagmaToSlimeball),
|
||||
new PageManaInfusionRecipe("13", ModManaAlchemyRecipes.prismarineRecipes), new PageText("9"),
|
||||
new PageText("11"), new PageCraftingRecipe("12", ModCraftingRecipes.recipeEndPortal));
|
||||
gardenOfGlass.setPriority().setIcon(new ItemStack(ModItems.manaResource, 1, 20));
|
||||
gardenOfGlass.setPriority().setIcon(new ItemStack(ModItems.livingroot));
|
||||
}
|
||||
|
||||
if (Botania.thaumcraftLoaded)
|
||||
@@ -1046,8 +1046,8 @@ public final class LexiconData {
|
||||
// ENDER ENTRIES
|
||||
enderAir = new BasicLexiconEntry(LibLexicon.ENDER_AIR, categoryEnder);
|
||||
enderAir.setPriority().setLexiconPages(new PageText("0"));
|
||||
enderAir.addExtraDisplayedRecipe(new ItemStack(ModItems.manaResource, 1, 15));
|
||||
LexiconRecipeMappings.map(new ItemStack(ModItems.manaResource, 1, 15), enderAir, 0);
|
||||
enderAir.addExtraDisplayedRecipe(new ItemStack(ModItems.enderAirBottle));
|
||||
LexiconRecipeMappings.map(new ItemStack(ModItems.enderAirBottle), enderAir, 0);
|
||||
|
||||
enderEyeBlock = new BasicLexiconEntry(LibLexicon.ENDER_ENDER_EYE_BLOCK, categoryEnder);
|
||||
enderEyeBlock.setLexiconPages(new PageText("0"),
|
||||
@@ -1280,19 +1280,19 @@ public final class LexiconData {
|
||||
new PageElvenRecipe("5", ModElvenTradeRecipes.dragonstoneRecipes), new PageText("6"),
|
||||
new PageElvenRecipe("7", ModElvenTradeRecipes.elvenQuartzRecipe), new PageText("8"),
|
||||
new PageElvenRecipe("9", ModElvenTradeRecipes.alfglassRecipe))
|
||||
.setIcon(new ItemStack(ModItems.manaResource, 1, 9));
|
||||
.setIcon(new ItemStack(ModItems.dragonstone));
|
||||
|
||||
gaiaRitual = new AlfheimLexiconEntry(LibLexicon.ALF_GAIA_RITUAL, categoryAlfhomancy);
|
||||
gaiaRitual.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeGaiaPylon),
|
||||
new PageMultiblock("2", ModMultiblocks.gaiaRitual), new PageText("3"), new PageText("4"),
|
||||
new PageText("5")).setIcon(new ItemStack(ModItems.manaResource, 1, 5));
|
||||
LexiconRecipeMappings.map(new ItemStack(ModItems.manaResource, 1, 5), gaiaRitual, 0);
|
||||
new PageText("5")).setIcon(new ItemStack(ModItems.lifeEssence));
|
||||
LexiconRecipeMappings.map(new ItemStack(ModItems.lifeEssence), gaiaRitual, 0);
|
||||
|
||||
gaiaRitualHardmode = new AlfheimLexiconEntry(LibLexicon.ALF_GAIA_RITUAL_HARDMODE, categoryAlfhomancy);
|
||||
gaiaRitualHardmode
|
||||
.setLexiconPages(new PageText("0"), new PageText("1"),
|
||||
new PageCraftingRecipe("2", ModCraftingRecipes.recipeGaiaIngot))
|
||||
.setIcon(new ItemStack(ModItems.manaResource, 1, 14));
|
||||
.setIcon(new ItemStack(ModItems.gaiaIngot));
|
||||
|
||||
elvenLore = new AlfheimLexiconEntry(LibLexicon.ALF_LORE, categoryAlfhomancy);
|
||||
elvenLore
|
||||
|
||||
@@ -68,10 +68,10 @@ public class PageTerrasteel extends PageRecipe {
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 102, new ItemStack(block3), false);
|
||||
GlStateManager.translate(0F, 0F, -10F);
|
||||
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 30, new ItemStack(ModItems.manaResource, 1, 4), false);
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 80, new ItemStack(ModItems.manaResource, 1, 0), false);
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 20, gui.getTop() + 86, new ItemStack(ModItems.manaResource, 1, 1), false);
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 19, gui.getTop() + 86, new ItemStack(ModItems.manaResource, 1, 2), false);
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 30, new ItemStack(ModItems.terrasteel), false);
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 80, new ItemStack(ModItems.manaSteel), false);
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 20, gui.getTop() + 86, new ItemStack(ModItems.manaPearl), false);
|
||||
renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 19, gui.getTop() + 86, new ItemStack(ModItems.manaDiamond), false);
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(terrasteelOverlay);
|
||||
|
||||
@@ -84,13 +84,13 @@ public class PageTerrasteel extends PageRecipe {
|
||||
|
||||
@Override
|
||||
public void onPageAdded(LexiconEntry entry, int index) {
|
||||
LexiconRecipeMappings.map(new ItemStack(ModItems.manaResource, 1, 4), entry, index);
|
||||
LexiconRecipeMappings.map(new ItemStack(ModItems.terrasteel), entry, index);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ItemStack> getDisplayedRecipes() {
|
||||
ArrayList<ItemStack> list = new ArrayList<>();
|
||||
list.add(new ItemStack(ModItems.manaResource, 1, 4));
|
||||
list.add(new ItemStack(ModItems.terrasteel));
|
||||
return list;
|
||||
}
|
||||
|
||||
|
||||
@@ -82,7 +82,7 @@ public final class SkyblockWorldEvents {
|
||||
event.getWorld().playSound(null, event.getPos(), block.getSoundType().getBreakSound(), SoundCategory.BLOCKS, block.getSoundType().getVolume() * 0.4F, block.getSoundType().getPitch() + (float) (Math.random() * 0.2 - 0.1));
|
||||
|
||||
if(Math.random() < 0.8)
|
||||
event.getEntityPlayer().dropItem(new ItemStack(ModItems.manaResource, 1, 21), false);
|
||||
event.getEntityPlayer().dropItem(new ItemStack(ModItems.pebble), false);
|
||||
}
|
||||
|
||||
event.setCanceled(true);
|
||||
|
||||
Reference in new issue
Block a user