mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Added chance machine JEI support, added fuel display to advanced machine JEI handlers, add classes for remaining machinery
This commit is contained in:
1 parent
bdc071582f
commit
a2143cc81c
46 files changed
+513
-8
No files matched your search
@@ -8,6 +8,7 @@ import mekanism.client.gui.GuiCombiner;
|
||||
import mekanism.client.gui.GuiCrusher;
|
||||
import mekanism.client.gui.GuiEnrichmentChamber;
|
||||
import mekanism.client.gui.GuiOsmiumCompressor;
|
||||
import mekanism.client.gui.GuiPrecisionSawmill;
|
||||
import mekanism.client.gui.GuiPurificationChamber;
|
||||
import mekanism.client.gui.element.GuiProgress.ProgressBar;
|
||||
import mekanism.client.jei.crafting.ShapedMekanismRecipeHandler;
|
||||
@@ -15,6 +16,9 @@ import mekanism.client.jei.crafting.ShapelessMekanismRecipeHandler;
|
||||
import mekanism.client.jei.machine.AdvancedMachineRecipeCategory;
|
||||
import mekanism.client.jei.machine.AdvancedMachineRecipeHandler;
|
||||
import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper;
|
||||
import mekanism.client.jei.machine.ChanceMachineRecipeCategory;
|
||||
import mekanism.client.jei.machine.ChanceMachineRecipeHandler;
|
||||
import mekanism.client.jei.machine.ChanceMachineRecipeWrapper;
|
||||
import mekanism.client.jei.machine.MachineRecipeCategory;
|
||||
import mekanism.client.jei.machine.MachineRecipeHandler;
|
||||
import mekanism.client.jei.machine.MachineRecipeWrapper;
|
||||
@@ -30,11 +34,14 @@ import mekanism.client.jei.machine.basic.CrusherRecipeHandler;
|
||||
import mekanism.client.jei.machine.basic.CrusherRecipeWrapper;
|
||||
import mekanism.client.jei.machine.basic.EnrichmentRecipeHandler;
|
||||
import mekanism.client.jei.machine.basic.EnrichmentRecipeWrapper;
|
||||
import mekanism.client.jei.machine.chance.PrecisionSawmillRecipeHandler;
|
||||
import mekanism.client.jei.machine.chance.PrecisionSawmillRecipeWrapper;
|
||||
import mekanism.common.MekanismBlocks;
|
||||
import mekanism.common.MekanismItems;
|
||||
import mekanism.common.recipe.RecipeHandler.Recipe;
|
||||
import mekanism.common.recipe.machines.AdvancedMachineRecipe;
|
||||
import mekanism.common.recipe.machines.BasicMachineRecipe;
|
||||
import mekanism.common.recipe.machines.ChanceMachineRecipe;
|
||||
import mekanism.common.util.ItemDataUtils;
|
||||
import mezz.jei.api.IItemRegistry;
|
||||
import mezz.jei.api.IJeiHelpers;
|
||||
@@ -79,6 +86,8 @@ public class MekanismJEI implements IModPlugin
|
||||
registerAdvancedMachine(registry, Recipe.PURIFICATION_CHAMBER, "tile.MachineBlock.PurificationChamber.name", ProgressBar.RED, PurificationChamberRecipeHandler.class, PurificationChamberRecipeWrapper.class);
|
||||
registerAdvancedMachine(registry, Recipe.OSMIUM_COMPRESSOR, "tile.MachineBlock.OsmiumCompressor.name", ProgressBar.RED, OsmiumCompressorRecipeHandler.class, OsmiumCompressorRecipeWrapper.class);
|
||||
registerAdvancedMachine(registry, Recipe.CHEMICAL_INJECTION_CHAMBER, "nei.chemicalInjectionChamber", ProgressBar.YELLOW, ChemicalInjectionChamberRecipeHandler.class, ChemicalInjectionChamberRecipeWrapper.class);
|
||||
|
||||
registerChanceMachine(registry, Recipe.PRECISION_SAWMILL, "tile.MachineBlock2.PrecisionSawmill.name", ProgressBar.PURPLE, PrecisionSawmillRecipeHandler.class, PrecisionSawmillRecipeWrapper.class);
|
||||
} catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
@@ -89,7 +98,9 @@ public class MekanismJEI implements IModPlugin
|
||||
registry.addRecipeClickArea(GuiCombiner.class, 79, 40, 24, 7, "mekanism.combiner");
|
||||
registry.addRecipeClickArea(GuiPurificationChamber.class, 79, 40, 24, 7, "mekanism.purification_chamber");
|
||||
registry.addRecipeClickArea(GuiOsmiumCompressor.class, 79, 40, 24, 7, "mekanism.osmium_compressor");
|
||||
registry.addRecipeClickArea(GuiChemicalInjectionChamber.class, 79, 40, 24, 7, "mekanism:chemical_injection_chamber");
|
||||
registry.addRecipeClickArea(GuiChemicalInjectionChamber.class, 79, 40, 24, 7, "mekanism.chemical_injection_chamber");
|
||||
|
||||
registry.addRecipeClickArea(GuiPrecisionSawmill.class, 79, 40, 24, 7, "mekanism.precision_sawmill");
|
||||
}
|
||||
|
||||
private void registerBasicMachine(IModRegistry registry, Recipe recipe, String unlocalized, ProgressBar bar, Class<? extends MachineRecipeHandler> handler, Class<? extends MachineRecipeWrapper> wrapper) throws Exception
|
||||
@@ -132,6 +143,26 @@ public class MekanismJEI implements IModPlugin
|
||||
registry.addRecipes(recipes);
|
||||
}
|
||||
|
||||
private void registerChanceMachine(IModRegistry registry, Recipe recipe, String unlocalized, ProgressBar bar, Class<? extends ChanceMachineRecipeHandler> handler, Class<? extends ChanceMachineRecipeWrapper> wrapper) throws Exception
|
||||
{
|
||||
ChanceMachineRecipeCategory category = new ChanceMachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), recipe.name().toLowerCase(), unlocalized, bar);
|
||||
|
||||
registry.addRecipeCategories(category);
|
||||
registry.addRecipeHandlers(handler.getConstructor(ChanceMachineRecipeCategory.class).newInstance(category));
|
||||
|
||||
List<ChanceMachineRecipeWrapper> recipes = new ArrayList<ChanceMachineRecipeWrapper>();
|
||||
|
||||
for(Object obj : recipe.get().values())
|
||||
{
|
||||
if(obj instanceof ChanceMachineRecipe)
|
||||
{
|
||||
recipes.add(wrapper.getConstructor(ChanceMachineRecipe.class, ChanceMachineRecipeCategory.class).newInstance((ChanceMachineRecipe)obj, category));
|
||||
}
|
||||
}
|
||||
|
||||
registry.addRecipes(recipes);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onItemRegistryAvailable(IItemRegistry registry) {}
|
||||
|
||||
|
||||
@@ -98,12 +98,16 @@ public class AdvancedMachineRecipeCategory extends BaseRecipeCategory
|
||||
tempRecipe = ((AdvancedMachineRecipeWrapper)recipeWrapper).recipe;
|
||||
}
|
||||
|
||||
AdvancedMachineInput input = (AdvancedMachineInput)tempRecipe.recipeInput;
|
||||
|
||||
IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks();
|
||||
|
||||
itemStacks.init(0, true, 27, 0);
|
||||
itemStacks.init(1, false, 87, 18);
|
||||
itemStacks.init(2, false, 27, 36);
|
||||
|
||||
itemStacks.setFromRecipe(0, recipeWrapper.getInputs());
|
||||
itemStacks.setFromRecipe(1, recipeWrapper.getOutputs());
|
||||
itemStacks.set(2, ((AdvancedMachineRecipeWrapper)recipeWrapper).getFuelStacks(input.gasType));
|
||||
}
|
||||
}
|
||||
@@ -1,17 +1,20 @@
|
||||
package mekanism.client.jei.machine;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import mekanism.api.gas.Gas;
|
||||
import mekanism.common.recipe.inputs.AdvancedMachineInput;
|
||||
import mekanism.common.recipe.machines.AdvancedMachineRecipe;
|
||||
import mekanism.common.recipe.outputs.ItemStackOutput;
|
||||
import mezz.jei.api.recipe.BlankRecipeWrapper;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class AdvancedMachineRecipeWrapper extends BlankRecipeWrapper
|
||||
public abstract class AdvancedMachineRecipeWrapper extends BlankRecipeWrapper
|
||||
{
|
||||
public AdvancedMachineRecipe recipe;
|
||||
|
||||
@@ -36,4 +39,20 @@ public class AdvancedMachineRecipeWrapper extends BlankRecipeWrapper
|
||||
{
|
||||
return Arrays.asList(((ItemStackOutput)recipe.getOutput()).output);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public List<String> getTooltipStrings(int mouseX, int mouseY)
|
||||
{
|
||||
List<String> currenttip = new ArrayList<String>();
|
||||
|
||||
if(mouseX >= 33 && mouseX <= 39 && mouseY >= 22 && mouseY <= 34)
|
||||
{
|
||||
currenttip.add(((AdvancedMachineInput)recipe.getInput()).gasType.getLocalizedName());
|
||||
}
|
||||
|
||||
return currenttip;
|
||||
}
|
||||
|
||||
public abstract List<ItemStack> getFuelStacks(Gas gasType);
|
||||
}
|
||||
@@ -1,5 +1,103 @@
|
||||
package mekanism.client.jei.machine;
|
||||
|
||||
public class ChanceMachineRecipeCategory {
|
||||
import mekanism.client.gui.element.GuiPowerBar;
|
||||
import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler;
|
||||
import mekanism.client.gui.element.GuiProgress;
|
||||
import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler;
|
||||
import mekanism.client.gui.element.GuiProgress.ProgressBar;
|
||||
import mekanism.client.gui.element.GuiSlot;
|
||||
import mekanism.client.gui.element.GuiSlot.SlotOverlay;
|
||||
import mekanism.client.gui.element.GuiSlot.SlotType;
|
||||
import mekanism.client.jei.BaseRecipeCategory;
|
||||
import mekanism.common.recipe.machines.ChanceMachineRecipe;
|
||||
import mekanism.common.recipe.outputs.ChanceOutput;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.util.MekanismUtils.ResourceType;
|
||||
import mezz.jei.api.IGuiHelper;
|
||||
import mezz.jei.api.gui.IDrawable;
|
||||
import mezz.jei.api.gui.IGuiItemStackGroup;
|
||||
import mezz.jei.api.gui.IRecipeLayout;
|
||||
import mezz.jei.api.gui.ITickTimer;
|
||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
public class ChanceMachineRecipeCategory extends BaseRecipeCategory
|
||||
{
|
||||
public IGuiHelper guiHelper;
|
||||
|
||||
public IDrawable background;
|
||||
|
||||
public ChanceMachineRecipe tempRecipe;
|
||||
|
||||
public ITickTimer timer;
|
||||
|
||||
public ChanceMachineRecipeCategory(IGuiHelper helper, String name, String unlocalized, ProgressBar progress)
|
||||
{
|
||||
super("mekanism:gui/GuiBasicMachine.png", name, unlocalized, progress);
|
||||
|
||||
guiHelper = helper;
|
||||
|
||||
timer = helper.createTickTimer(20, 20, false);
|
||||
|
||||
background = guiHelper.createDrawable(new ResourceLocation(guiTexture), 28, 16, 144, 54);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addGuiElements()
|
||||
{
|
||||
guiElements.add(new GuiSlot(SlotType.INPUT, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 55, 16));
|
||||
guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 55, 52).with(SlotOverlay.POWER));
|
||||
guiElements.add(new GuiSlot(SlotType.OUTPUT_WIDE, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 111, 30));
|
||||
|
||||
guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() {
|
||||
@Override
|
||||
public double getLevel()
|
||||
{
|
||||
return 1F;
|
||||
}
|
||||
}, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 164, 15));
|
||||
guiElements.add(new GuiProgress(new IProgressInfoHandler()
|
||||
{
|
||||
@Override
|
||||
public double getProgress()
|
||||
{
|
||||
return (double)timer.getValue() / 20F;
|
||||
}
|
||||
}, progressBar, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 77, 37));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IDrawable getBackground()
|
||||
{
|
||||
return background;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper)
|
||||
{
|
||||
if(recipeWrapper instanceof ChanceMachineRecipeWrapper)
|
||||
{
|
||||
tempRecipe = ((ChanceMachineRecipeWrapper)recipeWrapper).recipe;
|
||||
}
|
||||
|
||||
IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks();
|
||||
|
||||
itemStacks.init(0, true, 27, 0);
|
||||
itemStacks.init(1, false, 87, 18);
|
||||
itemStacks.init(2, false, 103, 18);
|
||||
|
||||
itemStacks.setFromRecipe(0, recipeWrapper.getInputs());
|
||||
|
||||
ChanceOutput output = (ChanceOutput)tempRecipe.getOutput();
|
||||
|
||||
if(output.hasPrimary())
|
||||
{
|
||||
itemStacks.setFromRecipe(1, output.primaryOutput);
|
||||
}
|
||||
|
||||
if(output.hasSecondary())
|
||||
{
|
||||
itemStacks.set(2, output.secondaryOutput);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,46 @@
|
||||
package mekanism.client.jei.machine;
|
||||
|
||||
public class ChanceMachineRecipeHandler {
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import mezz.jei.api.recipe.IRecipeHandler;
|
||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||
|
||||
public class ChanceMachineRecipeHandler<T extends ChanceMachineRecipeWrapper> implements IRecipeHandler<T>
|
||||
{
|
||||
private final ChanceMachineRecipeCategory category;
|
||||
|
||||
public Class<T> wrapperClass;
|
||||
|
||||
public ChanceMachineRecipeHandler(ChanceMachineRecipeCategory c, Class<T> wrapper)
|
||||
{
|
||||
category = c;
|
||||
|
||||
wrapperClass = wrapper;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Class<T> getRecipeClass()
|
||||
{
|
||||
return wrapperClass;
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public String getRecipeCategoryUid()
|
||||
{
|
||||
return category.getUid();
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public IRecipeWrapper getRecipeWrapper(@Nonnull T recipe)
|
||||
{
|
||||
return recipe;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isRecipeValid(@Nonnull T recipe)
|
||||
{
|
||||
return recipe.category == category;
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,55 @@
|
||||
package mekanism.client.jei.machine;
|
||||
|
||||
public class ChanceMachineRecipeWrapper {
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import mekanism.common.recipe.inputs.ItemStackInput;
|
||||
import mekanism.common.recipe.machines.ChanceMachineRecipe;
|
||||
import mekanism.common.recipe.outputs.ChanceOutput;
|
||||
import mezz.jei.api.recipe.BlankRecipeWrapper;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class ChanceMachineRecipeWrapper extends BlankRecipeWrapper
|
||||
{
|
||||
public ChanceMachineRecipe recipe;
|
||||
|
||||
public ChanceMachineRecipeCategory category;
|
||||
|
||||
public ChanceMachineRecipeWrapper(ChanceMachineRecipe r, ChanceMachineRecipeCategory c)
|
||||
{
|
||||
recipe = r;
|
||||
category = c;
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public List<ItemStack> getInputs()
|
||||
{
|
||||
return Arrays.asList(((ItemStackInput)recipe.getInput()).ingredient);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public List<ItemStack> getOutputs()
|
||||
{
|
||||
ChanceOutput output = (ChanceOutput)recipe.getOutput();
|
||||
|
||||
return Arrays.asList(output.primaryOutput, output.secondaryOutput);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY)
|
||||
{
|
||||
ChanceOutput output = (ChanceOutput)recipe.getOutput();
|
||||
|
||||
if(output.hasSecondary())
|
||||
{
|
||||
FontRenderer fontRendererObj = minecraft.fontRendererObj;
|
||||
fontRendererObj.drawString(Math.round(output.secondaryChance*100) + "%", 104, 41, 0x404040, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
+37
@@ -1,8 +1,18 @@
|
||||
package mekanism.client.jei.machine.advanced;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import mekanism.api.gas.Gas;
|
||||
import mekanism.api.gas.GasRegistry;
|
||||
import mekanism.api.util.ListUtils;
|
||||
import mekanism.client.jei.machine.AdvancedMachineRecipeCategory;
|
||||
import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper;
|
||||
import mekanism.common.Tier.GasTankTier;
|
||||
import mekanism.common.recipe.machines.AdvancedMachineRecipe;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
public class ChemicalInjectionChamberRecipeWrapper extends AdvancedMachineRecipeWrapper
|
||||
{
|
||||
@@ -10,4 +20,31 @@ public class ChemicalInjectionChamberRecipeWrapper extends AdvancedMachineRecipe
|
||||
{
|
||||
super(r, c);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ItemStack> getFuelStacks(Gas gasType)
|
||||
{
|
||||
if(gasType == GasRegistry.getGas("sulfuricAcid"))
|
||||
{
|
||||
List<ItemStack> fuels = new ArrayList<ItemStack>();
|
||||
fuels.addAll(OreDictionary.getOres("dustSulfur"));
|
||||
fuels.add(MekanismUtils.getFullGasTank(GasTankTier.BASIC, GasRegistry.getGas("sulfuricAcid")));
|
||||
|
||||
return fuels;
|
||||
}
|
||||
else if(gasType == GasRegistry.getGas("water"))
|
||||
{
|
||||
return ListUtils.asList(MekanismUtils.getFullGasTank(GasTankTier.BASIC, GasRegistry.getGas("water")));
|
||||
}
|
||||
else if(gasType == GasRegistry.getGas("hydrogenChloride"))
|
||||
{
|
||||
List<ItemStack> fuels = new ArrayList<ItemStack>();
|
||||
fuels.addAll(OreDictionary.getOres("dustSalt"));
|
||||
fuels.add(MekanismUtils.getFullGasTank(GasTankTier.BASIC, GasRegistry.getGas("hydrogenChloride")));
|
||||
|
||||
return fuels;
|
||||
}
|
||||
|
||||
return new ArrayList<ItemStack>();
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,14 @@
|
||||
package mekanism.client.jei.machine.advanced;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import mekanism.api.gas.Gas;
|
||||
import mekanism.api.util.ListUtils;
|
||||
import mekanism.client.jei.machine.AdvancedMachineRecipeCategory;
|
||||
import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper;
|
||||
import mekanism.common.recipe.machines.AdvancedMachineRecipe;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class CombinerRecipeWrapper extends AdvancedMachineRecipeWrapper
|
||||
{
|
||||
@@ -10,4 +16,10 @@ public class CombinerRecipeWrapper extends AdvancedMachineRecipeWrapper
|
||||
{
|
||||
super(r, c);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ItemStack> getFuelStacks(Gas gasType)
|
||||
{
|
||||
return ListUtils.asList(new ItemStack(Blocks.cobblestone));
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,14 @@
|
||||
package mekanism.client.jei.machine.advanced;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import mekanism.api.gas.Gas;
|
||||
import mekanism.api.util.ListUtils;
|
||||
import mekanism.client.jei.machine.AdvancedMachineRecipeCategory;
|
||||
import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper;
|
||||
import mekanism.common.MekanismItems;
|
||||
import mekanism.common.recipe.machines.AdvancedMachineRecipe;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class OsmiumCompressorRecipeWrapper extends AdvancedMachineRecipeWrapper
|
||||
{
|
||||
@@ -10,4 +16,10 @@ public class OsmiumCompressorRecipeWrapper extends AdvancedMachineRecipeWrapper
|
||||
{
|
||||
super(r, c);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ItemStack> getFuelStacks(Gas gasType)
|
||||
{
|
||||
return ListUtils.asList(new ItemStack(MekanismItems.Ingot, 1, 1));
|
||||
}
|
||||
}
|
||||
+21
@@ -1,8 +1,18 @@
|
||||
package mekanism.client.jei.machine.advanced;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import mekanism.api.gas.Gas;
|
||||
import mekanism.api.gas.GasRegistry;
|
||||
import mekanism.api.util.ListUtils;
|
||||
import mekanism.client.jei.machine.AdvancedMachineRecipeCategory;
|
||||
import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper;
|
||||
import mekanism.common.Tier.GasTankTier;
|
||||
import mekanism.common.recipe.machines.AdvancedMachineRecipe;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class PurificationChamberRecipeWrapper extends AdvancedMachineRecipeWrapper
|
||||
{
|
||||
@@ -10,4 +20,15 @@ public class PurificationChamberRecipeWrapper extends AdvancedMachineRecipeWrapp
|
||||
{
|
||||
super(r, c);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ItemStack> getFuelStacks(Gas gasType)
|
||||
{
|
||||
if(gasType == GasRegistry.getGas("oxygen"))
|
||||
{
|
||||
return ListUtils.asList(new ItemStack(Items.flint), MekanismUtils.getFullGasTank(GasTankTier.BASIC, GasRegistry.getGas("oxygen")));
|
||||
}
|
||||
|
||||
return new ArrayList<ItemStack>();
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,12 @@
|
||||
package mekanism.client.jei.machine.chance;
|
||||
|
||||
public class PrecisionSawmillRecipeHandler {
|
||||
import mekanism.client.jei.machine.ChanceMachineRecipeCategory;
|
||||
import mekanism.client.jei.machine.ChanceMachineRecipeHandler;
|
||||
|
||||
public class PrecisionSawmillRecipeHandler extends ChanceMachineRecipeHandler
|
||||
{
|
||||
public PrecisionSawmillRecipeHandler(ChanceMachineRecipeCategory c)
|
||||
{
|
||||
super(c, PrecisionSawmillRecipeWrapper.class);
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,13 @@
|
||||
package mekanism.client.jei.machine.chance;
|
||||
|
||||
public class PrecisionSawmillRecipeWrapper {
|
||||
import mekanism.client.jei.machine.ChanceMachineRecipeCategory;
|
||||
import mekanism.client.jei.machine.ChanceMachineRecipeWrapper;
|
||||
import mekanism.common.recipe.machines.ChanceMachineRecipe;
|
||||
|
||||
public class PrecisionSawmillRecipeWrapper extends ChanceMachineRecipeWrapper
|
||||
{
|
||||
public PrecisionSawmillRecipeWrapper(ChanceMachineRecipe r, ChanceMachineRecipeCategory c)
|
||||
{
|
||||
super(r, c);
|
||||
}
|
||||
}
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.chemical;
|
||||
|
||||
public class ChemicalCrystallizerRecipeCategory {
|
||||
|
||||
}
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.chemical;
|
||||
|
||||
public class ChemicalCrystallizerRecipeHandler {
|
||||
|
||||
}
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.chemical;
|
||||
|
||||
public class ChemicalCrystallizerRecipeWrapper {
|
||||
|
||||
}
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.chemical;
|
||||
|
||||
public class ChemicalDissolutionChamberRecipeCategory {
|
||||
|
||||
}
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.chemical;
|
||||
|
||||
public class ChemicalDissolutionChamberRecipeHandler {
|
||||
|
||||
}
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.chemical;
|
||||
|
||||
public class ChemicalDissolutionChamberRecipeWrapper {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.chemical;
|
||||
|
||||
public class ChemicalInfuserRecipeCategory {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.chemical;
|
||||
|
||||
public class ChemicalInfuserRecipeHandler {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.chemical;
|
||||
|
||||
public class ChemicalInfuserRecipeWrapper {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.chemical;
|
||||
|
||||
public class ChemicalOxidizerRecipeCategory {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.chemical;
|
||||
|
||||
public class ChemicalOxidizerRecipeHandler {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.chemical;
|
||||
|
||||
public class ChemicalOxidizerRecipeWrapper {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.chemical;
|
||||
|
||||
public class ChemicalWasherRecipeCategory {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.chemical;
|
||||
|
||||
public class ChemicalWasherRecipeHandler {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.chemical;
|
||||
|
||||
public class ChemicalWasherRecipeWrapper {
|
||||
|
||||
}
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.other;
|
||||
|
||||
public class ElectrolyticSeparatorRecipeCategory {
|
||||
|
||||
}
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.other;
|
||||
|
||||
public class ElectrolyticSeparatorRecipeHandler {
|
||||
|
||||
}
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.other;
|
||||
|
||||
public class ElectrolyticSeparatorRecipeWrapper {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.other;
|
||||
|
||||
public class MetallurgicInfuserRecipeCategory {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.other;
|
||||
|
||||
public class MetallurgicInfuserRecipeHandler {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.other;
|
||||
|
||||
public class MetallurgicInfuserRecipeWrapper {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.other;
|
||||
|
||||
public class PRCRecipeCategory {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.other;
|
||||
|
||||
public class PRCRecipeHandler {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.other;
|
||||
|
||||
public class PRCRecipeWrapper {
|
||||
|
||||
}
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.other;
|
||||
|
||||
public class RotaryCondensentratorRecipeCategory {
|
||||
|
||||
}
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.other;
|
||||
|
||||
public class RotaryCondensentratorRecipeHandler {
|
||||
|
||||
}
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.other;
|
||||
|
||||
public class RotaryCondensentratorRecipeWrapper {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.other;
|
||||
|
||||
public class SolarNeutronRecipeCategory {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.other;
|
||||
|
||||
public class SolarNeutronRecipeHandler {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.other;
|
||||
|
||||
public class SolarNeutronRecipeWrapper {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.other;
|
||||
|
||||
public class ThermalEvaporationRecipeCategory {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.other;
|
||||
|
||||
public class ThermalEvaporationRecipeHandler {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package mekanism.client.jei.machine.other;
|
||||
|
||||
public class ThermalEvaporationRecipeWrapper {
|
||||
|
||||
}
|
||||
@@ -40,7 +40,7 @@ public class ItemBlockOre extends ItemBlock
|
||||
{
|
||||
if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey))
|
||||
{
|
||||
list.add("Hold " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + LangUtils.localize("tooltip.forDetails") + ".");
|
||||
list.add("Hold " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + ".");
|
||||
}
|
||||
else {
|
||||
list.addAll(MekanismUtils.splitTooltip(LangUtils.localize("tooltip." + getUnlocalizedName(itemstack).replace("tile.OreBlock.", "")), itemstack));
|
||||
|
||||
Reference in new issue
Block a user