From a2143cc81cee494c74cfb33f94e150f05c5f5ef9 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 20 May 2016 01:16:10 -0400 Subject: [PATCH] Added chance machine JEI support, added fuel display to advanced machine JEI handlers, add classes for remaining machinery --- .../java/mekanism/client/jei/MekanismJEI.java | 33 +++++- .../AdvancedMachineRecipeCategory.java | 4 + .../machine/AdvancedMachineRecipeWrapper.java | 21 +++- .../machine/ChanceMachineRecipeCategory.java | 100 +++++++++++++++++- .../machine/ChanceMachineRecipeHandler.java | 43 +++++++- .../machine/ChanceMachineRecipeWrapper.java | 52 ++++++++- ...ChemicalInjectionChamberRecipeWrapper.java | 37 +++++++ .../advanced/CombinerRecipeWrapper.java | 12 +++ .../OsmiumCompressorRecipeWrapper.java | 12 +++ .../PurificationChamberRecipeWrapper.java | 21 ++++ .../chance/PrecisionSawmillRecipeHandler.java | 9 +- .../chance/PrecisionSawmillRecipeWrapper.java | 10 +- .../ChemicalCrystallizerRecipeCategory.java | 5 + .../ChemicalCrystallizerRecipeHandler.java | 5 + .../ChemicalCrystallizerRecipeWrapper.java | 5 + ...micalDissolutionChamberRecipeCategory.java | 5 + ...emicalDissolutionChamberRecipeHandler.java | 5 + ...emicalDissolutionChamberRecipeWrapper.java | 5 + .../ChemicalInfuserRecipeCategory.java | 5 + .../ChemicalInfuserRecipeHandler.java | 5 + .../ChemicalInfuserRecipeWrapper.java | 5 + .../ChemicalOxidizerRecipeCategory.java | 5 + .../ChemicalOxidizerRecipeHandler.java | 5 + .../ChemicalOxidizerRecipeWrapper.java | 5 + .../ChemicalWasherRecipeCategory.java | 5 + .../chemical/ChemicalWasherRecipeHandler.java | 5 + .../chemical/ChemicalWasherRecipeWrapper.java | 5 + .../ElectrolyticSeparatorRecipeCategory.java | 5 + .../ElectrolyticSeparatorRecipeHandler.java | 5 + .../ElectrolyticSeparatorRecipeWrapper.java | 5 + .../MetallurgicInfuserRecipeCategory.java | 5 + .../MetallurgicInfuserRecipeHandler.java | 5 + .../MetallurgicInfuserRecipeWrapper.java | 5 + .../jei/machine/other/PRCRecipeCategory.java | 5 + .../jei/machine/other/PRCRecipeHandler.java | 5 + .../jei/machine/other/PRCRecipeWrapper.java | 5 + .../RotaryCondensentratorRecipeCategory.java | 5 + .../RotaryCondensentratorRecipeHandler.java | 5 + .../RotaryCondensentratorRecipeWrapper.java | 5 + .../other/SolarNeutronRecipeCategory.java | 5 + .../other/SolarNeutronRecipeHandler.java | 5 + .../other/SolarNeutronRecipeWrapper.java | 5 + .../ThermalEvaporationRecipeCategory.java | 5 + .../ThermalEvaporationRecipeHandler.java | 5 + .../ThermalEvaporationRecipeWrapper.java | 5 + .../mekanism/common/item/ItemBlockOre.java | 2 +- 46 files changed, 513 insertions(+), 8 deletions(-) create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/PRCRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeHandler.java create mode 100644 src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeWrapper.java diff --git a/src/main/java/mekanism/client/jei/MekanismJEI.java b/src/main/java/mekanism/client/jei/MekanismJEI.java index 52b3896ab..e3391f7dd 100644 --- a/src/main/java/mekanism/client/jei/MekanismJEI.java +++ b/src/main/java/mekanism/client/jei/MekanismJEI.java @@ -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 handler, Class 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 handler, Class 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 recipes = new ArrayList(); + + 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) {} diff --git a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeCategory.java index 33f6f4d98..12ab12557 100644 --- a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeCategory.java @@ -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)); } } diff --git a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java index e400d24a8..aea384250 100644 --- a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java @@ -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 getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 33 && mouseX <= 39 && mouseY >= 22 && mouseY <= 34) + { + currenttip.add(((AdvancedMachineInput)recipe.getInput()).gasType.getLocalizedName()); + } + + return currenttip; + } + + public abstract List getFuelStacks(Gas gasType); } diff --git a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeCategory.java index 9b6f183c8..3bf0f6948 100644 --- a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeCategory.java @@ -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); + } + } } diff --git a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeHandler.java index 41435cd9e..170b7969f 100644 --- a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeHandler.java @@ -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 implements IRecipeHandler +{ + private final ChanceMachineRecipeCategory category; + + public Class wrapperClass; + + public ChanceMachineRecipeHandler(ChanceMachineRecipeCategory c, Class wrapper) + { + category = c; + + wrapperClass = wrapper; + } + + @Override + public Class 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; + } } diff --git a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java index 4b3274548..a32363c46 100644 --- a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java @@ -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 getInputs() + { + return Arrays.asList(((ItemStackInput)recipe.getInput()).ingredient); + } + + @Nonnull + @Override + public List 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); + } + } } diff --git a/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java index 1f607dc46..747a64cb6 100644 --- a/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java @@ -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 getFuelStacks(Gas gasType) + { + if(gasType == GasRegistry.getGas("sulfuricAcid")) + { + List fuels = new ArrayList(); + 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 fuels = new ArrayList(); + fuels.addAll(OreDictionary.getOres("dustSalt")); + fuels.add(MekanismUtils.getFullGasTank(GasTankTier.BASIC, GasRegistry.getGas("hydrogenChloride"))); + + return fuels; + } + + return new ArrayList(); + } } diff --git a/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java index 838e91e4a..e77fc03e7 100644 --- a/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java @@ -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 getFuelStacks(Gas gasType) + { + return ListUtils.asList(new ItemStack(Blocks.cobblestone)); + } } diff --git a/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeWrapper.java index 5e24c5bee..bb4acf946 100644 --- a/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeWrapper.java @@ -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 getFuelStacks(Gas gasType) + { + return ListUtils.asList(new ItemStack(MekanismItems.Ingot, 1, 1)); + } } diff --git a/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java index 12e643471..ac64e6c51 100644 --- a/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java @@ -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 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(); + } } diff --git a/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeHandler.java index c1ac25604..f97cb37d2 100644 --- a/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeHandler.java @@ -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); + } } diff --git a/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeWrapper.java index a69e95f17..145251061 100644 --- a/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeWrapper.java @@ -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); + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeCategory.java new file mode 100644 index 000000000..7bdf54b65 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalCrystallizerRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeHandler.java new file mode 100644 index 000000000..e7354081f --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalCrystallizerRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java new file mode 100644 index 000000000..b5de46677 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalCrystallizerRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java new file mode 100644 index 000000000..2d1003f9b --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalDissolutionChamberRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeHandler.java new file mode 100644 index 000000000..094c66a93 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalDissolutionChamberRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java new file mode 100644 index 000000000..622f3064a --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalDissolutionChamberRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeCategory.java new file mode 100644 index 000000000..8aff84977 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalInfuserRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeHandler.java new file mode 100644 index 000000000..496c5e426 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalInfuserRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java new file mode 100644 index 000000000..50565f8cc --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalInfuserRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeCategory.java new file mode 100644 index 000000000..9d1f4d574 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalOxidizerRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeHandler.java new file mode 100644 index 000000000..30e08db65 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalOxidizerRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java new file mode 100644 index 000000000..d88ab5c4e --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalOxidizerRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java new file mode 100644 index 000000000..a2798addb --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalWasherRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeHandler.java new file mode 100644 index 000000000..035340d57 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalWasherRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java new file mode 100644 index 000000000..aa7697db5 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.chemical; + +public class ChemicalWasherRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java new file mode 100644 index 000000000..2823fec6f --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class ElectrolyticSeparatorRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeHandler.java new file mode 100644 index 000000000..70f2a856d --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class ElectrolyticSeparatorRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java new file mode 100644 index 000000000..eaf6265a2 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class ElectrolyticSeparatorRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java new file mode 100644 index 000000000..760f8672a --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class MetallurgicInfuserRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeHandler.java new file mode 100644 index 000000000..2f9624df7 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class MetallurgicInfuserRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java new file mode 100644 index 000000000..56ed41cf4 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class MetallurgicInfuserRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java new file mode 100644 index 000000000..86c070caf --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class PRCRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeHandler.java new file mode 100644 index 000000000..2ee616dfa --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class PRCRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java new file mode 100644 index 000000000..2a121a327 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class PRCRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java new file mode 100644 index 000000000..180c56f51 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class RotaryCondensentratorRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java new file mode 100644 index 000000000..7b0a91bd2 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class RotaryCondensentratorRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java new file mode 100644 index 000000000..646d0f306 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class RotaryCondensentratorRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java new file mode 100644 index 000000000..1d6387b7d --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class SolarNeutronRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeHandler.java new file mode 100644 index 000000000..d065f8db9 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class SolarNeutronRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java new file mode 100644 index 000000000..c2a7c1b3c --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class SolarNeutronRecipeWrapper { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java new file mode 100644 index 000000000..b20fbc22f --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class ThermalEvaporationRecipeCategory { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeHandler.java new file mode 100644 index 000000000..3d0cd7afd --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeHandler.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class ThermalEvaporationRecipeHandler { + +} diff --git a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeWrapper.java new file mode 100644 index 000000000..ec4e23964 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeWrapper.java @@ -0,0 +1,5 @@ +package mekanism.client.jei.machine.other; + +public class ThermalEvaporationRecipeWrapper { + +} diff --git a/src/main/java/mekanism/common/item/ItemBlockOre.java b/src/main/java/mekanism/common/item/ItemBlockOre.java index 16b71a1b5..5e53c59d0 100644 --- a/src/main/java/mekanism/common/item/ItemBlockOre.java +++ b/src/main/java/mekanism/common/item/ItemBlockOre.java @@ -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));