This commit is contained in:
modmuss50 2016-01-07 10:46:33 +00:00
commit be2f5f9e52
6 changed files with 22 additions and 24 deletions

View file

@ -110,7 +110,7 @@ dependencies {
compile name: "CraftTweaker", version: "1.8.8-3.0.0", classifier: "Dev"
// shade 'IC2-Classic-API-STANDALONE:IC2-Classic-API-STANDALONE:1.1.0.19-5:api'
compile 'RebornCore:RebornCore-1.8.9:1.3.0.+:dev'
deobfCompile "mezz.jei:jei_1.8.9:2.13.3.58"
deobfCompile "mezz.jei:jei_1.8.9:2.14.0.67"
testCompile 'junit:junit:4.12'
}

View file

@ -25,24 +25,29 @@ public abstract class BaseRecipeWrapper<T extends BaseRecipe> extends BlankRecip
inputs = new ArrayList<>();
for (ItemStack input : baseRecipe.getInputs()) {
if (baseRecipe.useOreDic()) {
int[] oreIds = OreDictionary.getOreIDs(input);
if (oreIds.length > 0) {
Set<ItemStack> itemStackSet = new HashSet<>();
for (int oreId : oreIds) {
String oreName = OreDictionary.getOreName(oreId);
List<ItemStack> ores = OreDictionary.getOres(oreName);
itemStackSet.addAll(ores);
}
inputs.add(new ArrayList<>(itemStackSet));
} else {
inputs.add(Collections.singletonList(input));
}
List<ItemStack> oreDictInputs = expandOreDict(input);
inputs.add(oreDictInputs);
} else {
inputs.add(Collections.singletonList(input));
}
}
}
private static List<ItemStack> expandOreDict(ItemStack itemStack) {
int[] oreIds = OreDictionary.getOreIDs(itemStack);
if (oreIds.length == 0) {
return Collections.singletonList(itemStack);
}
Set<ItemStack> itemStackSet = new HashSet<>();
for (int oreId : oreIds) {
String oreName = OreDictionary.getOreName(oreId);
List<ItemStack> ores = OreDictionary.getOres(oreName);
itemStackSet.addAll(ores);
}
return new ArrayList<>(itemStackSet);
}
@Override
public List<List<ItemStack>> getInputs() {
return inputs;
@ -55,7 +60,6 @@ public abstract class BaseRecipeWrapper<T extends BaseRecipe> extends BlankRecip
@Override
public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {
// TODO: make right location for each recipe
// RecipeUtil.drawInfo(minecraft, 0, 0, baseRecipe.euPerTick(), baseRecipe.tickTime());
}
}

View file

@ -30,7 +30,6 @@ import techreborn.client.container.ContainerGrinder;
import techreborn.client.container.ContainerImplosionCompressor;
import techreborn.client.container.ContainerIndustrialElectrolyzer;
import techreborn.client.container.ContainerIndustrialSawmill;
import techreborn.client.container.ContainerRollingMachine;
import techreborn.client.container.ContainerVacuumFreezer;
import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeCategory;
import techreborn.compat.jei.alloySmelter.AlloySmelterRecipeHandler;
@ -62,11 +61,6 @@ import techreborn.compat.jei.vacuumFreezer.VacuumFreezerRecipeHandler;
public class TechRebornJeiPlugin implements IModPlugin {
public static IJeiHelpers jeiHelpers;
@Override
public boolean isModLoaded() {
return true;
}
@Override
public void onJeiHelpersAvailable(IJeiHelpers jeiHelpers) {
TechRebornJeiPlugin.jeiHelpers = jeiHelpers;

View file

@ -74,7 +74,7 @@ public class GrinderRecipeCategory implements IRecipeCategory {
guiItemStacks.init(OUTPUT_SLOTS[3], false, 123, 19);
IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks();
guiFluidStacks.init(INPUT_TANKS[0], true, 4, 4, 12, 47, TileGrinder.TANK_CAPACITY, tankOverlay);
guiFluidStacks.init(INPUT_TANKS[0], true, 4, 4, 12, 47, TileGrinder.TANK_CAPACITY, true, tankOverlay);
if (recipeWrapper instanceof GrinderRecipeWrapper) {
GrinderRecipeWrapper recipe = (GrinderRecipeWrapper) recipeWrapper;

View file

@ -73,7 +73,7 @@ public class IndustrialSawmillRecipeCategory implements IRecipeCategory {
guiItemStacks.init(OUTPUT_SLOTS[2], false, 112, 19);
IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks();
guiFluidStacks.init(INPUT_TANKS[0], true, 4, 4, 12, 47, TileIndustrialSawmill.TANK_CAPACITY, tankOverlay);
guiFluidStacks.init(INPUT_TANKS[0], true, 4, 4, 12, 47, TileIndustrialSawmill.TANK_CAPACITY, true, tankOverlay);
if (recipeWrapper instanceof IndustrialSawmillRecipeWrapper) {
IndustrialSawmillRecipeWrapper recipe = (IndustrialSawmillRecipeWrapper) recipeWrapper;

View file

@ -7,7 +7,7 @@ public class ModInfo implements IModInfo {
public static final String MOD_ID = "techreborn";
public static final String MOD_VERSION = "@MODVERSION@";
public static final String MOD_DEPENDENCUIES =
"required-after:Forge@[11.15.0.1609,);required-after:reborncore";
"required-after:Forge@[11.15.0.1609,);required-after:reborncore;after:JEI@[2.14,)";
public static final String SERVER_PROXY_CLASS = "techreborn.proxies.CommonProxy";
public static final String CLIENT_PROXY_CLASS = "techreborn.proxies.ClientProxy";
public static final String GUI_FACTORY_CLASS = "techreborn.config.TechRebornGUIFactory";