Safety check in platform model, update JEI

This commit is contained in:
Vincent Lee committed 2016-02-08 10:18:12 -06:00
1 parent 2b57a2232d
commit 972d0e5bf6
9 files changed
+101 -7

No files matched your search

@@ -10,6 +10,7 @@ package vazkii.botania.client.integration.jei;
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 class JEIBotaniaPlugin implements IModPlugin {
public void onRecipeRegistryAvailable(IRecipeRegistry recipeRegistry) {
}
@Override
public void onRuntimeAvailable(IJeiRuntime jeiRuntime) {
}
}
@@ -18,6 +18,7 @@ import vazkii.botania.api.recipe.RecipeBrew;
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 class BreweryRecipeWrapper implements IRecipeWrapper {
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;
}
}
@@ -17,6 +17,7 @@ import net.minecraftforge.oredict.OreDictionary;
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 class ElvenTradeRecipeWrapper implements IRecipeWrapper {
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;
}
}
@@ -21,6 +21,7 @@ import vazkii.botania.common.block.ModBlocks;
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 class ManaPoolRecipeWrapper implements IRecipeWrapper {
@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 class ManaPoolRecipeWrapper implements IRecipeWrapper {
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;
}
}
@@ -17,6 +17,7 @@ import net.minecraftforge.oredict.OreDictionary;
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 class PetalApothecaryRecipeWrapper implements IRecipeWrapper {
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;
}
}
@@ -19,6 +19,7 @@ import net.minecraftforge.oredict.OreDictionary;
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 class PureDaisyRecipeWrapper implements IRecipeWrapper {
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;
}
}
@@ -20,6 +20,7 @@ import vazkii.botania.client.core.handler.HUDHandler;
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 class RunicAltarRecipeWrapper implements IRecipeWrapper {
@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 class RunicAltarRecipeWrapper implements IRecipeWrapper {
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;
}
}
@@ -22,6 +22,7 @@ import net.minecraftforge.client.MinecraftForgeClient;
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;
@@ -29,6 +30,9 @@ 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);