From a0182a7bf833601c520c8badae1672f26f2cb760 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 18 Dec 2017 16:39:53 -0600 Subject: [PATCH] Flatten viruses --- .../common/core/BotaniaCreativeTab.java | 3 +- .../common/crafting/ModCraftingRecipes.java | 4 +- .../botania/common/fixers/FlattenItems.java | 7 +++ .../vazkii/botania/common/item/ItemVirus.java | 45 +++---------------- .../vazkii/botania/common/item/ModItems.java | 6 ++- .../botania/common/lib/LibItemNames.java | 3 +- .../resources/assets/botania/lang/en_us.lang | 4 +- .../resources/assets/botania/lang/es_es.lang | 4 +- .../resources/assets/botania/lang/fr_fr.lang | 4 +- .../resources/assets/botania/lang/ja_jp.lang | 4 +- .../resources/assets/botania/lang/ko_kr.lang | 4 +- .../resources/assets/botania/lang/nl_nl.lang | 4 +- .../resources/assets/botania/lang/pt_br.lang | 4 +- .../resources/assets/botania/lang/ru_ru.lang | 4 +- .../resources/assets/botania/lang/zh_cn.lang | 4 +- .../resources/assets/botania/lang/zh_tw.lang | 4 +- .../{virus0.json => virus_necrodermal.json} | 0 .../{virus1.json => virus_nullodermal.json} | 0 .../{virus_0.json => virus_necrodermal.json} | 3 +- .../{virus_1.json => virus_nullodermal.json} | 3 +- 20 files changed, 45 insertions(+), 69 deletions(-) rename src/main/resources/assets/botania/models/item/{virus0.json => virus_necrodermal.json} (100%) rename src/main/resources/assets/botania/models/item/{virus1.json => virus_nullodermal.json} (100%) rename src/main/resources/assets/botania/recipes/{virus_0.json => virus_necrodermal.json} (90%) rename src/main/resources/assets/botania/recipes/{virus_1.json => virus_nullodermal.json} (90%) diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 7ca5fec27..6f93328bb 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -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); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 21b7b69ef..c8c0c25d5 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -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(); diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 8d9af62f1..ec73d6d15 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 4df876a8e..e21a86071 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -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 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); - } - } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 682379c30..998f54a5c 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -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); diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index c5ef6e5f7..5de70b953 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -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"; diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 2a45ffae4..4abc72be1 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -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 diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index 052a50f3a..b2c4923ba 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -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 diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index 9f7c09012..a8a6664d0 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -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 diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index a8af0d70c..4a4ac1224 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -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=洞察のマナスチールヘルメット diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index 421324fa6..62cec4507 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -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=발견의 마나스틸 핼맷 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index 02f873e0e..ff36fcdee 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -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 diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index f2179c2ff..297f156fa 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -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 diff --git a/src/main/resources/assets/botania/lang/ru_ru.lang b/src/main/resources/assets/botania/lang/ru_ru.lang index 72240b1fa..25763fbdc 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.lang +++ b/src/main/resources/assets/botania/lang/ru_ru.lang @@ -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=Шлем откровения из манастали diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index 23653a35f..8c0dfeba5 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -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=魔钢揭示头盔 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index 5197a4473..cc89130f8 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -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=魔鋼揭示頭盔 diff --git a/src/main/resources/assets/botania/models/item/virus0.json b/src/main/resources/assets/botania/models/item/virus_necrodermal.json similarity index 100% rename from src/main/resources/assets/botania/models/item/virus0.json rename to src/main/resources/assets/botania/models/item/virus_necrodermal.json diff --git a/src/main/resources/assets/botania/models/item/virus1.json b/src/main/resources/assets/botania/models/item/virus_nullodermal.json similarity index 100% rename from src/main/resources/assets/botania/models/item/virus1.json rename to src/main/resources/assets/botania/models/item/virus_nullodermal.json diff --git a/src/main/resources/assets/botania/recipes/virus_0.json b/src/main/resources/assets/botania/recipes/virus_necrodermal.json similarity index 90% rename from src/main/resources/assets/botania/recipes/virus_0.json rename to src/main/resources/assets/botania/recipes/virus_necrodermal.json index df500e69f..47fe1bb16 100644 --- a/src/main/resources/assets/botania/recipes/virus_0.json +++ b/src/main/resources/assets/botania/recipes/virus_necrodermal.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:virus", - "data": 0 + "item": "botania:virus_necrodermal" }, "ingredients": [ { diff --git a/src/main/resources/assets/botania/recipes/virus_1.json b/src/main/resources/assets/botania/recipes/virus_nullodermal.json similarity index 90% rename from src/main/resources/assets/botania/recipes/virus_1.json rename to src/main/resources/assets/botania/recipes/virus_nullodermal.json index 085dfa0aa..6741bd78e 100644 --- a/src/main/resources/assets/botania/recipes/virus_1.json +++ b/src/main/resources/assets/botania/recipes/virus_nullodermal.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:virus", - "data": 1 + "item": "botania:virus_nullodermal" }, "ingredients": [ {