add factories to jei catalysts if enabled

This commit is contained in:
Thiakil committed 2018-05-05 20:15:01 +08:00
1 parent c18501a099
commit 86d232d9db
3 files changed
+33 -5

No files matched your search

@@ -70,6 +70,7 @@ import mekanism.client.jei.machine.other.ThermalEvaporationRecipeWrapper;
import mekanism.common.Mekanism;
import mekanism.common.MekanismBlocks;
import mekanism.common.MekanismItems;
import mekanism.common.Tier;
import mekanism.common.base.IFactory;
import mekanism.common.base.IFactory.RecipeType;
import mekanism.common.base.ITierItem;
@@ -105,6 +106,7 @@ import mekanism.common.recipe.machines.SmeltingRecipe;
import mekanism.common.recipe.machines.SolarNeutronRecipe;
import mekanism.common.recipe.machines.ThermalEvaporationRecipe;
import mekanism.common.recipe.machines.WasherRecipe;
import mekanism.common.util.MekanismUtils;
import mezz.jei.api.IModPlugin;
import mezz.jei.api.IModRegistry;
import mezz.jei.api.ISubtypeRegistry;
@@ -371,7 +373,25 @@ public class MekanismJEI implements IModPlugin
private void registerRecipeItem(IModRegistry registry, MachineType type)
{
registry.addRecipeCatalyst(type.getStack(), "mekanism." + type.getName());
String category = "mekanism." + type.getName();
registry.addRecipeCatalyst(type.getStack(), category);
RecipeType factoryType = null;
for (RecipeType t : RecipeType.values()){
if (t.getType() == type){
factoryType = t;
break;
}
}
if (factoryType != null)
{
for (Tier.FactoryTier tier : Tier.FactoryTier.values())
{
if(tier.machineType.isEnabled())
{
registry.addRecipeCatalyst(MekanismUtils.getFactory(tier, factoryType), category);
}
}
}
}
private void addRecipes(IModRegistry registry, Recipe type, Class<?> recipe, Class<? extends IRecipeWrapper> wrapper, String recipeCategoryUid)
+7 -4
View File
@@ -7,6 +7,7 @@ import java.util.List;
import java.util.Locale;
import mekanism.api.EnumColor;
import mekanism.common.block.states.BlockStateMachine;
import mekanism.common.util.LangUtils;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.ResourceLocation;
@@ -214,12 +215,13 @@ public final class Tier
public enum FactoryTier
{
BASIC(3, new ResourceLocation("mekanism", "gui/factory/GuiBasicFactory.png")),
ADVANCED(5, new ResourceLocation("mekanism", "gui/factory/GuiAdvancedFactory.png")),
ELITE(7, new ResourceLocation("mekanism", "gui/factory/GuiEliteFactory.png"));
BASIC(3, new ResourceLocation("mekanism", "gui/factory/GuiBasicFactory.png"), BlockStateMachine.MachineType.BASIC_FACTORY),
ADVANCED(5, new ResourceLocation("mekanism", "gui/factory/GuiAdvancedFactory.png"), BlockStateMachine.MachineType.ADVANCED_FACTORY),
ELITE(7, new ResourceLocation("mekanism", "gui/factory/GuiEliteFactory.png"), BlockStateMachine.MachineType.ELITE_FACTORY);
public int processes;
public ResourceLocation guiLocation;
public final BlockStateMachine.MachineType machineType;
public static FactoryTier getFromName(String tierName)
{
@@ -240,10 +242,11 @@ public final class Tier
return BaseTier.values()[ordinal()];
}
FactoryTier(int process, ResourceLocation gui)
FactoryTier(int process, ResourceLocation gui, BlockStateMachine.MachineType machineTypeIn)
{
processes = process;
guiLocation = gui;
machineType = machineTypeIn;
}
}
@@ -328,5 +328,10 @@ public interface IFactory
{
return name().toLowerCase(Locale.ROOT);
}
public MachineType getType()
{
return type;
}
}
}