Flatten viruses

This commit is contained in:
Vincent Lee committed 2017-12-18 16:39:53 -06:00
1 parent ae5ca7d44c
commit a0182a7bf8
20 files changed
+45 -69

No files matched your search

@@ -113,7 +113,8 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addItem(ModItems.diviningRod);
addItem(ModItems.gravityRod);
addItem(ModItems.missileRod);
addItem(ModItems.virus);
addItem(ModItems.necroVirus);
addItem(ModItems.nullVirus);
addItem(ModItems.slingshot);
addItem(ModItems.vineBall);
addItem(ModItems.keepIvy);
@@ -558,8 +558,8 @@ public final class ModCraftingRecipes {
recipeSlingshot = ModItems.slingshot.getRegistryName();
recipeLaputaShard = path("laputashard_0");
recipesLaputaShardUpgrade = allOfGroup("laputashard_upgrade");
recipeVirusZombie = path("virus_0");
recipeVirusSkeleton = path("virus_1");
recipeVirusZombie = ModItems.necroVirus.getRegistryName();
recipeVirusSkeleton = ModItems.nullVirus.getRegistryName();
recipeSkyDirtRod = ModItems.skyDirtRod.getRegistryName();
recipeGlassPick = ModItems.glassPick.getRegistryName();
recipeDiviningRod = ModItems.diviningRod.getRegistryName();
@@ -57,6 +57,13 @@ public class FlattenItems implements IFixableData {
EnumDyeColor color = EnumDyeColor.byMetadata(i);
return LibMisc.MOD_ID + ":" + LibItemNames.PETAL + "_" + color.getName();
});
LOOKUP.put("botania:virus", i -> {
if (i == 1) {
return LibMisc.MOD_ID + ":" + LibItemNames.NULL_VIRUS;
} else {
return LibMisc.MOD_ID + ":" + LibItemNames.NECRO_VIRUS;
}
});
}
@Override
@@ -10,7 +10,6 @@
*/
package vazkii.botania.common.item;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AbstractAttributeMap;
@@ -28,30 +27,18 @@ import net.minecraft.init.SoundEvents;
import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.living.LivingHurtEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.lib.LibItemNames;
import vazkii.botania.common.lib.LibObfuscation;
import javax.annotation.Nonnull;
import vazkii.botania.common.lib.LibMisc;
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID)
public class ItemVirus extends ItemMod {
private static final int SUBTYPES = 2;
public ItemVirus() {
super(LibItemNames.VIRUS);
setHasSubtypes(true);
MinecraftForge.EVENT_BUS.register(ItemVirus.class);
public ItemVirus(String name) {
super(name);
}
@Override
@@ -79,7 +66,7 @@ public class ItemVirus extends ItemMod {
horse.setDead();
AbstractHorse newHorse = stack.getItemDamage() == 0 ? new EntityZombieHorse(player.world) : new EntitySkeletonHorse(player.world);
AbstractHorse newHorse = stack.getItem() == ModItems.necroVirus ? new EntityZombieHorse(player.world) : new EntitySkeletonHorse(player.world);
newHorse.setTamedBy(player);
newHorse.setPositionAndRotation(horse.posX, horse.posY, horse.posZ, horse.rotationYaw, horse.rotationPitch);
@@ -123,24 +110,4 @@ public class ItemVirus extends ItemMod {
}
}
@Override
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> list) {
if(isInCreativeTab(tab)) {
for(int i = 0; i < SUBTYPES; i++)
list.add(new ItemStack(this, 1, i));
}
}
@Nonnull
@Override
public String getUnlocalizedName(ItemStack stack) {
return super.getUnlocalizedName(stack) + stack.getItemDamage();
}
@SideOnly(Side.CLIENT)
@Override
public void registerModels() {
ModelHandler.registerItemAppendMeta(this, 2, LibItemNames.VIRUS);
}
}
@@ -238,7 +238,8 @@ public final class ModItems {
public static final Item slingshot = new ItemSlingshot();
public static final Item manaBottle = new ItemBottledMana();
public static final Item laputaShard = new ItemLaputaShard();
public static final Item virus = new ItemVirus();
public static final Item necroVirus = new ItemVirus(LibItemNames.NECRO_VIRUS);
public static final Item nullVirus = new ItemVirus(LibItemNames.NULL_VIRUS);
public static final Item reachRing = new ItemReachRing();
public static final Item skyDirtRod = new ItemSkyDirtRod();
public static final Item itemFinder = new ItemItemFinder();
@@ -450,7 +451,8 @@ public final class ModItems {
r.register(slingshot);
r.register(manaBottle);
r.register(laputaShard);
r.register(virus);
r.register(necroVirus);
r.register(nullVirus);
r.register(reachRing);
r.register(skyDirtRod);
r.register(itemFinder);
@@ -89,7 +89,8 @@ public final class LibItemNames {
public static final String SLINGSHOT = "slingshot";
public static final String MANA_BOTTLE = "manaBottle";
public static final String LAPUTA_SHARD = "laputaShard";
public static final String VIRUS = "virus";
public static final String NECRO_VIRUS = "virus_necrodermal";
public static final String NULL_VIRUS = "virus_nullodermal";
public static final String REACH_RING = "reachRing";
public static final String SKY_DIRT_ROD = "skyDirtRod";
public static final String MANASTEEL_HELM_R = "manasteelHelmReveal";
@@ -1450,8 +1450,8 @@ item.botania:vineBall.name=Vine Ball
item.botania:slingshot.name=Livingwood Slingshot
item.botania:manaBottle.name=Mana in a Bottle
item.botania:laputaShard.name=Shard of Laputa
item.botania:virus0.name=Necrodermal Virus
item.botania:virus1.name=Nullodermal Virus
item.botania:virus_necrodermal.name=Necrodermal Virus
item.botania:virus_nullodermal.name=Nullodermal Virus
item.botania:skyDirtRod.name=Rod of the Highlands
item.botania:placeholder.name=Crafting Placeholder
item.botania:manasteelHelmReveal.name=Manasteel Helmet of Revealing
@@ -1210,8 +1210,8 @@ item.botania:vineBall.name=Bola de enredadera
item.botania:slingshot.name=Tirachinas de madera viviente
item.botania:manaBottle.name=Maná en una botella
item.botania:laputaShard.name=Lasca de Laputa
item.botania:virus0.name=Virus necrodermal
item.botania:virus1.name=virus nullodermal
item.botania:virus_necrodermal.name=Virus necrodermal
item.botania:virus_nullodermal.name=virus nullodermal
item.botania:skyDirtRod.name=Vara de las tierras altas
item.botania:placeholder.name=Marcador de trabajo
item.botania:manasteelHelmReveal.name=Casco de manacero de la revelación
@@ -1072,8 +1072,8 @@ item.botania:vineBall.name=Boule de vigne
item.botania:slingshot.name=Lance-pierre en vifbois
item.botania:manaBottle.name=Mana en bouteille
item.botania:laputaShard.name=Éclat de Laputa
item.botania:virus0.name=Virus nécrodermal
item.botania:virus1.name=Virus nullodermal
item.botania:virus_necrodermal.name=Virus nécrodermal
item.botania:virus_nullodermal.name=Virus nullodermal
item.botania:skyDirtRod.name=Bâton des Highlands
item.botania:placeholder.name=Mainteneur d'artisanat
item.botania:manasteelHelmReveal.name=Casque de révélation en manacier
@@ -1235,8 +1235,8 @@ item.botania:vineBall.name=ツタ玉
item.botania:slingshot.name=リビングウッドのパチンコ
item.botania:manaBottle.name=マナ入り瓶
item.botania:laputaShard.name=ラピュタの破片
item.botania:virus0.name=表皮を腐らせるウィルス
item.botania:virus1.name=表皮を溶かすウィルス
item.botania:virus_necrodermal.name=表皮を腐らせるウィルス
item.botania:virus_nullodermal.name=表皮を溶かすウィルス
item.botania:skyDirtRod.name=高地の杖
item.botania:placeholder.name=クラフト空白
item.botania:manasteelHelmReveal.name=洞察のマナスチールヘルメット
@@ -1171,8 +1171,8 @@ item.botania:vineBall.name=덩굴 공
item.botania:slingshot.name=생명의나무 개총
item.botania:manaBottle.name=마나가 들어있는 병
item.botania:laputaShard.name=라퓨타의 조각
item.botania:virus0.name=Necrodermal 바이러스
item.botania:virus1.name=Nullodermal 바이러스
item.botania:virus_necrodermal.name=Necrodermal 바이러스
item.botania:virus_nullodermal.name=Nullodermal 바이러스
item.botania:skyDirtRod.name=고지의 막대
item.botania:placeholder.name=제작 플레이스홀더
item.botania:manasteelHelmReveal.name=발견의 마나스틸 핼맷
@@ -1303,8 +1303,8 @@ item.botania:vineBall.name=Lianenbol
item.botania:slingshot.name=Levenshouten Katapult
item.botania:manaBottle.name=Flesje Mana
item.botania:laputaShard.name=Scherf van Laputa
item.botania:virus0.name=Necrodermaal Virus
item.botania:virus1.name=Nullodermaal Virus
item.botania:virus_necrodermal.name=Necrodermaal Virus
item.botania:virus_nullodermal.name=Nullodermaal Virus
item.botania:skyDirtRod.name=Staf van de Hooglanden
item.botania:placeholder.name=Vervaardig Plaatshouder
item.botania:manasteelHelmReveal.name=Manastaal Helm der Onthulling
@@ -1453,8 +1453,8 @@ item.botania:vineBall.name=Bola de Vinhas
item.botania:slingshot.name=Estilingue de Madeira-viva
item.botania:manaBottle.name=Mana Engarrafada
item.botania:laputaShard.name=Fragmento de Laputa
item.botania:virus0.name=Vírus Necrodermal
item.botania:virus1.name=Vírus Nullodermal
item.botania:virus_necrodermal.name=Vírus Necrodermal
item.botania:virus_nullodermal.name=Vírus Nullodermal
item.botania:skyDirtRod.name=Cajado de Highlands
item.botania:placeholder.name=Reservante de espaço
item.botania:manasteelHelmReveal.name=Elmo de Manasteel da Revelação
@@ -697,8 +697,8 @@ item.botania:vineBall.name=Шар лозы
item.botania:slingshot.name=Рогатка из жизнедерева
item.botania:manaBottle.name=Мана в бутылке
item.botania:laputaShard.name=Осколок острова Лапута
item.botania:virus0.name=Некродермальный вирус
item.botania:virus1.name=Наллодермальный вирус
item.botania:virus_necrodermal.name=Некродермальный вирус
item.botania:virus_nullodermal.name=Наллодермальный вирус
item.botania:skyDirtRod.name=Жезл Высокогорья
item.botania:placeholder.name=Заполнитель сборщика
item.botania:manasteelHelmReveal.name=Шлем откровения из манастали
@@ -1450,8 +1450,8 @@ item.botania:vineBall.name=藤蔓球
item.botania:slingshot.name=活木弹弓
item.botania:manaBottle.name=瓶装魔力
item.botania:laputaShard.name=拉普达碎片
item.botania:virus0.name=僵尸病毒
item.botania:virus1.name=骷髅病毒
item.botania:virus_necrodermal.name=僵尸病毒
item.botania:virus_nullodermal.name=骷髅病毒
item.botania:skyDirtRod.name=高原法杖
item.botania:placeholder.name=合成占位符
item.botania:manasteelHelmReveal.name=魔钢揭示头盔
@@ -1416,8 +1416,8 @@ item.botania:vineBall.name=籐蔓球
item.botania:slingshot.name=活木彈弓
item.botania:manaBottle.name=瓶裝瑪那
item.botania:laputaShard.name=拉普達碎片
item.botania:virus0.name=殭屍病毒
item.botania:virus1.name=骷髏病毒
item.botania:virus_necrodermal.name=殭屍病毒
item.botania:virus_nullodermal.name=骷髏病毒
item.botania:skyDirtRod.name=高原法杖
item.botania:placeholder.name=合成佔位符
item.botania:manasteelHelmReveal.name=魔鋼揭示頭盔
@@ -1,7 +1,6 @@
{
"result": {
"item": "botania:virus",
"data": 0
"item": "botania:virus_necrodermal"
},
"ingredients": [
{
@@ -1,7 +1,6 @@
{
"result": {
"item": "botania:virus",
"data": 1
"item": "botania:virus_nullodermal"
},
"ingredients": [
{