From cb482e82c3d73e05a200f0711faf4014a465972a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 28 Dec 2017 20:28:15 -0600 Subject: [PATCH] JEI cleanups thanks to Java8 --- .../integration/jei/JEIBotaniaPlugin.java | 8 -------- .../jei/brewery/BreweryRecipeCategory.java | 16 ---------------- .../jei/brewery/BreweryRecipeWrapper.java | 17 ----------------- .../elventrade/ElvenTradeRecipeCategory.java | 11 ----------- .../jei/elventrade/ElvenTradeRecipeWrapper.java | 15 --------------- .../PetalApothecaryRecipeCategory.java | 11 ----------- .../PetalApothecaryRecipeWrapper.java | 15 --------------- .../jei/puredaisy/PureDaisyRecipeCategory.java | 11 ----------- .../jei/puredaisy/PureDaisyRecipeWrapper.java | 15 --------------- .../runicaltar/RunicAltarRecipeCategory.java | 11 ----------- .../jei/runicaltar/RunicAltarRecipeWrapper.java | 11 ----------- 11 files changed, 141 deletions(-) diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index b27c44c0d..abb1432a7 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -8,12 +8,10 @@ */ package vazkii.botania.client.integration.jei; -import mezz.jei.api.IJeiRuntime; import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.ISubtypeRegistry; import mezz.jei.api.JEIPlugin; -import mezz.jei.api.ingredients.IModIngredientRegistration; import mezz.jei.api.recipe.IRecipeCategoryRegistration; import mezz.jei.api.recipe.VanillaRecipeCategoryUid; import net.minecraft.item.Item; @@ -55,9 +53,6 @@ public class JEIBotaniaPlugin implements IModPlugin { subtypeRegistry.registerSubtypeInterpreter(Item.getItemFromBlock(ModBlocks.floatingSpecialFlower), ItemBlockSpecialFlower::getType); } - @Override - public void registerIngredients(@Nonnull IModIngredientRegistration registry) {} - @Override public void registerCategories(IRecipeCategoryRegistration registry) { registry.addRecipeCategories( @@ -109,7 +104,4 @@ public class JEIBotaniaPlugin implements IModPlugin { registry.getRecipeTransferRegistry().addRecipeTransferHandler(ContainerCraftingHalo.class, VanillaRecipeCategoryUid.CRAFTING, 1, 9, 10, 36); } - @Override - public void onRuntimeAvailable(@Nonnull IJeiRuntime jeiRuntime) {} - } diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index 16cc6fe97..1ae6b3810 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -62,16 +62,6 @@ public class BreweryRecipeCategory implements IRecipeCategory { return background; } - @Nullable - @Override - public IDrawable getIcon() { - return null; - } - - @Override - public void drawExtras(@Nonnull Minecraft minecraft) { - } - @Override public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper, @Nonnull IIngredients ingredients) { if(!(recipeWrapper instanceof BreweryRecipeWrapper)) @@ -94,10 +84,4 @@ public class BreweryRecipeCategory implements IRecipeCategory { recipeLayout.getItemStacks().init(7, false, 87, 41); recipeLayout.getItemStacks().set(7, ingredients.getOutputs(ItemStack.class).get(0)); } - - @Override - public List getTooltipStrings(int mouseX, int mouseY) { - return new ArrayList(); - } - } diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java index a680d2d63..0788c3c9e 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java @@ -47,21 +47,4 @@ public class BreweryRecipeWrapper implements IRecipeWrapper { ingredients.setInputLists(ItemStack.class, input); ingredients.setOutputLists(ItemStack.class, ImmutableList.of(output)); } - - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { - } - - - @Nonnull - @Override - public List getTooltipStrings(int mouseX, int mouseY) { - return ImmutableList.of(); - } - - @Override - public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton) { - return false; - } - } diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java index 4451b1f64..a1ae05674 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -64,12 +64,6 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { return background; } - @Nullable - @Override - public IDrawable getIcon() { - return null; - } - @Override public void drawExtras(@Nonnull Minecraft minecraft) { GlStateManager.enableAlpha(); @@ -114,11 +108,6 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { } } - @Override - public List getTooltipStrings(int mouseX, int mouseY) { - return new ArrayList(); - } - @Nonnull @Override public String getModName() { diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java index e32017b8e..d00ccf37e 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java @@ -44,19 +44,4 @@ public class ElvenTradeRecipeWrapper implements IRecipeWrapper { ingredients.setInputLists(ItemStack.class, input); ingredients.setOutputs(ItemStack.class, outputs); } - - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {} - - @Nonnull - @Override - public List getTooltipStrings(int mouseX, int mouseY) { - return ImmutableList.of(); - } - - @Override - public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton) { - return false; - } - } diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index 7ce6b46bf..ddf0ee744 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -61,12 +61,6 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { return background; } - @Nullable - @Override - public IDrawable getIcon() { - return null; - } - @Override public void drawExtras(@Nonnull Minecraft minecraft) { GlStateManager.enableAlpha(); @@ -106,11 +100,6 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { return new Point((int) newX, (int) newY); } - @Override - public List getTooltipStrings(int mouseX, int mouseY) { - return new ArrayList(); - } - @Nonnull @Override public String getModName() { diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java index 8a28043bd..05eab87a4 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java @@ -44,19 +44,4 @@ public class PetalApothecaryRecipeWrapper implements IRecipeWrapper { ingredients.setOutput(ItemStack.class, output); } - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { - } - - @Nonnull - @Override - public List getTooltipStrings(int mouseX, int mouseY) { - return ImmutableList.of(); - } - - @Override - public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton) { - return false; - } - } diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index 4bd4ba35d..c14b7277b 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -61,12 +61,6 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { return background; } - @Nullable - @Override - public IDrawable getIcon() { - return null; - } - @Override public void drawExtras(@Nonnull Minecraft minecraft) { GlStateManager.enableAlpha(); @@ -104,11 +98,6 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { } } - @Override - public List getTooltipStrings(int mouseX, int mouseY) { - return new ArrayList(); - } - @Nonnull @Override public String getModName() { diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java index 60a23806b..b47451c7b 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java @@ -66,19 +66,4 @@ public class PureDaisyRecipeWrapper implements IRecipeWrapper { } } - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { - } - - @Nonnull - @Override - public List getTooltipStrings(int mouseX, int mouseY) { - return ImmutableList.of(); - } - - @Override - public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton) { - return false; - } - } diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java index bdc584ece..433097f60 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java @@ -60,12 +60,6 @@ public class RunicAltarRecipeCategory implements IRecipeCategory { return background; } - @Nullable - @Override - public IDrawable getIcon() { - return null; - } - @Override public void drawExtras(@Nonnull Minecraft minecraft) { GlStateManager.enableAlpha(); @@ -107,11 +101,6 @@ public class RunicAltarRecipeCategory implements IRecipeCategory { return new Point((int) newX, (int) newY); } - @Override - public List getTooltipStrings(int mouseX, int mouseY) { - return new ArrayList(); - } - @Nonnull @Override public String getModName() { diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java index f29311e6f..d6d691c89 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java @@ -57,15 +57,4 @@ public class RunicAltarRecipeWrapper implements IRecipeWrapper { GlStateManager.disableAlpha(); } - @Nonnull - @Override - public List getTooltipStrings(int mouseX, int mouseY) { - return ImmutableList.of(); - } - - @Override - public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton) { - return false; - } - }