mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 11:19:19 +00:00
Resolve some todos
This commit is contained in:
6 files changed
+4
-13
No files matched your search
@@ -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<ItemStack> l) {
|
||||
|
||||
@@ -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() {}
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
+1
-3
@@ -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;
|
||||
|
||||
+1
-1
@@ -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);
|
||||
|
||||
|
||||
Reference in new issue
Block a user