Flatten black lotuses

This commit is contained in:
Vincent Lee committed 2017-12-27 15:35:00 -06:00
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";
@@ -1482,8 +1482,8 @@ item.botania:unholycloak.name=Cloak of Sin
item.botania:balancecloak.name=Cloak of Balance
item.botania:craftinghalo.name=Assembly Halo
item.botania:autocraftinghalo.name=Manufactory Halo
item.botania:blacklotus0.name=Black Lotus
item.botania:blacklotus1.name=Blacker Lotus
item.botania:black_lotus.name=Black Lotus
item.botania:blacker_lotus.name=Blacker Lotus
item.botania:dreamwood_twig.name=Dreamwood Twig
item.botania:monocle.name=Manaseer Monocle
item.botania:clip.name=Lens Clip
@@ -1240,8 +1240,8 @@ item.botania:missilerod.name=Vara de la reserva inestable
item.botania:holycloak.name=Manto de la Virtud
item.botania:unholycloak.name=Manto del Pecado
item.botania:craftinghalo.name=Halo de ensamblaje
item.botania:blacklotus0.name=Loto negro
item.botania:blacklotus1.name=Loto más negro
item.botania:black_lotus.name=Loto negro
item.botania:blacker_lotus.name=Loto más negro
item.botania:dreamwood_twig.name=Ramita de madera onírica
item.botania:monocle.name=Monóculo de manavidente
item.botania:clip.name=Cartucho de lentes
@@ -1102,8 +1102,8 @@ item.botania:missilerod.name=Bâton du réservoir instable
item.botania:holycloak.name=Manteau de vertu
item.botania:unholycloak.name=Manteau de péché
item.botania:craftinghalo.name=Halo d'assemblage
item.botania:blacklotus0.name=Lotus noir
item.botania:blacklotus1.name=Lotus plus noir
item.botania:black_lotus.name=Lotus noir
item.botania:blacker_lotus.name=Lotus plus noir
item.botania:dreamwood_twig.name=Brindille de boisrève
item.botania:monocle.name=Monocle de vision de mana
item.botania:clip.name=Attache de lentille
@@ -1267,8 +1267,8 @@ item.botania:unholycloak.name=罪のマント
item.botania:balancecloak.name=均衡のマント
item.botania:craftinghalo.name=組立ての光輪
item.botania:autocraftinghalo.name=工場の光輪
item.botania:blacklotus0.name=黒スイレン
item.botania:blacklotus1.name=漆黒スイレン
item.botania:black_lotus.name=黒スイレン
item.botania:blacker_lotus.name=漆黒スイレン
item.botania:dreamwood_twig.name=ドリームウッドの小枝
item.botania:monocle.name=マナ観察者の片眼鏡
item.botania:clip.name=レンズクリップ
@@ -1201,8 +1201,8 @@ item.botania:missilerod.name=불안정한 저장소의 막대
item.botania:holycloak.name=선행의 망토
item.botania:unholycloak.name=죄악의 망토
item.botania:craftinghalo.name=조립 광륜
item.botania:blacklotus0.name=검은 연꽃
item.botania:blacklotus1.name=검은 연꽃
item.botania:black_lotus.name=검은 연꽃
item.botania:blacker_lotus.name=검은 연꽃
item.botania:dreamwood_twig.name=꿈의나무 나뭇가지
item.botania:monocle.name=마나관측 모노클
item.botania:clip.name=렌즈 클립
@@ -1334,8 +1334,8 @@ item.botania:holycloak.name=Mantel der Deugdzaamheid
item.botania:unholycloak.name=Mantel der Zonde
item.botania:craftinghalo.name=Vervaardigingshalo
item.botania:autocraftinghalo.name=Productiehalo
item.botania:blacklotus0.name=Zwarte Lotus
item.botania:blacklotus1.name=Zwartere Lotus
item.botania:black_lotus.name=Zwarte Lotus
item.botania:blacker_lotus.name=Zwartere Lotus
item.botania:dreamwood_twig.name=Droomhout Twijgje
item.botania:monocle.name=Manazicht Oogglas
item.botania:clip.name=Lens Klem
@@ -1484,8 +1484,8 @@ item.botania:holycloak.name=Capa da Virtude
item.botania:unholycloak.name=Capa do Pecado
item.botania:craftinghalo.name=Auréola da Criação
item.botania:autocraftinghalo.name=Auréola de Manufatura
item.botania:blacklotus0.name=Lótus Negra
item.botania:blacklotus1.name=Lótus Profunda
item.botania:black_lotus.name=Lótus Negra
item.botania:blacker_lotus.name=Lótus Profunda
item.botania:dreamwood_twig.name=Graveto de Madeira dos Sonhos
item.botania:monocle.name=Monóculo de Mana
item.botania:clip.name=Pente de Lentes
@@ -1482,8 +1482,8 @@ item.botania:unholycloak.name=罪恶斗篷
item.botania:balancecloak.name=平衡斗篷
item.botania:craftinghalo.name=合成环
item.botania:autocraftinghalo.name=工厂环
item.botania:blacklotus0.name=黑莲花
item.botania:blacklotus1.name=暗黑莲花
item.botania:black_lotus.name=黑莲花
item.botania:blacker_lotus.name=暗黑莲花
item.botania:dreamwood_twig.name=梦之木棍
item.botania:monocle.name=窥魔之镜
item.botania:clip.name=透镜夹
@@ -1447,8 +1447,8 @@ item.botania:holycloak.name=神聖斗篷
item.botania:unholycloak.name=罪惡鬥篷
item.botania:craftinghalo.name=合成環
item.botania:autocraftinghalo.name=工廠環
item.botania:blacklotus0.name=黑蓮花
item.botania:blacklotus1.name=暗黑蓮花
item.botania:black_lotus.name=黑蓮花
item.botania:blacker_lotus.name=暗黑蓮花
item.botania:dreamwood_twig.name=夢之木棍
item.botania:monocle.name=窺魔之鏡
item.botania:clip.name=透鏡夾
@@ -28,22 +28,17 @@
{
"type": "item",
"entryName": "superBlackLotus",
"name": "botania:blackLotus",
"name": "botania:blacker_lotus",
"weight": 3,
"quality": 1,
"functions": [
{ "function": "set_count", "count": 1 },
{ "function": "set_data", "data": 1 }
]
"quality": 1
},
{
"type": "item",
"entryName": "normalBlackLotus",
"name": "botania:blackLotus",
"name": "botania:black_lotus",
"weight": 7,
"functions": [
{ "function": "set_count", "count": { "min": 1, "max": 3 } },
{ "function": "set_data", "data": 0 }
{ "function": "set_count", "count": { "min": 1, "max": 3 } }
]
}
]
@@ -6,7 +6,7 @@
"entries": [
{
"type": "item",
"name": "botania:blackLotus",
"name": "botania:black_lotus",
"weight": 35
},
{
@@ -6,7 +6,7 @@
"entries": [
{
"type": "item",
"name": "botania:blackLotus",
"name": "botania:black_lotus",
"weight": 35
},
{
@@ -6,7 +6,7 @@
"entries": [
{
"type": "item",
"name": "botania:blackLotus",
"name": "botania:black_lotus",
"weight": 25
},
{
@@ -22,7 +22,7 @@
},
{
"type": "item",
"name": "botania:blackLotus",
"name": "botania:black_lotus",
"weight": 5
},
{
@@ -11,7 +11,7 @@
},
{
"type": "item",
"name": "botania:blackLotus",
"name": "botania:black_lotus",
"weight": 10
},
{
@@ -12,7 +12,7 @@
},
{
"type": "item",
"name": "botania:blackLotus",
"name": "botania:black_lotus",
"weight": 10
},
{
@@ -6,7 +6,7 @@
"entries": [
{
"type": "item",
"name": "botania:blackLotus",
"name": "botania:black_lotus",
"weight": 10
},
{