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

Move JEI integration to other package

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-08-02 20:36:35 +02:00
parent 64d67889a7
commit 4eb7a447f4
9 changed files with 194 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,10 +142,6 @@ public final class RefinedStorage {
PROXY.postInit(e); PROXY.postInit(e);
} }
public static boolean hasJei() {
return Loader.isModLoaded("JEI");
}
public static boolean hasTesla() { public static boolean hasTesla() {
return Loader.isModLoaded("Tesla"); return Loader.isModLoaded("Tesla");
} }

6
src/main/java/refinedstorage/gui/grid/GuiGrid.java
View File

@@ -21,7 +21,7 @@ import refinedstorage.gui.Scrollbar;
import refinedstorage.gui.grid.sorting.GridSortingName; import refinedstorage.gui.grid.sorting.GridSortingName;
import refinedstorage.gui.grid.sorting.GridSortingQuantity; import refinedstorage.gui.grid.sorting.GridSortingQuantity;
import refinedstorage.gui.sidebutton.*; import refinedstorage.gui.sidebutton.*;
import refinedstorage.jei.RefinedStorageJEIPlugin; import refinedstorage.integration.jei.JEIIntegration;
import refinedstorage.network.MessageGridCraftingClear; import refinedstorage.network.MessageGridCraftingClear;
import refinedstorage.network.MessageGridInsertHeld; import refinedstorage.network.MessageGridInsertHeld;
import refinedstorage.network.MessageGridPatternCreate; import refinedstorage.network.MessageGridPatternCreate;
@@ -394,8 +394,8 @@ public class GuiGrid extends GuiBase {
} }
private void updateJEI() { private void updateJEI() {
if (RefinedStorage.hasJei() && (grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED || grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED)) { if (JEIIntegration.isLoaded() && (grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED || grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED)) {
RefinedStorageJEIPlugin.INSTANCE.getRuntime().getItemListOverlay().setFilterText(searchField.getText()); JEIIntegration.INSTANCE.getRuntime().getItemListOverlay().setFilterText(searchField.getText());
} }
} }

4
src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java
View File

@@ -1,9 +1,9 @@
package refinedstorage.gui.sidebutton; package refinedstorage.gui.sidebutton;
import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TextFormatting;
import refinedstorage.RefinedStorage;
import refinedstorage.gui.GuiBase; import refinedstorage.gui.GuiBase;
import refinedstorage.gui.grid.GuiGrid; import refinedstorage.gui.grid.GuiGrid;
import refinedstorage.integration.jei.JEIIntegration;
import refinedstorage.tile.grid.TileGrid; import refinedstorage.tile.grid.TileGrid;
public class SideButtonGridSearchBoxMode extends SideButton { public class SideButtonGridSearchBoxMode extends SideButton {
@@ -31,7 +31,7 @@ public class SideButtonGridSearchBoxMode extends SideButton {
if (mode == TileGrid.SEARCH_BOX_MODE_NORMAL) { if (mode == TileGrid.SEARCH_BOX_MODE_NORMAL) {
mode = TileGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED; mode = TileGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED;
} else if (mode == TileGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED) { } else if (mode == TileGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED) {
if (RefinedStorage.hasJei()) { if (JEIIntegration.isLoaded()) {
mode = TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED; mode = TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED;
} else { } else {
mode = TileGrid.SEARCH_BOX_MODE_NORMAL; mode = TileGrid.SEARCH_BOX_MODE_NORMAL;

11
src/main/java/refinedstorage/jei/RefinedStorageJEIPlugin.java → src/main/java/refinedstorage/integration/jei/JEIIntegration.java
View File

@@ -1,15 +1,16 @@
package refinedstorage.jei; package refinedstorage.integration.jei;
import mezz.jei.api.IJeiRuntime; import mezz.jei.api.IJeiRuntime;
import mezz.jei.api.IModPlugin; import mezz.jei.api.IModPlugin;
import mezz.jei.api.IModRegistry; import mezz.jei.api.IModRegistry;
import mezz.jei.api.JEIPlugin; import mezz.jei.api.JEIPlugin;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.Loader;
import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageBlocks;
@JEIPlugin @JEIPlugin
public class RefinedStorageJEIPlugin implements IModPlugin { public class JEIIntegration implements IModPlugin {
public static RefinedStorageJEIPlugin INSTANCE; public static JEIIntegration INSTANCE;
private IJeiRuntime runtime; private IJeiRuntime runtime;
@@ -36,4 +37,8 @@ public class RefinedStorageJEIPlugin implements IModPlugin {
public IJeiRuntime getRuntime() { public IJeiRuntime getRuntime() {
return runtime; return runtime;
} }
public static boolean isLoaded() {
return Loader.isModLoaded("JEI");
}
} }

2
src/main/java/refinedstorage/jei/RecipeTransferHandlerGrid.java → src/main/java/refinedstorage/integration/jei/RecipeTransferHandlerGrid.java
View File

@@ -1,4 +1,4 @@
package refinedstorage.jei; package refinedstorage.integration.jei;
import mezz.jei.api.gui.IGuiIngredient; import mezz.jei.api.gui.IGuiIngredient;
import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.IRecipeLayout;

138
src/main/java/refinedstorage/jei/SoldererRecipeCategory.java → src/main/java/refinedstorage/integration/jei/SoldererRecipeCategory.java
View File

@@ -1,69 +1,69 @@
package refinedstorage.jei; package refinedstorage.integration.jei;
import mezz.jei.api.IGuiHelper; import mezz.jei.api.IGuiHelper;
import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawable;
import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IGuiItemStackGroup;
import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeCategory;
import mezz.jei.api.recipe.IRecipeWrapper; import mezz.jei.api.recipe.IRecipeWrapper;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
public class SoldererRecipeCategory implements IRecipeCategory { public class SoldererRecipeCategory implements IRecipeCategory {
public static final String ID = "refinedstorage.solderer"; public static final String ID = "refinedstorage.solderer";
private IDrawable background; private IDrawable background;
public SoldererRecipeCategory(IGuiHelper helper) { public SoldererRecipeCategory(IGuiHelper helper) {
background = helper.createDrawable(new ResourceLocation("refinedstorage", "textures/gui/solderer.png"), 8, 5, 162, 83); background = helper.createDrawable(new ResourceLocation("refinedstorage", "textures/gui/solderer.png"), 8, 5, 162, 83);
} }
@Override @Override
public String getUid() { public String getUid() {
return ID; return ID;
} }
@Override @Override
public String getTitle() { public String getTitle() {
return I18n.format("gui.refinedstorage:solderer"); return I18n.format("gui.refinedstorage:solderer");
} }
@Override @Override
public IDrawable getBackground() { public IDrawable getBackground() {
return background; return background;
} }
@Override @Override
public void drawExtras(Minecraft minecraft) { public void drawExtras(Minecraft minecraft) {
} }
@Override @Override
public void drawAnimations(Minecraft minecraft) { public void drawAnimations(Minecraft minecraft) {
} }
@Override @Override
public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) { public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) {
IGuiItemStackGroup group = recipeLayout.getItemStacks(); IGuiItemStackGroup group = recipeLayout.getItemStacks();
int x = 44 - 9; int x = 44 - 9;
int y = 20 - 6; int y = 20 - 6;
for (int i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i) {
group.init(i, true, x, y); group.init(i, true, x, y);
y += 18; y += 18;
} }
group.init(3, false, 127 - 9, 38 - 6); group.init(3, false, 127 - 9, 38 - 6);
if (recipeWrapper instanceof SoldererRecipeWrapper) { if (recipeWrapper instanceof SoldererRecipeWrapper) {
for (int i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i) {
group.set(i, (ItemStack) recipeWrapper.getInputs().get(i)); group.set(i, (ItemStack) recipeWrapper.getInputs().get(i));
} }
group.set(3, (ItemStack) recipeWrapper.getOutputs().get(0)); group.set(3, (ItemStack) recipeWrapper.getOutputs().get(0));
} }
} }
} }

68
src/main/java/refinedstorage/jei/SoldererRecipeHandler.java → src/main/java/refinedstorage/integration/jei/SoldererRecipeHandler.java
View File

@@ -1,34 +1,34 @@
package refinedstorage.jei; package refinedstorage.integration.jei;
import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeHandler;
import mezz.jei.api.recipe.IRecipeWrapper; import mezz.jei.api.recipe.IRecipeWrapper;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
public class SoldererRecipeHandler implements IRecipeHandler<SoldererRecipeWrapper> { public class SoldererRecipeHandler implements IRecipeHandler<SoldererRecipeWrapper> {
@Override @Override
public Class<SoldererRecipeWrapper> getRecipeClass() { public Class<SoldererRecipeWrapper> getRecipeClass() {
return SoldererRecipeWrapper.class; return SoldererRecipeWrapper.class;
} }
@Override @Override
public String getRecipeCategoryUid() { public String getRecipeCategoryUid() {
return SoldererRecipeCategory.ID; return SoldererRecipeCategory.ID;
} }
@Nonnull @Nonnull
@Override @Override
public String getRecipeCategoryUid(@Nonnull SoldererRecipeWrapper recipe) { public String getRecipeCategoryUid(@Nonnull SoldererRecipeWrapper recipe) {
return SoldererRecipeCategory.ID; return SoldererRecipeCategory.ID;
} }
@Override @Override
public IRecipeWrapper getRecipeWrapper(SoldererRecipeWrapper recipe) { public IRecipeWrapper getRecipeWrapper(SoldererRecipeWrapper recipe) {
return recipe; return recipe;
} }
@Override @Override
public boolean isRecipeValid(SoldererRecipeWrapper recipe) { public boolean isRecipeValid(SoldererRecipeWrapper recipe) {
return true; return true;
} }
} }

56
src/main/java/refinedstorage/jei/SoldererRecipeMaker.java → src/main/java/refinedstorage/integration/jei/SoldererRecipeMaker.java
View File

@@ -1,28 +1,28 @@
package refinedstorage.jei; package refinedstorage.integration.jei;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import refinedstorage.api.RefinedStorageAPI; import refinedstorage.api.RefinedStorageAPI;
import refinedstorage.api.solderer.ISoldererRecipe; import refinedstorage.api.solderer.ISoldererRecipe;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class SoldererRecipeMaker { public class SoldererRecipeMaker {
public static List<SoldererRecipeWrapper> getRecipes() { public static List<SoldererRecipeWrapper> getRecipes() {
List<SoldererRecipeWrapper> recipes = new ArrayList<SoldererRecipeWrapper>(); List<SoldererRecipeWrapper> recipes = new ArrayList<SoldererRecipeWrapper>();
for (ISoldererRecipe recipe : RefinedStorageAPI.SOLDERER_REGISTRY.getRecipes()) { for (ISoldererRecipe recipe : RefinedStorageAPI.SOLDERER_REGISTRY.getRecipes()) {
List<ItemStack> inputs = new ArrayList<ItemStack>(); List<ItemStack> inputs = new ArrayList<ItemStack>();
inputs.add(recipe.getRow(0)); inputs.add(recipe.getRow(0));
inputs.add(recipe.getRow(1)); inputs.add(recipe.getRow(1));
inputs.add(recipe.getRow(2)); inputs.add(recipe.getRow(2));
ItemStack output = recipe.getResult(); ItemStack output = recipe.getResult();
recipes.add(new SoldererRecipeWrapper(inputs, output)); recipes.add(new SoldererRecipeWrapper(inputs, output));
} }
return recipes; return recipes;
} }
} }

98
src/main/java/refinedstorage/jei/SoldererRecipeWrapper.java → src/main/java/refinedstorage/integration/jei/SoldererRecipeWrapper.java
View File

@@ -1,49 +1,49 @@
package refinedstorage.jei; package refinedstorage.integration.jei;
import mezz.jei.plugins.vanilla.VanillaRecipeWrapper; import mezz.jei.plugins.vanilla.VanillaRecipeWrapper;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
public class SoldererRecipeWrapper extends VanillaRecipeWrapper { public class SoldererRecipeWrapper extends VanillaRecipeWrapper {
private List<ItemStack> inputs; private List<ItemStack> inputs;
private ItemStack output; private ItemStack output;
public SoldererRecipeWrapper(List<ItemStack> inputs, ItemStack output) { public SoldererRecipeWrapper(List<ItemStack> inputs, ItemStack output) {
this.inputs = inputs; this.inputs = inputs;
this.output = output; this.output = output;
} }
@Override @Override
public List<ItemStack> getInputs() { public List<ItemStack> getInputs() {
return inputs; return inputs;
} }
@Override @Override
public List<ItemStack> getOutputs() { public List<ItemStack> getOutputs() {
return Collections.singletonList(output); return Collections.singletonList(output);
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (!(obj instanceof SoldererRecipeWrapper)) { if (!(obj instanceof SoldererRecipeWrapper)) {
return false; return false;
} }
SoldererRecipeWrapper other = (SoldererRecipeWrapper) obj; SoldererRecipeWrapper other = (SoldererRecipeWrapper) obj;
for (int i = 0; i < inputs.size(); i++) { for (int i = 0; i < inputs.size(); i++) {
if (!ItemStack.areItemStacksEqual(inputs.get(i), other.inputs.get(i))) { if (!ItemStack.areItemStacksEqual(inputs.get(i), other.inputs.get(i))) {
return false; return false;
} }
} }
return ItemStack.areItemStacksEqual(output, other.output); return ItemStack.areItemStacksEqual(output, other.output);
} }
@Override @Override
public String toString() { public String toString() {
return inputs + " = " + output; return inputs + " = " + output;
} }
} }