diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index e1c9a3c91..d5e17e3ef 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -369,6 +369,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.sparkUpgradeIsolated); addBlock(ModBlocks.sparkChanger); addItem(ModItems.corporeaSpark); + addItem(ModItems.corporeaSparkMaster); addBlock(ModBlocks.corporeaIndex); addBlock(ModBlocks.corporeaFunnel); addBlock(ModBlocks.corporeaInterceptor); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 4c559b874..cdee4dd0f 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -601,8 +601,8 @@ public final class ModCraftingRecipes { recipeRedStringInterceptor = ModBlocks.redStringInterceptor.getRegistryName(); recipeFlightTiara = path("flighttiara_0"); recipesWings = allOfGroup("flighttiara_wings"); - recipeCorporeaSpark = path("corporeaspark_0"); - recipeMasterCorporeaSpark = path("corporeaspark_1"); + recipeCorporeaSpark = ModItems.corporeaSpark.getRegistryName(); + recipeMasterCorporeaSpark = ModItems.corporeaSparkMaster.getRegistryName(); recipeCorporeaIndex = ModBlocks.corporeaIndex.getRegistryName(); recipeCorporeaFunnel = ModBlocks.corporeaFunnel.getRegistryName(); recipeCorporeaInterceptor = ModBlocks.corporeaInterceptor.getRegistryName(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index f50158d6a..01a20ecaf 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -71,7 +71,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @Nonnull @Override public ItemStack getPickedResult(RayTraceResult target) { - return isMaster() ? new ItemStack(ModItems.corporeaSpark, 1, 1) : new ItemStack(ModItems.corporeaSpark); + return isMaster() ? new ItemStack(ModItems.corporeaSparkMaster) : new ItemStack(ModItems.corporeaSpark); } @Override @@ -114,7 +114,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } private void dropAndKill() { - entityDropItem(new ItemStack(ModItems.corporeaSpark, 1, isMaster() ? 1 : 0), 0F); + entityDropItem(new ItemStack(isMaster() ? ModItems.corporeaSparkMaster : ModItems.corporeaSpark), 0F); setDead(); } diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 653b88ca3..560556b24 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -108,6 +108,13 @@ public class FlattenItems implements IFixableData { ItemBaubleCosmetic.Variant[] vals = ItemBaubleCosmetic.Variant.values(); return LibMisc.MOD_ID + ":" + LibItemNames.COSMETIC + "_" + vals[i % vals.length].name().toLowerCase(Locale.ROOT); }); + LOOKUP.put("botania:corporeaspark", i -> { + if(i == 1) { + return ModItems.corporeaSparkMaster.getRegistryName().toString(); + } else { + return ModItems.corporeaSpark.getRegistryName().toString(); + } + }); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 001f528d8..3b1d05150 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -10,39 +10,24 @@ */ package vazkii.botania.common.item; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.CapabilityItemHandler; import vazkii.botania.api.corporea.CorporeaHelper; -import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.entity.EntityCorporeaSpark; -import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; public class ItemCorporeaSpark extends ItemMod { - public ItemCorporeaSpark() { - super(LibItemNames.CORPOREA_SPARK); - setHasSubtypes(true); - } - - @Override - public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { - if(isInCreativeTab(tab)) { - for(int i = 0; i < 2; i++) - list.add(new ItemStack(this, 1, i)); - } + public ItemCorporeaSpark(String name) { + super(name); } @Nonnull @@ -55,27 +40,14 @@ public class ItemCorporeaSpark extends ItemMod { stack.shrink(1); if(!world.isRemote) { EntityCorporeaSpark spark = new EntityCorporeaSpark(world); - if(stack.getItemDamage() == 1) + if(this == ModItems.corporeaSparkMaster) spark.setMaster(true); spark.setPosition(pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5); world.spawnEntity(spark); - world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 0); } return EnumActionResult.SUCCESS; } return EnumActionResult.PASS; } - @Nonnull - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerItemAppendMeta(this, 2, LibItemNames.CORPOREA_SPARK); - } - } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index e7781504e..a9a181f1f 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -322,7 +322,8 @@ public final class ModItems { public static final Item ancientWillTorag = new ItemAncientWill(IAncientWillContainer.AncientWillType.TORAG); public static final Item ancientWillVerac = new ItemAncientWill(IAncientWillContainer.AncientWillType.VERAC); public static final Item ancientWillKaril = new ItemAncientWill(IAncientWillContainer.AncientWillType.KARIL); - public static final Item corporeaSpark = new ItemCorporeaSpark(); + public static final Item corporeaSpark = new ItemCorporeaSpark(LibItemNames.CORPOREA_SPARK); + public static final Item corporeaSparkMaster = new ItemCorporeaSpark(LibItemNames.CORPOREA_SPARK_MASTER); public static final Item livingwoodBow = new ItemLivingwoodBow(); public static final Item crystalBow = new ItemCrystalBow(); public static final Map cosmetics = new EnumMap<>(ItemBaubleCosmetic.Variant.class); @@ -580,6 +581,7 @@ public final class ModItems { r.register(ancientWillVerac); r.register(ancientWillKaril); r.register(corporeaSpark); + r.register(corporeaSparkMaster); r.register(livingwoodBow); r.register(crystalBow); cosmetics.values().forEach(r::register); diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 39163fe3c..9d66db458 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -132,7 +132,8 @@ public final class LibItemNames { public static final String OVERGROWTH_SEED = "overgrowthseed"; public static final String CRAFT_PATTERN = "pattern"; public static final String ANCIENT_WILL = "ancient_will"; - public static final String CORPOREA_SPARK = "corporeaspark"; + public static final String CORPOREA_SPARK = "corporea_spark"; + public static final String CORPOREA_SPARK_MASTER = "corporea_spark_master"; public static final String LIVINGWOOD_BOW = "livingwoodbow"; public static final String CRYSTAL_BOW = "crystalbow"; public static final String COSMETIC = "cosmetic"; diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 76964849f..0ea30b960 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -1510,8 +1510,8 @@ item.botania:ancient_will_guthan.name=Will of Guthan item.botania:ancient_will_torag.name=Will of Torag item.botania:ancient_will_verac.name=Will of Verac item.botania:ancient_will_karil.name=Will of Karil -item.botania:corporeaspark0.name=Corporea Spark -item.botania:corporeaspark1.name=Master Corporea Spark +item.botania:corporea_spark.name=Corporea Spark +item.botania:corporea_spark_master.name=Master Corporea Spark item.botania:ender_air_bottle.name=Ender Air Bottle item.botania:livingwoodbow.name=Livingwood Bow item.botania:crystalbow.name=Crystal Bow diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index 9689b0cc1..08bfbdb9b 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -1267,8 +1267,8 @@ item.botania:ancient_will_guthan.name=Legado de Guthan item.botania:ancient_will_torag.name=Legado de Torag item.botania:ancient_will_verac.name=Legado de Verac item.botania:ancient_will_karil.name=Legado de Karil -item.botania:corporeaspark0.name=Chispa de corporea -item.botania:corporeaspark1.name=Chispa maestra de corporea +item.botania:corporea_spark.name=Chispa de corporea +item.botania:corporea_spark_master.name=Chispa maestra de corporea item.botania:ender_air_bottle.name=Botella de aire del Fin item.botania:livingwoodbow.name=Arco de madera viviente item.botania:crystalbow.name=Arco de cristal diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index c3d4f5acc..c3e02c4b3 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -1129,8 +1129,8 @@ item.botania:ancient_will_guthan.name=Volonté de Guthan item.botania:ancient_will_torag.name=Volonté de Torag item.botania:ancient_will_verac.name=Volonté de Verac item.botania:ancient_will_karil.name=Volonté de Karil -item.botania:corporeaspark0.name=Étincelle de Corporea -item.botania:corporeaspark1.name=Étincelle maitresse de Corporea +item.botania:corporea_spark.name=Étincelle de Corporea +item.botania:corporea_spark_master.name=Étincelle maitresse de Corporea item.botania:ender_air_bottle.name=Bouteille d'air du néant item.botania:livingwoodbow.name=Arc en vifbois item.botania:crystalbow.name=Arc de cristal diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index 570b46d11..77714cccb 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -1295,8 +1295,8 @@ item.botania:ancient_will_guthan.name=グーサンの意思 item.botania:ancient_will_torag.name=トラグの意思 item.botania:ancient_will_verac.name=ベラックの意思 item.botania:ancient_will_karil.name=カリルの意思 -item.botania:corporeaspark0.name=コーポリアスパーク -item.botania:corporeaspark1.name=マスターコーポリアスパーク +item.botania:corporea_spark.name=コーポリアスパーク +item.botania:corporea_spark_master.name=マスターコーポリアスパーク item.botania:ender_air_bottle.name=エンダー空気瓶 item.botania:livingwoodbow.name=リビングウッドの弓 item.botania:crystalbow.name=水晶の弓 diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index 26abb98a9..e0035cf10 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -1229,8 +1229,8 @@ item.botania:ancient_will_guthan.name=규선의 의지 item.botania:ancient_will_torag.name=토어래그의 의지 item.botania:ancient_will_verac.name=버랙의 의지 item.botania:ancient_will_karil.name=케럴의 의지 -item.botania:corporeaspark0.name=Corporea 스파크 -item.botania:corporeaspark1.name=Master Corporea 스파크 +item.botania:corporea_spark.name=Corporea 스파크 +item.botania:corporea_spark_master.name=Master Corporea 스파크 item.botania:ender_air_bottle.name=엔더 공기가 담긴 병 item.botania:livingwoodbow.name=생명의 나무 활 item.botania:crystalbow.name=수정 활 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index ce46e3144..c7182f367 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -1362,8 +1362,8 @@ item.botania:ancient_will_guthan.name=Wil van Guthan item.botania:ancient_will_torag.name=Wil van Torag item.botania:ancient_will_verac.name=Wil van Verac item.botania:ancient_will_karil.name=Wil van Karil -item.botania:corporeaspark0.name=Corporea Vonk -item.botania:corporeaspark1.name=Corporea Bronvonk +item.botania:corporea_spark.name=Corporea Vonk +item.botania:corporea_spark_master.name=Corporea Bronvonk item.botania:ender_air_bottle.name=Ender Lucht Flesje item.botania:livingwoodbow.name=Levenshout Boog item.botania:crystalbow.name=Kristallen Boog diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index 59695d2ac..fb7cbc757 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -1512,8 +1512,8 @@ item.botania:ancient_will_guthan.name=Vontade de Guthan item.botania:ancient_will_torag.name=Vontade de Torag item.botania:ancient_will_verac.name=Vontade de Verac item.botania:ancient_will_karil.name=Vontade de Karil -item.botania:corporeaspark0.name=Fagulha Corporea -item.botania:corporeaspark1.name=Fagulha Corporea Mestre +item.botania:corporea_spark.name=Fagulha Corporea +item.botania:corporea_spark_master.name=Fagulha Corporea Mestre item.botania:ender_air_bottle.name=Garrafa de ar do Fim item.botania:livingwoodbow.name=Arco de Madeira-viva item.botania:crystalbow.name=Arco de Cristal diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index c0347ad04..3024c5df4 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -1510,8 +1510,8 @@ item.botania:ancient_will_guthan.name=古赞的意志 item.botania:ancient_will_torag.name=托拉格的意志 item.botania:ancient_will_verac.name=威拉克的意志 item.botania:ancient_will_karil.name=卡瑞的意志 -item.botania:corporeaspark0.name=多媒体火花 -item.botania:corporeaspark1.name=主媒体火花 +item.botania:corporea_spark.name=多媒体火花 +item.botania:corporea_spark_master.name=主媒体火花 item.botania:ender_air_bottle.name=瓶装末地空气 item.botania:livingwoodbow.name=活木弓 item.botania:crystalbow.name=水晶弓 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index 05f9dcc13..52904778d 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -1475,8 +1475,8 @@ item.botania:ancient_will_guthan.name=古讚的意志 item.botania:ancient_will_torag.name=托拉格的意志 item.botania:ancient_will_verac.name=威拉克的意志 item.botania:ancient_will_karil.name=卡瑞的意志 -item.botania:corporeaspark0.name=多媒體火花 -item.botania:corporeaspark1.name=主媒體火花 +item.botania:corporea_spark.name=多媒體火花 +item.botania:corporea_spark_master.name=主媒體火花 item.botania:ender_air_bottle.name=終界氣瓶 item.botania:livingwoodbow.name=活木弓 item.botania:crystalbow.name=水晶弓 diff --git a/src/main/resources/assets/botania/models/item/corporeaspark0.json b/src/main/resources/assets/botania/models/item/corporea_spark.json similarity index 100% rename from src/main/resources/assets/botania/models/item/corporeaspark0.json rename to src/main/resources/assets/botania/models/item/corporea_spark.json diff --git a/src/main/resources/assets/botania/models/item/corporeaspark1.json b/src/main/resources/assets/botania/models/item/corporea_spark_master.json similarity index 100% rename from src/main/resources/assets/botania/models/item/corporeaspark1.json rename to src/main/resources/assets/botania/models/item/corporea_spark_master.json diff --git a/src/main/resources/assets/botania/recipes/corporeaspark_0.json b/src/main/resources/assets/botania/recipes/corporea_spark.json similarity index 80% rename from src/main/resources/assets/botania/recipes/corporeaspark_0.json rename to src/main/resources/assets/botania/recipes/corporea_spark.json index 6bb9c504f..eacaf957e 100644 --- a/src/main/resources/assets/botania/recipes/corporeaspark_0.json +++ b/src/main/resources/assets/botania/recipes/corporea_spark.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:corporeaspark", - "data": 0 + "item": "botania:corporea_spark" }, "ingredients": [ { diff --git a/src/main/resources/assets/botania/recipes/corporeaspark_1.json b/src/main/resources/assets/botania/recipes/corporea_spark_master.json similarity index 56% rename from src/main/resources/assets/botania/recipes/corporeaspark_1.json rename to src/main/resources/assets/botania/recipes/corporea_spark_master.json index 2c6ea4887..c795d6c4e 100644 --- a/src/main/resources/assets/botania/recipes/corporeaspark_1.json +++ b/src/main/resources/assets/botania/recipes/corporea_spark_master.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:corporeaspark", - "data": 1 + "item": "botania:corporea_spark_master" }, "ingredients": [ { - "item": "botania:corporeaspark", - "data": 0 + "item": "botania:corporea_spark" }, { "item": "#ELVENDRAGONSTONE" diff --git a/src/main/resources/assets/botania/recipes/corporeacrystalcube.json b/src/main/resources/assets/botania/recipes/corporeacrystalcube.json index 998b5459d..a060dd39a 100644 --- a/src/main/resources/assets/botania/recipes/corporeacrystalcube.json +++ b/src/main/resources/assets/botania/recipes/corporeacrystalcube.json @@ -10,8 +10,7 @@ "type": "forge:ore_shaped", "key": { "C": { - "item": "botania:corporeaspark", - "data": 0 + "item": "botania:corporea_spark" }, "G": { "item": "botania:elfglass" diff --git a/src/main/resources/assets/botania/recipes/corporeafunnel.json b/src/main/resources/assets/botania/recipes/corporeafunnel.json index e0d2db26c..37a44b46e 100644 --- a/src/main/resources/assets/botania/recipes/corporeafunnel.json +++ b/src/main/resources/assets/botania/recipes/corporeafunnel.json @@ -7,8 +7,7 @@ "item": "minecraft:dropper" }, { - "item": "botania:corporeaspark", - "data": 0 + "item": "botania:corporea_spark" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/assets/botania/recipes/corporeaindex.json b/src/main/resources/assets/botania/recipes/corporeaindex.json index ee4677b9c..90270e78b 100644 --- a/src/main/resources/assets/botania/recipes/corporeaindex.json +++ b/src/main/resources/assets/botania/recipes/corporeaindex.json @@ -13,8 +13,7 @@ "item": "#BENDERAIRBOTTLE" }, "S": { - "item": "botania:corporeaspark", - "data": 0 + "item": "botania:corporea_spark" }, "D": { "item": "#ELVENDRAGONSTONE" diff --git a/src/main/resources/assets/botania/recipes/corporeainterceptor.json b/src/main/resources/assets/botania/recipes/corporeainterceptor.json index 2cf8a5b81..641a55ddc 100644 --- a/src/main/resources/assets/botania/recipes/corporeainterceptor.json +++ b/src/main/resources/assets/botania/recipes/corporeainterceptor.json @@ -7,8 +7,7 @@ "item": "#BLOCKREDSTONE" }, { - "item": "botania:corporeaspark", - "data": 0 + "item": "botania:corporea_spark" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/assets/botania/recipes/corporearetainer.json b/src/main/resources/assets/botania/recipes/corporearetainer.json index 8d13e701d..672279c55 100644 --- a/src/main/resources/assets/botania/recipes/corporearetainer.json +++ b/src/main/resources/assets/botania/recipes/corporearetainer.json @@ -7,8 +7,7 @@ "item": "#CHESTWOOD" }, { - "item": "botania:corporeaspark", - "data": 0 + "item": "botania:corporea_spark" } ], "type": "forge:ore_shapeless"