diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 7c9a854a8..9af6cb947 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -237,7 +237,8 @@ public class ClientProxy implements IProxy { RenderingRegistry.registerEntityRenderingHandler(EntityManaStorm.class, RenderManaStorm::new); RenderingRegistry.registerEntityRenderingHandler(EntityBabylonWeapon.class, RenderBabylonWeapon::new); - RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, renderManager -> new RenderSnowballStack<>(renderManager, ModItems.thornChakram, Minecraft.getMinecraft().getRenderItem(), entity -> new ItemStack(ModItems.thornChakram, 1, entity.isFire() ? 1 : 0))); + RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, renderManager -> new RenderSnowballStack<>(renderManager, ModItems.thornChakram, Minecraft.getMinecraft().getRenderItem(), + entity -> entity.isFire() ? new ItemStack(ModItems.flareChakram) : new ItemStack(ModItems.thornChakram))); RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, renderManager -> new RenderSnowball<>(renderManager, ModItems.vineBall, Minecraft.getMinecraft().getRenderItem())); RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, renderManager -> new RenderSnowball<>(renderManager, ModItems.enderAirBottle, Minecraft.getMinecraft().getRenderItem())); diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 2bc15c607..f3bea7791 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -29,7 +29,7 @@ import javax.annotation.Nonnull; public final class BotaniaCreativeTab extends CreativeTabs { public static final BotaniaCreativeTab INSTANCE = new BotaniaCreativeTab(); - NonNullList list; + private NonNullList list; public BotaniaCreativeTab() { super(LibMisc.MOD_ID); @@ -37,15 +37,9 @@ public final class BotaniaCreativeTab extends CreativeTabs { setBackgroundImageName(LibResources.GUI_CREATIVE); } - @Nonnull - @Override - public ItemStack getIconItemStack() { - return new ItemStack(ModItems.lexicon); - } - @Override public ItemStack getTabIconItem() { - return getIconItemStack(); + return new ItemStack(ModItems.lexicon); } @Override @@ -222,6 +216,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.elementiumBoots); addItem(ModItems.terraSword); addItem(ModItems.thornChakram); + addItem(ModItems.flareChakram); addItem(ModItems.terraPick); addItem(ModItems.terraAxe); addItem(ModItems.temperanceStone); @@ -404,7 +399,6 @@ public final class BotaniaCreativeTab extends CreativeTabs { } private void addBlock(Block block) { - ItemStack stack = new ItemStack(block); block.getSubBlocks(this, list); } diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 5aec60ad3..24a299fad 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -630,8 +630,8 @@ public final class ModCraftingRecipes { recipeSmeltRod = ModItems.smeltRod.getRegistryName(); recipeWorldSeed = ModItems.worldSeed.getRegistryName(); recipeSpellCloth = ModItems.spellCloth.getRegistryName(); - recipeThornChakram = path("thornchakram_0"); - recipeFireChakram = path("thornchakram_1"); + recipeThornChakram = ModItems.thornChakram.getRegistryName(); + recipeFireChakram = ModItems.flareChakram.getRegistryName(); recipeLivingwoodBow = ModItems.livingwoodBow.getRegistryName(); recipeCrystalBow = ModItems.crystalBow.getRegistryName(); recipeTemperanceStone = ModItems.temperanceStone.getRegistryName(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index 2d8982cce..0d6433d56 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -124,7 +124,9 @@ public class EntityThornChakram extends EntityThrowable { } private ItemStack getItemStack() { - return !stack.isEmpty() ? stack.copy() : new ItemStack(ModItems.thornChakram, 1, isFire() ? 1 : 0); + return !stack.isEmpty() + ? stack.copy() + : isFire() ? new ItemStack(ModItems.flareChakram) : new ItemStack(ModItems.thornChakram); } @Override diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index bb7e6c6b6..15f199656 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -31,6 +31,13 @@ public class FlattenItems implements IFixableData { } }); LOOKUP.put("botania:quartz", i -> LibMisc.MOD_ID + ":" + LibItemNames.QUARTZ_NAMES[i % LibItemNames.QUARTZ_NAMES.length]); + LOOKUP.put("botania:thornchakram", i -> { + if(i == 1) { + return LibMisc.MOD_ID + ":" + LibItemNames.FLARE_CHAKRAM; + } else { + return LibMisc.MOD_ID + ":" + LibItemNames.THORN_CHAKRAM; + } + }); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index a767ad64a..cbe0fa028 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -10,44 +10,23 @@ */ package vazkii.botania.common.item; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.entity.EntityThornChakram; -import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; public class ItemThornChakram extends ItemMod { - public ItemThornChakram() { - super(LibItemNames.THORN_CHAKRAM); + public ItemThornChakram(String name) { + super(name); setMaxStackSize(6); - 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)); - } - } - - @Nonnull - @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName() + stack.getItemDamage(); } @Nonnull @@ -60,7 +39,8 @@ public class ItemThornChakram extends ItemMod { copy.setCount(1); EntityThornChakram c = new EntityThornChakram(world, player, copy); c.setHeadingFromThrower(player, player.rotationPitch, player.rotationYaw, 0.0F, 1.5F, 1.0F); - c.setFire(stack.getItemDamage() != 0); + if(stack.getItem() == ModItems.flareChakram) + c.setFire(true); world.spawnEntity(c); world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); stack.shrink(1); @@ -69,10 +49,4 @@ public class ItemThornChakram extends ItemMod { return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerItemAppendMeta(this, 2, LibItemNames.THORN_CHAKRAM); - } - } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 2283ae5ce..b0db882e8 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -227,7 +227,8 @@ public final class ModItems { public static final Item smeltRod = new ItemSmeltRod(); public static final Item worldSeed = new ItemWorldSeed(); public static final Item spellCloth = new ItemSpellCloth(); - public static final Item thornChakram = new ItemThornChakram(); + public static final Item thornChakram = new ItemThornChakram(LibItemNames.THORN_CHAKRAM); + public static final Item flareChakram = new ItemThornChakram(LibItemNames.FLARE_CHAKRAM); public static final Item overgrowthSeed = new ItemOvergrowthSeed(); public static final Item craftPattern = new ItemCraftPattern(); public static final Item ancientWill = new ItemAncientWill(); @@ -413,6 +414,7 @@ public final class ModItems { r.register(worldSeed); r.register(spellCloth); r.register(thornChakram); + r.register(flareChakram); r.register(overgrowthSeed); r.register(craftPattern); r.register(ancientWill); diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 65c43a9cb..ec95af8b9 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -122,7 +122,8 @@ public final class LibItemNames { public static final String SMELT_ROD = "smeltRod"; public static final String WORLD_SEED = "worldSeed"; public static final String SPELL_CLOTH = "spellCloth"; - public static final String THORN_CHAKRAM = "thornChakram"; + public static final String THORN_CHAKRAM = "thorn_chakram"; + public static final String FLARE_CHAKRAM = "flare_chakram"; public static final String OVERGROWTH_SEED = "overgrowthSeed"; public static final String CRAFT_PATTERN = "craftPattern"; public static final String ANCIENT_WILL = "ancientWill"; diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 2129aabfc..0ac9fd2be 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -1491,8 +1491,8 @@ item.botania:cobbleRod.name=Rod of the Depths item.botania:smeltRod.name=Rod of the Molten Core item.botania:worldSeed.name=World Seed item.botania:spellCloth.name=Spellbinding Cloth -item.botania:thornChakram0.name=Thorn Chakram -item.botania:thornChakram1.name=Flare Chakram +item.botania:thorn_chakram.name=Thorn Chakram +item.botania:flare_chakram.name=Flare Chakram item.botania:overgrowthSeed.name=Overgrowth Seed item.botania:craftPattern0.name=Crafting Pattern #1: 1x1 item.botania:craftPattern1.name=Crafting Pattern #2: 2x2 diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index fbb321934..d9c2117dc 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -1276,8 +1276,8 @@ item.botania:cobbleRod.name=深淵の杖 item.botania:smeltRod.name=融解核の杖 item.botania:worldSeed.name=世界の種 item.botania:spellCloth.name=呪文が織り込まれた布 -item.botania:thornChakram0.name=棘のチャクラム -item.botania:thornChakram1.name=炎のチャクラム +item.botania:thorn_chakram.name=棘のチャクラム +item.botania:flare_chakram.name=炎のチャクラム item.botania:overgrowthSeed.name=育ちすぎた種 item.botania:craftPattern0.name=クラフトパターン #1: 1x1 item.botania:craftPattern1.name=クラフトパターン #2: 2x2 diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index 09672f28a..5670e7419 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -1210,8 +1210,8 @@ item.botania:cobbleRod.name=깊이의 막대 item.botania:smeltRod.name=주조의 막대 item.botania:worldSeed.name=세계의 씨앗 item.botania:spellCloth.name=마음을 사로잡는 옷감 -item.botania:thornChakram0.name=가시 차크람 -item.botania:thornChakram1.name=Flare Chakram +item.botania:thorn_chakram.name=가시 차크람 +item.botania:flare_chakram.name=Flare Chakram item.botania:overgrowthSeed.name=과성장 씨앗 item.botania:craftPattern0.name=제작 패턴 #1: 1x1 item.botania:craftPattern1.name=제작 패턴 #2: 2x2 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index 73bd182a1..63676754a 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -1343,8 +1343,8 @@ item.botania:cobbleRod.name=Staf van de Diepte item.botania:smeltRod.name=Staf van de Gesmolten Kern item.botania:worldSeed.name=Wereldzaad item.botania:spellCloth.name=Betoveringsdoek -item.botania:thornChakram0.name=Doorn van Chakram -item.botania:thornChakram1.name=Vlam van Chakram +item.botania:thorn_chakram.name=Doorn van Chakram +item.botania:flare_chakram.name=Vlam van Chakram item.botania:overgrowthSeed.name=Overwoekeringszaad item.botania:craftPattern0.name=Vervaardigingspatroon #1: 1x1 item.botania:craftPattern1.name=Vervaardigingspatroon #2: 2x2 diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index f8bce802c..f0f4515bd 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -1494,7 +1494,7 @@ item.botania:smeltRod.name=Cajado do Núcleo Derretido item.botania:worldSeed.name=Semente do Mundo item.botania:spellCloth.name=Tecido Encantado item.botania:thornChakram.name=Chakram Espinhento -item.botania:thornChakram1.name=Chakram Flamejante +item.botania:flare_chakram.name=Chakram Flamejante item.botania:overgrowthSeed.name=Semente do super-crescimento item.botania:craftPattern0.name=Padrão de Criação #1: 1x1 item.botania:craftPattern1.name=Padrão de Criação #2: 2x2 diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index 8bd67bae6..488c1a6fe 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -1491,8 +1491,8 @@ item.botania:cobbleRod.name=深渊法杖 item.botania:smeltRod.name=炽心法杖 item.botania:worldSeed.name=世界之种 item.botania:spellCloth.name=封印之布 -item.botania:thornChakram0.name=荆棘飞轮 -item.botania:thornChakram1.name=闪耀飞轮 +item.botania:thorn_chakram.name=荆棘飞轮 +item.botania:flare_chakram.name=闪耀飞轮 item.botania:overgrowthSeed.name=增生之种 item.botania:craftPattern0.name=合成模板#1: 1x1 item.botania:craftPattern1.name=合成模板#2: 2x2 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index fba826ab0..5dbf67f77 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -1456,8 +1456,8 @@ item.botania:cobbleRod.name=深淵法杖 item.botania:smeltRod.name=熾心法杖 item.botania:worldSeed.name=世界之種 item.botania:spellCloth.name=封印之布 -item.botania:thornChakram0.name=荊棘飛輪 -item.botania:thornChakram1.name=閃耀飛輪 +item.botania:thorn_chakram.name=荊棘飛輪 +item.botania:flare_chakram.name=閃耀飛輪 item.botania:overgrowthSeed.name=增生之種 item.botania:craftPattern0.name=合成模板#1: 1x1 item.botania:craftPattern1.name=合成模板#2: 2x2 diff --git a/src/main/resources/assets/botania/models/item/thornchakram1.json b/src/main/resources/assets/botania/models/item/flare_chakram.json similarity index 100% rename from src/main/resources/assets/botania/models/item/thornchakram1.json rename to src/main/resources/assets/botania/models/item/flare_chakram.json diff --git a/src/main/resources/assets/botania/models/item/thornchakram0.json b/src/main/resources/assets/botania/models/item/thorn_chakram.json similarity index 100% rename from src/main/resources/assets/botania/models/item/thornchakram0.json rename to src/main/resources/assets/botania/models/item/thorn_chakram.json diff --git a/src/main/resources/assets/botania/recipes/thornchakram_1.json b/src/main/resources/assets/botania/recipes/flare_chakram.json similarity index 71% rename from src/main/resources/assets/botania/recipes/thornchakram_1.json rename to src/main/resources/assets/botania/recipes/flare_chakram.json index 24e9d92d2..5c0d1c130 100644 --- a/src/main/resources/assets/botania/recipes/thornchakram_1.json +++ b/src/main/resources/assets/botania/recipes/flare_chakram.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:thornchakram", - "data": 1, + "item": "botania:flare_chakram", "count": 2 }, "pattern": [ @@ -18,8 +17,7 @@ "item": "minecraft:blaze_powder" }, "C": { - "item": "botania:thornchakram", - "data": 0 + "item": "botania:thorn_chakram" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/thornchakram_0.json b/src/main/resources/assets/botania/recipes/thorn_chakram.json similarity index 82% rename from src/main/resources/assets/botania/recipes/thornchakram_0.json rename to src/main/resources/assets/botania/recipes/thorn_chakram.json index 5c97477b3..83f73098a 100644 --- a/src/main/resources/assets/botania/recipes/thornchakram_0.json +++ b/src/main/resources/assets/botania/recipes/thorn_chakram.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:thornchakram", - "data": 0, + "item": "botania:thorn_chakram", "count": 2 }, "pattern": [