Safety check in platform model, update JEI

Author: williewillus

build.gradle

@@ -70,8 +70,7 @@ dependencies {
     //compile "codechicken:CodeChickenCore:1.8-1.0.5.36:dev"
     //compile "codechicken:NotEnoughItems:1.8-1.0.5.104:dev"
     //compile "codechicken:ForgeMultipart:1.7.10-1.1.1.320:dev"
-
-    deobfCompile "mezz.jei:jei_1.8.9:2.13.7.64"
+    deobfCompile "mezz.jei:jei_1.8.9:2.25.7.145"
 
     //and a bit more for SCP
     sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29"

src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java

@@ -10,6 +10,7 @@
 
 import mezz.jei.api.IItemRegistry;
 import mezz.jei.api.IJeiHelpers;
+import mezz.jei.api.IJeiRuntime;
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.IModRegistry;
 import mezz.jei.api.IRecipeRegistry;
@@ -33,11 +34,6 @@ public class JEIBotaniaPlugin implements IModPlugin {
 
 	private IJeiHelpers jeiHelpers;
 
-	@Override
-	public boolean isModLoaded() {
-		return true;
-	}
-
 	@Override
 	public void onJeiHelpersAvailable(IJeiHelpers jeiHelpers) {
 		this.jeiHelpers = jeiHelpers;
@@ -79,4 +75,8 @@ public void register(IModRegistry registry) {
 	public void onRecipeRegistryAvailable(IRecipeRegistry recipeRegistry) {
 	}
 
+	@Override
+	public void onRuntimeAvailable(IJeiRuntime jeiRuntime) {
+	}
+
 }

src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java

@@ -18,6 +18,7 @@
 import vazkii.botania.common.item.ModItems;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.List;
 
 public class BreweryRecipeWrapper implements IRecipeWrapper {
@@ -66,8 +67,22 @@ public List<FluidStack> getFluidOutputs() {
 	public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {
 	}
 
+	@Override
+	public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
+	}
+
 	@Override
 	public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {
 	}
 
+	@Override
+	public List<String> getTooltipStrings(int mouseX, int mouseY) {
+		return ImmutableList.of();
+	}
+
+	@Override
+	public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton) {
+		return false;
+	}
+
 }

src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java

@@ -17,6 +17,7 @@
 import vazkii.botania.api.recipe.RecipeElvenTrade;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.List;
 
 public class ElvenTradeRecipeWrapper implements IRecipeWrapper {
@@ -63,8 +64,22 @@ public List<FluidStack> getFluidOutputs() {
 	public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {
 	}
 
+	@Override
+	public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
+	}
+
 	@Override
 	public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {
 	}
 
+	@Override
+	public List<String> getTooltipStrings(int mouseX, int mouseY) {
+		return ImmutableList.of();
+	}
+
+	@Override
+	public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton) {
+		return false;
+	}
+
 }

src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java

@@ -21,6 +21,7 @@
 import vazkii.botania.common.block.tile.mana.TilePool;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.List;
 
 public class ManaPoolRecipeWrapper implements IRecipeWrapper {
@@ -71,6 +72,10 @@ public List<FluidStack> getFluidOutputs() {
 
 	@Override
 	public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {
+	}
+
+	@Override
+	public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
 		GlStateManager.enableAlpha();
 		HUDHandler.renderManaBar(28, 50, 0x0000FF, 0.75F, mana, TilePool.MAX_MANA / 10);
 		GlStateManager.disableAlpha();
@@ -80,4 +85,15 @@ public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHe
 	public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {
 	}
 
+	@Nullable
+	@Override
+	public List<String> getTooltipStrings(int mouseX, int mouseY) {
+		return ImmutableList.of();
+	}
+
+	@Override
+	public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton) {
+		return false;
+	}
+
 }

src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java

@@ -17,6 +17,7 @@
 import vazkii.botania.api.recipe.RecipePetals;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.List;
 
 public class PetalApothecaryRecipeWrapper implements IRecipeWrapper {
@@ -62,8 +63,22 @@ public List<FluidStack> getFluidOutputs() {
 	public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {
 	}
 
+	@Override
+	public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
+	}
+
 	@Override
 	public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {
 	}
 
+	@Override
+	public List<String> getTooltipStrings(int mouseX, int mouseY) {
+		return ImmutableList.of();
+	}
+
+	@Override
+	public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton) {
+		return false;
+	}
+
 }

src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java

@@ -19,6 +19,7 @@
 import vazkii.botania.api.recipe.RecipePureDaisy;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.List;
 
 public class PureDaisyRecipeWrapper implements IRecipeWrapper {
@@ -72,8 +73,22 @@ public List<FluidStack> getFluidOutputs() {
 	public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {
 	}
 
+	@Override
+	public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
+	}
+
 	@Override
 	public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {
 	}
 
+	@Override
+	public List<String> getTooltipStrings(int mouseX, int mouseY) {
+		return ImmutableList.of();
+	}
+
+	@Override
+	public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton) {
+		return false;
+	}
+
 }

src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java

@@ -20,6 +20,7 @@
 import vazkii.botania.common.block.tile.mana.TilePool;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.List;
 
 public class RunicAltarRecipeWrapper implements IRecipeWrapper {
@@ -66,6 +67,10 @@ public List<FluidStack> getFluidOutputs() {
 
 	@Override
 	public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {
+	}
+
+	@Override
+	public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
 		GlStateManager.enableAlpha();
 		HUDHandler.renderManaBar(28, 113, 0x0000FF, 0.75F, manaUsage, TilePool.MAX_MANA / 10);
 		GlStateManager.disableAlpha();
@@ -75,4 +80,14 @@ public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHe
 	public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {
 	}
 
+	@Override
+	public List<String> getTooltipStrings(int mouseX, int mouseY) {
+		return ImmutableList.of();
+	}
+
+	@Override
+	public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton) {
+		return false;
+	}
+
 }

src/main/java/vazkii/botania/client/model/PlatformModel.java

@@ -22,13 +22,17 @@
 import net.minecraftforge.client.model.ISmartBlockModel;
 import net.minecraftforge.common.property.IExtendedBlockState;
 import vazkii.botania.api.state.BotaniaStateProps;
+import vazkii.botania.common.block.ModBlocks;
 
 import java.util.List;
 
 public class PlatformModel implements ISmartBlockModel {
 
 	@Override
 	public IBakedModel handleBlockState(IBlockState state) {
+		if(state.getBlock() != ModBlocks.platform)
+			return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel();
+
 		EnumWorldBlockLayer layer = MinecraftForgeClient.getRenderLayer();
 		IBlockState heldState = ((IExtendedBlockState) state).getValue(BotaniaStateProps.HELD_STATE);