From 9d78aca015770da24985b40c5e4dd90e3149a651 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 20 Jul 2017 23:42:45 -0500 Subject: [PATCH] Clean up some todos --- .../java/vazkii/botania/api/BotaniaAPI.java | 24 ------------------- .../java/vazkii/botania/api/package-info.java | 2 +- .../item/equipment/bauble/ItemBauble.java | 6 ++--- .../botania/common/network/PacketDodge.java | 4 +++- .../resources/assets/botania/lang/en_us.lang | 1 + 5 files changed, 8 insertions(+), 29 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index f2d6f67ba..b67e12f15 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -647,30 +647,6 @@ public final class BotaniaAPI { looniumBlacklist.add(item); } - /** - * Gets the last recipe to have been added to the recipe list. - */ - public static IRecipe getLatestAddedRecipe() { - // todo 1.12 change this hack to just look all the recipes up by id - return null; - /*List list = CraftingManager.getInstance().getRecipeList(); - return list.get(list.size() - 1);*/ - } - - /** - * Gets the last x recipes added to the recipe list. - */ - public static List getLatestAddedRecipes(int x) { - // todo 1.12 change this hack to just look all the recipes up by id - return Collections.emptyList(); - /*List list = CraftingManager.getInstance().getRecipeList(); - List newList = new ArrayList<>(); - for(int i = x - 1; i >= 0; i--) - newList.add(list.get(list.size() - 1 - i)); - - return newList;*/ - } - /** * Registers a Wiki provider for a mod so it uses that instead of the fallback * FTB wiki. diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index a2153e5d2..799958825 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "86", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "87", provides = "BotaniaAPI") package vazkii.botania.api; import net.minecraftforge.fml.common.API; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index a0ce1b06b..339c2820b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -150,10 +150,10 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt @Override public void onEquipped(ItemStack stack, EntityLivingBase player) { if(player != null) { - if(!player.world.isRemote) + if(!player.world.isRemote) { player.world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.equipBauble, SoundCategory.PLAYERS, 0.1F, 1.3F); - - // todo 1.12 advancement trigger for baubles (ideally baubles adds one, not us..) + PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/bauble_wear"), "code_triggered"); + } onEquippedOrLoadedIntoWorld(stack, player); setLastPlayerHashcode(stack, player.hashCode()); diff --git a/src/main/java/vazkii/botania/common/network/PacketDodge.java b/src/main/java/vazkii/botania/common/network/PacketDodge.java index 1474644c8..8fc582764 100644 --- a/src/main/java/vazkii/botania/common/network/PacketDodge.java +++ b/src/main/java/vazkii/botania/common/network/PacketDodge.java @@ -16,6 +16,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; @@ -45,7 +46,8 @@ public class PacketDodge implements IMessage { if(ringStack.isEmpty() || !(ringStack.getItem() instanceof ItemDodgeRing)) { ringStack = baublesInv.getStackInSlot(2); if(ringStack.isEmpty() || !(ringStack.getItem() instanceof ItemDodgeRing)) - ctx.getServerHandler().disconnect(new TextComponentString("Invalid Dodge Packet")); // todo 1.12 textcomponenttranslation + ctx.getServerHandler().disconnect(new TextComponentTranslation("botaniamisc.invalidDodge")); + return; } player.addExhaustion(0.3F); diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 93a1c1289..9c560f9dc 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -155,6 +155,7 @@ botaniamisc.altarRefill1=add back the last recipe botaniamisc.santaweaveInfo=Manaweave, changed up for the &cs&fe&ca&fs&co&fn botaniamisc.enterToView=^ Press ENTER to view ^ botaniamisc.scaleChange=Change Scale +botaniamisc.invalidDodge=Invalid Dodge Packet # NEI INTEGRATION botania.nei.brewery=Botanical Brewery