From fa2533a4f14470030392ed9435fbf9bdcea0d853 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 7 Jan 2017 12:48:35 -0600 Subject: [PATCH] Resolve some todos --- .../vazkii/botania/client/gui/box/ContainerBaubleBox.java | 6 ------ .../vazkii/botania/common/core/handler/SheddingHandler.java | 1 - .../vazkii/botania/common/crafting/ModPetalRecipes.java | 2 +- src/main/java/vazkii/botania/common/item/ItemLexicon.java | 2 +- .../item/equipment/tool/manasteel/ItemManasteelAxe.java | 4 +--- .../item/equipment/tool/manasteel/ItemManasteelPick.java | 2 +- 6 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java index 7a792010c..6b7e8c2b0 100644 --- a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java @@ -78,12 +78,6 @@ public class ContainerBaubleBox extends Container { || player.getHeldItemOffhand() == baubleBoxInv.box; } - @Override - public void onContainerClosed(EntityPlayer player) { - super.onContainerClosed(player); - // TODO do we need anything here? - } - @SideOnly(Side.CLIENT) @Override public void setAll(List l) { diff --git a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java index a68269a13..a34b39d4d 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -30,7 +30,6 @@ import net.minecraftforge.fml.common.registry.ForgeRegistries; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lexicon.page.PageShedding; -// todo 1.11 made this use registry names, but that's incompatible with the old names, work out migration or use old names instead public final class SheddingHandler { private SheddingHandler() {} diff --git a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java index 301dc7483..480b2119d 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -124,7 +124,7 @@ public final class ModPetalRecipes { marimorphosisRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MARIMORPHOSIS), gray, yellow, green, red, runeEarth, runeFire, redstoneRoot); bubbellRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BUBBELL), cyan, cyan, lightBlue, lightBlue, blue, blue, runeWater, runeSummer, pixieDust); solegnoliaRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SOLEGNOLIA), brown, brown, red, blue, redstoneRoot); - bergamuteRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BERGAMUTE), orange, green, green, redstoneRoot); // todo temporary + bergamuteRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BERGAMUTE), orange, green, green, redstoneRoot); ItemStack stack = new ItemStack(Items.SKULL, 1, 3); ItemNBTHelper.setString(stack, "SkullOwner", "Vazkii"); diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 3c0ddfb04..a19032441 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -191,7 +191,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { if(ticks > 0 && entity instanceof EntityPlayer) { skipSound = ticks < 5; if(ticks == 1) - onItemRightClick(world, (EntityPlayer) entity, EnumHand.MAIN_HAND); // todo 1.11 this won't work + onItemRightClick(world, (EntityPlayer) entity, EnumHand.MAIN_HAND); setQueueTicks(stack, ticks - 1); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java index a4c6a31b7..ed1d653d7 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java @@ -93,11 +93,9 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab ItemStack stackAt = player.inventory.getStackInSlot(i); if(!stackAt.isEmpty() && SAPLING_PATTERN.matcher(stackAt.getItem().getUnlocalizedName()).find()) { ItemStack saveHeldStack = player.getHeldItem(hand); - player.setHeldItem(hand, stackAt); // todo 1.11 test if this works + player.setHeldItem(hand, stackAt); EnumActionResult did = stackAt.getItem().onItemUse(player, world, pos, hand, side, sx, sy, sz); player.setHeldItem(hand, saveHeldStack); - if(stackAt.isEmpty()) - player.inventory.setInventorySlotContents(i, ItemStack.EMPTY); ItemsRemainingRenderHandler.set(player, new ItemStack(Blocks.SAPLING), SAPLING_PATTERN); return did; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java index 1aa10e12d..f4e95eed1 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java @@ -89,7 +89,7 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS ItemStack stackAt = player.inventory.getStackInSlot(i); if(!stackAt.isEmpty() && TORCH_PATTERN.matcher(stackAt.getItem().getUnlocalizedName()).find()) { ItemStack saveHeldStack = player.getHeldItem(hand); - player.setHeldItem(hand, stackAt); // todo 1.11 test if this works + player.setHeldItem(hand, stackAt); EnumActionResult did = stackAt.getItem().onItemUse(player, world, pos, hand, side, sx, sy, sz); player.setHeldItem(hand, saveHeldStack);