mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 11:19:19 +00:00
Flatten black lotuses
This commit is contained in:
1 parent
abcf2a748b
commit
c7c0df4f79
24 files changed
+48
-62
No files matched your search
@@ -61,6 +61,7 @@ public final class BotaniaCreativeTab extends CreativeTabs {
|
||||
addItem(ModItems.fertilizer);
|
||||
addItem(ModItems.flowerBag);
|
||||
addItem(ModItems.blackLotus);
|
||||
addItem(ModItems.blackerLotus);
|
||||
addItem(ModItems.twigWand);
|
||||
addItem(ModItems.obedienceStick);
|
||||
addItem(ModItems.manaSteel);
|
||||
|
||||
@@ -115,6 +115,13 @@ public class FlattenItems implements IFixableData {
|
||||
return ModItems.corporeaSpark.getRegistryName().toString();
|
||||
}
|
||||
});
|
||||
LOOKUP.put("botania:blacklotus", i -> {
|
||||
if(i == 1) {
|
||||
return ModItems.blackerLotus.getRegistryName().toString();
|
||||
} else {
|
||||
return ModItems.blackLotus.getRegistryName().toString();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -37,28 +37,13 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable {
|
||||
private static final int MANA_PER = 8000;
|
||||
private static final int MANA_PER_T2 = 100000;
|
||||
|
||||
public ItemBlackLotus() {
|
||||
super(LibItemNames.BLACK_LOTUS);
|
||||
setHasSubtypes(true);
|
||||
public ItemBlackLotus(String name) {
|
||||
super(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> list) {
|
||||
if(isInCreativeTab(tab)) {
|
||||
for(int i = 0; i < 2; i++)
|
||||
list.add(new ItemStack(this, 1, i));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasEffect(ItemStack par1ItemStack) {
|
||||
return par1ItemStack.getItemDamage() > 0;
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack par1ItemStack) {
|
||||
return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage();
|
||||
public boolean hasEffect(ItemStack stack) {
|
||||
return stack.getItem() == ModItems.blackerLotus;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -67,7 +52,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable {
|
||||
return;
|
||||
|
||||
TileEntity tile = (TileEntity) pool;
|
||||
boolean t2 = stack.getItemDamage() > 0;
|
||||
boolean t2 = stack.getItem() == ModItems.blackerLotus;
|
||||
|
||||
if(!item.world.isRemote) {
|
||||
pool.recieveMana(t2 ? MANA_PER_T2 : MANA_PER);
|
||||
@@ -85,10 +70,4 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable {
|
||||
list.add(I18n.format("botaniamisc.lotusDesc"));
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModels() {
|
||||
ModelHandler.registerItemAppendMeta(this, 2, LibItemNames.BLACK_LOTUS);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -297,7 +297,8 @@ public final class ModItems {
|
||||
public static final Item unholyCloak = new ItemUnholyCloak();
|
||||
public static final Item balanceCloak = new ItemBalanceCloak();
|
||||
public static final Item craftingHalo = new ItemCraftingHalo();
|
||||
public static final Item blackLotus = new ItemBlackLotus();
|
||||
public static final Item blackLotus = new ItemBlackLotus(LibItemNames.BLACK_LOTUS);
|
||||
public static final Item blackerLotus = new ItemBlackLotus(LibItemNames.BLACKER_LOTUS);
|
||||
public static final Item monocle = new ItemMonocle();
|
||||
public static final Item clip = new ItemClip();
|
||||
public static final Item cobbleRod = new ItemCobbleRod();
|
||||
@@ -556,6 +557,7 @@ public final class ModItems {
|
||||
r.register(balanceCloak);
|
||||
r.register(craftingHalo);
|
||||
r.register(blackLotus);
|
||||
r.register(blackerLotus);
|
||||
r.register(monocle);
|
||||
r.register(clip);
|
||||
r.register(cobbleRod);
|
||||
@@ -696,6 +698,7 @@ public final class ModItems {
|
||||
BotaniaAPI.blackListItemFromLoonium(lexicon);
|
||||
BotaniaAPI.blackListItemFromLoonium(overgrowthSeed);
|
||||
BotaniaAPI.blackListItemFromLoonium(blackLotus);
|
||||
BotaniaAPI.blackListItemFromLoonium(blackerLotus);
|
||||
for(Item i : Item.REGISTRY) {
|
||||
if("minecraft".equals(i.getRegistryName().getResourceDomain()) & i instanceof ItemRecord) {
|
||||
BotaniaAPI.blackListItemFromLoonium(i);
|
||||
|
||||
@@ -120,7 +120,8 @@ public final class LibItemNames {
|
||||
public static final String UNHOLY_CLOAK = "unholycloak";
|
||||
public static final String BALANCE_CLOAK = "balancecloak";
|
||||
public static final String CRAFTING_HALO = "craftinghalo";
|
||||
public static final String BLACK_LOTUS = "blacklotus";
|
||||
public static final String BLACK_LOTUS = "black_lotus";
|
||||
public static final String BLACKER_LOTUS = "blacker_lotus";
|
||||
public static final String MONOCLE = "monocle";
|
||||
public static final String CLIP = "clip";
|
||||
public static final String COBBLE_ROD = "cobblerod";
|
||||
|
||||
Reference in new issue
Block a user