dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update forge, better JEI checking

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-04-03 22:52:49 +02:00
parent 789a46f39e
commit fe7c47928d
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -17,7 +17,7 @@ group = "refinedstorage"
archivesBaseName = "refinedstorage" archivesBaseName = "refinedstorage"
minecraft { minecraft {
version = "1.9-12.16.0.1826-1.9" version = "1.9-12.16.0.1832-1.9"
runDir = "run" runDir = "run"
useDepAts = true useDepAts = true
mappings = "snapshot_20160312" mappings = "snapshot_20160312"

5
src/main/java/refinedstorage/RefinedStorage.java
View File

@@ -3,6 +3,7 @@ package refinedstorage;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.Mod.Instance; import net.minecraftforge.fml.common.Mod.Instance;
@@ -54,4 +55,8 @@ public final class RefinedStorage {
public void postInit(FMLPostInitializationEvent e) { public void postInit(FMLPostInitializationEvent e) {
PROXY.postInit(e); PROXY.postInit(e);
} }
public static boolean hasJei() {
return Loader.isModLoaded("JEI");
}
} }

4
src/main/java/refinedstorage/gui/GuiGrid.java
View File

@@ -58,7 +58,7 @@ public class GuiGrid extends GuiBase {
addSideButton(new SideButtonGridSortingDirection(grid)); addSideButton(new SideButtonGridSortingDirection(grid));
addSideButton(new SideButtonGridSortingType(grid)); addSideButton(new SideButtonGridSortingType(grid));
if (PluginRefinedStorage.isJeiLoaded()) { if (RefinedStorage.hasJei()) {
addSideButton(new SideButtonGridSearchBoxMode(grid)); addSideButton(new SideButtonGridSearchBoxMode(grid));
} }
@@ -307,7 +307,7 @@ public class GuiGrid extends GuiBase {
@Override @Override
protected void keyTyped(char character, int keyCode) throws IOException { protected void keyTyped(char character, int keyCode) throws IOException {
if (!checkHotbarKeys(keyCode) && searchField.textboxKeyTyped(character, keyCode)) { if (!checkHotbarKeys(keyCode) && searchField.textboxKeyTyped(character, keyCode)) {
if (PluginRefinedStorage.isJeiLoaded() && grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED) { if (RefinedStorage.hasJei() && grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED) {
PluginRefinedStorage.INSTANCE.getRuntime().getItemListOverlay().setFilterText(searchField.getText()); PluginRefinedStorage.INSTANCE.getRuntime().getItemListOverlay().setFilterText(searchField.getText());
} }
} else { } else {

4
src/main/java/refinedstorage/jei/PluginRefinedStorage.java
View File

@@ -40,8 +40,4 @@ public class PluginRefinedStorage implements IModPlugin {
public IJeiRuntime getRuntime() { public IJeiRuntime getRuntime() {
return runtime; return runtime;
} }
public static boolean isJeiLoaded() {
return INSTANCE != null;
}
} }