diff --git a/build.properties b/build.properties index 4e7abc984..c097b6e1e 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft_version=1.8.9 mappings_version=stable_22 -forge_version=11.15.1.1722 +forge_version=11.15.1.1902 mcmp_version=1.0.9_47 CCLIB_version=1.1.3.136 NEI_version=1.0.4.101 diff --git a/legacy/mekanism.client.nei/AdvancedMachineRecipeHandler.java b/legacy/mekanism.client.nei/AdvancedMachineRecipeHandler.java deleted file mode 100644 index 536a86cfc..000000000 --- a/legacy/mekanism.client.nei/AdvancedMachineRecipeHandler.java +++ /dev/null @@ -1,306 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasStack; -import mekanism.client.gui.element.GuiElement; -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.common.ObfuscatedNames; -import mekanism.common.recipe.inputs.AdvancedMachineInput; -import mekanism.common.recipe.machines.AdvancedMachineRecipe; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public abstract class AdvancedMachineRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public abstract String getRecipeId(); - - public abstract Collection getRecipes(); - - public abstract List getFuelStacks(Gas gasType); - - public abstract ProgressBar getProgressType(); - - @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()), 30, 34).with(SlotOverlay.POWER)); - guiElements.add(new GuiSlot(SlotType.EXTRA, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 55, 52)); - guiElements.add(new GuiSlot(SlotType.OUTPUT_LARGE, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 111, 30)); - - guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { - @Override - public double getLevel() - { - return ticksPassed <= 20 ? ticksPassed / 20.0F : 1.0F; - } - }, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 164, 15)); - guiElements.add(new GuiProgress(new IProgressInfoHandler() - { - @Override - public double getProgress() - { - return ticksPassed >= 40 ? (ticksPassed - 40) % 20 / 20.0F : 0.0F; - } - }, getProgressType(), this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 77, 37)); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(12, 0, 28, 5, 144, 68); - - for(GuiElement e : guiElements) - { - e.renderBackground(0, 0, -16, -5); - } - } - - @Override - public void drawExtras(int i) - { - CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - - if(recipe.input.gasType != null && ticksPassed >= 20) - { - int displayInt = ticksPassed < 40 ? (ticksPassed-20)*12 / 20 : 12; - displayGauge(45, 32 + 12 - displayInt, 6, displayInt, new GasStack(recipe.input.gasType, 1)); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(63, 34, 24, 7), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(AdvancedMachineRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe, getFuelStacks(irecipe.getInput().gasType))); - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - for(AdvancedMachineRecipe irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getOutput().output, result)) - { - arecipes.add(new CachedIORecipe(irecipe, getFuelStacks(irecipe.getInput().gasType))); - } - } - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/GuiAdvancedMachine.png"; - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) - { - if(inputId.equals("gas") && ingredients.length == 1 && ingredients[0] instanceof GasStack) - { - for(AdvancedMachineRecipe irecipe : getRecipes()) - { - if(irecipe.getInput().gasType == ((GasStack)ingredients[0]).getGas()) - { - arecipes.add(new CachedIORecipe(irecipe, getFuelStacks(irecipe.getInput().gasType))); - } - } - } - else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - for(AdvancedMachineRecipe irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getInput().itemStack, ingredient)) - { - arecipes.add(new CachedIORecipe(irecipe, getFuelStacks(irecipe.getInput().gasType))); - } - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - Point offset = gui.getRecipePosition(recipe); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft)-offset.x; - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop)-offset.y; - - if(xAxis >= 45 && xAxis <= 51 && yAxis >= 33 && yAxis <= 45) - { - currenttip.add(((CachedIORecipe)arecipes.get(recipe)).input.gasType.getLocalizedName()); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - Point offset = gui.getRecipePosition(recipe); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft)-offset.x; - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop)-offset.y; - - GasStack stack = null; - - if(xAxis >= 45 && xAxis <= 51 && yAxis >= 33 && yAxis <= 45) - { - stack = new GasStack(((CachedIORecipe)arecipes.get(recipe)).input.gasType, 1); - } - - if(stack != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doGasLookup(stack, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doGasLookup(stack, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - Point offset = gui.getRecipePosition(recipe); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft)-offset.x; - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop)-offset.y; - - GasStack stack = null; - - if(xAxis >= 45 && xAxis <= 51 && yAxis >= 33 && yAxis <= 45) - { - stack = new GasStack(((CachedIORecipe)arecipes.get(recipe)).input.gasType, 1); - } - - if(stack != null) - { - if(button == 0) - { - if(doGasLookup(stack, false)) - { - return true; - } - } - else if(button == 1) - { - if(doGasLookup(stack, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public List fuelStacks; - - public AdvancedMachineInput input; - - public PositionedStack outputStack; - - @Override - public PositionedStack getIngredient() - { - return new PositionedStack(input.itemStack, 40, 12); - } - - @Override - public PositionedStack getResult() - { - return outputStack; - } - - @Override - public PositionedStack getOtherStack() - { - return new PositionedStack(fuelStacks.get(cycleticks/40 % fuelStacks.size()), 40, 48); - } - - public CachedIORecipe(AdvancedMachineInput adv, ItemStack output, List fuels) - { - input = adv; - outputStack = new PositionedStack(output, 100, 30); - fuelStacks = fuels; - } - - public CachedIORecipe(AdvancedMachineRecipe recipe, List fuels) - { - this(recipe.getInput(), recipe.getOutput().output, fuels); - } - } -} diff --git a/legacy/mekanism.client.nei/BaseRecipeHandler.java b/legacy/mekanism.client.nei/BaseRecipeHandler.java deleted file mode 100644 index 5fe5f3879..000000000 --- a/legacy/mekanism.client.nei/BaseRecipeHandler.java +++ /dev/null @@ -1,172 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; -import static codechicken.lib.gui.GuiDraw.gui; - -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import mekanism.api.gas.GasStack; -import mekanism.client.gui.IGuiWrapper; -import mekanism.client.gui.element.GuiElement; -import mekanism.client.render.MekanismRenderer; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.FluidStack; -import codechicken.nei.recipe.GuiCraftingRecipe; -import codechicken.nei.recipe.GuiUsageRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public abstract class BaseRecipeHandler extends TemplateRecipeHandler implements IGuiWrapper -{ - public BaseRecipeHandler() - { - addGuiElements(); - } - - public Set guiElements = new HashSet(); - - public abstract void addGuiElements(); - - public void displayGauge(int length, int xPos, int yPos, int overlayX, int overlayY, int scale, FluidStack fluid, GasStack gas) - { - if(fluid == null && gas == null) - { - return; - } - - int start = 0; - - while(true) - { - int renderRemaining = 0; - - if(scale > 16) - { - renderRemaining = 16; - scale -= 16; - } - else { - renderRemaining = scale; - scale = 0; - } - - changeTexture(MekanismRenderer.getBlocksTexture()); - - if(fluid != null) - { - gui.drawTexturedModelRectFromIcon(xPos, yPos + length - renderRemaining - start, fluid.getFluid().getIcon(), 16, 16 - (16 - renderRemaining)); - } - else if(gas != null) - { - gui.drawTexturedModelRectFromIcon(xPos, yPos + length - renderRemaining - start, gas.getGas().getIcon(), 16, 16 - (16 - renderRemaining)); - } - - start+=16; - - if(renderRemaining == 0 || scale == 0) - { - break; - } - } - - changeTexture(getGuiTexture()); - drawTexturedModalRect(xPos, yPos, overlayX, overlayY, 16, length+1); - } - - /* - * true = usage, false = recipe - */ - public boolean doGasLookup(GasStack stack, boolean type) - { - if(stack != null && stack.amount > 0) - { - if(type) - { - if(!GuiUsageRecipe.openRecipeGui("gas", new Object[] {stack})) - { - return false; - } - } - else { - if(!GuiCraftingRecipe.openRecipeGui("gas", new Object[] {stack})) - { - return false; - } - } - - return true; - } - - return false; - } - - public void displayGauge(int xPos, int yPos, int sizeX, int sizeY, GasStack gas) - { - if(gas == null) - { - return; - } - - changeTexture(MekanismRenderer.getBlocksTexture()); - gui.drawTexturedModelRectFromIcon(xPos, yPos, gas.getGas().getIcon(), sizeX, sizeY); - } - - public String stripTexture() - { - return getGuiTexture().replace("mekanism:gui/", ""); - } - - /* - * true = usage, false = recipe - */ - public boolean doFluidLookup(FluidStack stack, boolean type) - { - if(stack != null && stack.amount > 0) - { - if(type) - { - if(!GuiUsageRecipe.openRecipeGui("fluid", new Object[] {stack})) - { - return false; - } - } - else { - if(!GuiCraftingRecipe.openRecipeGui("fluid", new Object[] {stack})) - { - return false; - } - } - - return true; - } - - return false; - } - - @Override - public void drawTexturedRect(int x, int y, int u, int v, int w, int h) - { - drawTexturedModalRect(x, y, u, v, w, h); - } - - @Override - public void drawTexturedRectFromIcon(int x, int y, IIcon icon, int w, int h) - { - gui.drawTexturedModelRectFromIcon(x, y, icon, w, h); - } - - @Override - public void displayTooltip(String s, int xAxis, int yAxis) {} - - @Override - public void displayTooltips(List list, int xAxis, int yAxis) {} - - @Override - public FontRenderer getFont() - { - return null; - } -} diff --git a/legacy/mekanism.client.nei/ChanceMachineRecipeHandler.java b/legacy/mekanism.client.nei/ChanceMachineRecipeHandler.java deleted file mode 100644 index e9e56e0ac..000000000 --- a/legacy/mekanism.client.nei/ChanceMachineRecipeHandler.java +++ /dev/null @@ -1,195 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawString; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Rectangle; -import java.util.Collection; - -import mekanism.client.gui.element.GuiElement; -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.common.recipe.machines.ChanceMachineRecipe; -import mekanism.common.recipe.outputs.ChanceOutput; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public abstract class ChanceMachineRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public abstract String getRecipeId(); - - public abstract Collection getRecipes(); - - public abstract ProgressBar getProgressType(); - - @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 ticksPassed <= 20 ? ticksPassed / 20.0F : 1.0F; - } - }, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 164, 15)); - guiElements.add(new GuiProgress(new IProgressInfoHandler() - { - @Override - public double getProgress() - { - return ticksPassed >= 20 ? (ticksPassed - 20) % 20 / 20.0F : 0.0F; - } - }, getProgressType(), this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 77, 37)); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(12, 0, 28, 5, 144, 68); - - for(GuiElement e : guiElements) - { - e.renderBackground(0, 0, -16, -5); - } - } - - @Override - public void drawExtras(int i) - { - CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - - if(recipe.output.hasSecondary()) - { - drawString(Math.round(recipe.output.secondaryChance*100) + "%", 116, 52, 0x404040, false); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(63, 34, 24, 7), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(ChanceMachineRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - for(ChanceMachineRecipe irecipe : getRecipes()) - { - if(irecipe.getOutput().hasPrimary() && NEIServerUtils.areStacksSameTypeCrafting(irecipe.getOutput().primaryOutput, result)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - else if(irecipe.getOutput().hasSecondary() && NEIServerUtils.areStacksSameTypeCrafting(irecipe.getOutput().secondaryOutput, result)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/GuiBasicMachine.png"; - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - for(ChanceMachineRecipe irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting((ItemStack)irecipe.getInput().ingredient, ingredient)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public PositionedStack input; - public ChanceOutput output; - - @Override - public PositionedStack getIngredient() - { - return input; - } - - @Override - public PositionedStack getResult() - { - if(output.hasPrimary()) - { - return new PositionedStack(output.primaryOutput, 100, 30); - } - - return null; - } - - @Override - public PositionedStack getOtherStack() - { - if(output.hasSecondary()) - { - return new PositionedStack(output.secondaryOutput, 116, 30); - } - - return null; - } - - public CachedIORecipe(ItemStack itemstack, ChanceOutput chance) - { - input = new PositionedStack(itemstack, 40, 12); - output = chance; - } - - public CachedIORecipe(ChanceMachineRecipe recipe) - { - this(recipe.getInput().ingredient, recipe.getOutput()); - } - } -} diff --git a/legacy/mekanism.client.nei/ChemicalCrystallizerRecipeHandler.java b/legacy/mekanism.client.nei/ChemicalCrystallizerRecipeHandler.java deleted file mode 100644 index 72821cc56..000000000 --- a/legacy/mekanism.client.nei/ChemicalCrystallizerRecipeHandler.java +++ /dev/null @@ -1,274 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiChemicalCrystallizer; -import mekanism.common.ObfuscatedNames; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.CrystallizerRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class ChemicalCrystallizerRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public static int xOffset = 5; - public static int yOffset = 3; - - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock2.ChemicalCrystallizer.name"); - } - - @Override - public String getOverlayIdentifier() - { - return "chemicalcrystallizer"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/nei/GuiChemicalCrystallizer.png"; - } - - @Override - public Class getGuiClass() - { - return GuiChemicalCrystallizer.class; - } - - public String getRecipeId() - { - return "mekanism.chemicalcrystallizer"; - } - - public Collection getRecipes() - { - return Recipe.CHEMICAL_CRYSTALLIZER.get().values(); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(-2, 0, 3, yOffset, 147, 79); - } - - @Override - public void drawExtras(int i) - { - GasStack gas = ((CachedIORecipe)arecipes.get(i)).inputStack; - - float f = ticksPassed % 20 / 20.0F; - drawProgressBar(53-xOffset, 61-yOffset, 176, 63, 48, 8, f, 0); - - if(gas != null) - { - displayGauge(58, 6-xOffset, 5-yOffset, 176, 4, 58, null, gas); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(53-xOffset, 61-yOffset, 48, 8), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(CrystallizerRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - for(CrystallizerRecipe irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getOutput().output, result)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5+13 && yAxis <= 63+13) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).inputStack)); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack stack = null; - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5+13 && yAxis <= 63+13) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).inputStack; - } - - if(stack != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doGasLookup(stack, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doGasLookup(stack, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack stack = null; - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5+13 && yAxis <= 63+13) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).inputStack; - } - - if(stack != null) - { - if(button == 0) - { - if(doGasLookup(stack, false)) - { - return true; - } - } - else if(button == 1) - { - if(doGasLookup(stack, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - @Override - public int recipiesPerPage() - { - return 1; - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) - { - if(inputId.equals("gas") && ingredients.length == 1 && ingredients[0] instanceof GasStack) - { - for(CrystallizerRecipe irecipe : getRecipes()) - { - if(irecipe.getInput().ingredient.isGasEqual((GasStack)ingredients[0])) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public void addGuiElements() - { - - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public GasStack inputStack; - public PositionedStack outputStack; - - @Override - public PositionedStack getResult() - { - return outputStack; - } - - public CachedIORecipe(GasStack input, ItemStack output) - { - inputStack = input; - outputStack = new PositionedStack(output, 131-xOffset, 57-yOffset); - } - - public CachedIORecipe(CrystallizerRecipe recipe) - { - this(recipe.getInput().ingredient, recipe.getOutput().output); - } - } -} diff --git a/legacy/mekanism.client.nei/ChemicalDissolutionChamberRecipeHandler.java b/legacy/mekanism.client.nei/ChemicalDissolutionChamberRecipeHandler.java deleted file mode 100644 index 2dc3b302f..000000000 --- a/legacy/mekanism.client.nei/ChemicalDissolutionChamberRecipeHandler.java +++ /dev/null @@ -1,287 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.GasRegistry; -import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiChemicalDissolutionChamber; -import mekanism.common.ObfuscatedNames; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.DissolutionRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class ChemicalDissolutionChamberRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public static int xOffset = 5; - public static int yOffset = 3; - - @Override - public String getRecipeName() - { - return LangUtils.localize("gui.chemicalDissolutionChamber.short"); - } - - @Override - public String getOverlayIdentifier() - { - return "chemicaldissolutionchamber"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/nei/GuiChemicalDissolutionChamber.png"; - } - - @Override - public Class getGuiClass() - { - return GuiChemicalDissolutionChamber.class; - } - - public String getRecipeId() - { - return "mekanism.chemicaldissolutionchamber"; - } - - public Collection getRecipes() - { - return Recipe.CHEMICAL_DISSOLUTION_CHAMBER.get().values(); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(-2, 0, 3, yOffset, 170, 79); - } - - @Override - public void drawExtras(int i) - { - GasStack gas = ((CachedIORecipe)arecipes.get(i)).outputStack; - - float f = ticksPassed % 20 / 20.0F; - drawProgressBar(64-xOffset, 40-yOffset, 176, 63, 48, 8, f, 0); - - displayGauge(58, 6-xOffset, 5-yOffset, 176, 4, 58, null, new GasStack(GasRegistry.getGas("sulfuricAcid"), 1)); - - if(gas != null) - { - displayGauge(58, 134-xOffset, 14-yOffset, 176, 4, 58, null, gas); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(64-xOffset, 40-yOffset, 48, 8), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(DissolutionRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else if(outputId.equals("gas") && results.length == 1 && results[0] instanceof GasStack) - { - for(DissolutionRecipe irecipe : getRecipes()) - { - if(((GasStack)results[0]).isGasEqual(irecipe.getOutput().output)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5+13 && yAxis <= 63+13) - { - currenttip.add(GasRegistry.getGas("sulfuricAcid").getLocalizedName()); - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+4 && yAxis <= 72+4) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).outputStack)); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack stack = null; - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5+13 && yAxis <= 63+13) - { - stack = new GasStack(GasRegistry.getGas("sulfuricAcid"), 1); - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+4 && yAxis <= 72+4) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).outputStack; - } - - if(stack != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doGasLookup(stack, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doGasLookup(stack, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack stack = null; - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5+13 && yAxis <= 63+13) - { - stack = new GasStack(GasRegistry.getGas("sulfuricAcid"), 1); - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+4 && yAxis <= 72+4) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).outputStack; - } - - if(stack != null) - { - if(button == 0) - { - if(doGasLookup(stack, false)) - { - return true; - } - } - else if(button == 1) - { - if(doGasLookup(stack, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - @Override - public int recipiesPerPage() - { - return 1; - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - for(DissolutionRecipe irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting((ItemStack)irecipe.getInput().ingredient, ingredient)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - - @Override - public void addGuiElements() - { - - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public PositionedStack inputStack; - public GasStack outputStack; - - @Override - public PositionedStack getIngredient() - { - return inputStack; - } - - @Override - public PositionedStack getResult() - { - return null; - } - - public CachedIORecipe(ItemStack input, GasStack output) - { - inputStack = new PositionedStack(input, 26-xOffset, 36-yOffset); - outputStack = output; - } - - public CachedIORecipe(DissolutionRecipe recipe) - { - this(recipe.getInput().ingredient, recipe.getOutput().output); - } - } -} diff --git a/legacy/mekanism.client.nei/ChemicalInfuserRecipeHandler.java b/legacy/mekanism.client.nei/ChemicalInfuserRecipeHandler.java deleted file mode 100644 index f0040b32a..000000000 --- a/legacy/mekanism.client.nei/ChemicalInfuserRecipeHandler.java +++ /dev/null @@ -1,306 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiChemicalInfuser; -import mekanism.common.ObfuscatedNames; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.inputs.ChemicalPairInput; -import mekanism.common.recipe.machines.ChemicalInfuserRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import net.minecraft.client.gui.inventory.GuiContainer; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class ChemicalInfuserRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public static int xOffset = 5; - public static int yOffset = 3; - - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock2.ChemicalInfuser.name"); - } - - @Override - public String getOverlayIdentifier() - { - return "chemicalinfuser"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/nei/GuiChemicalInfuser.png"; - } - - @Override - public Class getGuiClass() - { - return GuiChemicalInfuser.class; - } - - public String getRecipeId() - { - return "mekanism.chemicalinfuser"; - } - - public Collection getRecipes() - { - return Recipe.CHEMICAL_INFUSER.get().values(); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(-2, 0, 3, yOffset, 170, 80); - } - - @Override - public void drawExtras(int i) - { - CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - - drawTexturedModalRect(47-xOffset, 39-yOffset, 176, 71, 28, 8); - drawTexturedModalRect(101-xOffset, 39-yOffset, 176, 63, 28, 8); - - if(recipe.chemicalInput.leftGas != null) - { - displayGauge(58, 26-xOffset, 14-yOffset, 176, 4, 58, null, recipe.chemicalInput.leftGas); - } - - if(recipe.outputStack != null) - { - displayGauge(58, 80-xOffset, 5-yOffset, 176, 4, 58, null, recipe.outputStack); - } - - if(recipe.chemicalInput.rightGas != null) - { - displayGauge(58, 134-xOffset, 14-yOffset, 176, 4, 58, null, recipe.chemicalInput.rightGas); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(47-xOffset, 39-yOffset, 28, 8), getRecipeId(), new Object[0])); - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(101-xOffset, 39-yOffset, 28, 8), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(ChemicalInfuserRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else if(outputId.equals("gas") && results.length == 1 && results[0] instanceof GasStack) - { - for(ChemicalInfuserRecipe irecipe : getRecipes()) - { - if(((GasStack)results[0]).isGasEqual(irecipe.getOutput().output)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) - { - if(inputId.equals("gas") && ingredients.length == 1 && ingredients[0] instanceof GasStack) - { - for(ChemicalInfuserRecipe irecipe : getRecipes()) - { - if(irecipe.getInput().containsType((GasStack)ingredients[0])) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14+13 && yAxis <= 72+13) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).chemicalInput.leftGas)); - } - else if(xAxis >= 80 && xAxis <= 96 && yAxis >= 5+13 && yAxis <= 63+13) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).outputStack)); - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+13 && yAxis <= 72+13) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).chemicalInput.rightGas)); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack stack = null; - - if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14+13 && yAxis <= 72+13) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).chemicalInput.leftGas; - } - else if(xAxis >= 80 && xAxis <= 96 && yAxis >= 5+13 && yAxis <= 63+13) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).outputStack; - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+13 && yAxis <= 72+13) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).chemicalInput.rightGas; - } - - if(stack != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doGasLookup(stack, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doGasLookup(stack, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack stack = null; - - if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14+13 && yAxis <= 72+13) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).chemicalInput.leftGas; - } - else if(xAxis >= 80 && xAxis <= 96 && yAxis >= 5+13 && yAxis <= 63+13) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).outputStack; - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+13 && yAxis <= 72+13) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).chemicalInput.rightGas; - } - - if(stack != null) - { - if(button == 0) - { - if(doGasLookup(stack, false)) - { - return true; - } - } - else if(button == 1) - { - if(doGasLookup(stack, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - @Override - public int recipiesPerPage() - { - return 1; - } - - @Override - public void addGuiElements() - { - - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public ChemicalPairInput chemicalInput; - public GasStack outputStack; - - @Override - public PositionedStack getResult() - { - return null; - } - - public CachedIORecipe(ChemicalPairInput input, GasStack output) - { - chemicalInput = input; - outputStack = output; - } - - public CachedIORecipe(ChemicalInfuserRecipe recipe) - { - this(recipe.getInput(), recipe.getOutput().output); - } - } -} diff --git a/legacy/mekanism.client.nei/ChemicalInjectionChamberRecipeHandler.java b/legacy/mekanism.client.nei/ChemicalInjectionChamberRecipeHandler.java deleted file mode 100644 index e94cb15cf..000000000 --- a/legacy/mekanism.client.nei/ChemicalInjectionChamberRecipeHandler.java +++ /dev/null @@ -1,95 +0,0 @@ -package mekanism.client.nei; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasRegistry; -import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiChemicalInjectionChamber; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.Tier.GasTankTier; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.InjectionRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -public class ChemicalInjectionChamberRecipeHandler extends AdvancedMachineRecipeHandler -{ - @Override - public String getRecipeName() - { - return LangUtils.localize("nei.chemicalInjectionChamber"); - } - - @Override - public String getRecipeId() - { - return "mekanism.chemicalinjectionchamber"; - } - - @Override - public String getOverlayIdentifier() - { - return "chemicalinjectionchamber"; - } - - @Override - public Collection getRecipes() - { - return Recipe.CHEMICAL_INJECTION_CHAMBER.get().values(); - } - - @Override - public List getFuelStacks(Gas gasType) - { - if(gasType == GasRegistry.getGas("sulfuricAcid")) - { - List fuels = new ArrayList(); - fuels.addAll(OreDictionary.getOres("dustSulfur")); - - for(GasTankTier tier : GasTankTier.values()) - { - fuels.add(MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("sulfuricAcid"))); - } - - return fuels; - } - else if(gasType == GasRegistry.getGas("water")) - { - for(GasTankTier tier : GasTankTier.values()) - { - return ListUtils.asList(MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("water"))); - } - } - else if(gasType == GasRegistry.getGas("hydrogenChloride")) - { - List fuels = new ArrayList(); - fuels.addAll(OreDictionary.getOres("dustSalt")); - - for(GasTankTier tier : GasTankTier.values()) - { - fuels.add(MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("hydrogenChloride"))); - } - - return fuels; - } - - return new ArrayList(); - } - - @Override - public ProgressBar getProgressType() - { - return ProgressBar.YELLOW; - } - - @Override - public Class getGuiClass() - { - return GuiChemicalInjectionChamber.class; - } -} diff --git a/legacy/mekanism.client.nei/ChemicalOxidizerRecipeHandler.java b/legacy/mekanism.client.nei/ChemicalOxidizerRecipeHandler.java deleted file mode 100644 index 6f5b877c5..000000000 --- a/legacy/mekanism.client.nei/ChemicalOxidizerRecipeHandler.java +++ /dev/null @@ -1,293 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiChemicalOxidizer; -import mekanism.client.gui.element.GuiElement; -import mekanism.client.gui.element.GuiGasGauge; -import mekanism.client.gui.element.GuiGauge; -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.common.ObfuscatedNames; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.OxidationRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class ChemicalOxidizerRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public GuiGasGauge gasOutput; - - public static int xOffset = 5; - public static int yOffset = 12; - - @Override - public void addGuiElements() - { - guiElements.add(gasOutput = GuiGasGauge.getDummy(GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 133, 13)); - - guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 154, 4).with(SlotOverlay.POWER)); - guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 25, 35)); - guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 154, 24).with(SlotOverlay.PLUS)); - - guiElements.add(new GuiProgress(new IProgressInfoHandler() - { - @Override - public double getProgress() - { - return ticksPassed >= 20 ? (ticksPassed - 20) % 20 / 20.0F : 0.0F; - } - }, ProgressBar.LARGE_RIGHT, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 62, 39)); - } - - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock2.ChemicalOxidizer.name"); - } - - @Override - public String getOverlayIdentifier() - { - return "chemicaloxidizer"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/GuiChemicalOxidizer.png"; - } - - @Override - public Class getGuiClass() - { - return GuiChemicalOxidizer.class; - } - - public String getRecipeId() - { - return "mekanism.chemicaloxidizer"; - } - - public Collection getRecipes() - { - return Recipe.CHEMICAL_OXIDIZER.get().values(); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(0, 0, xOffset, yOffset, 147, 62); - - for(GuiElement e : guiElements) - { - e.renderBackground(0, 0, -xOffset, -yOffset); - } - } - - @Override - public void drawExtras(int i) - { - CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - - if(recipe.outputStack != null) - { - gasOutput.setDummyType(recipe.outputStack.getGas()); - gasOutput.renderScale(0, 0, -xOffset, -yOffset); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(64-xOffset, 40-yOffset, 48, 8), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(OxidationRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else if(outputId.equals("gas") && results.length == 1 && results[0] instanceof GasStack) - { - for(OxidationRecipe irecipe : getRecipes()) - { - if(((GasStack)results[0]).isGasEqual(irecipe.getOutput().output)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - Point offset = gui.getRecipePosition(recipe); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft)-offset.x; - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop)-offset.y; - - if(xAxis >= 134-5 && xAxis <= 150-5 && yAxis >= 14-11 && yAxis <= 72-11) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).outputStack)); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - Point offset = gui.getRecipePosition(recipe); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft)-offset.x; - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop)-offset.y; - - if(xAxis >= 134-5 && xAxis <= 150-5 && yAxis >= 14-11 && yAxis <= 72-11) - { - GasStack stack = ((CachedIORecipe)arecipes.get(recipe)).outputStack; - - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doGasLookup(stack, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doGasLookup(stack, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - Point offset = gui.getRecipePosition(recipe); - - int xAxis = point.x - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft)-offset.x; - int yAxis = point.y - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop)-offset.y; - - if(xAxis >= 134-5 && xAxis <= 150-5 && yAxis >= 14-11 && yAxis <= 72-11) - { - GasStack stack = ((CachedIORecipe)arecipes.get(recipe)).outputStack; - - if(button == 0) - { - if(doGasLookup(stack, false)) - { - return true; - } - } - else if(button == 1) - { - if(doGasLookup(stack, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - @Override - public int recipiesPerPage() - { - return 2; - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - for(OxidationRecipe irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getInput().ingredient, ingredient)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public PositionedStack inputStack; - public GasStack outputStack; - - @Override - public PositionedStack getIngredient() - { - return inputStack; - } - - @Override - public PositionedStack getResult() - { - return null; - } - - public CachedIORecipe(ItemStack input, GasStack output) - { - inputStack = new PositionedStack(input, 26-xOffset, 36-yOffset); - outputStack = output; - } - - public CachedIORecipe(OxidationRecipe recipe) - { - this(recipe.getInput().ingredient, recipe.getOutput().output); - } - } -} diff --git a/legacy/mekanism.client.nei/ChemicalWasherRecipeHandler.java b/legacy/mekanism.client.nei/ChemicalWasherRecipeHandler.java deleted file mode 100644 index 808029516..000000000 --- a/legacy/mekanism.client.nei/ChemicalWasherRecipeHandler.java +++ /dev/null @@ -1,348 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiChemicalWasher; -import mekanism.common.ObfuscatedNames; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.WasherRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class ChemicalWasherRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public static int xOffset = 5; - public static int yOffset = 3; - - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock2.ChemicalWasher.name"); - } - - @Override - public String getOverlayIdentifier() - { - return "chemicalwasher"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/nei/GuiChemicalWasher.png"; - } - - @Override - public Class getGuiClass() - { - return GuiChemicalWasher.class; - } - - public String getRecipeId() - { - return "mekanism.chemicalwasher"; - } - - public Collection getRecipes() - { - return Recipe.CHEMICAL_WASHER.get().values(); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(-2, 0, 3, yOffset, 170, 70); - } - - @Override - public void drawExtras(int i) - { - CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - - drawTexturedModalRect(61-xOffset, 39-yOffset, 176, 63, 55, 8); - - displayGauge(58, 6-xOffset, 5-yOffset, 176, 4, 58, new FluidStack(FluidRegistry.WATER, 1), null); - - if(recipe.outputStack != null) - { - displayGauge(58, 27-xOffset, 14-yOffset, 176, 4, 58, null, recipe.inputStack); - } - - if(recipe.inputStack != null) - { - displayGauge(58, 134-xOffset, 14-yOffset, 176, 4, 58, null, recipe.outputStack); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(61-xOffset, 39-yOffset, 55, 8), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(WasherRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else if(outputId.equals("gas") && results.length == 1 && results[0] instanceof GasStack) - { - for(WasherRecipe irecipe : getRecipes()) - { - if(((GasStack)results[0]).isGasEqual(irecipe.getOutput().output)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) - { - if(inputId.equals("fluid") && ingredients.length == 1 && ingredients[0] instanceof FluidStack) - { - if(((FluidStack)ingredients[0]).getFluid() == FluidRegistry.WATER) - { - for(WasherRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else if(inputId.equals("gas") && ingredients.length == 1 && ingredients[0] instanceof GasStack) - { - for(WasherRecipe irecipe : getRecipes()) - { - if(irecipe.getInput().ingredient.isGasEqual((GasStack)ingredients[0])) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5+13 && yAxis <= 63+13) - { - currenttip.add(FluidRegistry.WATER.getLocalizedName(null)); - } - else if(xAxis >= 27 && xAxis <= 43 && yAxis >= 14+13 && yAxis <= 72+13) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).inputStack)); - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+13 && yAxis <= 72+13) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).outputStack)); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack gas = null; - FluidStack fluid = null; - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5+13 && yAxis <= 63+13) - { - fluid = new FluidStack(FluidRegistry.WATER, 1); - } - else if(xAxis >= 27 && xAxis <= 43 && yAxis >= 14+13 && yAxis <= 72+13) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).inputStack; - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+13 && yAxis <= 72+13) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).outputStack; - } - - if(gas != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doGasLookup(gas, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doGasLookup(gas, true)) - { - return true; - } - } - } - else if(fluid != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doFluidLookup(fluid, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doFluidLookup(fluid, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack gas = null; - FluidStack fluid = null; - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5+13 && yAxis <= 63+13) - { - fluid = new FluidStack(FluidRegistry.WATER, 1); - } - else if(xAxis >= 27 && xAxis <= 43 && yAxis >= 14+13 && yAxis <= 72+13) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).inputStack; - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+13 && yAxis <= 72+13) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).outputStack; - } - - if(gas != null) - { - if(button == 0) - { - if(doGasLookup(gas, false)) - { - return true; - } - } - else if(button == 1) - { - if(doGasLookup(gas, true)) - { - return true; - } - } - } - else if(fluid != null) - { - if(button == 0) - { - if(doFluidLookup(fluid, false)) - { - return true; - } - } - else if(button == 1) - { - if(doFluidLookup(fluid, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - @Override - public int recipiesPerPage() - { - return 1; - } - - @Override - public void addGuiElements() - { - - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public GasStack inputStack; - public GasStack outputStack; - - @Override - public PositionedStack getResult() - { - return null; - } - - public CachedIORecipe(GasStack input, GasStack output) - { - inputStack = input; - outputStack = output; - } - - public CachedIORecipe(WasherRecipe recipe) - { - this(recipe.getInput().ingredient, recipe.getOutput().output); - } - } -} diff --git a/legacy/mekanism.client.nei/CombinerRecipeHandler.java b/legacy/mekanism.client.nei/CombinerRecipeHandler.java deleted file mode 100644 index c6e052620..000000000 --- a/legacy/mekanism.client.nei/CombinerRecipeHandler.java +++ /dev/null @@ -1,59 +0,0 @@ -package mekanism.client.nei; - -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.Gas; -import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiCombiner; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.CombinerRecipe; -import mekanism.common.util.LangUtils; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; - -public class CombinerRecipeHandler extends AdvancedMachineRecipeHandler -{ - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock.Combiner.name"); - } - - @Override - public String getRecipeId() - { - return "mekanism.combiner"; - } - - @Override - public String getOverlayIdentifier() - { - return "combiner"; - } - - @Override - public Collection getRecipes() - { - return Recipe.COMBINER.get().values(); - } - - @Override - public ProgressBar getProgressType() - { - return ProgressBar.STONE; - } - - @Override - public List getFuelStacks(Gas gasType) - { - return ListUtils.asList(new ItemStack(Blocks.cobblestone)); - } - - @Override - public Class getGuiClass() - { - return GuiCombiner.class; - } -} diff --git a/legacy/mekanism.client.nei/CrusherRecipeHandler.java b/legacy/mekanism.client.nei/CrusherRecipeHandler.java deleted file mode 100644 index 0b695e98a..000000000 --- a/legacy/mekanism.client.nei/CrusherRecipeHandler.java +++ /dev/null @@ -1,48 +0,0 @@ -package mekanism.client.nei; - -import java.util.Collection; - -import mekanism.client.gui.GuiCrusher; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.CrusherRecipe; -import mekanism.common.util.LangUtils; - -public class CrusherRecipeHandler extends MachineRecipeHandler -{ - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock.Crusher.name"); - } - - @Override - public String getRecipeId() - { - return "mekanism.crusher"; - } - - @Override - public String getOverlayIdentifier() - { - return "crusher"; - } - - @Override - public ProgressBar getProgressType() - { - return ProgressBar.CRUSH; - } - - @Override - public Collection getRecipes() - { - return Recipe.CRUSHER.get().values(); - } - - @Override - public Class getGuiClass() - { - return GuiCrusher.class; - } -} diff --git a/legacy/mekanism.client.nei/ElectrolyticSeparatorRecipeHandler.java b/legacy/mekanism.client.nei/ElectrolyticSeparatorRecipeHandler.java deleted file mode 100644 index cb5a27450..000000000 --- a/legacy/mekanism.client.nei/ElectrolyticSeparatorRecipeHandler.java +++ /dev/null @@ -1,390 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiElectrolyticSeparator; -import mekanism.client.gui.element.GuiElement; -import mekanism.client.gui.element.GuiFluidGauge; -import mekanism.client.gui.element.GuiGasGauge; -import mekanism.client.gui.element.GuiGauge; -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.common.ObfuscatedNames; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.inputs.FluidInput; -import mekanism.common.recipe.machines.SeparatorRecipe; -import mekanism.common.recipe.outputs.ChemicalPairOutput; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class ElectrolyticSeparatorRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public GuiFluidGauge fluidInput; - public GuiGasGauge leftGas; - public GuiGasGauge rightGas; - - public static int xOffset = 5; - public static int yOffset = 9; - - @Override - public void addGuiElements() - { - guiElements.add(fluidInput = GuiFluidGauge.getDummy(GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 5, 10)); - guiElements.add(leftGas = GuiGasGauge.getDummy(GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 58, 18)); - guiElements.add(rightGas = GuiGasGauge.getDummy(GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 100, 18)); - guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { - @Override - public double getLevel() - { - return ticksPassed <= 20 ? ticksPassed / 20.0F : 1.0F; - } - }, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 164, 15)); - - guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 25, 34)); - guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 58, 51)); - guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 100, 51)); - guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 142, 34).with(SlotOverlay.POWER)); - - guiElements.add(new GuiProgress(new IProgressInfoHandler() - { - @Override - public double getProgress() - { - return 1; - } - }, ProgressBar.BI, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 78, 29)); - } - - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock2.ElectrolyticSeparator.name"); - } - - @Override - public String getOverlayIdentifier() - { - return "electrolyticseparator"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/GuiElectrolyticSeparator.png"; - } - - @Override - public Class getGuiClass() - { - return GuiElectrolyticSeparator.class; - } - - public String getRecipeId() - { - return "mekanism.electrolyticseparator"; - } - - public Collection getRecipes() - { - return Recipe.ELECTROLYTIC_SEPARATOR.get().values(); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(-1, 0, 4, yOffset, 167, 62); - - for(GuiElement e : guiElements) - { - e.renderBackground(0, 0, -xOffset, -yOffset); - } - } - - @Override - public void drawExtras(int i) - { - CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - - if(recipe.fluidInput != null) - { - fluidInput.setDummyType(recipe.fluidInput.ingredient.getFluid()); - fluidInput.renderScale(0, 0, -xOffset, -yOffset); - } - - if(recipe.outputPair.leftGas != null) - { - displayGauge(28, 59-xOffset, 19-yOffset, 176, 68, 28, null, recipe.outputPair.leftGas); - leftGas.setDummyType(recipe.outputPair.leftGas.getGas()); - leftGas.renderScale(0, 0, -xOffset, -yOffset); - } - - if(recipe.outputPair.rightGas != null) - { - displayGauge(28, 101-xOffset, 19-yOffset, 176, 68, 28, null, recipe.outputPair.rightGas); - rightGas.setDummyType(recipe.outputPair.rightGas.getGas()); - rightGas.renderScale(0, 0, -xOffset, -yOffset); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(80-xOffset, 30-yOffset, 16, 6), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(SeparatorRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else if(outputId.equals("gas") && results.length == 1 && results[0] instanceof GasStack) - { - for(SeparatorRecipe irecipe : getRecipes()) - { - if(irecipe.recipeOutput.containsType((GasStack)results[0])) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) - { - if(inputId.equals("fluid") && ingredients.length == 1 && ingredients[0] instanceof FluidStack) - { - for(SeparatorRecipe irecipe : getRecipes()) - { - if(irecipe.recipeInput.ingredient.isFluidEqual((FluidStack)ingredients[0])) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 11+7 && yAxis <= 69+7) - { - currenttip.add(LangUtils.localizeFluidStack(((CachedIORecipe)arecipes.get(recipe)).fluidInput.ingredient)); - } - else if(xAxis >= 59 && xAxis <= 75 && yAxis >= 19+7 && yAxis <= 47+7) - { - currenttip.add(((CachedIORecipe)arecipes.get(recipe)).outputPair.leftGas.getGas().getLocalizedName()); - } - else if(xAxis >= 101 && xAxis <= 117 && yAxis >= 19+7 && yAxis <= 47+7) - { - currenttip.add(((CachedIORecipe)arecipes.get(recipe)).outputPair.rightGas.getGas().getLocalizedName()); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack gas = null; - FluidStack fluid = null; - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 11+7 && yAxis <= 69+7) - { - fluid = ((CachedIORecipe)arecipes.get(recipe)).fluidInput.ingredient; - } - else if(xAxis >= 59 && xAxis <= 75 && yAxis >= 19+7 && yAxis <= 47+7) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).outputPair.leftGas; - } - else if(xAxis >= 101 && xAxis <= 117 && yAxis >= 19+7 && yAxis <= 47+7) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).outputPair.rightGas; - } - - if(gas != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doGasLookup(gas, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doGasLookup(gas, true)) - { - return true; - } - } - } - else if(fluid != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doFluidLookup(fluid, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doFluidLookup(fluid, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack gas = null; - FluidStack fluid = null; - - if(xAxis >= 6 && xAxis <= 22 && yAxis >= 11+7 && yAxis <= 69+7) - { - fluid = ((CachedIORecipe)arecipes.get(recipe)).fluidInput.ingredient; - } - else if(xAxis >= 59 && xAxis <= 75 && yAxis >= 19+7 && yAxis <= 47+7) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).outputPair.leftGas; - } - else if(xAxis >= 101 && xAxis <= 117 && yAxis >= 19+7 && yAxis <= 47+7) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).outputPair.rightGas; - } - - if(gas != null) - { - if(button == 0) - { - if(doGasLookup(gas, false)) - { - return true; - } - } - else if(button == 1) - { - if(doGasLookup(gas, true)) - { - return true; - } - } - } - else if(fluid != null) - { - if(button == 0) - { - if(doFluidLookup(fluid, false)) - { - return true; - } - } - else if(button == 1) - { - if(doFluidLookup(fluid, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - @Override - public int recipiesPerPage() - { - return 1; - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public FluidInput fluidInput; - public ChemicalPairOutput outputPair; - - @Override - public PositionedStack getResult() - { - return null; - } - - public CachedIORecipe(FluidInput input, ChemicalPairOutput pair) - { - fluidInput = input; - outputPair = pair; - } - - public CachedIORecipe(SeparatorRecipe recipe) - { - this(recipe.recipeInput, recipe.recipeOutput); - } - } -} diff --git a/legacy/mekanism.client.nei/ElementBoundHandler.java b/legacy/mekanism.client.nei/ElementBoundHandler.java deleted file mode 100644 index e0b455704..000000000 --- a/legacy/mekanism.client.nei/ElementBoundHandler.java +++ /dev/null @@ -1,31 +0,0 @@ -package mekanism.client.nei; - -import mekanism.client.gui.GuiMekanism; -import mekanism.client.gui.element.GuiElement; -import net.minecraft.client.gui.inventory.GuiContainer; -import codechicken.lib.vec.Rectangle4i; -import codechicken.nei.api.INEIGuiAdapter; - -public class ElementBoundHandler extends INEIGuiAdapter -{ - @Override - public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int width, int height) - { - if(gui instanceof GuiMekanism) - { - GuiMekanism guiMek = (GuiMekanism)gui; - - Rectangle4i rect = new Rectangle4i(x, y, width, height); - - for(GuiElement element : guiMek.guiElements) - { - if(element.getBounds(guiMek.getXPos(), guiMek.getYPos()).intersects(rect)) - { - return true; - } - } - } - - return false; - } -} diff --git a/legacy/mekanism.client.nei/EnrichmentChamberRecipeHandler.java b/legacy/mekanism.client.nei/EnrichmentChamberRecipeHandler.java deleted file mode 100644 index f32986f6b..000000000 --- a/legacy/mekanism.client.nei/EnrichmentChamberRecipeHandler.java +++ /dev/null @@ -1,48 +0,0 @@ -package mekanism.client.nei; - -import java.util.Collection; - -import mekanism.client.gui.GuiEnrichmentChamber; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.EnrichmentRecipe; -import mekanism.common.util.LangUtils; - -public class EnrichmentChamberRecipeHandler extends MachineRecipeHandler -{ - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock.EnrichmentChamber.name"); - } - - @Override - public String getRecipeId() - { - return "mekanism.chamber"; - } - - @Override - public String getOverlayIdentifier() - { - return "chamber"; - } - - @Override - public ProgressBar getProgressType() - { - return ProgressBar.BLUE; - } - - @Override - public Collection getRecipes() - { - return Recipe.ENRICHMENT_CHAMBER.get().values(); - } - - @Override - public Class getGuiClass() - { - return GuiEnrichmentChamber.class; - } -} diff --git a/legacy/mekanism.client.nei/MachineRecipeHandler.java b/legacy/mekanism.client.nei/MachineRecipeHandler.java deleted file mode 100644 index d9551fae2..000000000 --- a/legacy/mekanism.client.nei/MachineRecipeHandler.java +++ /dev/null @@ -1,164 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Rectangle; -import java.util.Collection; - -import mekanism.client.gui.element.GuiElement; -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.common.recipe.machines.BasicMachineRecipe; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public abstract class MachineRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public abstract String getRecipeId(); - - public abstract Collection getRecipes(); - - public abstract ProgressBar getProgressType(); - - @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_LARGE, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 111, 30)); - - guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { - @Override - public double getLevel() - { - return ticksPassed <= 20 ? ticksPassed / 20.0F : 1.0F; - } - }, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 164, 15)); - guiElements.add(new GuiProgress(new IProgressInfoHandler() - { - @Override - public double getProgress() - { - return ticksPassed >= 20 ? (ticksPassed - 20) % 20 / 20.0F : 0.0F; - } - }, getProgressType(), this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 77, 37)); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(12, 0, 28, 5, 144, 68); - - for(GuiElement e : guiElements) - { - e.renderBackground(0, 0, -16, -5); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(63, 34, 24, 7), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(BasicMachineRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - for(BasicMachineRecipe irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getOutput().output, result)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/GuiBasicMachine.png"; - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - for(BasicMachineRecipe irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getInput().ingredient, ingredient)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public PositionedStack input; - public PositionedStack output; - - @Override - public PositionedStack getIngredient() - { - return input; - } - - @Override - public PositionedStack getResult() - { - return output; - } - - public CachedIORecipe(ItemStack itemstack, ItemStack itemstack1) - { - super(); - - input = new PositionedStack(itemstack, 40, 12); - output = new PositionedStack(itemstack1, 100, 30); - } - - public CachedIORecipe(BasicMachineRecipe recipe) - { - this(recipe.getInput().ingredient, recipe.getOutput().output); - } - } -} diff --git a/legacy/mekanism.client.nei/MekanismSlotClickHandler.java b/legacy/mekanism.client.nei/MekanismSlotClickHandler.java deleted file mode 100644 index 229831a5b..000000000 --- a/legacy/mekanism.client.nei/MekanismSlotClickHandler.java +++ /dev/null @@ -1,33 +0,0 @@ -package mekanism.client.nei; - -import mekanism.client.gui.GuiMekanism; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.inventory.Slot; -import codechicken.nei.guihook.IContainerSlotClickHandler; - -public class MekanismSlotClickHandler implements IContainerSlotClickHandler -{ - @Override - public void beforeSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier) - { - - } - - @Override - public boolean handleSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier, boolean eventconsumed) - { - if(gui instanceof GuiMekanism) - { - ((GuiMekanism)gui).handleMouse(slot, slotIndex, button, modifier); - return true; - } - - return false; - } - - @Override - public void afterSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier) - { - - } -} diff --git a/legacy/mekanism.client.nei/MetallurgicInfuserRecipeHandler.java b/legacy/mekanism.client.nei/MetallurgicInfuserRecipeHandler.java deleted file mode 100644 index f8053382e..000000000 --- a/legacy/mekanism.client.nei/MetallurgicInfuserRecipeHandler.java +++ /dev/null @@ -1,257 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import mekanism.api.infuse.InfuseObject; -import mekanism.api.infuse.InfuseRegistry; -import mekanism.api.infuse.InfuseType; -import mekanism.client.gui.GuiMetallurgicInfuser; -import mekanism.client.gui.element.GuiElement; -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.render.MekanismRenderer; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class MetallurgicInfuserRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - @Override - public void addGuiElements() - { - guiElements.add(new GuiSlot(SlotType.EXTRA, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 16, 34)); - guiElements.add(new GuiSlot(SlotType.INPUT, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 50, 42)); - guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 142, 34).with(SlotOverlay.POWER)); - guiElements.add(new GuiSlot(SlotType.OUTPUT, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 108, 42)); - - guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { - @Override - public double getLevel() - { - return ticksPassed <= 20 ? ticksPassed / 20.0F : 1.0F; - } - }, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 164, 15)); - guiElements.add(new GuiProgress(new IProgressInfoHandler() { - @Override - public double getProgress() - { - return ticksPassed >= 40 ? (ticksPassed - 40) % 20 / 20.0F : 0.0F; - } - }, ProgressBar.MEDIUM, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 70, 46)); - } - - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock.MetallurgicInfuser.name"); - } - - @Override - public String getOverlayIdentifier() - { - return "infuser"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/GuiMetallurgicInfuser.png"; - } - - @Override - public Class getGuiClass() - { - return GuiMetallurgicInfuser.class; - } - - public String getRecipeId() - { - return "mekanism.infuser"; - } - - public List getInfuseStacks(InfuseType type) - { - List ret = new ArrayList(); - - for(Map.Entry obj : InfuseRegistry.getObjectMap().entrySet()) - { - if(obj.getValue().type == type) - { - ret.add(obj.getKey()); - } - } - - return ret; - } - - public Collection getRecipes() - { - return Recipe.METALLURGIC_INFUSER.get().values(); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(0, 0, 5, 15, 166, 56); - - for(GuiElement e : guiElements) - { - e.renderBackground(0, 0, -5, -15); - } - } - - @Override - public void drawExtras(int i) - { - InfuseType type = ((CachedIORecipe)arecipes.get(i)).infusionType; - - float f = ticksPassed >= 20 && ticksPassed < 40 ? (ticksPassed - 20) % 20 / 20.0F : 1.0F; - if(ticksPassed < 20) f = 0.0F; - - int display = (int)(52F*f); - changeTexture(MekanismRenderer.getBlocksTexture()); - drawTexturedRectFromIcon(2, 2+52-display, type.icon, 4, display); - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(67, 32, 32, 8), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(MetallurgicInfuserRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe, getInfuseStacks(irecipe.getInput().infuse.type), irecipe.getInput().infuse.type)); - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public int recipiesPerPage() - { - return 2; - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - for(MetallurgicInfuserRecipe irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getOutput().output, result)) - { - arecipes.add(new CachedIORecipe(irecipe, getInfuseStacks(irecipe.getInput().infuse.type), irecipe.getInput().infuse.type)); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - for(MetallurgicInfuserRecipe irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getInput().inputStack, ingredient)) - { - arecipes.add(new CachedIORecipe(irecipe, getInfuseStacks(irecipe.getInput().infuse.type), irecipe.getInput().infuse.type)); - } - - List infuses; - - for(ItemStack stack : getInfuseStacks(irecipe.getInput().infuse.type)) - { - if(NEIServerUtils.areStacksSameTypeCrafting(stack, ingredient)) - { - infuses = new ArrayList(); - infuses.add(stack); - arecipes.add(new CachedIORecipe(irecipe, infuses, irecipe.getInput().infuse.type)); - } - } - } - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public List infuseStacks; - - public PositionedStack inputStack; - public PositionedStack outputStack; - - public InfuseType infusionType; - - @Override - public PositionedStack getIngredient() - { - return inputStack; - } - - @Override - public PositionedStack getResult() - { - return outputStack; - } - - @Override - public PositionedStack getOtherStack() - { - return new PositionedStack(infuseStacks.get(cycleticks/40 % infuseStacks.size()), 12, 20); - } - - public CachedIORecipe(ItemStack input, ItemStack output, List infuses, InfuseType type) - { - super(); - - inputStack = new PositionedStack(input, 46, 28); - outputStack = new PositionedStack(output, 104, 28); - - infuseStacks = infuses; - - infusionType = type; - } - - public CachedIORecipe(MetallurgicInfuserRecipe recipe, List infuses, InfuseType type) - { - this(recipe.getInput().inputStack, recipe.getOutput().output, infuses, type); - } - } -} diff --git a/legacy/mekanism.client.nei/NEIMekanismConfig.java b/legacy/mekanism.client.nei/NEIMekanismConfig.java deleted file mode 100644 index cecb68de5..000000000 --- a/legacy/mekanism.client.nei/NEIMekanismConfig.java +++ /dev/null @@ -1,132 +0,0 @@ -package mekanism.client.nei; - -import mekanism.client.gui.GuiChemicalCrystallizer; -import mekanism.client.gui.GuiChemicalDissolutionChamber; -import mekanism.client.gui.GuiChemicalInfuser; -import mekanism.client.gui.GuiChemicalInjectionChamber; -import mekanism.client.gui.GuiChemicalOxidizer; -import mekanism.client.gui.GuiChemicalWasher; -import mekanism.client.gui.GuiCombiner; -import mekanism.client.gui.GuiCrusher; -import mekanism.client.gui.GuiElectrolyticSeparator; -import mekanism.client.gui.GuiEnrichmentChamber; -import mekanism.client.gui.GuiMetallurgicInfuser; -import mekanism.client.gui.GuiOsmiumCompressor; -import mekanism.client.gui.GuiPRC; -import mekanism.client.gui.GuiPrecisionSawmill; -import mekanism.client.gui.GuiPurificationChamber; -import mekanism.client.gui.GuiRotaryCondensentrator; -import mekanism.client.gui.GuiSolarNeutronActivator; -import mekanism.client.gui.GuiThermalEvaporationController; -import mekanism.common.MekanismBlocks; -import mekanism.common.MekanismItems; -import net.minecraft.item.ItemStack; -import codechicken.nei.api.API; -import codechicken.nei.api.IConfigureNEI; -import codechicken.nei.guihook.GuiContainerManager; - -public class NEIMekanismConfig implements IConfigureNEI -{ - @Override - public void loadConfig() - { - API.registerRecipeHandler(new EnrichmentChamberRecipeHandler()); - API.registerUsageHandler(new EnrichmentChamberRecipeHandler()); - - API.registerRecipeHandler(new OsmiumCompressorRecipeHandler()); - API.registerUsageHandler(new OsmiumCompressorRecipeHandler()); - - API.registerRecipeHandler(new CrusherRecipeHandler()); - API.registerUsageHandler(new CrusherRecipeHandler()); - - API.registerRecipeHandler(new CombinerRecipeHandler()); - API.registerUsageHandler(new CombinerRecipeHandler()); - - API.registerRecipeHandler(new MetallurgicInfuserRecipeHandler()); - API.registerUsageHandler(new MetallurgicInfuserRecipeHandler()); - - API.registerRecipeHandler(new PurificationChamberRecipeHandler()); - API.registerUsageHandler(new PurificationChamberRecipeHandler()); - - API.registerRecipeHandler(new ChemicalInjectionChamberRecipeHandler()); - API.registerUsageHandler(new ChemicalInjectionChamberRecipeHandler()); - - API.registerRecipeHandler(new ChemicalOxidizerRecipeHandler()); - API.registerUsageHandler(new ChemicalOxidizerRecipeHandler()); - - API.registerRecipeHandler(new ChemicalInfuserRecipeHandler()); - API.registerUsageHandler(new ChemicalInfuserRecipeHandler()); - - API.registerRecipeHandler(new RotaryCondensentratorRecipeHandler()); - API.registerUsageHandler(new RotaryCondensentratorRecipeHandler()); - - API.registerRecipeHandler(new ElectrolyticSeparatorRecipeHandler()); - API.registerUsageHandler(new ElectrolyticSeparatorRecipeHandler()); - - API.registerRecipeHandler(new PrecisionSawmillRecipeHandler()); - API.registerUsageHandler(new PrecisionSawmillRecipeHandler()); - - API.registerRecipeHandler(new ThermalEvaporationRecipeHandler()); - API.registerUsageHandler(new ThermalEvaporationRecipeHandler()); - - API.registerRecipeHandler(new ChemicalDissolutionChamberRecipeHandler()); - API.registerUsageHandler(new ChemicalDissolutionChamberRecipeHandler()); - - API.registerRecipeHandler(new ChemicalWasherRecipeHandler()); - API.registerUsageHandler(new ChemicalWasherRecipeHandler()); - - API.registerRecipeHandler(new ChemicalCrystallizerRecipeHandler()); - API.registerUsageHandler(new ChemicalCrystallizerRecipeHandler()); - - API.registerRecipeHandler(new PRCRecipeHandler()); - API.registerUsageHandler(new PRCRecipeHandler()); - - API.registerRecipeHandler(new SolarNeutronRecipeHandler()); - API.registerUsageHandler(new SolarNeutronRecipeHandler()); - - API.registerRecipeHandler(new ShapedMekanismRecipeHandler()); - API.registerUsageHandler(new ShapedMekanismRecipeHandler()); - - API.registerRecipeHandler(new ShapelessMekanismRecipeHandler()); - API.registerUsageHandler(new ShapelessMekanismRecipeHandler()); - - API.setGuiOffset(GuiEnrichmentChamber.class, 16, 6); - API.setGuiOffset(GuiOsmiumCompressor.class, 16, 6); - API.setGuiOffset(GuiCrusher.class, 16, 6); - API.setGuiOffset(GuiCombiner.class, 16, 6); - API.setGuiOffset(GuiPurificationChamber.class, 16, 6); - API.setGuiOffset(GuiChemicalInjectionChamber.class, 16, 6); - API.setGuiOffset(GuiMetallurgicInfuser.class, 5, 15); - API.setGuiOffset(GuiChemicalOxidizer.class, ChemicalOxidizerRecipeHandler.xOffset, ChemicalOxidizerRecipeHandler.yOffset); - API.setGuiOffset(GuiChemicalInfuser.class, ChemicalInfuserRecipeHandler.xOffset, ChemicalInfuserRecipeHandler.yOffset); - API.setGuiOffset(GuiRotaryCondensentrator.class, RotaryCondensentratorRecipeHandler.xOffset, RotaryCondensentratorRecipeHandler.yOffset); - API.setGuiOffset(GuiElectrolyticSeparator.class, ElectrolyticSeparatorRecipeHandler.xOffset, ElectrolyticSeparatorRecipeHandler.yOffset); - API.setGuiOffset(GuiPrecisionSawmill.class, 16, 6); - API.setGuiOffset(GuiThermalEvaporationController.class, ThermalEvaporationRecipeHandler.xOffset, ThermalEvaporationRecipeHandler.yOffset); - API.setGuiOffset(GuiChemicalDissolutionChamber.class, ChemicalDissolutionChamberRecipeHandler.xOffset, ChemicalDissolutionChamberRecipeHandler.yOffset); - API.setGuiOffset(GuiChemicalWasher.class, ChemicalWasherRecipeHandler.xOffset, ChemicalWasherRecipeHandler.yOffset); - API.setGuiOffset(GuiChemicalCrystallizer.class, ChemicalCrystallizerRecipeHandler.xOffset, ChemicalCrystallizerRecipeHandler.yOffset); - API.setGuiOffset(GuiPRC.class, PRCRecipeHandler.xOffset, PRCRecipeHandler.yOffset); - API.setGuiOffset(GuiThermalEvaporationController.class, ThermalEvaporationRecipeHandler.xOffset, ThermalEvaporationRecipeHandler.yOffset); - API.setGuiOffset(GuiSolarNeutronActivator.class, SolarNeutronRecipeHandler.xOffset, SolarNeutronRecipeHandler.yOffset); - - GuiContainerManager.addSlotClickHandler(new MekanismSlotClickHandler()); - - API.registerNEIGuiHandler(new ElementBoundHandler()); - - API.hideItem(new ItemStack(MekanismBlocks.BoundingBlock)); - API.hideItem(new ItemStack(MekanismItems.ItemProxy)); - } - - @Override - public String getName() - { - return "Mekanism NEI Plugin"; - } - - @Override - public String getVersion() - { - return "8.0.0"; - } -} diff --git a/legacy/mekanism.client.nei/OsmiumCompressorRecipeHandler.java b/legacy/mekanism.client.nei/OsmiumCompressorRecipeHandler.java deleted file mode 100644 index 2b6fb30a6..000000000 --- a/legacy/mekanism.client.nei/OsmiumCompressorRecipeHandler.java +++ /dev/null @@ -1,59 +0,0 @@ -package mekanism.client.nei; - -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.Gas; -import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiOsmiumCompressor; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.MekanismItems; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.OsmiumCompressorRecipe; -import mekanism.common.util.LangUtils; -import net.minecraft.item.ItemStack; - -public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler -{ - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock.OsmiumCompressor.name"); - } - - @Override - public String getRecipeId() - { - return "mekanism.compressor"; - } - - @Override - public String getOverlayIdentifier() - { - return "compressor"; - } - - @Override - public Collection getRecipes() - { - return Recipe.OSMIUM_COMPRESSOR.get().values(); - } - - @Override - public ProgressBar getProgressType() - { - return ProgressBar.RED; - } - - @Override - public List getFuelStacks(Gas gasType) - { - return ListUtils.asList(new ItemStack(MekanismItems.Ingot, 1, 1)); - } - - @Override - public Class getGuiClass() - { - return GuiOsmiumCompressor.class; - } -} diff --git a/legacy/mekanism.client.nei/PRCRecipeHandler.java b/legacy/mekanism.client.nei/PRCRecipeHandler.java deleted file mode 100644 index 4dbb1484b..000000000 --- a/legacy/mekanism.client.nei/PRCRecipeHandler.java +++ /dev/null @@ -1,443 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiPRC; -import mekanism.client.gui.element.GuiElement; -import mekanism.client.gui.element.GuiFluidGauge; -import mekanism.client.gui.element.GuiGasGauge; -import mekanism.client.gui.element.GuiGauge; -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.common.ObfuscatedNames; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.inputs.PressurizedInput; -import mekanism.common.recipe.machines.PressurizedRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class PRCRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public GuiFluidGauge fluidInput; - public GuiGasGauge gasInput; - public GuiGasGauge gasOutput; - - public static int xOffset = 5; - public static int yOffset = 11; - - @Override - public void addGuiElements() - { - guiElements.add(new GuiSlot(SlotType.INPUT, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 53, 34)); - guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 140, 18).with(SlotOverlay.POWER)); - guiElements.add(new GuiSlot(SlotType.OUTPUT, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 115, 34)); - - guiElements.add(fluidInput = GuiFluidGauge.getDummy(GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiPRC.png"), 5, 10)); - guiElements.add(gasInput = GuiGasGauge.getDummy(GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiPRC.png"), 28, 10)); - guiElements.add(gasOutput = GuiGasGauge.getDummy(GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiPRC.png"), 140, 40)); - - guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { - @Override - public double getLevel() - { - return ticksPassed <= 20 ? ticksPassed / 20.0F : 1.0F; - } - }, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 164, 15)); - guiElements.add(new GuiProgress(new IProgressInfoHandler() - { - @Override - public double getProgress() - { - return ticksPassed >= 20 ? (ticksPassed - 20) % 20 / 20.0F : 0.0F; - } - }, getProgressType(), this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 75, 37)); - } - - public ProgressBar getProgressType() - { - return ProgressBar.MEDIUM; - } - - public Set> getRecipes() - { - return Recipe.PRESSURIZED_REACTION_CHAMBER.get().entrySet(); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(-2, 0, 3, yOffset, 170, 68); - - for(GuiElement e : guiElements) - { - e.renderBackground(0, 0, -xOffset, -yOffset); - } - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(75-xOffset, 37-yOffset, 36, 10), getRecipeId(), new Object[0])); - } - - @Override - public void onUpdate() - { - super.onUpdate(); - ticksPassed++; - } - - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock2.PressurizedReactionChamber.short.name"); - } - - @Override - public Class getGuiClass() - { - return GuiPRC.class; - } - - @Override - public String getOverlayIdentifier() - { - return "prc"; - } - - @Override - public int recipiesPerPage() - { - return 2; - } - - public String getRecipeId() - { - return "mekanism.prc"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/nei/GuiPRC.png"; - } - - @Override - public void drawExtras(int i) - { - CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - - if(recipe.pressurizedRecipe.getInput().getFluid() != null) - { - fluidInput.setDummyType(recipe.pressurizedRecipe.getInput().getFluid().getFluid()); - fluidInput.renderScale(0, 0, -xOffset, -yOffset); - } - - if(recipe.pressurizedRecipe.getInput().getGas() != null) - { - gasInput.setDummyType(recipe.pressurizedRecipe.getInput().getGas().getGas()); - gasInput.renderScale(0, 0, -xOffset, -yOffset); - } - - if(recipe.pressurizedRecipe.getOutput().getGasOutput() != null) - { - gasOutput.setDummyType(recipe.pressurizedRecipe.getOutput().getGasOutput().getGas()); - gasOutput.renderScale(0, 0, -xOffset, -yOffset); - } - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(Map.Entry irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else if(outputId.equals("gas") && results.length == 1 && results[0] instanceof GasStack) - { - for(Map.Entry irecipe : getRecipes()) - { - if(irecipe.getValue().getOutput().getGasOutput().isGasEqual((GasStack)results[0])) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - for(Map.Entry irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getValue().getOutput().getItemOutput(), result)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) - { - if(inputId.equals("gas") && ingredients.length == 1 && ingredients[0] instanceof GasStack) - { - for(Map.Entry irecipe : getRecipes()) - { - if(irecipe.getKey().containsType((GasStack)ingredients[0])) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else if(inputId.equals("fluid") && ingredients.length == 1 && ingredients[0] instanceof FluidStack) - { - for(Map.Entry irecipe : getRecipes()) - { - if(irecipe.getKey().containsType((FluidStack)ingredients[0])) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - for(Map.Entry irecipe : getRecipes()) - { - if(NEIServerUtils.areStacksSameTypeCrafting(irecipe.getKey().getSolid(), ingredient)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - Point offset = gui.getRecipePosition(recipe); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft)-offset.x; - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop)-offset.y; - - if(xAxis >= 6-5 && xAxis <= 22-5 && yAxis >= 11-10 && yAxis <= 69-10) - { - currenttip.add(LangUtils.localizeFluidStack(((CachedIORecipe)arecipes.get(recipe)).pressurizedRecipe.getInput().getFluid())); - } - else if(xAxis >= 29-5 && xAxis <= 45-5 && yAxis >= 11-10 && yAxis <= 69-10) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).pressurizedRecipe.getInput().getGas())); - } - else if(xAxis >= 141-5 && xAxis <= 157-5 && yAxis >= 41-10 && yAxis <= 69-10) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).pressurizedRecipe.getOutput().getGasOutput())); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - Point offset = gui.getRecipePosition(recipe); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft)-offset.x; - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop)-offset.y; - - GasStack gas = null; - FluidStack fluid = null; - - if(xAxis >= 6-5 && xAxis <= 22-5 && yAxis >= 11-10 && yAxis <= 69-10) - { - fluid = ((CachedIORecipe)arecipes.get(recipe)).pressurizedRecipe.getInput().getFluid(); - } - else if(xAxis >= 29-5 && xAxis <= 45-5 && yAxis >= 11-10 && yAxis <= 69-10) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).pressurizedRecipe.getInput().getGas(); - } - else if(xAxis >= 141-5 && xAxis <= 157-5 && yAxis >= 41-10 && yAxis <= 69-10) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).pressurizedRecipe.getOutput().getGasOutput(); - } - - if(gas != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doGasLookup(gas, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doGasLookup(gas, true)) - { - return true; - } - } - } - else if(fluid != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doFluidLookup(fluid, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doFluidLookup(fluid, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - Point offset = gui.getRecipePosition(recipe); - - int xAxis = point.x - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft)-offset.x; - int yAxis = point.y - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop)-offset.y; - - GasStack gas = null; - FluidStack fluid = null; - - if(xAxis >= 6-5 && xAxis <= 22-5 && yAxis >= 11-10 && yAxis <= 69-10) - { - fluid = ((CachedIORecipe)arecipes.get(recipe)).pressurizedRecipe.getInput().getFluid(); - } - else if(xAxis >= 29-5 && xAxis <= 45-5 && yAxis >= 11-10 && yAxis <= 69-10) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).pressurizedRecipe.getInput().getGas(); - } - else if(xAxis >= 141-5 && xAxis <= 157-5 && yAxis >= 41-10 && yAxis <= 69-10) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).pressurizedRecipe.getOutput().getGasOutput(); - } - - if(gas != null) - { - if(button == 0) - { - if(doGasLookup(gas, false)) - { - return true; - } - } - else if(button == 1) - { - if(doGasLookup(gas, true)) - { - return true; - } - } - } - else if(fluid != null) - { - if(button == 0) - { - if(doFluidLookup(fluid, false)) - { - return true; - } - } - else if(button == 1) - { - if(doFluidLookup(fluid, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public PressurizedRecipe pressurizedRecipe; - - public PositionedStack input; - public PositionedStack output; - - @Override - public PositionedStack getIngredient() - { - return input; - } - - @Override - public PositionedStack getResult() - { - return output; - } - - public CachedIORecipe(PressurizedRecipe recipe) - { - super(); - - pressurizedRecipe = recipe; - - input = new PositionedStack(recipe.getInput().getSolid(), 54-xOffset, 35-yOffset); - output = new PositionedStack(recipe.getOutput().getItemOutput(), 116-xOffset, 35-yOffset); - } - - public CachedIORecipe(Map.Entry recipe) - { - this((PressurizedRecipe)recipe.getValue()); - } - } -} diff --git a/legacy/mekanism.client.nei/PrecisionSawmillRecipeHandler.java b/legacy/mekanism.client.nei/PrecisionSawmillRecipeHandler.java deleted file mode 100644 index 9d3442119..000000000 --- a/legacy/mekanism.client.nei/PrecisionSawmillRecipeHandler.java +++ /dev/null @@ -1,48 +0,0 @@ -package mekanism.client.nei; - -import java.util.Collection; - -import mekanism.client.gui.GuiPrecisionSawmill; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.SawmillRecipe; -import mekanism.common.util.LangUtils; - -public class PrecisionSawmillRecipeHandler extends ChanceMachineRecipeHandler -{ - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock2.PrecisionSawmill.name"); - } - - @Override - public String getRecipeId() - { - return "mekanism.precisionsawmill"; - } - - @Override - public String getOverlayIdentifier() - { - return "precisionsawmill"; - } - - @Override - public Collection getRecipes() - { - return Recipe.PRECISION_SAWMILL.get().values(); - } - - @Override - public ProgressBar getProgressType() - { - return ProgressBar.PURPLE; - } - - @Override - public Class getGuiClass() - { - return GuiPrecisionSawmill.class; - } -} diff --git a/legacy/mekanism.client.nei/PurificationChamberRecipeHandler.java b/legacy/mekanism.client.nei/PurificationChamberRecipeHandler.java deleted file mode 100644 index db1e61bca..000000000 --- a/legacy/mekanism.client.nei/PurificationChamberRecipeHandler.java +++ /dev/null @@ -1,71 +0,0 @@ -package mekanism.client.nei; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasRegistry; -import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiPurificationChamber; -import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.Tier.GasTankTier; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.PurificationRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -public class PurificationChamberRecipeHandler extends AdvancedMachineRecipeHandler -{ - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock.PurificationChamber.name"); - } - - @Override - public String getRecipeId() - { - return "mekanism.purificationchamber"; - } - - @Override - public String getOverlayIdentifier() - { - return "purificationchamber"; - } - - @Override - public Collection getRecipes() - { - return Recipe.PURIFICATION_CHAMBER.get().values(); - } - - @Override - public ProgressBar getProgressType() - { - return ProgressBar.RED; - } - - @Override - public List getFuelStacks(Gas gasType) - { - if(gasType == GasRegistry.getGas("oxygen")) - { - for(GasTankTier tier : GasTankTier.values()) - { - return ListUtils.asList(new ItemStack(Items.flint), MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("oxygen"))); - } - } - - return new ArrayList(); - } - - @Override - public Class getGuiClass() - { - return GuiPurificationChamber.class; - } -} diff --git a/legacy/mekanism.client.nei/RotaryCondensentratorRecipeHandler.java b/legacy/mekanism.client.nei/RotaryCondensentratorRecipeHandler.java deleted file mode 100644 index 03afb2ae3..000000000 --- a/legacy/mekanism.client.nei/RotaryCondensentratorRecipeHandler.java +++ /dev/null @@ -1,347 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawString; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.List; - -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasRegistry; -import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiRotaryCondensentrator; -import mekanism.common.ObfuscatedNames; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class RotaryCondensentratorRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public static int xOffset = 5; - public static int yOffset = 12; - - @Override - public String getRecipeName() - { - return LangUtils.localize("nei.rotaryCondensentrator"); - } - - @Override - public String getOverlayIdentifier() - { - return "rotarycondensentrator"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/nei/GuiRotaryCondensentrator.png"; - } - - @Override - public Class getGuiClass() - { - return GuiRotaryCondensentrator.class; - } - - public String getRecipeId() - { - return "mekanism.rotarycondensentrator"; - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(-2, 0, 3, yOffset, 170, 71); - } - - @Override - public void drawExtras(int i) - { - CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - - if(recipe.type) - { - drawTexturedModalRect(64-xOffset, 39-yOffset, 176, 123, 48, 8); - } - else { - drawTexturedModalRect(64-xOffset, 39-yOffset, 176, 115, 48, 8); - } - - if(recipe.gasStack != null) - { - displayGauge(58, 26-xOffset, 14-yOffset, 176, 40, 58, null, recipe.gasStack); - } - - if(recipe.fluidStack != null) - { - displayGauge(58, 134-xOffset, 14-yOffset, 176, 40, 58, recipe.fluidStack, null); - } - - drawString(recipe.type ? LangUtils.localize("gui.condensentrating") : LangUtils.localize("gui.decondensentrating"), 6-xOffset, 74-yOffset, 0x404040, false); - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(64-xOffset, 39-yOffset, 48, 8), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(Gas gas : GasRegistry.getRegisteredGasses()) - { - if(gas.hasFluid()) - { - arecipes.add(new CachedIORecipe(new GasStack(gas, 1), new FluidStack(gas.getFluid(), 1), true)); - arecipes.add(new CachedIORecipe(new GasStack(gas, 1), new FluidStack(gas.getFluid(), 1), false)); - } - } - } - else if(outputId.equals("gas") && results.length == 1 && results[0] instanceof GasStack) - { - GasStack gas = (GasStack)results[0]; - - if(gas.getGas().hasFluid()) - { - arecipes.add(new CachedIORecipe(new GasStack(gas.getGas(), 1), new FluidStack(gas.getGas().getFluid(), 1), false)); - } - } - else if(outputId.equals("fluid") && results.length == 1 && results[0] instanceof FluidStack) - { - FluidStack fluid = (FluidStack)results[0]; - Gas gas = GasRegistry.getGas(fluid.getFluid()); - - if(gas != null) - { - arecipes.add(new CachedIORecipe(new GasStack(gas, 1), new FluidStack(fluid.getFluid(), 1), true)); - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) - { - if(inputId.equals("gas") && ingredients.length == 1 && ingredients[0] instanceof GasStack) - { - GasStack gas = (GasStack)ingredients[0]; - - if(gas.getGas().hasFluid()) - { - arecipes.add(new CachedIORecipe(new GasStack(gas.getGas(), 1), new FluidStack(gas.getGas().getFluid(), 1), true)); - } - } - else if(inputId.equals("fluid") && ingredients.length == 1 && ingredients[0] instanceof FluidStack) - { - FluidStack fluid = (FluidStack)ingredients[0]; - Gas gas = GasRegistry.getGas(fluid.getFluid()); - - if(gas != null) - { - arecipes.add(new CachedIORecipe(new GasStack(gas, 1), new FluidStack(fluid.getFluid(), 1), false)); - } - } - else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14+4 && yAxis <= 72+4) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).gasStack)); - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+4 && yAxis <= 72+4) - { - currenttip.add(LangUtils.localizeFluidStack(((CachedIORecipe)arecipes.get(recipe)).fluidStack)); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack gas = null; - FluidStack fluid = null; - - if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14+4 && yAxis <= 72+4) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).gasStack; - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+4 && yAxis <= 72+4) - { - fluid = ((CachedIORecipe)arecipes.get(recipe)).fluidStack; - } - - if(gas != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doGasLookup(gas, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doGasLookup(gas, true)) - { - return true; - } - } - } - else if(fluid != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doFluidLookup(fluid, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doFluidLookup(fluid, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack gas = null; - FluidStack fluid = null; - - if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14+18 && yAxis <= 72+18) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).gasStack; - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+18 && yAxis <= 72+18) - { - fluid = ((CachedIORecipe)arecipes.get(recipe)).fluidStack; - } - - if(gas != null) - { - if(button == 0) - { - if(doGasLookup(gas, false)) - { - return true; - } - } - else if(button == 1) - { - if(doGasLookup(gas, true)) - { - return true; - } - } - } - else if(fluid != null) - { - if(button == 0) - { - if(doFluidLookup(fluid, false)) - { - return true; - } - } - else if(button == 1) - { - if(doFluidLookup(fluid, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - @Override - public int recipiesPerPage() - { - return 1; - } - - @Override - public void addGuiElements() - { - - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public GasStack gasStack; - public FluidStack fluidStack; - - /* true = condensentrating, false = decondensentrating */ - public boolean type; - - @Override - public PositionedStack getResult() - { - return null; - } - - public CachedIORecipe(GasStack gas, FluidStack fluid, boolean b) - { - gasStack = gas; - fluidStack = fluid; - type = b; - } - } -} diff --git a/legacy/mekanism.client.nei/ShapedMekanismRecipeHandler.java b/legacy/mekanism.client.nei/ShapedMekanismRecipeHandler.java deleted file mode 100644 index 0c87a628a..000000000 --- a/legacy/mekanism.client.nei/ShapedMekanismRecipeHandler.java +++ /dev/null @@ -1,156 +0,0 @@ -package mekanism.client.nei; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import mekanism.common.recipe.ShapedMekanismRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.RecipeUtils; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.ShapedRecipeHandler; - -public class ShapedMekanismRecipeHandler extends ShapedRecipeHandler -{ - @Override - public String getRecipeName() - { - return "Mekanism " + LangUtils.localize("recipe.mekanismShaped"); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals("crafting") && getClass() == ShapedMekanismRecipeHandler.class) - { - List allrecipes = CraftingManager.getInstance().getRecipeList(); - - for(IRecipe irecipe : allrecipes) - { - if(irecipe instanceof ShapedMekanismRecipe) - { - ShapedMekanismRecipe mekanismRecipe = (ShapedMekanismRecipe)irecipe; - CachedShapedMekanismRecipe recipe = new CachedShapedMekanismRecipe(mekanismRecipe); - - recipe.computeVisuals(); - arecipes.add(recipe); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - List allrecipes = CraftingManager.getInstance().getRecipeList(); - - for(IRecipe irecipe : allrecipes) - { - if(irecipe instanceof ShapedMekanismRecipe && RecipeUtils.areItemsEqualForCrafting(irecipe.getRecipeOutput(), result)) - { - ShapedMekanismRecipe mekanismRecipe = (ShapedMekanismRecipe)irecipe; - CachedShapedMekanismRecipe recipe = new CachedShapedMekanismRecipe(mekanismRecipe); - - recipe.computeVisuals(); - arecipes.add(recipe); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - List allrecipes = CraftingManager.getInstance().getRecipeList(); - - for(IRecipe irecipe : allrecipes) - { - if(irecipe instanceof ShapedMekanismRecipe) - { - ShapedMekanismRecipe mekanismRecipe = (ShapedMekanismRecipe)irecipe; - CachedShapedMekanismRecipe recipe = new CachedShapedMekanismRecipe(mekanismRecipe); - - recipe.computeVisuals(); - - if(recipe.contains(recipe.ingredients, ingredient)) - { - recipe.setIngredientPermutation(recipe.ingredients, ingredient); - arecipes.add(recipe); - } - } - } - } - - public class CachedShapedMekanismRecipe extends CachedRecipe - { - public ArrayList ingredients; - public PositionedStack result; - - public CachedShapedMekanismRecipe(ShapedMekanismRecipe recipe) - { - result = new PositionedStack(recipe.getRecipeOutput(), 119, 24); - ingredients = new ArrayList(); - setIngredients(recipe.width, recipe.height, recipe.getInput()); - } - - public void setIngredients(int width, int height, Object[] items) - { - for(int x = 0; x < width; x++) - { - for(int y = 0; y < height; y++) - { - if(items[y*width+x] == null) - { - continue; - } - - PositionedStack stack = new PositionedStack(items[y*width+x], 25+x*18, 6+y*18); - stack.setMaxSize(1); - ingredients.add(stack); - } - } - } - - @Override - public List getIngredients() - { - return getCycledIngredients(cycleticks / 20, ingredients); - } - - @Override - public PositionedStack getResult() - { - return result; - } - - public void computeVisuals() - { - for(PositionedStack p : ingredients) - { - p.generatePermutations(); - } - } - - @Override - public boolean contains(Collection ingredients, ItemStack ingredient) - { - for(PositionedStack stack : ingredients) - { - for(ItemStack item : stack.items) - { - if(RecipeUtils.areItemsEqualForCrafting(item, ingredient)) - { - return true; - } - } - } - - return false; - } - } -} diff --git a/legacy/mekanism.client.nei/ShapelessMekanismRecipeHandler.java b/legacy/mekanism.client.nei/ShapelessMekanismRecipeHandler.java deleted file mode 100644 index f3cecc9a5..000000000 --- a/legacy/mekanism.client.nei/ShapelessMekanismRecipeHandler.java +++ /dev/null @@ -1,125 +0,0 @@ -package mekanism.client.nei; - -import java.util.ArrayList; -import java.util.List; - -import mekanism.common.recipe.ShapelessMekanismRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.RecipeUtils; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.ShapelessRecipeHandler; - -public class ShapelessMekanismRecipeHandler extends ShapelessRecipeHandler -{ - @Override - public String getRecipeName() - { - return "Mekanism " + LangUtils.localize("recipe.mekanismShapeless"); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals("crafting") && getClass() == ShapelessMekanismRecipeHandler.class) - { - List allrecipes = CraftingManager.getInstance().getRecipeList(); - - for(IRecipe irecipe : allrecipes) - { - if(irecipe instanceof ShapelessMekanismRecipe) - { - ShapelessMekanismRecipe mekanismRecipe = (ShapelessMekanismRecipe)irecipe; - CachedShapelessMekanismRecipe recipe = new CachedShapelessMekanismRecipe(mekanismRecipe); - - arecipes.add(recipe); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - List allrecipes = CraftingManager.getInstance().getRecipeList(); - - for(IRecipe irecipe : allrecipes) - { - if(irecipe instanceof ShapelessMekanismRecipe && RecipeUtils.areItemsEqualForCrafting(irecipe.getRecipeOutput(), result)) - { - ShapelessMekanismRecipe mekanismRecipe = (ShapelessMekanismRecipe)irecipe; - CachedShapelessMekanismRecipe recipe = new CachedShapelessMekanismRecipe(mekanismRecipe); - - arecipes.add(recipe); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - List allrecipes = CraftingManager.getInstance().getRecipeList(); - - for(IRecipe irecipe : allrecipes) - { - if(irecipe instanceof ShapelessMekanismRecipe) - { - ShapelessMekanismRecipe mekanismRecipe = (ShapelessMekanismRecipe)irecipe; - CachedShapelessMekanismRecipe recipe = new CachedShapelessMekanismRecipe(mekanismRecipe); - - if(recipe.contains(recipe.ingredients, ingredient)) - { - recipe.setIngredientPermutation(recipe.ingredients, ingredient); - arecipes.add(recipe); - } - } - } - } - - public class CachedShapelessMekanismRecipe extends CachedRecipe - { - public ArrayList ingredients; - public PositionedStack result; - - public CachedShapelessMekanismRecipe(ShapelessMekanismRecipe recipe) - { - result = new PositionedStack(recipe.getRecipeOutput(), 119, 24); - ingredients = new ArrayList(); - setIngredients(recipe.getInput()); - } - - public void setIngredients(List items) - { - ingredients.clear(); - - for(int x = 0; x < items.size(); x++) - { - PositionedStack stack = new PositionedStack(items.get(x), 25 + stackorder[x][0] * 18, 6 + stackorder[x][1] * 18); - stack.setMaxSize(1); - ingredients.add(stack); - } - } - - public void setResult(ItemStack output) - { - result = new PositionedStack(output, 119, 24); - } - - @Override - public List getIngredients() - { - return getCycledIngredients(cycleticks / 20, ingredients); - } - - @Override - public PositionedStack getResult() - { - return result; - } - } -} diff --git a/legacy/mekanism.client.nei/SolarNeutronRecipeHandler.java b/legacy/mekanism.client.nei/SolarNeutronRecipeHandler.java deleted file mode 100644 index f7d2b88c2..000000000 --- a/legacy/mekanism.client.nei/SolarNeutronRecipeHandler.java +++ /dev/null @@ -1,286 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.Collection; -import java.util.List; - -import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiSolarNeutronActivator; -import mekanism.common.ObfuscatedNames; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.SolarNeutronRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import net.minecraft.client.gui.inventory.GuiContainer; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class SolarNeutronRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public static int xOffset = 5; - public static int yOffset = 12; - - @Override - public String getRecipeName() - { - return LangUtils.localize("tile.MachineBlock3.SolarNeutronActivator.name"); - } - - @Override - public String getOverlayIdentifier() - { - return "solarneutron"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/nei/GuiSolarNeutronActivator.png"; - } - - @Override - public Class getGuiClass() - { - return GuiSolarNeutronActivator.class; - } - - public String getRecipeId() - { - return "mekanism.solarneutron"; - } - - public Collection getRecipes() - { - return Recipe.SOLAR_NEUTRON_ACTIVATOR.get().values(); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(-2, 0, 3, yOffset, 170, 70); - } - - @Override - public void drawExtras(int i) - { - CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - - drawTexturedModalRect(64-xOffset, 39-yOffset, 176, 58, 55, 8); - - if(recipe.inputStack != null) - { - displayGauge(58, 26-xOffset, 14-yOffset, 176, 0, 58, null, recipe.inputStack); - } - - if(recipe.inputStack != null) - { - displayGauge(58, 134-xOffset, 14-yOffset, 176, 0, 58, null, recipe.outputStack); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(64-xOffset, 39-yOffset, 48, 8), getRecipeId(), new Object[0])); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(SolarNeutronRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else if(outputId.equals("gas") && results.length == 1 && results[0] instanceof GasStack) - { - for(SolarNeutronRecipe irecipe : getRecipes()) - { - if(((GasStack)results[0]).isGasEqual(irecipe.getOutput().output)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) - { - if(inputId.equals("gas") && ingredients.length == 1 && ingredients[0] instanceof GasStack) - { - for(SolarNeutronRecipe irecipe : getRecipes()) - { - if(irecipe.getInput().ingredient.isGasEqual((GasStack)ingredients[0])) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14+4 && yAxis <= 72+4) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).inputStack)); - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+4 && yAxis <= 72+4) - { - currenttip.add(LangUtils.localizeGasStack(((CachedIORecipe)arecipes.get(recipe)).outputStack)); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack gas = null; - - if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14+4 && yAxis <= 72+4) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).inputStack; - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+4 && yAxis <= 72+4) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).outputStack; - } - - if(gas != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doGasLookup(gas, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doGasLookup(gas, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - GasStack gas = null; - - if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14+18 && yAxis <= 72+18) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).inputStack; - } - else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+18 && yAxis <= 72+18) - { - gas = ((CachedIORecipe)arecipes.get(recipe)).outputStack; - } - - if(gas != null) - { - if(button == 0) - { - if(doGasLookup(gas, false)) - { - return true; - } - } - else if(button == 1) - { - if(doGasLookup(gas, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - @Override - public int recipiesPerPage() - { - return 1; - } - - @Override - public void addGuiElements() - { - - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public GasStack inputStack; - public GasStack outputStack; - - @Override - public PositionedStack getResult() - { - return null; - } - - public CachedIORecipe(GasStack input, GasStack output) - { - inputStack = input; - outputStack = output; - } - - public CachedIORecipe(SolarNeutronRecipe recipe) - { - this(recipe.getInput().ingredient, recipe.getOutput().output); - } - } -} diff --git a/legacy/mekanism.client.nei/ThermalEvaporationRecipeHandler.java b/legacy/mekanism.client.nei/ThermalEvaporationRecipeHandler.java deleted file mode 100644 index bf924aae7..000000000 --- a/legacy/mekanism.client.nei/ThermalEvaporationRecipeHandler.java +++ /dev/null @@ -1,286 +0,0 @@ -package mekanism.client.nei; - -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.Collection; -import java.util.List; - -import mekanism.client.gui.GuiThermalEvaporationController; -import mekanism.common.ObfuscatedNames; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.machines.ThermalEvaporationRecipe; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -public class ThermalEvaporationRecipeHandler extends BaseRecipeHandler -{ - private int ticksPassed; - - public static int xOffset = 5; - public static int yOffset = 12; - - @Override - public String getRecipeName() - { - return LangUtils.localize("gui.thermalEvaporationController.short"); - } - - @Override - public String getOverlayIdentifier() - { - return "thermalevaporation"; - } - - @Override - public String getGuiTexture() - { - return "mekanism:gui/nei/GuiThermalEvaporationController.png"; - } - - @Override - public Class getGuiClass() - { - return GuiThermalEvaporationController.class; - } - - public String getRecipeId() - { - return "mekanism.thermalevaporation"; - } - - public Collection getRecipes() - { - return Recipe.THERMAL_EVAPORATION_PLANT.get().values(); - } - - @Override - public void loadTransferRects() - { - transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(49-xOffset, 20-yOffset, 78, 38), getRecipeId(), new Object[0])); - } - - @Override - public void drawBackground(int i) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - changeTexture(getGuiTexture()); - drawTexturedModalRect(-2, 0, 3, yOffset, 170, 62); - } - - @Override - public void drawExtras(int i) - { - CachedIORecipe recipe = (CachedIORecipe)arecipes.get(i); - - drawProgressBar(49-xOffset, 64-yOffset, 176, 59, 78, 8, ticksPassed < 20 ? ticksPassed % 20 / 20.0F : 1.0F, 0); - - if(recipe.fluidInput != null) - { - displayGauge(58, 7-xOffset, 14-yOffset, 176, 0, 58, recipe.fluidInput, null); - } - - if(recipe.fluidOutput != null) - { - displayGauge(58, 153-xOffset, 14-yOffset, 176, 0, 58, recipe.fluidOutput, null); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - ticksPassed++; - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if(outputId.equals(getRecipeId())) - { - for(ThermalEvaporationRecipe irecipe : getRecipes()) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - else if(outputId.equals("fluid") && results.length == 1 && results[0] instanceof FluidStack) - { - for(ThermalEvaporationRecipe irecipe : getRecipes()) - { - if(((FluidStack)results[0]).isFluidEqual(irecipe.recipeOutput.output)) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) - { - if(inputId.equals("fluid") && ingredients.length == 1 && ingredients[0] instanceof FluidStack) - { - for(ThermalEvaporationRecipe irecipe : getRecipes()) - { - if(irecipe.recipeInput.ingredient.isFluidEqual((FluidStack)ingredients[0])) - { - arecipes.add(new CachedIORecipe(irecipe)); - } - } - } - else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - if(xAxis >= 7 && xAxis <= 23 && yAxis >= 14+4 && yAxis <= 72+4) - { - currenttip.add(LangUtils.localizeFluidStack(((CachedIORecipe) arecipes.get(recipe)).fluidInput)); - } - else if(xAxis >= 153 && xAxis <= 169 && yAxis >= 14+4 && yAxis <= 72+4) - { - currenttip.add(LangUtils.localizeFluidStack(((CachedIORecipe) arecipes.get(recipe)).fluidOutput)); - } - - return super.handleTooltip(gui, currenttip, recipe); - } - - @Override - public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y-(Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - FluidStack stack = null; - - if(xAxis >= 7 && xAxis <= 23 && yAxis >= 14+4 && yAxis <= 72+4) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).fluidInput; - } - else if(xAxis >= 153 && xAxis <= 169 && yAxis >= 14+4 && yAxis <= 72+4) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).fluidOutput; - } - - if(stack != null) - { - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) - { - if(doFluidLookup(stack, false)) - { - return true; - } - } - else if(keyCode == NEIClientConfig.getKeyBinding("gui.usage")) - { - if(doFluidLookup(stack, true)) - { - return true; - } - } - } - - return super.keyTyped(gui, keyChar, keyCode, recipe); - } - - @Override - public boolean mouseClicked(GuiRecipe gui, int button, int recipe) - { - Point point = GuiDraw.getMousePosition(); - - int xAxis = point.x - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - int yAxis = point.y - (Integer)MekanismUtils.getPrivateValue(gui, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - - FluidStack stack = null; - - if(xAxis >= 7 && xAxis <= 23 && yAxis >= 14+4 && yAxis <= 72+4) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).fluidInput; - } - else if(xAxis >= 153 && xAxis <= 169 && yAxis >= 14+4 && yAxis <= 72+4) - { - stack = ((CachedIORecipe)arecipes.get(recipe)).fluidOutput; - } - - if(stack != null) - { - if(button == 0) - { - if(doFluidLookup(stack, false)) - { - return true; - } - } - else if(button == 1) - { - if(doFluidLookup(stack, true)) - { - return true; - } - } - } - - return super.mouseClicked(gui, button, recipe); - } - - @Override - public int recipiesPerPage() - { - return 1; - } - - @Override - public void addGuiElements() - { - - } - - public class CachedIORecipe extends TemplateRecipeHandler.CachedRecipe - { - public FluidStack fluidInput; - public FluidStack fluidOutput; - - @Override - public PositionedStack getResult() - { - return null; - } - - public CachedIORecipe(FluidStack input, FluidStack output) - { - fluidInput = input; - fluidOutput = output; - } - - public CachedIORecipe(ThermalEvaporationRecipe recipe) - { - this((FluidStack)recipe.recipeInput.ingredient, (FluidStack)recipe.recipeOutput.output); - } - } -} diff --git a/legacy/mekanism.client.render.block/BasicRenderingHandler.java b/legacy/mekanism.client.render.block/BasicRenderingHandler.java deleted file mode 100644 index 1584e582c..000000000 --- a/legacy/mekanism.client.render.block/BasicRenderingHandler.java +++ /dev/null @@ -1,92 +0,0 @@ -package mekanism.client.render.block; - -import mekanism.client.ClientProxy; -import mekanism.client.model.ModelSecurityDesk; -import mekanism.client.render.MekanismRenderer; -import mekanism.common.MekanismBlocks; -import mekanism.common.block.BlockBasic.BasicType; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class BasicRenderingHandler implements ISimpleBlockRenderingHandler -{ - private Minecraft mc = Minecraft.getMinecraft(); - - public ModelSecurityDesk securityDesk = new ModelSecurityDesk(); - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) - { - GL11.glPushMatrix(); - GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); - - BasicType type = BasicType.get(block, metadata); - - if(type != null) - { - if(type == BasicType.STRUCTURAL_GLASS) - { - MekanismRenderer.blendOn(); - } - - if(type != BasicType.SECURITY_DESK) - { - GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); - MekanismRenderer.renderItem(renderer, metadata, block); - } - else { - GL11.glRotatef(180, 1.0F, 0.0F, 0.0F); - GL11.glScalef(0.8F, 0.8F, 0.8F); - GL11.glTranslatef(0.0F, -0.8F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SecurityDesk.png")); - securityDesk.render(0.0625F, mc.renderEngine); - } - - if(type == BasicType.STRUCTURAL_GLASS) - { - MekanismRenderer.blendOff(); - } - } - - GL11.glPopMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) - { - if(block == MekanismBlocks.BasicBlock || block == MekanismBlocks.BasicBlock2) - { - int metadata = world.getBlockMetadata(x, y, z); - - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBoundsFromBlock(block); - - return true; - } - - return false; - } - - @Override - public int getRenderId() - { - return ClientProxy.BASIC_RENDER_ID; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) - { - return true; - } -} diff --git a/legacy/mekanism.client.render.block/CTMRenderingHandler.java b/legacy/mekanism.client.render.block/CTMRenderingHandler.java deleted file mode 100644 index b41e830b5..000000000 --- a/legacy/mekanism.client.render.block/CTMRenderingHandler.java +++ /dev/null @@ -1,102 +0,0 @@ -package mekanism.client.render.block; - -import mekanism.api.MekanismConfig; -import mekanism.client.ClientProxy; -import mekanism.client.render.MekanismRenderer; -import mekanism.common.CTMData; -import mekanism.common.base.IBlockCTM; -import mekanism.common.block.BlockMachine.MachineType; -import mekanism.common.tile.TileEntityBasicBlock; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; - -/** - * CTM ISBRH adapted from Chisel - * Code licensed under GPLv2 - * @author AUTOMATIC_MAIDEN, asie, pokefenn, unpairedbracket - */ -public class CTMRenderingHandler implements ISimpleBlockRenderingHandler -{ - RenderBlocksCTM rendererCTM = new RenderBlocksCTM(); - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) - { - MekanismRenderer.renderItem(renderer, metadata, block); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks rendererOld) - { - int meta = world.getBlockMetadata(x, y, z); - - if(block instanceof IBlockCTM && !((IBlockCTM)block).shouldRenderBlock(world, x, y, z, meta)) - { - return false; - } - - CTMData blockCTM = ((IBlockCTM)block).getCTMData(world, x, y, z, meta); - - if(MekanismConfig.client.renderCTM && blockCTM != null) - { - if(blockCTM.hasFacingOverride() && world.getTileEntity(x, y, z) instanceof TileEntityBasicBlock) - { - TileEntityBasicBlock tile = (TileEntityBasicBlock)world.getTileEntity(x, y, z); - blockCTM.setFacing(tile.facing); - } - - rendererCTM.blockAccess = world; - rendererCTM.renderMaxX = 1.0; - rendererCTM.renderMaxY = 1.0; - rendererCTM.renderMaxZ = 1.0; - - rendererCTM.dataCTM = blockCTM; - - rendererCTM.rendererOld = rendererOld; - - return rendererCTM.renderStandardBlock(block, x, y, z); - } - - if(MachineType.get(block, meta) != null) - { - TileEntity tile = world.getTileEntity(x, y, z); - - int prevRotateTop = rendererOld.uvRotateTop; - int prevRotateBottom = rendererOld.uvRotateBottom; - - if(tile instanceof TileEntityBasicBlock) - { - if(((TileEntityBasicBlock)tile).facing >= 2) - { - rendererOld.uvRotateTop = MekanismRenderer.directionMap[((TileEntityBasicBlock)tile).facing-2]; - rendererOld.uvRotateBottom = MekanismRenderer.directionMap[((TileEntityBasicBlock)tile).facing-2]; - } - } - - rendererOld.renderStandardBlock(block, x, y, z); - rendererOld.setRenderBoundsFromBlock(block); - - rendererOld.uvRotateTop = prevRotateTop; - rendererOld.uvRotateBottom = prevRotateBottom; - - return true; - } - - return rendererOld.renderStandardBlock(block, x, y, z); - } - - @Override - public boolean shouldRender3DInInventory(int renderId) - { - return true; - } - - @Override - public int getRenderId() - { - return ClientProxy.CTM_RENDER_ID; - } -} diff --git a/legacy/mekanism.client.render.block/MachineRenderingHandler.java b/legacy/mekanism.client.render.block/MachineRenderingHandler.java deleted file mode 100644 index 624387e88..000000000 --- a/legacy/mekanism.client.render.block/MachineRenderingHandler.java +++ /dev/null @@ -1,272 +0,0 @@ -package mekanism.client.render.block; - -import mekanism.client.ClientProxy; -import mekanism.client.model.ModelChargepad; -import mekanism.client.model.ModelChemicalCrystallizer; -import mekanism.client.model.ModelChemicalDissolutionChamber; -import mekanism.client.model.ModelChemicalInfuser; -import mekanism.client.model.ModelChemicalOxidizer; -import mekanism.client.model.ModelChemicalWasher; -import mekanism.client.model.ModelDigitalMiner; -import mekanism.client.model.ModelElectricPump; -import mekanism.client.model.ModelElectrolyticSeparator; -import mekanism.client.model.ModelFluidicPlenisher; -import mekanism.client.model.ModelLaser; -import mekanism.client.model.ModelLaserAmplifier; -import mekanism.client.model.ModelLogisticalSorter; -import mekanism.client.model.ModelMetallurgicInfuser; -import mekanism.client.model.ModelPressurizedReactionChamber; -import mekanism.client.model.ModelQuantumEntangloporter; -import mekanism.client.model.ModelResistiveHeater; -import mekanism.client.model.ModelRotaryCondensentrator; -import mekanism.client.model.ModelSeismicVibrator; -import mekanism.client.model.ModelSolarNeutronActivator; -import mekanism.client.render.MekanismRenderer; -import mekanism.common.block.BlockMachine.MachineType; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class MachineRenderingHandler implements ISimpleBlockRenderingHandler -{ - private Minecraft mc = Minecraft.getMinecraft(); - - public ModelElectricPump electricPump = new ModelElectricPump(); - public ModelMetallurgicInfuser metallurgicInfuser = new ModelMetallurgicInfuser(); - public ModelChargepad chargepad = new ModelChargepad(); - public ModelLogisticalSorter logisticalSorter = new ModelLogisticalSorter(); - public ModelDigitalMiner digitalMiner = new ModelDigitalMiner(); - public ModelRotaryCondensentrator rotaryCondensentrator = new ModelRotaryCondensentrator(); - public ModelChemicalOxidizer chemicalOxidizer = new ModelChemicalOxidizer(); - public ModelChemicalInfuser chemicalInfuser = new ModelChemicalInfuser(); - public ModelElectrolyticSeparator electrolyticSeparator = new ModelElectrolyticSeparator(); - public ModelChemicalDissolutionChamber chemicalDissolutionChamber = new ModelChemicalDissolutionChamber(); - public ModelChemicalWasher chemicalWasher = new ModelChemicalWasher(); - public ModelChemicalCrystallizer chemicalCrystallizer = new ModelChemicalCrystallizer(); - public ModelSeismicVibrator seismicVibrator = new ModelSeismicVibrator(); - public ModelPressurizedReactionChamber pressurizedReactionChamber = new ModelPressurizedReactionChamber(); - public ModelFluidicPlenisher fluidicPlenisher = new ModelFluidicPlenisher(); - public ModelLaser laser = new ModelLaser(); - public ModelLaserAmplifier laserAmplifier = new ModelLaserAmplifier(); - public ModelSolarNeutronActivator solarNeutronActivator = new ModelSolarNeutronActivator(); - public ModelResistiveHeater resistiveHeater = new ModelResistiveHeater(); - public ModelQuantumEntangloporter quantumEntangloporter = new ModelQuantumEntangloporter(); - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) - { - if(block == null || renderer == null || MachineType.get(block, metadata) == null) - { - return; - } - - GL11.glPushMatrix(); - GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); - - MachineType type = MachineType.get(block, metadata); - - if(type == MachineType.ELECTRIC_PUMP) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.0F, -0.85F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectricPump.png")); - electricPump.render(0.0560F); - } - else if(type == MachineType.METALLURGIC_INFUSER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.0F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "MetallurgicInfuser.png")); - metallurgicInfuser.render(0.0625F); - } - else if(type == MachineType.CHARGEPAD) - { - GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.1F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Chargepad.png")); - chargepad.render(0.0625F, mc.renderEngine); - } - else if(type == MachineType.LOGISTICAL_SORTER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.0F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LogisticalSorter.png")); - logisticalSorter.render(0.0625F, false); - } - else if(type == MachineType.DIGITAL_MINER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(-180F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.35F, 0.1F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner.png")); - digitalMiner.render(0.022F, false, mc.renderEngine); - } - else if(type == MachineType.ROTARY_CONDENSENTRATOR) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.05F, -0.96F, 0.05F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "RotaryCondensentrator.png")); - rotaryCondensentrator.render(0.0625F); - } - else if(type == MachineType.CHEMICAL_OXIDIZER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.00F, 0.05F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalOxidizer.png")); - chemicalOxidizer.render(0.0625F); - } - else if(type == MachineType.CHEMICAL_INFUSER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180f, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.96F, 0.05F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalInfuser.png")); - chemicalInfuser.render(0.0625F); - } - else if(type == MachineType.ELECTROLYTIC_SEPARATOR) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F); - GL11.glTranslated(0.0F, -1.0F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectrolyticSeparator.png")); - electrolyticSeparator.render(0.0625F); - } - else if(type == MachineType.CHEMICAL_DISSOLUTION_CHAMBER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.05F, -0.96F, 0.05F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalDissolutionChamber.png")); - chemicalDissolutionChamber.render(0.0625F); - } - else if(type == MachineType.CHEMICAL_WASHER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.05F, -0.96F, 0.05F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalWasher.png")); - chemicalWasher.render(0.0625F); - } - else if(type == MachineType.CHEMICAL_CRYSTALLIZER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.05F, -0.96F, 0.05F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalCrystallizer.png")); - chemicalCrystallizer.render(0.0625F); - } - else if(type == MachineType.SEISMIC_VIBRATOR) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glScalef(0.6F, 0.6F, 0.6F); - GL11.glTranslatef(0.0F, -0.55F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SeismicVibrator.png")); - seismicVibrator.render(0.0625F); - } - else if(type == MachineType.PRESSURIZED_REACTION_CHAMBER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.05F, -0.96F, 0.05F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PressurizedReactionChamber.png")); - pressurizedReactionChamber.render(0.0625F); - } - else if(type == MachineType.FLUIDIC_PLENISHER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.85F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidicPlenisher.png")); - fluidicPlenisher.render(0.0560F); - } - else if(type == MachineType.LASER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.85F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Laser.png")); - laser.render(0.0560F); - } - else if(type == MachineType.LASER_AMPLIFIER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.85F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserAmplifier.png")); - laserAmplifier.render(0.0560F); - } - else if(type == MachineType.LASER_TRACTOR_BEAM) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.85F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserTractorBeam.png")); - laserAmplifier.render(0.0560F); - } - else if(type == MachineType.RESISTIVE_HEATER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.05F, -0.96F, 0.05F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater.png")); - resistiveHeater.render(0.0625F, false, mc.renderEngine); - } - else if(type == MachineType.SOLAR_NEUTRON_ACTIVATOR) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); - GL11.glScalef(0.6F, 0.6F, 0.6F); - GL11.glTranslatef(0.0F, -0.55F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarNeutronActivator.png")); - solarNeutronActivator.render(0.0625F); - } - else if(type == MachineType.QUANTUM_ENTANGLOPORTER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.0F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "QuantumEntangloporter.png")); - quantumEntangloporter.render(0.0625F, mc.renderEngine); - } - else { - GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); - MekanismRenderer.renderItem(renderer, metadata, block); - } - - GL11.glPopMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) - { - //Handled by CTMRenderingHandler - return false; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) - { - return true; - } - - @Override - public int getRenderId() - { - return ClientProxy.MACHINE_RENDER_ID; - } -} diff --git a/legacy/mekanism.client.render.block/PlasticRenderingHandler.java b/legacy/mekanism.client.render.block/PlasticRenderingHandler.java deleted file mode 100644 index 3f13ae1f5..000000000 --- a/legacy/mekanism.client.render.block/PlasticRenderingHandler.java +++ /dev/null @@ -1,96 +0,0 @@ -package mekanism.client.render.block; - -import mekanism.client.ClientProxy; -import mekanism.client.render.MekanismRenderer; -import mekanism.common.MekanismBlocks; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class PlasticRenderingHandler implements ISimpleBlockRenderingHandler -{ - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) - { - MekanismRenderer.renderItem(renderer, metadata, block); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) - { - boolean flag = false; - - if(block == MekanismBlocks.GlowPlasticBlock) - { - Tessellator tessellator = Tessellator.instance; - tessellator.setBrightness(240); - int meta = world.getBlockMetadata(x, y, z); - int l = block.getRenderColor(meta); - int r = l >> 16 & 0xFF; - int g = l >> 8 & 0xFF; - int b = l & 0xFF; - tessellator.setColorOpaque(r, g, b); - - if((renderer.renderAllFaces) || (block.shouldSideBeRendered(renderer.blockAccess, x, y - 1, z, 0))) - { - renderer.renderFaceYNeg(block, x, y, z, renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 0)); - flag = true; - } - - if((renderer.renderAllFaces) || (block.shouldSideBeRendered(renderer.blockAccess, x, y + 1, z, 1))) - { - renderer.renderFaceYPos(block, x, y, z, renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 1)); - flag = true; - } - - if((renderer.renderAllFaces) || (block.shouldSideBeRendered(renderer.blockAccess, x, y, z - 1, 2))) - { - renderer.renderFaceZNeg(block, x, y, z, renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 2)); - flag = true; - } - - if((renderer.renderAllFaces) || (block.shouldSideBeRendered(renderer.blockAccess, x, y, z + 1, 3))) - { - renderer.renderFaceZPos(block, x, y, z, renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 3)); - flag = true; - } - - if((renderer.renderAllFaces) || (block.shouldSideBeRendered(renderer.blockAccess, x - 1, y, z, 4))) - { - renderer.renderFaceXNeg(block, x, y, z, renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 4)); - flag = true; - } - - if((renderer.renderAllFaces) || (block.shouldSideBeRendered(renderer.blockAccess, x + 1, y, z, 5))) - { - renderer.renderFaceXPos(block, x, y, z, renderer.getBlockIcon(block, renderer.blockAccess, x, y, z, 5)); - flag = true; - } - - return flag; - } - - flag = renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBoundsFromBlock(block); - - return flag; - - } - - @Override - public int getRenderId() - { - return ClientProxy.PLASTIC_RENDER_ID; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) - { - return true; - } -} diff --git a/legacy/mekanism.client.render.block/RenderBlocksCTM.java b/legacy/mekanism.client.render.block/RenderBlocksCTM.java deleted file mode 100644 index 871ff161e..000000000 --- a/legacy/mekanism.client.render.block/RenderBlocksCTM.java +++ /dev/null @@ -1,382 +0,0 @@ -package mekanism.client.render.block; - -import mekanism.client.render.CTM; -import mekanism.common.CTMData; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; - -/** - * CTM RenderBlocks adapted from Chisel - * Code licensed under GPLv2 - * @author AUTOMATIC_MAIDEN, asie, pokefenn, unpairedbracket - */ -public class RenderBlocksCTM extends RenderBlocks -{ - RenderBlocksCTM() - { - super(); - - resetVertices(); - } - - Tessellator tessellator; - double[] X = new double[26]; - double[] Y = new double[26]; - double[] Z = new double[26]; - double[] U = new double[26]; - double[] V = new double[26]; - int[] L = new int[26]; - float[] R = new float[26]; - float[] G = new float[26]; - float[] B = new float[26]; - CTMData dataCTM; - RenderBlocks rendererOld; - - int bx, by, bz; - - @Override - public boolean renderStandardBlock(Block block, int x, int y, int z) - { - bx = x; - by = y; - bz = z; - - tessellator = Tessellator.instance; - tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F); - - tessellator.addTranslation(x, y, z); - - boolean res = super.renderStandardBlock(block, x, y, z); - - tessellator.addTranslation(-x, -y, -z); - - return res; - } - - void setupSides(int a, int b, int c, int d, int xa, int xb, int xc, int xd, int e) - { - L[a] = brightnessBottomLeft; - L[b] = brightnessBottomRight; - L[c] = brightnessTopRight; - L[d] = brightnessTopLeft; - L[e] = (brightnessBottomLeft + brightnessTopLeft + brightnessTopRight + brightnessBottomRight) / 4; - L[xa] = (L[a] + L[b]) / 2; - L[xb] = (L[b] + L[c]) / 2; - L[xc] = (L[c] + L[d]) / 2; - L[xd] = (L[d] + L[a]) / 2; - - R[a] = colorRedBottomLeft; - R[b] = colorRedBottomRight; - R[c] = colorRedTopRight; - R[d] = colorRedTopLeft; - R[e] = (colorRedBottomLeft + colorRedTopLeft + colorRedTopRight + colorRedBottomRight) / 4; - R[xa] = (R[a] + R[b]) / 2; - R[xb] = (R[b] + R[c]) / 2; - R[xc] = (R[c] + R[d]) / 2; - R[xd] = (R[d] + R[a]) / 2; - - G[a] = colorGreenBottomLeft; - G[b] = colorGreenBottomRight; - G[c] = colorGreenTopRight; - G[d] = colorGreenTopLeft; - G[e] = (colorGreenBottomLeft + colorGreenTopLeft + colorGreenTopRight + colorGreenBottomRight) / 4; - G[xa] = (G[a] + G[b]) / 2; - G[xb] = (G[b] + G[c]) / 2; - G[xc] = (G[c] + G[d]) / 2; - G[xd] = (G[d] + G[a]) / 2; - - B[a] = colorBlueBottomLeft; - B[b] = colorBlueBottomRight; - B[c] = colorBlueTopRight; - B[d] = colorBlueTopLeft; - B[e] = (colorBlueBottomLeft + colorBlueTopLeft + colorBlueTopRight + colorBlueBottomRight) / 4; - B[xa] = (B[a] + B[b]) / 2; - B[xb] = (B[b] + B[c]) / 2; - B[xc] = (B[c] + B[d]) / 2; - B[xd] = (B[d] + B[a]) / 2; - } - - void side(int a, int b, int c, int d, int iconIndex, boolean flip, int side) - { - IIcon icon = iconIndex >= 16 ? dataCTM.getSmallSubmap(side).icons[iconIndex - 16] : dataCTM.getSubmap(side).icons[iconIndex]; - - double u0 = icon.getMaxU(); - double u1 = icon.getMinU(); - double v0 = icon.getMaxV(); - double v1 = icon.getMinV(); - - U[a] = flip ? u1 : u1; - U[b] = flip ? u0 : u1; - U[c] = flip ? u0 : u0; - U[d] = flip ? u1 : u0; - - V[a] = flip ? v1 : v1; - V[b] = flip ? v1 : v0; - V[c] = flip ? v0 : v0; - V[d] = flip ? v0 : v1; - - vert(a); - vert(b); - vert(c); - vert(d); - } - - void vert(int index) - { - if(enableAO) - { - tessellator.setColorOpaque_F(R[index], G[index], B[index]); - tessellator.setBrightness(L[index]); - } - - tessellator.addVertexWithUV(X[index], Y[index], Z[index], U[index], V[index]); - } - - @Override - public void renderFaceXNeg(Block block, double x, double y, double z, IIcon icon) - { - if(rendererOld != null && rendererOld.hasOverrideBlockTexture()) - { - IIcon i = rendererOld.overrideBlockTexture; - - tessellator.addVertexWithUV(0.0, 1.0, 0.0, i.getMinU(), i.getMinV()); - tessellator.addVertexWithUV(0.0, 0.0, 0.0, i.getMinU(), i.getMaxV()); - tessellator.addVertexWithUV(0.0, 0.0, 1.0, i.getMaxU(), i.getMaxV()); - tessellator.addVertexWithUV(0.0, 1.0, 1.0, i.getMaxU(), i.getMinV()); - } - else { - int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 4, dataCTM.acceptableBlockMetas, dataCTM.renderConvexConnections); - - setupSides(1, 0, 4, 5, 14, 19, 17, 23, 9); - side(1, 14, 9, 23, tex[0], false, 4); - side(23, 9, 17, 5, tex[1], false, 4); - side(9, 19, 4, 17, tex[3], false, 4); - side(14, 0, 19, 9, tex[2], false, 4); - } - } - - @Override - public void renderFaceXPos(Block block, double x, double y, double z, IIcon icon) - { - if(rendererOld != null && rendererOld.hasOverrideBlockTexture()) - { - IIcon i = rendererOld.overrideBlockTexture; - - tessellator.addVertexWithUV(1.0, 1.0, 1.0, i.getMaxU(), i.getMinV()); - tessellator.addVertexWithUV(1.0, 0.0, 1.0, i.getMaxU(), i.getMaxV()); - tessellator.addVertexWithUV(1.0, 0.0, 0.0, i.getMinU(), i.getMaxV()); - tessellator.addVertexWithUV(1.0, 1.0, 0.0, i.getMinU(), i.getMinV()); - } - else { - int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 5, dataCTM.acceptableBlockMetas, dataCTM.renderConvexConnections); - - setupSides(3, 2, 6, 7, 15, 25, 16, 21, 11); - side(11, 21, 3, 15, tex[3], false, 5); - side(16, 7, 21, 11, tex[2], false, 5); - side(25, 11, 15, 2, tex[1], false, 5); - side(6, 16, 11, 25, tex[0], false, 5); - } - } - - @Override - public void renderFaceZNeg(Block block, double x, double y, double z, IIcon icon) - { - if(rendererOld != null && rendererOld.hasOverrideBlockTexture()) - { - IIcon i = rendererOld.overrideBlockTexture; - - tessellator.addVertexWithUV(1.0, 1.0, 0.0, i.getMaxU(), i.getMinV()); - tessellator.addVertexWithUV(1.0, 0.0, 0.0, i.getMaxU(), i.getMaxV()); - tessellator.addVertexWithUV(0.0, 0.0, 0.0, i.getMinU(), i.getMaxV()); - tessellator.addVertexWithUV(0.0, 1.0, 0.0, i.getMinU(), i.getMinV()); - } - else { - int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 2, dataCTM.acceptableBlockMetas, dataCTM.renderConvexConnections); - - setupSides(2, 3, 0, 1, 15, 18, 14, 22, 8); - side(2, 15, 8, 22, tex[0], false, 2); - side(15, 3, 18, 8, tex[2], false, 2); - side(8, 18, 0, 14, tex[3], false, 2); - side(22, 8, 14, 1, tex[1], false, 2); - } - } - - - @Override - public void renderFaceZPos(Block block, double x, double y, double z, IIcon icon) - { - if(rendererOld != null && rendererOld.hasOverrideBlockTexture()) - { - IIcon i = rendererOld.overrideBlockTexture; - - tessellator.addVertexWithUV(0.0, 1.0, 1.0, i.getMinU(), i.getMinV()); - tessellator.addVertexWithUV(0.0, 0.0, 1.0, i.getMinU(), i.getMaxV()); - tessellator.addVertexWithUV(1.0, 0.0, 1.0, i.getMaxU(), i.getMaxV()); - tessellator.addVertexWithUV(1.0, 1.0, 1.0, i.getMaxU(), i.getMinV()); - } - else { - int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 3, dataCTM.acceptableBlockMetas, dataCTM.renderConvexConnections); - - setupSides(4, 7, 6, 5, 20, 16, 24, 17, 10); - side(17, 4, 20, 10, tex[2], false, 3); - side(5, 17, 10, 24, tex[0], false, 3); - side(24, 10, 16, 6, tex[1], false, 3); - side(10, 20, 7, 16, tex[3], false, 3); - } - } - - @Override - public void renderFaceYNeg(Block block, double x, double y, double z, IIcon icon) - { - if(rendererOld != null && rendererOld.hasOverrideBlockTexture()) - { - IIcon i = rendererOld.overrideBlockTexture; - - tessellator.addVertexWithUV(0.0, 0.0, 1.0, i.getMinU(), i.getMaxV()); - tessellator.addVertexWithUV(0.0, 0.0, 0.0, i.getMinU(), i.getMinV()); - tessellator.addVertexWithUV(1.0, 0.0, 0.0, i.getMaxU(), i.getMinV()); - tessellator.addVertexWithUV(1.0, 0.0, 1.0, i.getMaxU(), i.getMaxV()); - } - else { - int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 0, dataCTM.acceptableBlockMetas, dataCTM.renderConvexConnections); - - setupSides(0, 3, 7, 4, 18, 21, 20, 19, 13); - side(13, 21, 7, 20, tex[3], true, 0); - side(19, 13, 20, 4, tex[2], true, 0); - side(0, 18, 13, 19, tex[0], true, 0); - side(18, 3, 21, 13, tex[1], true, 0); - } - } - - @Override - public void renderFaceYPos(Block block, double x, double y, double z, IIcon icon) - { - if(rendererOld != null && rendererOld.hasOverrideBlockTexture()) - { - IIcon i = rendererOld.overrideBlockTexture; - - tessellator.addVertexWithUV(0.0, 1.0, 0.0, i.getMinU(), i.getMinV()); - tessellator.addVertexWithUV(0.0, 1.0, 1.0, i.getMinU(), i.getMaxV()); - tessellator.addVertexWithUV(1.0, 1.0, 1.0, i.getMaxU(), i.getMaxV()); - tessellator.addVertexWithUV(1.0, 1.0, 0.0, i.getMaxU(), i.getMinV()); - } - else { - int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 1, dataCTM.acceptableBlockMetas, dataCTM.renderConvexConnections); - - setupSides(2, 1, 5, 6, 22, 23, 24, 25, 12); - side(12, 24, 6, 25, tex[3], false, 1); - side(22, 12, 25, 2, tex[1], false, 1); - side(1, 23, 12, 22, tex[0], false, 1); - side(23, 5, 24, 12, tex[2], false, 1); - } - } - - void resetVertices() - { - X[0] = 0; - Z[0] = 0; - Y[0] = 0; - - X[1] = 0; - Z[1] = 0; - Y[1] = 1; - - X[2] = 1; - Z[2] = 0; - Y[2] = 1; - - X[3] = 1; - Z[3] = 0; - Y[3] = 0; - - X[4] = 0; - Z[4] = 1; - Y[4] = 0; - - X[5] = 0; - Z[5] = 1; - Y[5] = 1; - - X[6] = 1; - Z[6] = 1; - Y[6] = 1; - - X[7] = 1; - Z[7] = 1; - Y[7] = 0; - - X[8] = 0.5; - Z[8] = 0; - Y[8] = 0.5; - - X[9] = 0; - Z[9] = 0.5; - Y[9] = 0.5; - - X[10] = 0.5; - Z[10] = 1; - Y[10] = 0.5; - - X[11] = 1; - Z[11] = 0.5; - Y[11] = 0.5; - - X[12] = 0.5; - Z[12] = 0.5; - Y[12] = 1; - - X[13] = 0.5; - Z[13] = 0.5; - Y[13] = 0; - - X[14] = 0; - Z[14] = 0; - Y[14] = 0.5; - - X[15] = 1; - Z[15] = 0; - Y[15] = 0.5; - - X[16] = 1; - Z[16] = 1; - Y[16] = 0.5; - - X[17] = 0; - Z[17] = 1; - Y[17] = 0.5; - - X[18] = 0.5; - Z[18] = 0; - Y[18] = 0; - - X[19] = 0; - Z[19] = 0.5; - Y[19] = 0; - - X[20] = 0.5; - Z[20] = 1; - Y[20] = 0; - - X[21] = 1; - Z[21] = 0.5; - Y[21] = 0; - - X[22] = 0.5; - Z[22] = 0; - Y[22] = 1; - - X[23] = 0; - Z[23] = 0.5; - Y[23] = 1; - - X[24] = 0.5; - Z[24] = 1; - Y[24] = 1; - - X[25] = 1; - Z[25] = 0.5; - Y[25] = 1; - } -} diff --git a/legacy/mekanism.client.render.block/TextureSubmap.java b/legacy/mekanism.client.render.block/TextureSubmap.java deleted file mode 100644 index 817b7850a..000000000 --- a/legacy/mekanism.client.render.block/TextureSubmap.java +++ /dev/null @@ -1,42 +0,0 @@ -package mekanism.client.render.block; - -import net.minecraft.util.IIcon; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -/** - * Multi-texture class adapted from Chisel - * Code licensed under GPLv2 - * @author AUTOMATIC_MAIDEN, asie, pokefenn, unpairedbracket - */ -public class TextureSubmap -{ - public int width, height; - - public IIcon icon; - - public IIcon icons[]; - - public TextureSubmap(IIcon i, int w, int h) - { - icon = i; - width = w; - height = h; - icons = new IIcon[width * height]; - - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - public void TexturesStitched(TextureStitchEvent.Post event) - { - for(int x = 0; x < width; x++) - { - for(int y = 0; y < height; y++) - { - icons[y * width + x] = new TextureVirtual(icon, width, height, x, y); - } - } - } -} diff --git a/legacy/mekanism.client.render.block/TextureVirtual.java b/legacy/mekanism.client.render.block/TextureVirtual.java deleted file mode 100644 index 6bc921a6a..000000000 --- a/legacy/mekanism.client.render.block/TextureVirtual.java +++ /dev/null @@ -1,96 +0,0 @@ -package mekanism.client.render.block; - -import net.minecraft.util.IIcon; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -/** - * Texture component class adapted from Chisel - * Code licensed under GPLv2 - * @author AUTOMATIC_MAIDEN, asie, pokefenn, unpairedbracket - */ -public class TextureVirtual implements IIcon -{ - int ox, oy; - float u0, u1, v0, v1; - String name; - IIcon icon; - - TextureVirtual(IIcon parent, int w, int h, int x, int y) - { - icon = parent; - - u0 = icon.getInterpolatedU(16.0 * (x) / w); - u1 = icon.getInterpolatedU(16.0 * (x + 1) / w); - v0 = icon.getInterpolatedV(16.0 * (y) / h); - v1 = icon.getInterpolatedV(16.0 * (y + 1) / h); - - name = icon.getIconName() + "|" + x + "." + y; - - ox = icon.getIconWidth(); - oy = icon.getIconHeight(); - } - - @Override - @SideOnly(Side.CLIENT) - public float getMinU() - { - return u0; - } - - @Override - @SideOnly(Side.CLIENT) - public float getMaxU() - { - return u1; - } - - @Override - @SideOnly(Side.CLIENT) - public float getInterpolatedU(double d0) - { - return (float) (u0 + (u1 - u0) * d0 / 16.0); - } - - @Override - @SideOnly(Side.CLIENT) - public float getMinV() - { - return v0; - } - - @Override - @SideOnly(Side.CLIENT) - public float getMaxV() - { - return v1; - } - - @Override - @SideOnly(Side.CLIENT) - public float getInterpolatedV(double d0) - { - return (float) (v0 + (v1 - v0) * d0 / 16.0); - } - - @Override - @SideOnly(Side.CLIENT) - public String getIconName() - { - return name; - } - - @Override - @SideOnly(Side.CLIENT) - public int getIconWidth() - { - return ox; - } - - @Override - @SideOnly(Side.CLIENT) - public int getIconHeight() - { - return oy; - } -} diff --git a/src/main/java/mekanism/api/gas/Gas.java b/src/main/java/mekanism/api/gas/Gas.java index a712432ed..2de9e55f9 100644 --- a/src/main/java/mekanism/api/gas/Gas.java +++ b/src/main/java/mekanism/api/gas/Gas.java @@ -136,7 +136,7 @@ public class Gas { return MekanismRenderer.getFluidTexture(fluid, FluidType.STILL); } - + return sprite; } @@ -145,13 +145,25 @@ public class Gas * @param i - IIcon to associate with this Gas * @return this Gas object */ - public Gas updateIcon(TextureMap map) + public Gas registerIcon(TextureMap map) { - sprite = map.registerSprite(iconLocation); + map.registerSprite(iconLocation); from_fluid = false; return this; } + + public Gas updateIcon(TextureMap map) + { + TextureAtlasSprite tex = map.getTextureExtry(iconLocation.toString()); + + if(tex != null) + { + sprite = tex; + } + System.out.println(sprite); + return this; + } /** * Gets the ID associated with this gas. diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 7f8d26598..410d000d5 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -84,10 +84,8 @@ import mekanism.client.render.tileentity.RenderChemicalDissolutionChamber; import mekanism.client.render.tileentity.RenderConfigurableMachine; import mekanism.client.render.tileentity.RenderDigitalMiner; import mekanism.client.render.tileentity.RenderDynamicTank; -import mekanism.client.render.tileentity.RenderElectricPump; import mekanism.client.render.tileentity.RenderEnergyCube; import mekanism.client.render.tileentity.RenderFluidTank; -import mekanism.client.render.tileentity.RenderFluidicPlenisher; import mekanism.client.render.tileentity.RenderGasTank; import mekanism.client.render.tileentity.RenderLogisticalSorter; import mekanism.client.render.tileentity.RenderPersonalChest; @@ -293,7 +291,6 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityMetallurgicInfuser.class, "MetallurgicInfuser", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityGasTank.class, "GasTank", new RenderGasTank()); ClientRegistry.registerTileEntity(TileEntityEnergyCube.class, "EnergyCube", new RenderEnergyCube()); - ClientRegistry.registerTileEntity(TileEntityElectricPump.class, "ElectricPump", new RenderElectricPump()); ClientRegistry.registerTileEntity(TileEntityPersonalChest.class, "PersonalChest", new RenderPersonalChest()); ClientRegistry.registerTileEntity(TileEntityDynamicTank.class, "DynamicTank", new RenderDynamicTank()); ClientRegistry.registerTileEntity(TileEntityDynamicValve.class, "DynamicValve", new RenderDynamicTank()); @@ -309,7 +306,6 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator", new RenderSeismicVibrator()); ClientRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityFluidTank.class, "FluidTank", new RenderFluidTank()); - ClientRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher", new RenderFluidicPlenisher()); ClientRegistry.registerTileEntity(TileEntitySolarNeutronActivator.class, "SolarNeutronActivator", new RenderSolarNeutronActivator()); ClientRegistry.registerTileEntity(TileEntityFormulaicAssemblicator.class, "FormulaicAssemblicator", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater", new RenderResistiveHeater()); @@ -371,11 +367,11 @@ public class ClientProxy extends CommonProxy registerItemRender(MekanismItems.Substrate); registerItemRender(MekanismItems.Polyethene); registerItemRender(MekanismItems.BioFuel); -// registerItemRender(MekanismItems.GlowPanel); registerItemRender(MekanismItems.Flamethrower); registerItemRender(MekanismItems.GaugeDropper); registerItemRender(MekanismItems.FactoryInstaller); registerItemRender(MekanismItems.OtherDust); + registerItemRender(MekanismItems.GlowPanel); ModelBakery.registerItemVariants(MekanismItems.WalkieTalkie, ItemWalkieTalkie.OFF_MODEL); @@ -855,10 +851,11 @@ public class ClientProxy extends CommonProxy { MekanismRenderer.init(); - ModelLoaderRegistry.registerLoader(new MekanismOBJLoader()); + ModelLoaderRegistry.registerLoader(MekanismOBJLoader.INSTANCE); MinecraftForge.EVENT_BUS.register(new CTMRegistry()); MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(MekanismOBJLoader.INSTANCE); //Register entity rendering handlers RenderingRegistry.registerEntityRenderingHandler(EntityObsidianTNT.class, new IRenderFactory() { diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java index 8f2558245..de7e7339a 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java @@ -12,6 +12,7 @@ import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOredictionificator.OredictionificatorFilter; +import mekanism.common.util.ItemRegistryUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -176,7 +177,7 @@ public class GuiOredictionificatorFilter extends GuiMekanism { if(renderStack != null) { - String name = MekanismUtils.getMod(renderStack); + String name = ItemRegistryUtils.getMod(renderStack); String extra = name.equals("null") ? "" : " (" + name + ")"; drawCreativeTabHoveringText(renderStack.getDisplayName() + extra, xAxis, yAxis); diff --git a/src/main/java/mekanism/client/gui/element/GuiElement.java b/src/main/java/mekanism/client/gui/element/GuiElement.java index 9203cd240..84dcd6e8a 100644 --- a/src/main/java/mekanism/client/gui/element/GuiElement.java +++ b/src/main/java/mekanism/client/gui/element/GuiElement.java @@ -1,5 +1,6 @@ package mekanism.client.gui.element; +import java.awt.Rectangle; import java.util.List; import mekanism.api.ObfuscatedNames; @@ -13,8 +14,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public abstract class GuiElement { @@ -145,6 +144,7 @@ public abstract class GuiElement public static class Rectangle4i { public int x, y, width, height; + public Rectangle4i(int x, int y, int width, int height) { this.x = x; @@ -152,5 +152,10 @@ public abstract class GuiElement this.width = width; this.height = height; } + + public Rectangle toRectangle() + { + return new Rectangle(x, y, width, height); + } } } diff --git a/src/main/java/mekanism/client/jei/BaseRecipeCategory.java b/src/main/java/mekanism/client/jei/BaseRecipeCategory.java new file mode 100644 index 000000000..ebf8eb421 --- /dev/null +++ b/src/main/java/mekanism/client/jei/BaseRecipeCategory.java @@ -0,0 +1,175 @@ +package mekanism.client.jei; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import mekanism.api.gas.GasStack; +import mekanism.client.gui.IGuiWrapper; +import mekanism.client.gui.element.GuiElement; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.render.MekanismRenderer; +import mekanism.client.render.MekanismRenderer.FluidType; +import mekanism.common.util.LangUtils; +import mezz.jei.api.recipe.IRecipeCategory; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.Gui; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; + +import org.lwjgl.opengl.GL11; + +public abstract class BaseRecipeCategory implements IRecipeCategory, IGuiWrapper +{ + public static final GuiDummy gui = new GuiDummy(); + + public String recipeName; + public String unlocalizedName; + + public String guiTexture; + public ResourceLocation guiLocation; + + public ProgressBar progressBar; + + public int xOffset = 28; + public int yOffset = 16; + + public BaseRecipeCategory(String gui, String name, String unlocalized, ProgressBar progress) + { + guiTexture = gui; + guiLocation = new ResourceLocation(guiTexture); + + progressBar = progress; + + recipeName = name; + unlocalizedName = unlocalized; + + addGuiElements(); + } + + @Override + public String getUid() + { + return "mekanism." + recipeName; + } + + @Override + public String getTitle() + { + return LangUtils.localize(unlocalizedName); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + changeTexture(guiLocation); + + for(GuiElement e : guiElements) + { + e.renderBackground(0, 0, -xOffset, -yOffset); + } + } + + @Override + public void drawAnimations(Minecraft minecraft) {} + + @Override + public void drawTexturedRect(int x, int y, int u, int v, int w, int h) + { + gui.drawTexturedModalRect(x, y, u, v, w, h); + } + + @Override + public void drawTexturedRectFromIcon(int x, int y, TextureAtlasSprite icon, int w, int h) + { + gui.drawTexturedModalRect(x, y, icon, w, h); + } + + @Override + public void displayTooltip(String s, int xAxis, int yAxis) {} + + @Override + public void displayTooltips(List list, int xAxis, int yAxis) {} + + @Override + public FontRenderer getFont() + { + return null; + } + + public void displayGauge(int length, int xPos, int yPos, int overlayX, int overlayY, int scale, FluidStack fluid, GasStack gas) + { + if(fluid == null && gas == null) + { + return; + } + + int start = 0; + + while(true) + { + int renderRemaining = 0; + + if(scale > 16) + { + renderRemaining = 16; + scale -= 16; + } + else { + renderRemaining = scale; + scale = 0; + } + + changeTexture(MekanismRenderer.getBlocksTexture()); + + if(fluid != null) + { + gui.drawTexturedModalRect(xPos, yPos + length - renderRemaining - start, MekanismRenderer.getFluidTexture(fluid.getFluid(), FluidType.STILL), 16, 16 - (16 - renderRemaining)); + } + else if(gas != null) + { + gui.drawTexturedModalRect(xPos, yPos + length - renderRemaining - start, gas.getGas().getSprite(), 16, 16 - (16 - renderRemaining)); + } + + start+=16; + + if(renderRemaining == 0 || scale == 0) + { + break; + } + } + + changeTexture(guiLocation); + gui.drawTexturedModalRect(xPos, yPos, overlayX, overlayY, 16, length+1); + } + + public void displayGauge(int xPos, int yPos, int sizeX, int sizeY, GasStack gas) + { + if(gas == null) + { + return; + } + + changeTexture(MekanismRenderer.getBlocksTexture()); + gui.drawTexturedModalRect(xPos, yPos, gas.getGas().getSprite(), sizeX, sizeY); + } + + public String stripTexture() + { + return guiTexture.replace("mekanism:gui/", ""); + } + + public void changeTexture(ResourceLocation texture) + { + Minecraft.getMinecraft().renderEngine.bindTexture(texture); + } + + public Set guiElements = new HashSet(); + + public void addGuiElements() {} + + public static class GuiDummy extends Gui {} +} diff --git a/src/main/java/mekanism/client/jei/GuiElementHandler.java b/src/main/java/mekanism/client/jei/GuiElementHandler.java new file mode 100644 index 000000000..b6e1bb9ed --- /dev/null +++ b/src/main/java/mekanism/client/jei/GuiElementHandler.java @@ -0,0 +1,39 @@ +package mekanism.client.jei; + +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; + +import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement; +import mezz.jei.api.gui.IAdvancedGuiHandler; +import net.minecraft.client.gui.inventory.GuiContainer; + +public class GuiElementHandler implements IAdvancedGuiHandler +{ + @Override + public Class getGuiContainerClass() + { + return GuiMekanism.class; + } + + @Override + public List getGuiExtraAreas(GuiContainer gui) + { + if(gui instanceof GuiMekanism) + { + List list = new ArrayList(); + + GuiMekanism guiMek = (GuiMekanism)gui; + + for(GuiElement element : guiMek.guiElements) + { + list.add(element.getBounds(guiMek.getXPos(), guiMek.getYPos()).toRectangle()); + } + + return list; + } + + return null; + } +} diff --git a/src/main/java/mekanism/client/jei/MekanismJEI.java b/src/main/java/mekanism/client/jei/MekanismJEI.java new file mode 100644 index 000000000..5313ad4fc --- /dev/null +++ b/src/main/java/mekanism/client/jei/MekanismJEI.java @@ -0,0 +1,298 @@ +package mekanism.client.jei; + +import java.util.ArrayList; +import java.util.List; + +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; +import mekanism.client.gui.GuiChemicalCrystallizer; +import mekanism.client.gui.GuiChemicalDissolutionChamber; +import mekanism.client.gui.GuiChemicalInfuser; +import mekanism.client.gui.GuiChemicalInjectionChamber; +import mekanism.client.gui.GuiChemicalOxidizer; +import mekanism.client.gui.GuiChemicalWasher; +import mekanism.client.gui.GuiCombiner; +import mekanism.client.gui.GuiCrusher; +import mekanism.client.gui.GuiElectrolyticSeparator; +import mekanism.client.gui.GuiEnrichmentChamber; +import mekanism.client.gui.GuiMetallurgicInfuser; +import mekanism.client.gui.GuiOsmiumCompressor; +import mekanism.client.gui.GuiPRC; +import mekanism.client.gui.GuiPrecisionSawmill; +import mekanism.client.gui.GuiPurificationChamber; +import mekanism.client.gui.GuiRotaryCondensentrator; +import mekanism.client.gui.GuiSolarNeutronActivator; +import mekanism.client.gui.GuiThermalEvaporationController; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.jei.crafting.ShapedMekanismRecipeHandler; +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; +import mekanism.client.jei.machine.advanced.ChemicalInjectionChamberRecipeHandler; +import mekanism.client.jei.machine.advanced.ChemicalInjectionChamberRecipeWrapper; +import mekanism.client.jei.machine.advanced.CombinerRecipeHandler; +import mekanism.client.jei.machine.advanced.CombinerRecipeWrapper; +import mekanism.client.jei.machine.advanced.OsmiumCompressorRecipeHandler; +import mekanism.client.jei.machine.advanced.OsmiumCompressorRecipeWrapper; +import mekanism.client.jei.machine.advanced.PurificationChamberRecipeHandler; +import mekanism.client.jei.machine.advanced.PurificationChamberRecipeWrapper; +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.client.jei.machine.chemical.ChemicalCrystallizerRecipeCategory; +import mekanism.client.jei.machine.chemical.ChemicalCrystallizerRecipeHandler; +import mekanism.client.jei.machine.chemical.ChemicalCrystallizerRecipeWrapper; +import mekanism.client.jei.machine.chemical.ChemicalDissolutionChamberRecipeCategory; +import mekanism.client.jei.machine.chemical.ChemicalDissolutionChamberRecipeHandler; +import mekanism.client.jei.machine.chemical.ChemicalDissolutionChamberRecipeWrapper; +import mekanism.client.jei.machine.chemical.ChemicalInfuserRecipeCategory; +import mekanism.client.jei.machine.chemical.ChemicalInfuserRecipeHandler; +import mekanism.client.jei.machine.chemical.ChemicalInfuserRecipeWrapper; +import mekanism.client.jei.machine.chemical.ChemicalOxidizerRecipeCategory; +import mekanism.client.jei.machine.chemical.ChemicalOxidizerRecipeHandler; +import mekanism.client.jei.machine.chemical.ChemicalOxidizerRecipeWrapper; +import mekanism.client.jei.machine.chemical.ChemicalWasherRecipeCategory; +import mekanism.client.jei.machine.chemical.ChemicalWasherRecipeHandler; +import mekanism.client.jei.machine.chemical.ChemicalWasherRecipeWrapper; +import mekanism.client.jei.machine.other.ElectrolyticSeparatorRecipeCategory; +import mekanism.client.jei.machine.other.ElectrolyticSeparatorRecipeHandler; +import mekanism.client.jei.machine.other.ElectrolyticSeparatorRecipeWrapper; +import mekanism.client.jei.machine.other.MetallurgicInfuserRecipeCategory; +import mekanism.client.jei.machine.other.MetallurgicInfuserRecipeHandler; +import mekanism.client.jei.machine.other.MetallurgicInfuserRecipeWrapper; +import mekanism.client.jei.machine.other.PRCRecipeCategory; +import mekanism.client.jei.machine.other.PRCRecipeHandler; +import mekanism.client.jei.machine.other.PRCRecipeWrapper; +import mekanism.client.jei.machine.other.RotaryCondensentratorRecipeCategory; +import mekanism.client.jei.machine.other.RotaryCondensentratorRecipeHandler; +import mekanism.client.jei.machine.other.RotaryCondensentratorRecipeWrapper; +import mekanism.client.jei.machine.other.SolarNeutronRecipeCategory; +import mekanism.client.jei.machine.other.SolarNeutronRecipeHandler; +import mekanism.client.jei.machine.other.SolarNeutronRecipeWrapper; +import mekanism.client.jei.machine.other.ThermalEvaporationRecipeCategory; +import mekanism.client.jei.machine.other.ThermalEvaporationRecipeHandler; +import mekanism.client.jei.machine.other.ThermalEvaporationRecipeWrapper; +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.recipe.machines.ChemicalInfuserRecipe; +import mekanism.common.recipe.machines.CrystallizerRecipe; +import mekanism.common.recipe.machines.DissolutionRecipe; +import mekanism.common.recipe.machines.MachineRecipe; +import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; +import mekanism.common.recipe.machines.OxidationRecipe; +import mekanism.common.recipe.machines.PressurizedRecipe; +import mekanism.common.recipe.machines.SeparatorRecipe; +import mekanism.common.recipe.machines.SolarNeutronRecipe; +import mekanism.common.recipe.machines.ThermalEvaporationRecipe; +import mekanism.common.recipe.machines.WasherRecipe; +import mekanism.common.util.ItemDataUtils; +import mezz.jei.api.IItemRegistry; +import mezz.jei.api.IJeiHelpers; +import mezz.jei.api.IJeiRuntime; +import mezz.jei.api.IModPlugin; +import mezz.jei.api.IModRegistry; +import mezz.jei.api.IRecipeRegistry; +import mezz.jei.api.JEIPlugin; +import mezz.jei.api.recipe.IRecipeCategory; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +@JEIPlugin +public class MekanismJEI implements IModPlugin +{ + public static final String[] UNUSED_TAGS = new String[] {ItemDataUtils.DATA_ID}; + + @Override + public void register(IModRegistry registry) + { + registry.addAdvancedGuiHandlers(new GuiElementHandler()); + + registry.addRecipeHandlers(new ShapedMekanismRecipeHandler()); + registry.addRecipeHandlers(new ShapelessMekanismRecipeHandler()); + + registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(MekanismItems.ItemProxy)); + registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(MekanismBlocks.BoundingBlock)); + + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(MekanismBlocks.EnergyCube), UNUSED_TAGS); + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(MekanismBlocks.MachineBlock), UNUSED_TAGS); + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), UNUSED_TAGS); + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), UNUSED_TAGS); + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(MekanismBlocks.BasicBlock), UNUSED_TAGS); + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(MekanismBlocks.BasicBlock2), UNUSED_TAGS); + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(MekanismBlocks.GasTank), UNUSED_TAGS); + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(MekanismBlocks.CardboardBox), UNUSED_TAGS); + + try { + registerBasicMachine(registry, Recipe.ENRICHMENT_CHAMBER, "tile.MachineBlock.EnrichmentChamber.name", ProgressBar.BLUE, EnrichmentRecipeHandler.class, EnrichmentRecipeWrapper.class); + registerBasicMachine(registry, Recipe.CRUSHER, "tile.MachineBlock.Crusher.name", ProgressBar.CRUSH, CrusherRecipeHandler.class, CrusherRecipeWrapper.class); + + registerAdvancedMachine(registry, Recipe.COMBINER, "tile.MachineBlock.Combiner.name", ProgressBar.STONE, CombinerRecipeHandler.class, CombinerRecipeWrapper.class); + 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); + + MetallurgicInfuserRecipeCategory metallurgicInfuserCategory = new MetallurgicInfuserRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(metallurgicInfuserCategory); + registry.addRecipeHandlers(new MetallurgicInfuserRecipeHandler(metallurgicInfuserCategory)); + addRecipes(registry, Recipe.METALLURGIC_INFUSER, metallurgicInfuserCategory, MetallurgicInfuserRecipe.class, MetallurgicInfuserRecipeCategory.class, MetallurgicInfuserRecipeWrapper.class); + + ChemicalCrystallizerRecipeCategory chemicalCrystallizerCategory = new ChemicalCrystallizerRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(chemicalCrystallizerCategory); + registry.addRecipeHandlers(new ChemicalCrystallizerRecipeHandler(chemicalCrystallizerCategory)); + addRecipes(registry, Recipe.CHEMICAL_CRYSTALLIZER, chemicalCrystallizerCategory, CrystallizerRecipe.class, ChemicalCrystallizerRecipeCategory.class, ChemicalCrystallizerRecipeWrapper.class); + + ChemicalDissolutionChamberRecipeCategory chemicalDissolutionChamberCategory = new ChemicalDissolutionChamberRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(chemicalDissolutionChamberCategory); + registry.addRecipeHandlers(new ChemicalDissolutionChamberRecipeHandler(chemicalDissolutionChamberCategory)); + addRecipes(registry, Recipe.CHEMICAL_DISSOLUTION_CHAMBER, chemicalDissolutionChamberCategory, DissolutionRecipe.class, ChemicalDissolutionChamberRecipeCategory.class, ChemicalDissolutionChamberRecipeWrapper.class); + + ChemicalInfuserRecipeCategory chemicalInfuserCategory = new ChemicalInfuserRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(chemicalInfuserCategory); + registry.addRecipeHandlers(new ChemicalInfuserRecipeHandler(chemicalInfuserCategory)); + addRecipes(registry, Recipe.CHEMICAL_INFUSER, chemicalInfuserCategory, ChemicalInfuserRecipe.class, ChemicalInfuserRecipeCategory.class, ChemicalInfuserRecipeWrapper.class); + + ChemicalOxidizerRecipeCategory chemicalOxidizerCategory = new ChemicalOxidizerRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(chemicalOxidizerCategory); + registry.addRecipeHandlers(new ChemicalOxidizerRecipeHandler(chemicalOxidizerCategory)); + addRecipes(registry, Recipe.CHEMICAL_OXIDIZER, chemicalOxidizerCategory, OxidationRecipe.class, ChemicalOxidizerRecipeCategory.class, ChemicalOxidizerRecipeWrapper.class); + + ChemicalWasherRecipeCategory chemicalWasherCategory = new ChemicalWasherRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(chemicalWasherCategory); + registry.addRecipeHandlers(new ChemicalWasherRecipeHandler(chemicalWasherCategory)); + addRecipes(registry, Recipe.CHEMICAL_WASHER, chemicalWasherCategory, WasherRecipe.class, ChemicalWasherRecipeCategory.class, ChemicalWasherRecipeWrapper.class); + + SolarNeutronRecipeCategory solarNeutronCategory = new SolarNeutronRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(solarNeutronCategory); + registry.addRecipeHandlers(new SolarNeutronRecipeHandler(solarNeutronCategory)); + addRecipes(registry, Recipe.SOLAR_NEUTRON_ACTIVATOR, solarNeutronCategory, SolarNeutronRecipe.class, SolarNeutronRecipeCategory.class, SolarNeutronRecipeWrapper.class); + + ElectrolyticSeparatorRecipeCategory electrolyticSeparatorCategory = new ElectrolyticSeparatorRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(electrolyticSeparatorCategory); + registry.addRecipeHandlers(new ElectrolyticSeparatorRecipeHandler(electrolyticSeparatorCategory)); + addRecipes(registry, Recipe.ELECTROLYTIC_SEPARATOR, electrolyticSeparatorCategory, SeparatorRecipe.class, ElectrolyticSeparatorRecipeCategory.class, ElectrolyticSeparatorRecipeWrapper.class); + + ThermalEvaporationRecipeCategory thermalEvaporationCategory = new ThermalEvaporationRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(thermalEvaporationCategory); + registry.addRecipeHandlers(new ThermalEvaporationRecipeHandler(thermalEvaporationCategory)); + addRecipes(registry, Recipe.THERMAL_EVAPORATION_PLANT, thermalEvaporationCategory, ThermalEvaporationRecipe.class, ThermalEvaporationRecipeCategory.class, ThermalEvaporationRecipeWrapper.class); + + PRCRecipeCategory prcCategory = new PRCRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(prcCategory); + registry.addRecipeHandlers(new PRCRecipeHandler(prcCategory)); + addRecipes(registry, Recipe.PRESSURIZED_REACTION_CHAMBER, prcCategory, PressurizedRecipe.class, PRCRecipeCategory.class, PRCRecipeWrapper.class); + } catch(Exception e) { + e.printStackTrace(); + } + + registry.addRecipeClickArea(GuiEnrichmentChamber.class, 79, 40, 24, 7, "mekanism.enrichment_chamber"); + registry.addRecipeClickArea(GuiCrusher.class, 79, 40, 24, 7, "mekanism.crusher"); + 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(GuiPrecisionSawmill.class, 79, 40, 24, 7, "mekanism.precision_sawmill"); + registry.addRecipeClickArea(GuiMetallurgicInfuser.class, 72, 47, 32, 8, "mekanism.metallurgic_infuser"); + registry.addRecipeClickArea(GuiChemicalCrystallizer.class, 53, 62, 48, 8, "mekanism.chemical_crystallizer"); + registry.addRecipeClickArea(GuiChemicalDissolutionChamber.class, 64, 40, 48, 8, "mekanism.chemical_dissolution_chamber"); + registry.addRecipeClickArea(GuiChemicalInfuser.class, 47, 39, 28, 8, "mekanism.chemical_infuser"); + registry.addRecipeClickArea(GuiChemicalInfuser.class, 101, 39, 28, 8, "mekanism.chemical_infuser"); + registry.addRecipeClickArea(GuiChemicalOxidizer.class, 64, 40, 48, 8, "mekanism.chemical_oxidizer"); + registry.addRecipeClickArea(GuiChemicalWasher.class, 61, 39, 55, 8, "mekanism.chemical_washer"); + registry.addRecipeClickArea(GuiSolarNeutronActivator.class, 64, 39, 48, 8, "mekanism.solar_neutron_activator"); + registry.addRecipeClickArea(GuiElectrolyticSeparator.class, 80, 30, 16, 6, "mekanism.electrolytic_separator"); + registry.addRecipeClickArea(GuiThermalEvaporationController.class, 49, 20, 78, 38, "mekanism.thermal_evaporation_plant"); + registry.addRecipeClickArea(GuiPRC.class, 75, 37, 36, 10, "mekanism.pressurized_reaction_chamber"); + registry.addRecipeClickArea(GuiRotaryCondensentrator.class, 64, 39, 48, 8, "mekanism.rotary_condensentrator"); + + List condensentratorRecipes = new ArrayList(); + + RotaryCondensentratorRecipeCategory rotaryCondensentratorCategory = new RotaryCondensentratorRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(rotaryCondensentratorCategory); + registry.addRecipeHandlers(new RotaryCondensentratorRecipeHandler(rotaryCondensentratorCategory)); + + for(Gas gas : GasRegistry.getRegisteredGasses()) + { + if(gas.hasFluid()) + { + condensentratorRecipes.add(new RotaryCondensentratorRecipeWrapper(gas.getFluid(), gas, true, rotaryCondensentratorCategory)); + condensentratorRecipes.add(new RotaryCondensentratorRecipeWrapper(gas.getFluid(), gas, false, rotaryCondensentratorCategory)); + } + } + + registry.addRecipes(condensentratorRecipes); + } + + private void registerBasicMachine(IModRegistry registry, Recipe recipe, String unlocalized, ProgressBar bar, Class handler, Class wrapper) throws Exception + { + MachineRecipeCategory category = new MachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), recipe.name().toLowerCase(), unlocalized, bar); + + registry.addRecipeCategories(category); + registry.addRecipeHandlers(handler.getConstructor(MachineRecipeCategory.class).newInstance(category)); + + addRecipes(registry, recipe, category, BasicMachineRecipe.class, MachineRecipeCategory.class, wrapper); + } + + private void registerAdvancedMachine(IModRegistry registry, Recipe recipe, String unlocalized, ProgressBar bar, Class handler, Class wrapper) throws Exception + { + AdvancedMachineRecipeCategory category = new AdvancedMachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), recipe.name().toLowerCase(), unlocalized, bar); + + registry.addRecipeCategories(category); + registry.addRecipeHandlers(handler.getConstructor(AdvancedMachineRecipeCategory.class).newInstance(category)); + + addRecipes(registry, recipe, category, AdvancedMachineRecipe.class, AdvancedMachineRecipeCategory.class, wrapper); + } + + 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)); + + addRecipes(registry, recipe, category, ChanceMachineRecipe.class, ChanceMachineRecipeCategory.class, wrapper); + } + + private void addRecipes(IModRegistry registry, Recipe type, IRecipeCategory cat, Class recipe, Class category, Class wrapper) throws Exception + { + List recipes = new ArrayList(); + + for(Object obj : type.get().values()) + { + if(obj instanceof MachineRecipe) + { + recipes.add(wrapper.getConstructor(recipe, category).newInstance(obj, cat)); + } + } + + registry.addRecipes(recipes); + } + + @Override + public void onItemRegistryAvailable(IItemRegistry registry) {} + + @Override + public void onJeiHelpersAvailable(IJeiHelpers helpers) {} + + @Override + public void onRecipeRegistryAvailable(IRecipeRegistry registry) {} + + @Override + public void onRuntimeAvailable(IJeiRuntime runtime) {} +} diff --git a/src/main/java/mekanism/client/jei/crafting/ShapedMekanismRecipeHandler.java b/src/main/java/mekanism/client/jei/crafting/ShapedMekanismRecipeHandler.java new file mode 100644 index 000000000..93e7c0074 --- /dev/null +++ b/src/main/java/mekanism/client/jei/crafting/ShapedMekanismRecipeHandler.java @@ -0,0 +1,33 @@ +package mekanism.client.jei.crafting; + +import mekanism.common.recipe.ShapedMekanismRecipe; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; +import mezz.jei.api.recipe.VanillaRecipeCategoryUid; + +public class ShapedMekanismRecipeHandler implements IRecipeHandler +{ + @Override + public String getRecipeCategoryUid() + { + return VanillaRecipeCategoryUid.CRAFTING; + } + + @Override + public Class getRecipeClass() + { + return ShapedMekanismRecipe.class; + } + + @Override + public IRecipeWrapper getRecipeWrapper(ShapedMekanismRecipe recipe) + { + return new ShapedMekanismRecipeWrapper(recipe); + } + + @Override + public boolean isRecipeValid(ShapedMekanismRecipe recipe) + { + return true; + } +} diff --git a/src/main/java/mekanism/client/jei/crafting/ShapedMekanismRecipeWrapper.java b/src/main/java/mekanism/client/jei/crafting/ShapedMekanismRecipeWrapper.java new file mode 100644 index 000000000..43dbf25b6 --- /dev/null +++ b/src/main/java/mekanism/client/jei/crafting/ShapedMekanismRecipeWrapper.java @@ -0,0 +1,62 @@ +package mekanism.client.jei.crafting; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nonnull; + +import mekanism.common.recipe.ShapedMekanismRecipe; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import mezz.jei.api.recipe.wrapper.IShapedCraftingRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class ShapedMekanismRecipeWrapper extends BlankRecipeWrapper implements IShapedCraftingRecipeWrapper +{ + @Nonnull + private final ShapedMekanismRecipe recipe; + + public ShapedMekanismRecipeWrapper(@Nonnull ShapedMekanismRecipe r) + { + recipe = r; + + for(Object input : this.recipe.getInput()) + { + if(input instanceof ItemStack) + { + ItemStack itemStack = (ItemStack)input; + + if(itemStack.stackSize != 1) + { + itemStack.stackSize = 1; + } + } + } + } + + @Nonnull + @Override + public List getInputs() + { + return Arrays.asList(recipe.getInput()); + } + + @Nonnull + @Override + public List getOutputs() + { + return Collections.singletonList(recipe.getRecipeOutput()); + } + + @Override + public int getWidth() + { + return recipe.width; + } + + @Override + public int getHeight() + { + return recipe.height; + } +} diff --git a/src/main/java/mekanism/client/jei/crafting/ShapelessMekanismRecipeHandler.java b/src/main/java/mekanism/client/jei/crafting/ShapelessMekanismRecipeHandler.java new file mode 100644 index 000000000..882b070d5 --- /dev/null +++ b/src/main/java/mekanism/client/jei/crafting/ShapelessMekanismRecipeHandler.java @@ -0,0 +1,38 @@ +package mekanism.client.jei.crafting; + +import javax.annotation.Nonnull; + +import mekanism.common.recipe.ShapelessMekanismRecipe; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; +import mezz.jei.api.recipe.VanillaRecipeCategoryUid; + +public class ShapelessMekanismRecipeHandler implements IRecipeHandler +{ + @Override + @Nonnull + public Class getRecipeClass() + { + return ShapelessMekanismRecipe.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return VanillaRecipeCategoryUid.CRAFTING; + } + + @Override + @Nonnull + public IRecipeWrapper getRecipeWrapper(@Nonnull ShapelessMekanismRecipe recipe) + { + return new ShapelessMekanismRecipeWrapper(recipe); + } + + @Override + public boolean isRecipeValid(@Nonnull ShapelessMekanismRecipe recipe) + { + return true; + } +} diff --git a/src/main/java/mekanism/client/jei/crafting/ShapelessMekanismRecipeWrapper.java b/src/main/java/mekanism/client/jei/crafting/ShapelessMekanismRecipeWrapper.java new file mode 100644 index 000000000..8344b2903 --- /dev/null +++ b/src/main/java/mekanism/client/jei/crafting/ShapelessMekanismRecipeWrapper.java @@ -0,0 +1,49 @@ +package mekanism.client.jei.crafting; + +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nonnull; + +import mekanism.common.recipe.ShapelessMekanismRecipe; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import mezz.jei.api.recipe.wrapper.ICraftingRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class ShapelessMekanismRecipeWrapper extends BlankRecipeWrapper implements ICraftingRecipeWrapper +{ + @Nonnull + private final ShapelessMekanismRecipe recipe; + + public ShapelessMekanismRecipeWrapper(@Nonnull ShapelessMekanismRecipe r) + { + recipe = r; + + for(Object input : recipe.getInput()) + { + if(input instanceof ItemStack) + { + ItemStack itemStack = (ItemStack)input; + + if(itemStack.stackSize != 1) + { + itemStack.stackSize = 1; + } + } + } + } + + @Nonnull + @Override + public List getInputs() + { + return recipe.getInput(); + } + + @Nonnull + @Override + public List getOutputs() + { + return Collections.singletonList(recipe.getRecipeOutput()); + } +} diff --git a/src/main/java/mekanism/client/jei/gas/GasStackHelper.java b/src/main/java/mekanism/client/jei/gas/GasStackHelper.java new file mode 100644 index 000000000..06de01d44 --- /dev/null +++ b/src/main/java/mekanism/client/jei/gas/GasStackHelper.java @@ -0,0 +1,29 @@ +package mekanism.client.jei.gas; + + +public class GasStackHelper// implements IIngredientHelper +{ + /*@Override + public Collection expandSubtypes(Collection contained) { + return contained; + } + + @Override + public GasStack getMatch(Iterable ingredients, @Nonnull Focus toMatch) { + if (toMatch.getGas() == null) { + return null; + } + for (GasStack GasStack : ingredients) { + if (toMatch.getGas() == GasStack.getGas()) { + return GasStack; + } + } + return null; + } + + @Nonnull + @Override + public Focus createFocus(@Nonnull GasStack ingredient) { + return new Focus(ingredient.getGas()); + }*/ +} diff --git a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeCategory.java new file mode 100644 index 000000000..12ab12557 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeCategory.java @@ -0,0 +1,113 @@ +package mekanism.client.jei.machine; + +import mekanism.api.gas.GasStack; +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.inputs.AdvancedMachineInput; +import mekanism.common.recipe.machines.AdvancedMachineRecipe; +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.client.Minecraft; +import net.minecraft.util.ResourceLocation; + +public class AdvancedMachineRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public String recipeName; + public String unlocalizedName; + + public IDrawable background; + + public AdvancedMachineRecipe tempRecipe; + + public ITickTimer timer; + + public AdvancedMachineRecipeCategory(IGuiHelper helper, String name, String unlocalized, ProgressBar progress) + { + super("mekanism:gui/GuiAdvancedMachine.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()), 30, 34).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.EXTRA, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 55, 52)); + guiElements.add(new GuiSlot(SlotType.OUTPUT_LARGE, 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 void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + AdvancedMachineInput input = (AdvancedMachineInput)tempRecipe.getInput(); + + if(input.gasType != null) + { + displayGauge(33, 21, 6, 12, new GasStack(input.gasType, 1)); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof AdvancedMachineRecipeWrapper) + { + 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/AdvancedMachineRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeHandler.java new file mode 100644 index 000000000..4dbb889db --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeHandler.java @@ -0,0 +1,46 @@ +package mekanism.client.jei.machine; + +import javax.annotation.Nonnull; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class AdvancedMachineRecipeHandler implements IRecipeHandler +{ + private final AdvancedMachineRecipeCategory category; + + public Class wrapperClass; + + public AdvancedMachineRecipeHandler(AdvancedMachineRecipeCategory 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/AdvancedMachineRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java new file mode 100644 index 000000000..aea384250 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java @@ -0,0 +1,58 @@ +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 abstract class AdvancedMachineRecipeWrapper extends BlankRecipeWrapper +{ + public AdvancedMachineRecipe recipe; + + public AdvancedMachineRecipeCategory category; + + public AdvancedMachineRecipeWrapper(AdvancedMachineRecipe r, AdvancedMachineRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return Arrays.asList(((AdvancedMachineInput)recipe.getInput()).itemStack); + } + + @Nonnull + @Override + public List getOutputs() + { + 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 new file mode 100644 index 000000000..3bf0f6948 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeCategory.java @@ -0,0 +1,103 @@ +package mekanism.client.jei.machine; + +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 new file mode 100644 index 000000000..170b7969f --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeHandler.java @@ -0,0 +1,46 @@ +package mekanism.client.jei.machine; + +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 new file mode 100644 index 000000000..a32363c46 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java @@ -0,0 +1,55 @@ +package mekanism.client.jei.machine; + +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/MachineRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/MachineRecipeCategory.java new file mode 100644 index 000000000..5b41c8194 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/MachineRecipeCategory.java @@ -0,0 +1,90 @@ +package mekanism.client.jei.machine; + +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.BasicMachineRecipe; +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 MachineRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + + public BasicMachineRecipe tempRecipe; + + public ITickTimer timer; + + public MachineRecipeCategory(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_LARGE, 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 MachineRecipeWrapper) + { + tempRecipe = ((MachineRecipeWrapper)recipeWrapper).recipe; + } + + IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); + + itemStacks.init(0, true, 27, 0); + itemStacks.init(1, false, 87, 18); + + itemStacks.setFromRecipe(0, recipeWrapper.getInputs()); + itemStacks.setFromRecipe(1, recipeWrapper.getOutputs()); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/MachineRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/MachineRecipeHandler.java new file mode 100644 index 000000000..a6431580a --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/MachineRecipeHandler.java @@ -0,0 +1,46 @@ +package mekanism.client.jei.machine; + +import javax.annotation.Nonnull; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class MachineRecipeHandler implements IRecipeHandler +{ + private final MachineRecipeCategory category; + + public Class wrapperClass; + + public MachineRecipeHandler(MachineRecipeCategory 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/MachineRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/MachineRecipeWrapper.java new file mode 100644 index 000000000..7cc872bdd --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/MachineRecipeWrapper.java @@ -0,0 +1,39 @@ +package mekanism.client.jei.machine; + +import java.util.Arrays; +import java.util.List; + +import javax.annotation.Nonnull; + +import mekanism.common.recipe.inputs.ItemStackInput; +import mekanism.common.recipe.machines.BasicMachineRecipe; +import mekanism.common.recipe.outputs.ItemStackOutput; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class MachineRecipeWrapper extends BlankRecipeWrapper +{ + public BasicMachineRecipe recipe; + + public MachineRecipeCategory category; + + public MachineRecipeWrapper(BasicMachineRecipe r, MachineRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return Arrays.asList(((ItemStackInput)recipe.getInput()).ingredient); + } + + @Nonnull + @Override + public List getOutputs() + { + return Arrays.asList(((ItemStackOutput)recipe.getOutput()).output); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeHandler.java new file mode 100644 index 000000000..6f4d0d573 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeHandler.java @@ -0,0 +1,12 @@ +package mekanism.client.jei.machine.advanced; + +import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; +import mekanism.client.jei.machine.AdvancedMachineRecipeHandler; + +public class ChemicalInjectionChamberRecipeHandler extends AdvancedMachineRecipeHandler +{ + public ChemicalInjectionChamberRecipeHandler(AdvancedMachineRecipeCategory c) + { + super(c, ChemicalInjectionChamberRecipeWrapper.class); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java new file mode 100644 index 000000000..747a64cb6 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java @@ -0,0 +1,50 @@ +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 +{ + public ChemicalInjectionChamberRecipeWrapper(AdvancedMachineRecipe r, AdvancedMachineRecipeCategory c) + { + 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/CombinerRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeHandler.java new file mode 100644 index 000000000..109977634 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeHandler.java @@ -0,0 +1,12 @@ +package mekanism.client.jei.machine.advanced; + +import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; +import mekanism.client.jei.machine.AdvancedMachineRecipeHandler; + +public class CombinerRecipeHandler extends AdvancedMachineRecipeHandler +{ + public CombinerRecipeHandler(AdvancedMachineRecipeCategory c) + { + super(c, CombinerRecipeWrapper.class); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java new file mode 100644 index 000000000..e77fc03e7 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java @@ -0,0 +1,25 @@ +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 +{ + public CombinerRecipeWrapper(AdvancedMachineRecipe r, AdvancedMachineRecipeCategory c) + { + 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/OsmiumCompressorRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeHandler.java new file mode 100644 index 000000000..bc3d7bfec --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeHandler.java @@ -0,0 +1,12 @@ +package mekanism.client.jei.machine.advanced; + +import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; +import mekanism.client.jei.machine.AdvancedMachineRecipeHandler; + +public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler +{ + public OsmiumCompressorRecipeHandler(AdvancedMachineRecipeCategory c) + { + super(c, OsmiumCompressorRecipeWrapper.class); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeWrapper.java new file mode 100644 index 000000000..bb4acf946 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeWrapper.java @@ -0,0 +1,25 @@ +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 +{ + public OsmiumCompressorRecipeWrapper(AdvancedMachineRecipe r, AdvancedMachineRecipeCategory c) + { + 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/PurificationChamberRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeHandler.java new file mode 100644 index 000000000..482c812e3 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeHandler.java @@ -0,0 +1,12 @@ +package mekanism.client.jei.machine.advanced; + +import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; +import mekanism.client.jei.machine.AdvancedMachineRecipeHandler; + +public class PurificationChamberRecipeHandler extends AdvancedMachineRecipeHandler +{ + public PurificationChamberRecipeHandler(AdvancedMachineRecipeCategory c) + { + super(c, PurificationChamberRecipeWrapper.class); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java new file mode 100644 index 000000000..ac64e6c51 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java @@ -0,0 +1,34 @@ +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 +{ + public PurificationChamberRecipeWrapper(AdvancedMachineRecipe r, AdvancedMachineRecipeCategory c) + { + 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/basic/CrusherRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/basic/CrusherRecipeHandler.java new file mode 100644 index 000000000..bce25da89 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/basic/CrusherRecipeHandler.java @@ -0,0 +1,12 @@ +package mekanism.client.jei.machine.basic; + +import mekanism.client.jei.machine.MachineRecipeCategory; +import mekanism.client.jei.machine.MachineRecipeHandler; + +public class CrusherRecipeHandler extends MachineRecipeHandler +{ + public CrusherRecipeHandler(MachineRecipeCategory c) + { + super(c, CrusherRecipeWrapper.class); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/basic/CrusherRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/basic/CrusherRecipeWrapper.java new file mode 100644 index 000000000..cd15ec112 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/basic/CrusherRecipeWrapper.java @@ -0,0 +1,13 @@ +package mekanism.client.jei.machine.basic; + +import mekanism.client.jei.machine.MachineRecipeCategory; +import mekanism.client.jei.machine.MachineRecipeWrapper; +import mekanism.common.recipe.machines.BasicMachineRecipe; + +public class CrusherRecipeWrapper extends MachineRecipeWrapper +{ + public CrusherRecipeWrapper(BasicMachineRecipe r, MachineRecipeCategory c) + { + super(r, c); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/basic/EnrichmentRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/basic/EnrichmentRecipeHandler.java new file mode 100644 index 000000000..7b62a193d --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/basic/EnrichmentRecipeHandler.java @@ -0,0 +1,12 @@ +package mekanism.client.jei.machine.basic; + +import mekanism.client.jei.machine.MachineRecipeCategory; +import mekanism.client.jei.machine.MachineRecipeHandler; + +public class EnrichmentRecipeHandler extends MachineRecipeHandler +{ + public EnrichmentRecipeHandler(MachineRecipeCategory c) + { + super(c, EnrichmentRecipeWrapper.class); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/basic/EnrichmentRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/basic/EnrichmentRecipeWrapper.java new file mode 100644 index 000000000..6333210a4 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/basic/EnrichmentRecipeWrapper.java @@ -0,0 +1,13 @@ +package mekanism.client.jei.machine.basic; + +import mekanism.client.jei.machine.MachineRecipeCategory; +import mekanism.client.jei.machine.MachineRecipeWrapper; +import mekanism.common.recipe.machines.BasicMachineRecipe; + +public class EnrichmentRecipeWrapper extends MachineRecipeWrapper +{ + public EnrichmentRecipeWrapper(BasicMachineRecipe r, MachineRecipeCategory c) + { + super(r, c); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeHandler.java new file mode 100644 index 000000000..f97cb37d2 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeHandler.java @@ -0,0 +1,12 @@ +package mekanism.client.jei.machine.chance; + +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 new file mode 100644 index 000000000..145251061 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeWrapper.java @@ -0,0 +1,13 @@ +package mekanism.client.jei.machine.chance; + +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..8b3749745 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeCategory.java @@ -0,0 +1,75 @@ +package mekanism.client.jei.machine.chemical; + +import mekanism.api.gas.GasStack; +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.CrystallizerRecipe; +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.client.Minecraft; +import net.minecraft.util.ResourceLocation; + +public class ChemicalCrystallizerRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + + public CrystallizerRecipe tempRecipe; + + public ITickTimer timer; + + public ChemicalCrystallizerRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/nei/GuiChemicalCrystallizer.png", "chemical_crystallizer", "tile.MachineBlock2.ChemicalCrystallizer.name", null); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 5; + yOffset = 3; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 147, 79); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + GasStack gas = tempRecipe.getInput().ingredient; + + float f = (float)timer.getValue() / 20F; + drawTexturedRect(53-xOffset, 61-yOffset, 176, 63, (int)(48*f), 8); + + if(gas != null) + { + displayGauge(58, 6-xOffset, 5-yOffset, 176, 4, 58, null, gas); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof ChemicalCrystallizerRecipeWrapper) + { + tempRecipe = ((ChemicalCrystallizerRecipeWrapper)recipeWrapper).recipe; + } + + IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); + + itemStacks.init(0, false, 130-xOffset, 56-yOffset); + + itemStacks.set(0, tempRecipe.getOutput().output); + } +} 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..7b9c69531 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeHandler.java @@ -0,0 +1,42 @@ +package mekanism.client.jei.machine.chemical; + +import javax.annotation.Nonnull; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class ChemicalCrystallizerRecipeHandler implements IRecipeHandler +{ + private final ChemicalCrystallizerRecipeCategory category; + + public ChemicalCrystallizerRecipeHandler(ChemicalCrystallizerRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return ChemicalCrystallizerRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull ChemicalCrystallizerRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull ChemicalCrystallizerRecipeWrapper recipe) + { + return recipe.category == category; + } +} 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..2bd77b778 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java @@ -0,0 +1,55 @@ +package mekanism.client.jei.machine.chemical; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import mekanism.common.recipe.inputs.AdvancedMachineInput; +import mekanism.common.recipe.machines.CrystallizerRecipe; +import mekanism.common.util.LangUtils; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class ChemicalCrystallizerRecipeWrapper extends BlankRecipeWrapper +{ + public CrystallizerRecipe recipe; + + public ChemicalCrystallizerRecipeCategory category; + + public ChemicalCrystallizerRecipeWrapper(CrystallizerRecipe r, ChemicalCrystallizerRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return new ArrayList(); + } + + @Nonnull + @Override + public List getOutputs() + { + return Arrays.asList(recipe.getOutput().output); + } + + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 1 && mouseX <= 17 && mouseY >= 5-3 && mouseY <= 63-3) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getInput().ingredient)); + } + + return currenttip; + } +} 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..dc9d631b0 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java @@ -0,0 +1,78 @@ +package mekanism.client.jei.machine.chemical; + +import mekanism.api.gas.GasRegistry; +import mekanism.api.gas.GasStack; +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.DissolutionRecipe; +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.client.Minecraft; +import net.minecraft.util.ResourceLocation; + +public class ChemicalDissolutionChamberRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + + public DissolutionRecipe tempRecipe; + + public ITickTimer timer; + + public ChemicalDissolutionChamberRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/nei/GuiChemicalDissolutionChamber.png", "chemical_dissolution_chamber", "gui.chemicalDissolutionChamber.short", null); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 3; + yOffset = 3; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 79); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + GasStack gas = tempRecipe.getOutput().output; + + float f = (float)timer.getValue() / 20F; + drawTexturedRect(64-xOffset, 40-yOffset, 176, 63, (int)(48*f), 8); + + displayGauge(58, 6-xOffset, 5-yOffset, 176, 4, 58, null, new GasStack(GasRegistry.getGas("sulfuricAcid"), 1)); + + if(gas != null) + { + displayGauge(58, 134-xOffset, 14-yOffset, 176, 4, 58, null, gas); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof ChemicalDissolutionChamberRecipeWrapper) + { + tempRecipe = ((ChemicalDissolutionChamberRecipeWrapper)recipeWrapper).recipe; + } + + IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); + + itemStacks.init(0, true, 25-xOffset, 35-yOffset); + + itemStacks.set(0, tempRecipe.getInput().ingredient); + } +} 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..680b1277e --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeHandler.java @@ -0,0 +1,42 @@ +package mekanism.client.jei.machine.chemical; + +import javax.annotation.Nonnull; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class ChemicalDissolutionChamberRecipeHandler implements IRecipeHandler +{ + private final ChemicalDissolutionChamberRecipeCategory category; + + public ChemicalDissolutionChamberRecipeHandler(ChemicalDissolutionChamberRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return ChemicalDissolutionChamberRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull ChemicalDissolutionChamberRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull ChemicalDissolutionChamberRecipeWrapper recipe) + { + return recipe.category == category; + } +} 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..c6cb3b3b0 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java @@ -0,0 +1,59 @@ +package mekanism.client.jei.machine.chemical; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import mekanism.api.gas.GasRegistry; +import mekanism.common.recipe.machines.DissolutionRecipe; +import mekanism.common.util.LangUtils; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class ChemicalDissolutionChamberRecipeWrapper extends BlankRecipeWrapper +{ + public DissolutionRecipe recipe; + + public ChemicalDissolutionChamberRecipeCategory category; + + public ChemicalDissolutionChamberRecipeWrapper(DissolutionRecipe r, ChemicalDissolutionChamberRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return Arrays.asList(recipe.getInput().ingredient); + } + + @Nonnull + @Override + public List getOutputs() + { + return new ArrayList(); + } + + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 6-3 && mouseX <= 22-3 && mouseY >= 5-3 && mouseY <= 63-3) + { + currenttip.add(GasRegistry.getGas("sulfuricAcid").getLocalizedName()); + } + else if(mouseX >= 134-3 && mouseX <= 150-3 && mouseY >= 14-3 && mouseY <= 72-3) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getOutput().output)); + } + + return currenttip; + } +} 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..acdc7cbc2 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeCategory.java @@ -0,0 +1,75 @@ +package mekanism.client.jei.machine.chemical; + +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.ChemicalInfuserRecipe; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; + +public class ChemicalInfuserRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + + public ChemicalInfuserRecipe tempRecipe; + + public ITickTimer timer; + + public ChemicalInfuserRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/nei/GuiChemicalInfuser.png", "chemical_infuser", "tile.MachineBlock2.ChemicalInfuser.name", null); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 3; + yOffset = 3; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 80); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + drawTexturedRect(47-xOffset, 39-yOffset, 176, 71, 28, 8); + drawTexturedRect(101-xOffset, 39-yOffset, 176, 63, 28, 8); + + if(tempRecipe.getInput().leftGas != null) + { + displayGauge(58, 26-xOffset, 14-yOffset, 176, 4, 58, null, tempRecipe.getInput().leftGas); + } + + if(tempRecipe.getOutput().output != null) + { + displayGauge(58, 80-xOffset, 5-yOffset, 176, 4, 58, null, tempRecipe.getOutput().output); + } + + if(tempRecipe.getInput().rightGas != null) + { + displayGauge(58, 134-xOffset, 14-yOffset, 176, 4, 58, null, tempRecipe.getInput().rightGas); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof ChemicalInfuserRecipeWrapper) + { + tempRecipe = ((ChemicalInfuserRecipeWrapper)recipeWrapper).recipe; + } + } +} 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..f68a48025 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeHandler.java @@ -0,0 +1,42 @@ +package mekanism.client.jei.machine.chemical; + +import javax.annotation.Nonnull; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class ChemicalInfuserRecipeHandler implements IRecipeHandler +{ + private final ChemicalInfuserRecipeCategory category; + + public ChemicalInfuserRecipeHandler(ChemicalInfuserRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return ChemicalInfuserRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull ChemicalInfuserRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull ChemicalInfuserRecipeWrapper recipe) + { + return recipe.category == category; + } +} 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..832d9283c --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java @@ -0,0 +1,61 @@ +package mekanism.client.jei.machine.chemical; + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import mekanism.common.recipe.machines.ChemicalInfuserRecipe; +import mekanism.common.util.LangUtils; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class ChemicalInfuserRecipeWrapper extends BlankRecipeWrapper +{ + public ChemicalInfuserRecipe recipe; + + public ChemicalInfuserRecipeCategory category; + + public ChemicalInfuserRecipeWrapper(ChemicalInfuserRecipe r, ChemicalInfuserRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return new ArrayList(); + } + + @Nonnull + @Override + public List getOutputs() + { + return new ArrayList(); + } + + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 26-3 && mouseX <= 42-3 && mouseY >= 14-3 && mouseY <= 72-3) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getInput().leftGas)); + } + else if(mouseX >= 80-3 && mouseX <= 96-3 && mouseY >= 5-3 && mouseY <= 63-3) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getOutput().output)); + } + else if(mouseX >= 134-3 && mouseX <= 150-3 && mouseY >= 14-3 && mouseY <= 72-3) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getInput().rightGas)); + } + + return currenttip; + } +} 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..0f8bd2c81 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeCategory.java @@ -0,0 +1,98 @@ +package mekanism.client.jei.machine.chemical; + +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGauge; +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.SlotType; +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.OxidationRecipe; +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.client.Minecraft; +import net.minecraft.util.ResourceLocation; + +public class ChemicalOxidizerRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + + public OxidationRecipe tempRecipe; + + public GuiGasGauge gasOutput; + + public ITickTimer timer; + + public ChemicalOxidizerRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/GuiChemicalOxidizer.png", "chemical_oxidizer", "tile.MachineBlock2.ChemicalOxidizer.name", ProgressBar.LARGE_RIGHT); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 20; + yOffset = 12; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 132, 62); + } + + @Override + public void addGuiElements() + { + guiElements.add(gasOutput = GuiGasGauge.getDummy(GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 133, 13)); + + guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 25, 35)); + + guiElements.add(new GuiProgress(new IProgressInfoHandler() + { + @Override + public double getProgress() + { + return (double)timer.getValue() / 20F; + } + }, progressBar, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"), 62, 39)); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + if(tempRecipe.getOutput().output != null) + { + gasOutput.setDummyType(tempRecipe.getOutput().output.getGas()); + gasOutput.renderScale(0, 0, -xOffset, -yOffset); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof ChemicalOxidizerRecipeWrapper) + { + tempRecipe = ((ChemicalOxidizerRecipeWrapper)recipeWrapper).recipe; + } + + IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); + + itemStacks.init(0, true, 25-xOffset, 35-yOffset); + + itemStacks.set(0, tempRecipe.getInput().ingredient); + } +} 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..69d3abdd9 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeHandler.java @@ -0,0 +1,42 @@ +package mekanism.client.jei.machine.chemical; + +import javax.annotation.Nonnull; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class ChemicalOxidizerRecipeHandler implements IRecipeHandler +{ + private final ChemicalOxidizerRecipeCategory category; + + public ChemicalOxidizerRecipeHandler(ChemicalOxidizerRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return ChemicalOxidizerRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull ChemicalOxidizerRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull ChemicalOxidizerRecipeWrapper recipe) + { + return recipe.category == category; + } +} 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..2391b3999 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java @@ -0,0 +1,55 @@ +package mekanism.client.jei.machine.chemical; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import mekanism.api.gas.GasRegistry; +import mekanism.common.recipe.machines.OxidationRecipe; +import mekanism.common.util.LangUtils; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class ChemicalOxidizerRecipeWrapper extends BlankRecipeWrapper +{ + public OxidationRecipe recipe; + + public ChemicalOxidizerRecipeCategory category; + + public ChemicalOxidizerRecipeWrapper(OxidationRecipe r, ChemicalOxidizerRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return Arrays.asList(recipe.getInput().ingredient); + } + + @Nonnull + @Override + public List getOutputs() + { + return new ArrayList(); + } + + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 134-20 && mouseX <= 150-20 && mouseY >= 14-12 && mouseY <= 72-12) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getOutput().output)); + } + + return currenttip; + } +} 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..c7e895a9f --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java @@ -0,0 +1,89 @@ +package mekanism.client.jei.machine.chemical; + +import java.util.List; + +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.WasherRecipe; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.gui.ITooltipCallback; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; + +public class ChemicalWasherRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + public IDrawable fluidOverlay; + + public WasherRecipe tempRecipe; + + public ITickTimer timer; + + public ChemicalWasherRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/nei/GuiChemicalWasher.png", "chemical_washer", "tile.MachineBlock2.ChemicalWasher.name", null); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 3; + yOffset = 3; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 70); + fluidOverlay = guiHelper.createDrawable(new ResourceLocation(guiTexture), 176, 4, 16, 59); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + drawTexturedRect(61-xOffset, 39-yOffset, 176, 63, 55, 8); + + if(tempRecipe.getInput().ingredient != null) + { + displayGauge(58, 27-xOffset, 14-yOffset, 176, 4, 58, null, tempRecipe.getInput().ingredient); + } + + if(tempRecipe.getOutput().output != null) + { + displayGauge(58, 134-xOffset, 14-yOffset, 176, 4, 58, null, tempRecipe.getOutput().output); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof ChemicalWasherRecipeWrapper) + { + tempRecipe = ((ChemicalWasherRecipeWrapper)recipeWrapper).recipe; + } + + IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); + + fluidStacks.init(0, true, 6-xOffset, 5-yOffset, 16, 58, 1000, false, fluidOverlay); + fluidStacks.set(0, recipeWrapper.getFluidInputs()); + fluidStacks.addTooltipCallback(new ITooltipCallback() { + + @Override + public void onTooltip(int slotIndex, boolean input, FluidStack ingredient, List tooltip) + { + tooltip.remove(1); + } + }); + } +} 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..de25def2f --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeHandler.java @@ -0,0 +1,42 @@ +package mekanism.client.jei.machine.chemical; + +import javax.annotation.Nonnull; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class ChemicalWasherRecipeHandler implements IRecipeHandler +{ + private final ChemicalWasherRecipeCategory category; + + public ChemicalWasherRecipeHandler(ChemicalWasherRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return ChemicalWasherRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull ChemicalWasherRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull ChemicalWasherRecipeWrapper recipe) + { + return recipe.category == category; + } +} 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..ea248ca09 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java @@ -0,0 +1,67 @@ +package mekanism.client.jei.machine.chemical; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import mekanism.common.recipe.machines.WasherRecipe; +import mekanism.common.util.LangUtils; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +public class ChemicalWasherRecipeWrapper extends BlankRecipeWrapper +{ + public WasherRecipe recipe; + + public ChemicalWasherRecipeCategory category; + + public ChemicalWasherRecipeWrapper(WasherRecipe r, ChemicalWasherRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return new ArrayList(); + } + + @Nonnull + @Override + public List getFluidInputs() + { + return Arrays.asList(new FluidStack(FluidRegistry.WATER, 1000)); + } + + @Nonnull + @Override + public List getOutputs() + { + return new ArrayList(); + } + + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 27-3 && mouseX <= 43-3 && mouseY >= 14-3 && mouseY <= 72-3) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getInput().ingredient)); + } + else if(mouseX >= 134-3 && mouseX <= 150-3 && mouseY >= 14-3 && mouseY <= 72-3) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getOutput().output)); + } + + return currenttip; + } +} 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..a05358924 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java @@ -0,0 +1,136 @@ +package mekanism.client.jei.machine.other; + +import java.util.List; + +import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGauge; +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.SeparatorRecipe; +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.IGuiFluidStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.gui.ITooltipCallback; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; + +public class ElectrolyticSeparatorRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + public IDrawable fluidOverlay; + + public GuiGasGauge leftGas; + public GuiGasGauge rightGas; + + public SeparatorRecipe tempRecipe; + + public ITickTimer timer; + + public ElectrolyticSeparatorRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/GuiElectrolyticSeparator.png", "electrolytic_separator", "tile.MachineBlock2.ElectrolyticSeparator.name", ProgressBar.BI); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 4; + yOffset = 9; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 167, 62); + fluidOverlay = guiHelper.createDrawable(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, GuiGauge.Type.STANDARD.textureLocation), 19, 1, 16, 59); + } + + @Override + public void addGuiElements() + { + guiElements.add(GuiFluidGauge.getDummy(GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 5, 10)); + guiElements.add(leftGas = GuiGasGauge.getDummy(GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 58, 18)); + guiElements.add(rightGas = GuiGasGauge.getDummy(GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 100, 18)); + guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { + @Override + public double getLevel() + { + return 1F; + } + }, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 164, 15)); + + guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 25, 34)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 58, 51)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 100, 51)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 142, 34).with(SlotOverlay.POWER)); + + guiElements.add(new GuiProgress(new IProgressInfoHandler() + { + @Override + public double getProgress() + { + return 1; + } + }, progressBar, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 78, 29)); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + if(tempRecipe.getOutput().leftGas != null) + { + leftGas.setDummyType(tempRecipe.getOutput().leftGas.getGas()); + leftGas.renderScale(0, 0, -xOffset, -yOffset); + } + + if(tempRecipe.getOutput().rightGas != null) + { + rightGas.setDummyType(tempRecipe.getOutput().rightGas.getGas()); + rightGas.renderScale(0, 0, -xOffset, -yOffset); + } + + changeTexture(guiLocation); + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof ElectrolyticSeparatorRecipeWrapper) + { + tempRecipe = ((ElectrolyticSeparatorRecipeWrapper)recipeWrapper).recipe; + } + + IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); + + fluidStacks.init(0, true, 2, 2, 16, 58, tempRecipe.getInput().ingredient.amount, false, fluidOverlay); + fluidStacks.set(0, recipeWrapper.getFluidInputs()); + fluidStacks.addTooltipCallback(new ITooltipCallback() { + + @Override + public void onTooltip(int slotIndex, boolean input, FluidStack ingredient, List tooltip) + { + tooltip.remove(1); + } + }); + } +} 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..83c2096c9 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeHandler.java @@ -0,0 +1,42 @@ +package mekanism.client.jei.machine.other; + +import javax.annotation.Nonnull; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class ElectrolyticSeparatorRecipeHandler implements IRecipeHandler +{ + private final ElectrolyticSeparatorRecipeCategory category; + + public ElectrolyticSeparatorRecipeHandler(ElectrolyticSeparatorRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return ElectrolyticSeparatorRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull ElectrolyticSeparatorRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull ElectrolyticSeparatorRecipeWrapper recipe) + { + return recipe.category == category; + } +} 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..6b7a3fe3c --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java @@ -0,0 +1,65 @@ +package mekanism.client.jei.machine.other; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import mekanism.common.recipe.machines.SeparatorRecipe; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public class ElectrolyticSeparatorRecipeWrapper extends BlankRecipeWrapper +{ + public SeparatorRecipe recipe; + + public ElectrolyticSeparatorRecipeCategory category; + + public ElectrolyticSeparatorRecipeWrapper(SeparatorRecipe r, ElectrolyticSeparatorRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return new ArrayList(); + } + + @Nonnull + @Override + public List getFluidInputs() + { + return Arrays.asList(recipe.getInput().ingredient); + } + + @Nonnull + @Override + public List getOutputs() + { + return new ArrayList(); + } + + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 59-4 && mouseX <= 75-4 && mouseY >= 19-9 && mouseY <= 47-9) + { + currenttip.add(recipe.getOutput().leftGas.getGas().getLocalizedName()); + } + else if(mouseX >= 101-4 && mouseX <= 117-4 && mouseY >= 19-9 && mouseY <= 47-9) + { + currenttip.add(recipe.getOutput().rightGas.getGas().getLocalizedName()); + } + + return currenttip; + } +} 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..d85ccfca8 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeCategory.java @@ -0,0 +1,130 @@ +package mekanism.client.jei.machine.other; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import mekanism.api.infuse.InfuseObject; +import mekanism.api.infuse.InfuseRegistry; +import mekanism.api.infuse.InfuseType; +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.client.render.MekanismRenderer; +import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; +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.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +public class MetallurgicInfuserRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + + public MetallurgicInfuserRecipe tempRecipe; + + public ITickTimer timer; + + public MetallurgicInfuserRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/GuiMetallurgicInfuser.png", "metallurgic_infuser", "tile.MachineBlock.MetallurgicInfuser.name", ProgressBar.MEDIUM); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 5; + yOffset = 16; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 166, 54); + } + + @Override + public void addGuiElements() + { + guiElements.add(new GuiSlot(SlotType.EXTRA, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 16, 34)); + guiElements.add(new GuiSlot(SlotType.INPUT, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 50, 42)); + guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 142, 34).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.OUTPUT, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 108, 42)); + + 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.MEDIUM, this, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 70, 46)); + } + + public static List getInfuseStacks(InfuseType type) + { + List ret = new ArrayList(); + + for(Map.Entry obj : InfuseRegistry.getObjectMap().entrySet()) + { + if(obj.getValue().type == type) + { + ret.add(obj.getKey()); + } + } + + return ret; + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + InfuseType type = tempRecipe.getInput().infuse.type; + changeTexture(MekanismRenderer.getBlocksTexture()); + drawTexturedRectFromIcon(2, 2, type.sprite, 4, 52); + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof MetallurgicInfuserRecipeWrapper) + { + tempRecipe = ((MetallurgicInfuserRecipeWrapper)recipeWrapper).recipe; + } + + IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); + + itemStacks.init(0, true, 45, 26); + itemStacks.init(1, false, 103, 26); + itemStacks.init(2, true, 11, 18); + + itemStacks.set(0, tempRecipe.getInput().inputStack); + itemStacks.setFromRecipe(1, recipeWrapper.getOutputs()); + itemStacks.set(2, getInfuseStacks(tempRecipe.getInput().infuse.type)); + } +} 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..b163a0c8d --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeHandler.java @@ -0,0 +1,42 @@ +package mekanism.client.jei.machine.other; + +import javax.annotation.Nonnull; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class MetallurgicInfuserRecipeHandler implements IRecipeHandler +{ + private final MetallurgicInfuserRecipeCategory category; + + public MetallurgicInfuserRecipeHandler(MetallurgicInfuserRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return MetallurgicInfuserRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull MetallurgicInfuserRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull MetallurgicInfuserRecipeWrapper recipe) + { + return recipe.category == category; + } +} 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..974a3cf43 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java @@ -0,0 +1,42 @@ +package mekanism.client.jei.machine.other; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.annotation.Nonnull; + +import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class MetallurgicInfuserRecipeWrapper extends BlankRecipeWrapper +{ + public MetallurgicInfuserRecipe recipe; + + public MetallurgicInfuserRecipeCategory category; + + public MetallurgicInfuserRecipeWrapper(MetallurgicInfuserRecipe r, MetallurgicInfuserRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + List list = new ArrayList(); + list.add(recipe.getInput().inputStack); + list.addAll(MetallurgicInfuserRecipeCategory.getInfuseStacks(recipe.getInput().infuse.type)); + + return list; + } + + @Nonnull + @Override + public List getOutputs() + { + return Arrays.asList(recipe.getOutput().output); + } +} 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..d41b2f99a --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java @@ -0,0 +1,142 @@ +package mekanism.client.jei.machine.other; + +import java.util.List; + +import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGauge; +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.PressurizedRecipe; +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.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.gui.ITooltipCallback; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; + +public class PRCRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + public IDrawable fluidOverlay; + + public GuiGasGauge gasInput; + public GuiGasGauge gasOutput; + + public PressurizedRecipe tempRecipe; + + public ITickTimer timer; + + public PRCRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/nei/GuiPRC.png", "pressurized_reaction_chamber", "tile.MachineBlock2.PressurizedReactionChamber.short.name", ProgressBar.MEDIUM); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 3; + yOffset = 11; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 68); + fluidOverlay = guiHelper.createDrawable(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, GuiGauge.Type.STANDARD.textureLocation), 19, 1, 16, 59); + } + + @Override + public void addGuiElements() + { + guiElements.add(new GuiSlot(SlotType.INPUT, this, guiLocation, 53, 34)); + guiElements.add(new GuiSlot(SlotType.POWER, this, guiLocation, 140, 18).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.OUTPUT, this, guiLocation, 115, 34)); + + guiElements.add(GuiFluidGauge.getDummy(GuiGauge.Type.STANDARD_YELLOW, this, guiLocation, 5, 10)); + guiElements.add(gasInput = GuiGasGauge.getDummy(GuiGauge.Type.STANDARD_RED, this, guiLocation, 28, 10)); + guiElements.add(gasOutput = GuiGasGauge.getDummy(GuiGauge.Type.SMALL_BLUE, this, guiLocation, 140, 40)); + + guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { + @Override + public double getLevel() + { + return 1F; + } + }, guiLocation, 164, 15)); + guiElements.add(new GuiProgress(new IProgressInfoHandler() + { + @Override + public double getProgress() + { + return (float)timer.getValue() / 20F; + } + }, progressBar, this, guiLocation, 75, 37)); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + if(tempRecipe.getInput().getGas() != null) + { + gasInput.setDummyType(tempRecipe.getInput().getGas().getGas()); + gasInput.renderScale(0, 0, -xOffset, -yOffset); + } + + if(tempRecipe.getOutput().getGasOutput() != null) + { + gasOutput.setDummyType(tempRecipe.getOutput().getGasOutput().getGas()); + gasOutput.renderScale(0, 0, -xOffset, -yOffset); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof PRCRecipeWrapper) + { + tempRecipe = ((PRCRecipeWrapper)recipeWrapper).recipe; + } + + IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); + + itemStacks.init(0, true, 53-xOffset, 34-yOffset); + itemStacks.init(1, false, 115-xOffset, 34-yOffset); + + itemStacks.set(0, recipeWrapper.getInputs()); + itemStacks.set(1, recipeWrapper.getOutputs()); + + IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); + + fluidStacks.init(0, true, 3, 0, 16, 58, tempRecipe.getInput().getFluid().amount, false, fluidOverlay); + fluidStacks.set(0, recipeWrapper.getFluidInputs()); + fluidStacks.addTooltipCallback(new ITooltipCallback() { + + @Override + public void onTooltip(int slotIndex, boolean input, FluidStack ingredient, List tooltip) + { + tooltip.remove(1); + } + }); + } +} 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..947f1b7b4 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeHandler.java @@ -0,0 +1,42 @@ +package mekanism.client.jei.machine.other; + +import javax.annotation.Nonnull; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class PRCRecipeHandler implements IRecipeHandler +{ + private final PRCRecipeCategory category; + + public PRCRecipeHandler(PRCRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return PRCRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull PRCRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull PRCRecipeWrapper recipe) + { + return recipe.category == category; + } +} 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..4d1ddcfce --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java @@ -0,0 +1,66 @@ +package mekanism.client.jei.machine.other; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import mekanism.common.recipe.machines.PressurizedRecipe; +import mekanism.common.util.LangUtils; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public class PRCRecipeWrapper extends BlankRecipeWrapper +{ + public PressurizedRecipe recipe; + + public PRCRecipeCategory category; + + public PRCRecipeWrapper(PressurizedRecipe r, PRCRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return Arrays.asList(recipe.getInput().getSolid()); + } + + @Nonnull + @Override + public List getFluidInputs() + { + return Arrays.asList(recipe.getInput().getFluid()); + } + + @Nonnull + @Override + public List getOutputs() + { + return Arrays.asList(recipe.getOutput().getItemOutput()); + } + + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 29-3 && mouseX <= 45-3 && mouseY >= 11-12 && mouseY <= 69-12) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getInput().getGas())); + } + else if(mouseX >= 141-3 && mouseX <= 157-3 && mouseY >= 41-12 && mouseY <= 69-12) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getOutput().getGasOutput())); + } + + return currenttip; + } +} 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..bfb7f318d --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java @@ -0,0 +1,78 @@ +package mekanism.client.jei.machine.other; + +import mekanism.api.gas.GasStack; +import mekanism.client.jei.BaseRecipeCategory; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; + +public class RotaryCondensentratorRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + public IDrawable fluidOverlay; + + public RotaryCondensentratorRecipeWrapper tempRecipe; + + public ITickTimer timer; + + public RotaryCondensentratorRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/nei/GuiRotaryCondensentrator.png", "rotary_condensentrator", "nei.rotaryCondensentrator", null); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 3; + yOffset = 12; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 71); + fluidOverlay = guiHelper.createDrawable(new ResourceLocation(guiTexture), 176, 40, 16, 59); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + if(tempRecipe.condensentrating) + { + drawTexturedRect(64-xOffset, 39-yOffset, 176, 123, 48, 8); + } + else { + drawTexturedRect(64-xOffset, 39-yOffset, 176, 115, 48, 8); + } + + if(tempRecipe.gasType != null) + { + displayGauge(58, 26-xOffset, 14-yOffset, 176, 40, 58, null, new GasStack(tempRecipe.gasType, 1)); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof RotaryCondensentratorRecipeWrapper) + { + tempRecipe = (RotaryCondensentratorRecipeWrapper)recipeWrapper; + } + + IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); + + fluidStacks.init(0, !tempRecipe.condensentrating, 134-xOffset, 14-yOffset, 16, 58, 1000, false, fluidOverlay); + fluidStacks.set(0, tempRecipe.condensentrating ? recipeWrapper.getFluidOutputs() : recipeWrapper.getFluidInputs()); + } +} 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..45d9f3dc8 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java @@ -0,0 +1,42 @@ +package mekanism.client.jei.machine.other; + +import javax.annotation.Nonnull; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class RotaryCondensentratorRecipeHandler implements IRecipeHandler +{ + private final RotaryCondensentratorRecipeCategory category; + + public RotaryCondensentratorRecipeHandler(RotaryCondensentratorRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return RotaryCondensentratorRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RotaryCondensentratorRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull RotaryCondensentratorRecipeWrapper recipe) + { + return recipe.category == category; + } +} 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..703de3bdb --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java @@ -0,0 +1,97 @@ +package mekanism.client.jei.machine.other; + +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.util.LangUtils; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + +public class RotaryCondensentratorRecipeWrapper extends BlankRecipeWrapper +{ + public Fluid fluidType; + public Gas gasType; + + public boolean condensentrating = true; + + public RotaryCondensentratorRecipeCategory category; + + public RotaryCondensentratorRecipeWrapper(Fluid fluid, Gas gas, boolean b, RotaryCondensentratorRecipeCategory c) + { + fluidType = fluid; + gasType = gas; + + condensentrating = b; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return new ArrayList(); + } + + @Nonnull + @Override + public List getFluidInputs() + { + if(condensentrating) + { + return new ArrayList(); + } + else { + return Arrays.asList(new FluidStack(fluidType, 1000)); + } + } + + @Nonnull + @Override + public List getOutputs() + { + return new ArrayList(); + } + + @Nonnull + @Override + public List getFluidOutputs() + { + if(condensentrating) + { + return Arrays.asList(new FluidStack(fluidType, 1000)); + } + else { + return new ArrayList(); + } + } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) + { + FontRenderer fontRendererObj = minecraft.fontRendererObj; + fontRendererObj.drawString(condensentrating ? LangUtils.localize("gui.condensentrating") : LangUtils.localize("gui.decondensentrating"), 6-3, 74-12, 0x404040, false); + } + + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 26-3 && mouseX <= 42-3 && mouseY >= 14-12 && mouseY <= 72-12) + { + currenttip.add(gasType.getLocalizedName()); + } + + return currenttip; + } +} 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..23d5e0d95 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java @@ -0,0 +1,69 @@ +package mekanism.client.jei.machine.other; + +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.SolarNeutronRecipe; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; + +public class SolarNeutronRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + + public SolarNeutronRecipe tempRecipe; + + public ITickTimer timer; + + public SolarNeutronRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/nei/GuiSolarNeutronActivator.png", "solar_neutron_activator", "tile.MachineBlock3.SolarNeutronActivator.name", null); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 3; + yOffset = 12; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 70); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + drawTexturedRect(64-xOffset, 39-yOffset, 176, 58, 55, 8); + + if(tempRecipe.getInput().ingredient != null) + { + displayGauge(58, 26-xOffset, 14-yOffset, 176, 0, 58, null, tempRecipe.getInput().ingredient); + } + + if(tempRecipe.getOutput().output != null) + { + displayGauge(58, 134-xOffset, 14-yOffset, 176, 0, 58, null, tempRecipe.getOutput().output); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof SolarNeutronRecipeWrapper) + { + tempRecipe = ((SolarNeutronRecipeWrapper)recipeWrapper).recipe; + } + } +} 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..bf366253a --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeHandler.java @@ -0,0 +1,42 @@ +package mekanism.client.jei.machine.other; + +import javax.annotation.Nonnull; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class SolarNeutronRecipeHandler implements IRecipeHandler +{ + private final SolarNeutronRecipeCategory category; + + public SolarNeutronRecipeHandler(SolarNeutronRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return SolarNeutronRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull SolarNeutronRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull SolarNeutronRecipeWrapper recipe) + { + return recipe.category == category; + } +} 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..068bfa2d0 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java @@ -0,0 +1,57 @@ +package mekanism.client.jei.machine.other; + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import mekanism.common.recipe.machines.SolarNeutronRecipe; +import mekanism.common.util.LangUtils; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; + +public class SolarNeutronRecipeWrapper extends BlankRecipeWrapper +{ + public SolarNeutronRecipe recipe; + + public SolarNeutronRecipeCategory category; + + public SolarNeutronRecipeWrapper(SolarNeutronRecipe r, SolarNeutronRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return new ArrayList(); + } + + @Nonnull + @Override + public List getOutputs() + { + return new ArrayList(); + } + + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 26-3 && mouseX <= 42-3 && mouseY >= 14-12 && mouseY <= 72-12) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getInput().ingredient)); + } + else if(mouseX >= 134-3 && mouseX <= 150-3 && mouseY >= 14-12 && mouseY <= 72-12) + { + currenttip.add(LangUtils.localizeGasStack(recipe.getOutput().output)); + } + + return currenttip; + } +} 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..a191ffbf7 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java @@ -0,0 +1,83 @@ +package mekanism.client.jei.machine.other; + +import java.util.List; + +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.ThermalEvaporationRecipe; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.gui.ITooltipCallback; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; + +public class ThermalEvaporationRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + public IDrawable fluidOverlay; + + public ThermalEvaporationRecipe tempRecipe; + + public ITickTimer timer; + + public ThermalEvaporationRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/nei/GuiThermalEvaporationController.png", "thermal_evaporation_plant", "gui.thermalEvaporationController.short", null); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 3; + yOffset = 12; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 62); + fluidOverlay = guiHelper.createDrawable(new ResourceLocation(guiTexture), 176, 0, 16, 59); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + drawTexturedRect(49-xOffset, 64-yOffset, 176, 59, 78, 8); + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof ThermalEvaporationRecipeWrapper) + { + tempRecipe = ((ThermalEvaporationRecipeWrapper)recipeWrapper).recipe; + } + + IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); + + fluidStacks.init(0, true, 7-xOffset, 14-yOffset, 16, 58, tempRecipe.getInput().ingredient.amount, false, fluidOverlay); + fluidStacks.init(1, false, 153-xOffset, 14-yOffset, 16, 58, tempRecipe.getOutput().output.amount, false, fluidOverlay); + + fluidStacks.set(0, recipeWrapper.getFluidInputs()); + fluidStacks.set(1, recipeWrapper.getFluidOutputs()); + + fluidStacks.addTooltipCallback(new ITooltipCallback() { + + @Override + public void onTooltip(int slotIndex, boolean input, FluidStack ingredient, List tooltip) + { + tooltip.remove(1); + } + }); + } +} 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..9d1762bba --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeHandler.java @@ -0,0 +1,42 @@ +package mekanism.client.jei.machine.other; + +import javax.annotation.Nonnull; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class ThermalEvaporationRecipeHandler implements IRecipeHandler +{ + private final ThermalEvaporationRecipeCategory category; + + public ThermalEvaporationRecipeHandler(ThermalEvaporationRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return ThermalEvaporationRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull ThermalEvaporationRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull ThermalEvaporationRecipeWrapper recipe) + { + return recipe.category == category; + } +} 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..3fc0c671a --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeWrapper.java @@ -0,0 +1,37 @@ +package mekanism.client.jei.machine.other; + +import java.util.Arrays; +import java.util.List; + +import javax.annotation.Nonnull; + +import mekanism.common.recipe.machines.ThermalEvaporationRecipe; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraftforge.fluids.FluidStack; + +public class ThermalEvaporationRecipeWrapper extends BlankRecipeWrapper +{ + public ThermalEvaporationRecipe recipe; + + public ThermalEvaporationRecipeCategory category; + + public ThermalEvaporationRecipeWrapper(ThermalEvaporationRecipe r, ThermalEvaporationRecipeCategory c) + { + recipe = r; + category = c; + } + + @Nonnull + @Override + public List getFluidInputs() + { + return Arrays.asList(recipe.getInput().ingredient); + } + + @Nonnull + @Override + public List getFluidOutputs() + { + return Arrays.asList(recipe.getOutput().output); + } +} diff --git a/src/main/java/mekanism/client/model/ModelElectricPump.java b/src/main/java/mekanism/client/model/ModelElectricPump.java deleted file mode 100644 index 8de86bbaf..000000000 --- a/src/main/java/mekanism/client/model/ModelElectricPump.java +++ /dev/null @@ -1,189 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelElectricPump extends ModelBase -{ - ModelRenderer pumpRingTop; - ModelRenderer pumpPortTop; - ModelRenderer pumpCasing; - ModelRenderer pumpBase; - ModelRenderer powerPort; - ModelRenderer powerConnector; - ModelRenderer powerConnectorFrame4; - ModelRenderer powerConnectorFrame3; - ModelRenderer powerConnectorFrame2; - ModelRenderer powerConnectorFrame1; - ModelRenderer pipeToggleBack; - ModelRenderer pipeToggleRingBack; - ModelRenderer pipeTogglePortBack; - ModelRenderer pipeToggleLeft; - ModelRenderer pipeToggleRingLeft; - ModelRenderer pipeTogglePortLeft; - ModelRenderer pipeToggleRight; - ModelRenderer pipeToggleRingRight; - ModelRenderer pipeTogglePortRight; - ModelRenderer pumpPipe; - - public ModelElectricPump() - { - textureWidth = 128; - textureHeight = 64; - - pumpRingTop = new ModelRenderer(this, 68, 9); - pumpRingTop.addBox(0F, 0F, 0F, 8, 1, 8); - pumpRingTop.setRotationPoint(-4F, 10F, -4F); - pumpRingTop.setTextureSize(128, 64); - pumpRingTop.mirror = true; - setRotation(pumpRingTop, 0F, 0F, 0F); - pumpPortTop = new ModelRenderer(this, 68, 0); - pumpPortTop.addBox(0F, 0F, 0F, 8, 1, 8); - pumpPortTop.setRotationPoint(-4F, 8F, -4F); - pumpPortTop.setTextureSize(128, 64); - pumpPortTop.mirror = true; - setRotation(pumpPortTop, 0F, 0F, 0F); - pumpCasing = new ModelRenderer(this, 0, 0); - pumpCasing.addBox(0F, 0F, 0F, 7, 12, 7); - pumpCasing.setRotationPoint(-3.5F, 11F, -3.5F); - pumpCasing.setTextureSize(128, 64); - pumpCasing.mirror = true; - setRotation(pumpCasing, 0F, 0F, 0F); - pumpBase = new ModelRenderer(this, 28, 0); - pumpBase.addBox(0F, 0F, 0F, 6, 15, 6); - pumpBase.setRotationPoint(-3F, 9F, -3F); - pumpBase.setTextureSize(128, 64); - pumpBase.mirror = true; - setRotation(pumpBase, 0F, 0F, 0F); - powerPort = new ModelRenderer(this, 38, 29); - powerPort.addBox(0F, 0F, 0F, 8, 8, 1); - powerPort.setRotationPoint(-4F, 12F, -8F); - powerPort.setTextureSize(128, 64); - powerPort.mirror = true; - setRotation(powerPort, 0F, 0F, 0F); - powerConnector = new ModelRenderer(this, 0, 29); - powerConnector.addBox(0F, 0F, 0F, 5, 5, 4); - powerConnector.setRotationPoint(-2.5F, 13.5F, -7F); - powerConnector.setTextureSize(128, 64); - powerConnector.mirror = true; - setRotation(powerConnector, 0F, 0F, 0F); - powerConnectorFrame4 = new ModelRenderer(this, 38, 21); - powerConnectorFrame4.addBox(0F, 0F, 0F, 1, 1, 4); - powerConnectorFrame4.setRotationPoint(2F, 18F, -7F); - powerConnectorFrame4.setTextureSize(128, 64); - powerConnectorFrame4.mirror = true; - setRotation(powerConnectorFrame4, 0F, 0F, 0F); - powerConnectorFrame3 = new ModelRenderer(this, 38, 21); - powerConnectorFrame3.addBox(0F, 0F, 0F, 1, 1, 4); - powerConnectorFrame3.setRotationPoint(-3F, 18F, -7F); - powerConnectorFrame3.setTextureSize(128, 64); - powerConnectorFrame3.mirror = true; - setRotation(powerConnectorFrame3, 0F, 0F, 0F); - powerConnectorFrame2 = new ModelRenderer(this, 38, 21); - powerConnectorFrame2.addBox(0F, 0F, 0F, 1, 1, 4); - powerConnectorFrame2.setRotationPoint(2F, 13F, -7F); - powerConnectorFrame2.setTextureSize(128, 64); - powerConnectorFrame2.mirror = true; - setRotation(powerConnectorFrame2, 0F, 0F, 0F); - powerConnectorFrame1 = new ModelRenderer(this, 38, 21); - powerConnectorFrame1.addBox(0F, 0F, 0F, 1, 1, 4); - powerConnectorFrame1.setRotationPoint(-3F, 13F, -7F); - powerConnectorFrame1.setTextureSize(128, 64); - powerConnectorFrame1.mirror = true; - setRotation(powerConnectorFrame1, 0F, 0F, 0F); - pipeToggleBack = new ModelRenderer(this, 0, 19); - pipeToggleBack.addBox(0F, 0F, 0F, 6, 6, 4); - pipeToggleBack.setRotationPoint(-3F, 13F, 3F); - pipeToggleBack.setTextureSize(128, 64); - pipeToggleBack.mirror = true; - setRotation(pipeToggleBack, 0F, 0F, 0F); - pipeToggleRingBack = new ModelRenderer(this, 18, 30); - pipeToggleRingBack.addBox(0F, 0F, 0F, 7, 7, 1); - pipeToggleRingBack.setRotationPoint(-3.5F, 12.5F, 5F); - pipeToggleRingBack.setTextureSize(128, 64); - pipeToggleRingBack.mirror = true; - setRotation(pipeToggleRingBack, 0F, 0F, 0F); - pipeTogglePortBack = new ModelRenderer(this, 20, 21); - pipeTogglePortBack.addBox(0F, 0F, 0F, 8, 8, 1); - pipeTogglePortBack.setRotationPoint(-4F, 12F, 7F); - pipeTogglePortBack.setTextureSize(128, 64); - pipeTogglePortBack.mirror = true; - setRotation(pipeTogglePortBack, 0F, 0F, 0F); - pipeToggleLeft = new ModelRenderer(this, 34, 38); - pipeToggleLeft.addBox(0F, 0F, 0F, 4, 6, 6); - pipeToggleLeft.setRotationPoint(3F, 13F, -3F); - pipeToggleLeft.setTextureSize(128, 64); - pipeToggleLeft.mirror = true; - setRotation(pipeToggleLeft, 0F, 0F, 0F); - pipeToggleRingLeft = new ModelRenderer(this, 18, 38); - pipeToggleRingLeft.addBox(0F, 0F, 0F, 1, 7, 7); - pipeToggleRingLeft.setRotationPoint(5F, 12.5F, -3.5F); - pipeToggleRingLeft.setTextureSize(128, 64); - pipeToggleRingLeft.mirror = true; - setRotation(pipeToggleRingLeft, 0F, 0F, 0F); - pipeTogglePortLeft = new ModelRenderer(this, 0, 38); - pipeTogglePortLeft.addBox(0F, 0F, 0F, 1, 8, 8); - pipeTogglePortLeft.setRotationPoint(7F, 12F, -4F); - pipeTogglePortLeft.setTextureSize(128, 64); - pipeTogglePortLeft.mirror = true; - setRotation(pipeTogglePortLeft, 0F, 0F, 0F); - pipeToggleRight = new ModelRenderer(this, 34, 38); - pipeToggleRight.mirror = true; - pipeToggleRight.addBox(0F, 0F, 0F, 4, 6, 6); - pipeToggleRight.setRotationPoint(-7F, 13F, -3F); - pipeToggleRight.setTextureSize(128, 64); - setRotation(pipeToggleRight, 0F, 0F, 0F); - pipeToggleRingRight = new ModelRenderer(this, 18, 38); - pipeToggleRingRight.addBox(0F, 0F, 0F, 1, 7, 7); - pipeToggleRingRight.setRotationPoint(-6F, 12.5F, -3.5F); - pipeToggleRingRight.setTextureSize(128, 64); - pipeToggleRingRight.mirror = true; - setRotation(pipeToggleRingRight, 0F, 0F, 0F); - pipeTogglePortRight = new ModelRenderer(this, 0, 38); - pipeTogglePortRight.addBox(0F, 0F, 0F, 1, 8, 8); - pipeTogglePortRight.setRotationPoint(-8F, 12F, -4F); - pipeTogglePortRight.setTextureSize(128, 64); - pipeTogglePortRight.mirror = true; - setRotation(pipeTogglePortRight, 0F, 0F, 0F); - pumpPipe = new ModelRenderer(this, 52, 0); - pumpPipe.addBox(0F, 0F, 0F, 4, 8, 4); - pumpPipe.setRotationPoint(-2F, 24F, -2F); - pumpPipe.setTextureSize(128, 64); - pumpPipe.mirror = true; - setRotation(pumpPipe, 0F, 0F, 0F); - } - - public void render(float size) - { - pumpRingTop.render(size); - pumpPortTop.render(size); - pumpCasing.render(size); - pumpBase.render(size); - powerPort.render(size); - powerConnector.render(size); - powerConnectorFrame4.render(size); - powerConnectorFrame3.render(size); - powerConnectorFrame2.render(size); - powerConnectorFrame1.render(size); - /*pipeToggleBack.render(size); - pipeToggleRingBack.render(size); - pipeTogglePortBack.render(size); - pipeToggleLeft.render(size); - pipeToggleRingLeft.render(size); - pipeTogglePortLeft.render(size); - pipeToggleRight.render(size); - pipeToggleRingRight.render(size); - pipeTogglePortRight.render(size); - pumpPipe.render(size);*/ - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java b/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java deleted file mode 100644 index 7f6115008..000000000 --- a/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java +++ /dev/null @@ -1,149 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelFluidicPlenisher extends ModelBase -{ - ModelRenderer bearingRight; - ModelRenderer ringTank; - ModelRenderer portTop; - ModelRenderer portBack; - ModelRenderer Connector; - ModelRenderer pipeToggle; - ModelRenderer ringTop; - ModelRenderer ringBottom; - ModelRenderer tank; - ModelRenderer bearingLeft; - ModelRenderer connectorRing; - ModelRenderer rod4; - ModelRenderer rod3; - ModelRenderer rod2; - ModelRenderer rod1; - - public ModelFluidicPlenisher() - { - textureWidth = 64; - textureHeight = 64; - - bearingRight = new ModelRenderer(this, 44, 26); - bearingRight.mirror = true; - bearingRight.addBox(0F, 0F, 0F, 1, 4, 4); - bearingRight.setRotationPoint(4F, 14F, -2F); - bearingRight.setTextureSize(64, 64); - setRotation(bearingRight, 0F, 0F, 0F); - ringTank = new ModelRenderer(this, 0, 32); - ringTank.addBox(0F, 0F, 0F, 11, 1, 11); - ringTank.setRotationPoint(-5.5F, 10F, -5.5F); - ringTank.setTextureSize(64, 64); - ringTank.mirror = true; - setRotation(ringTank, 0F, 0F, 0F); - portTop = new ModelRenderer(this, 0, 21); - portTop.addBox(0F, 0F, 0F, 10, 1, 10); - portTop.setRotationPoint(-5F, 8F, -5F); - portTop.setTextureSize(64, 64); - portTop.mirror = true; - setRotation(portTop, 0F, 0F, 0F); - portBack = new ModelRenderer(this, 36, 0); - portBack.addBox(0F, 0F, 0F, 8, 8, 1); - portBack.setRotationPoint(-4F, 12F, 7F); - portBack.setTextureSize(64, 64); - portBack.mirror = true; - setRotation(portBack, 0F, 0F, 0F); - Connector = new ModelRenderer(this, 36, 9); - Connector.addBox(0F, 0F, 0F, 5, 5, 4); - Connector.setRotationPoint(-2.5F, 13.5F, 3F); - Connector.setTextureSize(64, 64); - Connector.mirror = true; - setRotation(Connector, 0F, 0F, 0F); - pipeToggle = new ModelRenderer(this, 32, 44); - pipeToggle.addBox(0F, 0F, 0F, 6, 8, 6); - pipeToggle.setRotationPoint(-3F, 24F, -3F); - pipeToggle.setTextureSize(64, 64); - pipeToggle.mirror = true; - setRotation(pipeToggle, 0F, 0F, 0F); - ringTop = new ModelRenderer(this, 0, 44); - ringTop.addBox(0F, 0F, 0F, 8, 1, 8); - ringTop.setRotationPoint(-4F, 9F, -4F); - ringTop.setTextureSize(64, 64); - ringTop.mirror = true; - setRotation(ringTop, 0F, 0F, 0F); - ringBottom = new ModelRenderer(this, 0, 53); - ringBottom.addBox(0F, 0F, 0F, 8, 1, 8); - ringBottom.setRotationPoint(-4F, 23F, -4F); - ringBottom.setTextureSize(64, 64); - ringBottom.mirror = true; - setRotation(ringBottom, 0F, 0F, 0F); - tank = new ModelRenderer(this, 0, 0); - tank.addBox(0F, 0F, 0F, 9, 12, 9); - tank.setRotationPoint(-4.5F, 11F, -4.5F); - tank.setTextureSize(64, 64); - tank.mirror = true; - setRotation(tank, 0F, 0F, 0F); - bearingLeft = new ModelRenderer(this, 44, 26); - bearingLeft.addBox(0F, 0F, 0F, 1, 4, 4); - bearingLeft.setRotationPoint(-5F, 14F, -2F); - bearingLeft.setTextureSize(64, 64); - bearingLeft.mirror = true; - setRotation(bearingLeft, 0F, 0F, 0F); - connectorRing = new ModelRenderer(this, 40, 18); - connectorRing.addBox(0F, 0F, 0F, 7, 7, 1); - connectorRing.setRotationPoint(-3.5F, 12.5F, 5F); - connectorRing.setTextureSize(64, 64); - connectorRing.mirror = true; - setRotation(connectorRing, 0F, 0F, 0F); - rod4 = new ModelRenderer(this, 0, 0); - rod4.addBox(0F, 0F, 0F, 1, 1, 3); - rod4.setRotationPoint(2F, 18F, 4F); - rod4.setTextureSize(64, 64); - rod4.mirror = true; - setRotation(rod4, 0F, 0F, 0F); - rod3 = new ModelRenderer(this, 0, 0); - rod3.addBox(0F, 0F, 0F, 1, 1, 3); - rod3.setRotationPoint(-3F, 18F, 4F); - rod3.setTextureSize(64, 64); - rod3.mirror = true; - setRotation(rod3, 0F, 0F, 0F); - rod2 = new ModelRenderer(this, 0, 0); - rod2.addBox(0F, 0F, 0F, 1, 1, 3); - rod2.setRotationPoint(2F, 13F, 4F); - rod2.setTextureSize(64, 64); - rod2.mirror = true; - setRotation(rod2, 0F, 0F, 0F); - rod1 = new ModelRenderer(this, 0, 0); - rod1.addBox(0F, 0F, 0F, 1, 1, 3); - rod1.setRotationPoint(-3F, 13F, 4F); - rod1.setTextureSize(64, 64); - rod1.mirror = true; - setRotation(rod1, 0F, 0F, 0F); - } - - public void render(float size) - { - bearingRight.render(size); - ringTank.render(size); - portTop.render(size); - portBack.render(size); - Connector.render(size); - //pipeToggle.render(size); - ringTop.render(size); - ringBottom.render(size); - tank.render(size); - bearingLeft.render(size); - connectorRing.render(size); - rod4.render(size); - rod3.render(size); - rod2.render(size); - rod1.render(size); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 78ae7ebb2..1bc8a8e87 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -103,7 +103,7 @@ public class MekanismRenderer for(Gas gas : GasRegistry.getRegisteredGasses()) { - gas.updateIcon(event.map); + gas.registerIcon(event.map); } for(InfuseType type : InfuseRegistry.getInfuseMap().values()) @@ -127,6 +127,11 @@ public class MekanismRenderer public void onStitch(TextureStitchEvent.Post event) { initFluidTextures(event.map); + + for(Gas gas : GasRegistry.getRegisteredGasses()) + { + gas.updateIcon(event.map); + } } public static void registerItemRender(String domain, Item item) diff --git a/src/main/java/mekanism/client/render/ctm/ChiselFace.java b/src/main/java/mekanism/client/render/ctm/CTMFace.java similarity index 65% rename from src/main/java/mekanism/client/render/ctm/ChiselFace.java rename to src/main/java/mekanism/client/render/ctm/CTMFace.java index c0f88a684..baf7bfe0e 100644 --- a/src/main/java/mekanism/client/render/ctm/ChiselFace.java +++ b/src/main/java/mekanism/client/render/ctm/CTMFace.java @@ -9,50 +9,50 @@ import net.minecraft.util.EnumWorldBlockLayer; /** * Chisel Face, basically a list of IChiselTexture's */ -public final class ChiselFace { +public final class CTMFace { - private List textureList; + private List textureList; - private List childFaces; + private List childFaces; private EnumWorldBlockLayer layer; - public ChiselFace() { + public CTMFace() { this(new ArrayList<>(), new ArrayList<>()); } - public ChiselFace(EnumWorldBlockLayer layer) { + public CTMFace(EnumWorldBlockLayer layer) { this(); setLayer(layer); } - public ChiselFace(List textureList, List childFaces) { + public CTMFace(List textureList, List childFaces) { this.textureList = textureList; this.childFaces = childFaces; } - public List getTextureList(){ - List list = new ArrayList<>(); + public List getTextureList(){ + List list = new ArrayList<>(); list.addAll(this.textureList); - for (ChiselFace face : childFaces){ + for (CTMFace face : childFaces){ list.addAll(face.getTextureList()); } return list; } - public void addTexture(ChiselTextureCTM texture){ + public void addTexture(TextureCTM texture){ this.textureList.add(texture); } - public void addChildFace(ChiselFace face){ + public void addChildFace(CTMFace face){ this.childFaces.add(face); } - public boolean removeTexture(ChiselTextureCTM texture){ + public boolean removeTexture(TextureCTM texture){ return this.textureList.remove(texture); } - public boolean removeChildFace(ChiselFace face){ + public boolean removeChildFace(CTMFace face){ return this.childFaces.remove(face); } diff --git a/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java b/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java index dbd9e0a2b..f37f696f4 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java +++ b/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java @@ -131,7 +131,7 @@ public class CTMModelFactory implements ISmartBlockModel, ISmartItemModel, IPers for(EnumFacing facing : EnumFacing.VALUES) { - ChiselTextureCTM face = model.getFace(facing); + TextureCTM face = model.getFace(facing); ICTMBlock block = (ICTMBlock)state.getBlock(); CTMData data = block.getCTMData(state); @@ -151,7 +151,7 @@ public class CTMModelFactory implements ISmartBlockModel, ISmartItemModel, IPers return new CTMModelFactory(faceQuads, generalQuads, model); } - private void addAllQuads(List from, ChiselTextureCTM tex, @Nullable CTMBlockRenderContext ctx, IBlockState state, int quadGoal, List to) + private void addAllQuads(List from, TextureCTM tex, @Nullable CTMBlockRenderContext ctx, IBlockState state, int quadGoal, List to) { for(BakedQuad q : from) { diff --git a/src/main/java/mekanism/client/render/ctm/CTMRegistry.java b/src/main/java/mekanism/client/render/ctm/CTMRegistry.java index ba193fce4..0c79ab459 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMRegistry.java +++ b/src/main/java/mekanism/client/render/ctm/CTMRegistry.java @@ -30,7 +30,7 @@ public class CTMRegistry public static List> ctmTypes = new ArrayList>(); - public static Map textureCache = new HashMap(); + public static Map textureCache = new HashMap(); @SubscribeEvent public void onTextureStitch(TextureStitchEvent.Pre event) @@ -69,7 +69,7 @@ public class CTMRegistry textures.add(callback); } - public static ChiselTextureCTM createTexture(String domain, String name) + public static TextureCTM createTexture(String domain, String name) { TextureSpriteCallback[] callbacks = new TextureSpriteCallback[CTM.REQUIRED_TEXTURES]; @@ -79,6 +79,6 @@ public class CTMRegistry register(callbacks[0]); register(callbacks[1]); - return new ChiselTextureCTM(EnumWorldBlockLayer.SOLID, callbacks); + return new TextureCTM(EnumWorldBlockLayer.SOLID, callbacks); } } diff --git a/src/main/java/mekanism/client/render/ctm/ModelCTM.java b/src/main/java/mekanism/client/render/ctm/ModelCTM.java index 701b9fec6..d4891dccb 100644 --- a/src/main/java/mekanism/client/render/ctm/ModelCTM.java +++ b/src/main/java/mekanism/client/render/ctm/ModelCTM.java @@ -26,8 +26,8 @@ public class ModelCTM implements IModel { private Map overrides = Maps.newHashMap(); - private transient ChiselTextureCTM faceObj; - private transient Map overridesObj = new EnumMap<>(EnumFacing.class); + private transient TextureCTM faceObj; + private transient Map overridesObj = new EnumMap<>(EnumFacing.class); private transient IBakedModel modelObj; @@ -77,12 +77,12 @@ public class ModelCTM implements IModel overridesObj.values().forEach(t -> textures.addAll(t.getTextures())); } - public ChiselTextureCTM getDefaultFace() + public TextureCTM getDefaultFace() { return faceObj; } - public ChiselTextureCTM getFace(EnumFacing facing) + public TextureCTM getFace(EnumFacing facing) { return overridesObj.getOrDefault(facing, faceObj); } diff --git a/src/main/java/mekanism/client/render/ctm/ChiselTextureCTM.java b/src/main/java/mekanism/client/render/ctm/TextureCTM.java similarity index 94% rename from src/main/java/mekanism/client/render/ctm/ChiselTextureCTM.java rename to src/main/java/mekanism/client/render/ctm/TextureCTM.java index e86ac1cf3..fb1027141 100644 --- a/src/main/java/mekanism/client/render/ctm/ChiselTextureCTM.java +++ b/src/main/java/mekanism/client/render/ctm/TextureCTM.java @@ -13,13 +13,13 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.ResourceLocation; -public class ChiselTextureCTM +public class TextureCTM { protected EnumWorldBlockLayer layer; public TextureSpriteCallback[] sprites; - public ChiselTextureCTM(EnumWorldBlockLayer layer, TextureSpriteCallback[] sprites) + public TextureCTM(EnumWorldBlockLayer layer, TextureSpriteCallback[] sprites) { this.layer = layer; this.sprites = sprites; diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index 8bf2c2f58..0aa94a283 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -51,12 +51,15 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; @@ -75,6 +78,8 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel private IBakedModel baseModel; private ItemStack stack; + private TransformType prevTransform; + private Minecraft mc = Minecraft.getMinecraft(); private static final RenderFluidTank fluidTankRenderer = (RenderFluidTank)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityFluidTank.class); @@ -393,11 +398,33 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel @Override public List getGeneralQuads() { + Tessellator tessellator = Tessellator.getInstance(); + tessellator.draw(); + List generalQuads = new LinkedList(); + GlStateManager.pushMatrix(); + GlStateManager.translate(0.5F, 0.5F, 0.5F); + doRender(prevTransform); + GlStateManager.enableLighting(); + GlStateManager.enableLight(0); + GlStateManager.enableLight(1); + GlStateManager.enableColorMaterial(); + GlStateManager.colorMaterial(1032, 5634); + Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.locationBlocksTexture); + GlStateManager.popMatrix(); + + WorldRenderer worldrenderer = tessellator.getWorldRenderer(); + worldrenderer.begin(7, DefaultVertexFormats.ITEM); + if(Block.getBlockFromItem(stack.getItem()) != null) { - generalQuads.addAll(baseModel.getGeneralQuads()); + MachineType machineType = MachineType.get(stack); + + if(machineType != MachineType.DIGITAL_MINER) + { + generalQuads.addAll(baseModel.getGeneralQuads()); + } } return generalQuads; @@ -441,22 +468,13 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel @Override public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) - { + { + prevTransform = cameraTransformType; + if(cameraTransformType == TransformType.THIRD_PERSON) { ForgeHooksClient.multiplyCurrentGlMatrix(CTMModelFactory.DEFAULT_BLOCK_THIRD_PERSON_MATRIX); } - - GlStateManager.pushMatrix(); - GlStateManager.scale(0.5F, 0.5F, 0.5F); - doRender(cameraTransformType); - GlStateManager.scale(2.0F, 2.0F, 2.0F); - GlStateManager.enableLighting(); - GlStateManager.enableLight(0); - GlStateManager.enableLight(1); - GlStateManager.enableColorMaterial(); - GlStateManager.colorMaterial(1032, 5634); - GlStateManager.popMatrix(); return Pair.of(this, null); } diff --git a/src/main/java/mekanism/client/render/obj/GlowPanelModel.java b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java new file mode 100644 index 000000000..bcee73c14 --- /dev/null +++ b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java @@ -0,0 +1,335 @@ +package mekanism.client.render.obj; + +import java.lang.reflect.Field; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.vecmath.Matrix4f; + +import mcmultipart.client.multipart.ISmartMultipartModel; +import mekanism.api.EnumColor; +import mekanism.client.render.ctm.CTMModelFactory; +import mekanism.common.multipart.GlowPanelBlockState; +import mekanism.common.multipart.PartGlowPanel; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.IModelState; +import net.minecraftforge.client.model.IPerspectiveAwareModel; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.client.model.TRSRTransformation; +import net.minecraftforge.client.model.obj.OBJModel; +import net.minecraftforge.client.model.obj.OBJModel.Face; +import net.minecraftforge.client.model.obj.OBJModel.Group; +import net.minecraftforge.client.model.obj.OBJModel.Normal; +import net.minecraftforge.client.model.obj.OBJModel.OBJBakedModel; +import net.minecraftforge.client.model.obj.OBJModel.OBJState; +import net.minecraftforge.client.model.obj.OBJModel.TextureCoordinate; +import net.minecraftforge.client.model.obj.OBJModel.Vertex; +import net.minecraftforge.client.model.pipeline.LightUtil; +import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; +import net.minecraftforge.common.property.IExtendedBlockState; + +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; + +import com.google.common.base.Optional; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; + +public class GlowPanelModel extends OBJBakedModel implements ISmartMultipartModel +{ + private IBakedModel baseModel; + + private HashMap transformationMap = new HashMap(); + + private static Map glowPanelCache = new HashMap(); + private static Map glowPanelItemCache = new HashMap(); + + private Set bakedQuads; + private IBlockState tempState; + private TextureAtlasSprite tempSprite; + private ItemStack tempStack; + + public GlowPanelModel(IBakedModel base, OBJModel model, IModelState state, VertexFormat format, ImmutableMap textures, HashMap transform) + { + model.super(model, state, format, textures); + baseModel = base; + transformationMap = transform; + } + + public EnumColor getColor() + { + if(tempStack != null) + { + return EnumColor.DYES[tempStack.getItemDamage()]; + } + + if(tempState != null) + { + return ((IExtendedBlockState)tempState).getValue(GlowPanelBlockState.colorState).color; + } + + return EnumColor.WHITE; + } + + @Override + public OBJBakedModel handlePartState(IBlockState state) + { + int hash = PartGlowPanel.hash((IExtendedBlockState)state); + EnumColor color = ((IExtendedBlockState)state).getValue(GlowPanelBlockState.colorState).color; + + if(!glowPanelCache.containsKey(hash)) + { + GlowPanelModel model = new GlowPanelModel(baseModel, getModel(), getState(), getFormat(), getTextures(), transformationMap); + model.tempState = state; + glowPanelCache.put(hash, model); + } + + return glowPanelCache.get(hash); + } + + @Override + public IBakedModel handleItemState(ItemStack stack) + { + if(glowPanelItemCache.containsKey(stack.getItemDamage())) + return glowPanelItemCache.get(stack.getItemDamage()); + + ImmutableMap.Builder builder = ImmutableMap.builder(); + builder.put(ModelLoader.White.loc.toString(), ModelLoader.White.instance); + TextureAtlasSprite missing = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(new ResourceLocation("missingno").toString()); + + for(String s : getModel().getMatLib().getMaterialNames()) + { + TextureAtlasSprite sprite = null; + + if(sprite==null) + sprite = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(getModel().getMatLib().getMaterial(s).getTexture().getTextureLocation().toString()); + if(sprite==null) + sprite = missing; + + builder.put(s, sprite); + } + + builder.put("missingno", missing); + GlowPanelModel bakedModel = new GlowPanelModel(baseModel, getModel(), getState(), getFormat(), builder.build(), transformationMap); + bakedModel.tempStack = stack; + glowPanelItemCache.put(stack.getItemDamage(), bakedModel); + + return bakedModel; + } + + @Override + public List getGeneralQuads() + { + if(bakedQuads == null) + { + bakedQuads = Collections.synchronizedSet(new LinkedHashSet()); + Set faces = Collections.synchronizedSet(new LinkedHashSet()); + Optional transform = Optional.absent(); + Set coloredFaces = new HashSet(); + + for(Group g : getModel().getMatLib().getGroups().values()) + { + if(getState() instanceof OBJState) + { + OBJState state = (OBJState)getState(); + + if(state.parent != null) + { + transform = state.parent.apply(Optional.absent()); + } + + if(state.getGroupsWithVisibility(true).contains(g.getName())) + { + LinkedHashSet tempFaces = g.applyTransform(transform); + faces.addAll(tempFaces); + + if(g.getName().equals("light")) + { + coloredFaces.addAll(tempFaces); + } + } + } + else { + transform = getState().apply(Optional.absent()); + LinkedHashSet tempFaces = g.applyTransform(transform); + faces.addAll(tempFaces); + + if(g.getName().equals("light")) + { + coloredFaces.addAll(tempFaces); + } + } + } + + for(Face f : faces) + { + if(getModel().getMatLib().getMaterial(f.getMaterialName()).isWhite()) + { + for(Vertex v : f.getVertices()) + { + if(!v.getMaterial().equals(this.getModel().getMatLib().getMaterial(v.getMaterial().getName()))) + { + v.setMaterial(this.getModel().getMatLib().getMaterial(v.getMaterial().getName())); + } + } + + tempSprite = ModelLoader.White.instance; + } + else { + tempSprite = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(this.getModel().getMatLib().getMaterial(f.getMaterialName()).getTexture().getTextureLocation().toString()); + } + + float[] color = new float[] { 1, 1, 1, 1 }; + + if(coloredFaces.contains(f)) + { + EnumColor c = getColor(); + color = new float[] {c.getColor(0), c.getColor(1), c.getColor(2), 1}; + } + + UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(getFormat()); + builder.setQuadOrientation(EnumFacing.getFacingFromVector(f.getNormal().x, f.getNormal().y, f.getNormal().z)); + builder.setQuadColored(); + builder.setQuadTint(0); + + Normal faceNormal = f.getNormal(); + putVertexData(builder, f.getVertices()[0], faceNormal, TextureCoordinate.getDefaultUVs()[0], tempSprite, color); + putVertexData(builder, f.getVertices()[1], faceNormal, TextureCoordinate.getDefaultUVs()[1], tempSprite, color); + putVertexData(builder, f.getVertices()[2], faceNormal, TextureCoordinate.getDefaultUVs()[2], tempSprite, color); + putVertexData(builder, f.getVertices()[3], faceNormal, TextureCoordinate.getDefaultUVs()[3], tempSprite, color); + + bakedQuads.add(builder.build()); + } + } + + List quadList = Collections.synchronizedList(Lists.newArrayList(bakedQuads)); + + return quadList; + } + + private final void putVertexData(UnpackedBakedQuad.Builder builder, Vertex v, Normal faceNormal, TextureCoordinate defUV, TextureAtlasSprite sprite, float[] color) + { + for(int e = 0; e < getFormat().getElementCount(); e++) + { + switch(getFormat().getElement(e).getUsage()) + { + case POSITION: + builder.put(e, v.getPos().x, v.getPos().y, v.getPos().z, v.getPos().w); + break; + case COLOR: + float d; + + if(v.hasNormal()) + { + d = LightUtil.diffuseLight(v.getNormal().x, v.getNormal().y, v.getNormal().z); + } + else { + d = LightUtil.diffuseLight(faceNormal.x, faceNormal.y, faceNormal.z); + } + + if(v.getMaterial() != null) + { + builder.put(e, d * v.getMaterial().getColor().x * color[0], d * v.getMaterial().getColor().y * color[1], d * v.getMaterial().getColor().z * color[2], v.getMaterial().getColor().w * color[3]); + } + else { + builder.put(e, d, d, d, 1); + } + + break; + case UV: + if(!v.hasTextureCoordinate()) + { + builder.put(e, sprite.getInterpolatedU(defUV.u * 16), sprite.getInterpolatedV((1 - defUV.v) * 16), 0, 1); + } + else { + builder.put(e, sprite.getInterpolatedU(v.getTextureCoordinate().u * 16), sprite.getInterpolatedV((1 - v.getTextureCoordinate().v) * 16), 0, 1); + } + + break; + case NORMAL: + if(!v.hasNormal()) + { + builder.put(e, faceNormal.x, faceNormal.y, faceNormal.z, 0); + } + else { + builder.put(e, v.getNormal().x, v.getNormal().y, v.getNormal().z, 0); + } + + break; + default: + builder.put(e); + } + } + } + + private static Field f_textures; + + public static ImmutableMap getTexturesForOBJModel(IBakedModel model) + { + try { + if(f_textures == null) + { + f_textures = OBJBakedModel.class.getDeclaredField("textures"); + f_textures.setAccessible(true); + } + + return (ImmutableMap)f_textures.get(model); + } catch(Exception e) { + e.printStackTrace(); + } + + return null; + } + + public ImmutableMap getTextures() + { + return getTexturesForOBJModel(this); + } + + private Pair thirdPersonTransform; + + @Override + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) + { + if(cameraTransformType == TransformType.GUI) + { + GlStateManager.translate(0.3F, 0.25F, 0.0F); + GlStateManager.rotate(90, 1, 0, 0); + GlStateManager.scale(1.6F, 1.6F, 1.6F); + } + else if(cameraTransformType == TransformType.FIRST_PERSON) + { + GlStateManager.translate(0.0F, 0.3F, 0.0F); + } + else if(cameraTransformType == TransformType.THIRD_PERSON) + { + GlStateManager.translate(0.0F, -0.1F, 0.0F); + + if(thirdPersonTransform == null) + { + thirdPersonTransform = ImmutablePair.of(this, CTMModelFactory.DEFAULT_BLOCK_THIRD_PERSON_MATRIX); + } + + return thirdPersonTransform; + } + + return Pair.of(this, null); + } +} diff --git a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java index f48eb683e..3e2682ff1 100644 --- a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java +++ b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java @@ -4,16 +4,96 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import javax.vecmath.Matrix4f; + +import mekanism.client.render.obj.MekanismOBJModel.OBJModelType; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.IModel; +import net.minecraftforge.client.model.IModelState; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.client.model.obj.OBJModel; +import net.minecraftforge.client.model.obj.OBJModel.OBJBakedModel; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +import com.google.common.base.Function; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; public class MekanismOBJLoader extends OBJLoader { + public static final MekanismOBJLoader INSTANCE = new MekanismOBJLoader(); + private final Map modelCache = new HashMap(); + private static final ImmutableMap flipData = ImmutableMap.of("flip-v", String.valueOf(true)); + + public static final String[] OBJ_RENDERS = new String[] {"glow_panel"}; + + @SubscribeEvent + public void onModelBake(ModelBakeEvent event) throws IOException + { + for(String s : OBJ_RENDERS) + { + ModelResourceLocation model = new ModelResourceLocation("mekanism:" + s, "inventory"); + Object obj = event.modelRegistry.getObject(model); + + if(obj instanceof IBakedModel) + { + event.modelRegistry.putObject(model, createBakedObjItemModel((IBakedModel)obj, "mekanism:models/block/" + s + ".obj.mek", new OBJModel.OBJState(Lists.newArrayList(OBJModel.Group.ALL), true), DefaultVertexFormats.ITEM)); + } + } + } + + public OBJBakedModel createBakedObjItemModel(IBakedModel existingModel, String name, IModelState state, VertexFormat format) + { + try { + Function textureGetter = new Function() { + public TextureAtlasSprite apply(ResourceLocation location) + { + return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(location.toString()); + } + }; + + ResourceLocation modelLocation = new ResourceLocation(name); + OBJModel objModel = (OBJModel)OBJLoader.instance.loadModel(modelLocation); + objModel = (OBJModel)objModel.process(flipData); + ImmutableMap.Builder builder = ImmutableMap.builder(); + builder.put(ModelLoader.White.loc.toString(), ModelLoader.White.instance); + TextureAtlasSprite missing = textureGetter.apply(new ResourceLocation("missingno")); + + for(String s : objModel.getMatLib().getMaterialNames()) + { + if(objModel.getMatLib().getMaterial(s).getTexture().getTextureLocation().getResourcePath().startsWith("#")) + { + FMLLog.severe("OBJLoader: Unresolved texture '%s' for obj model '%s'", objModel.getMatLib().getMaterial(s).getTexture().getTextureLocation().getResourcePath(), modelLocation); + builder.put(s, missing); + } + else { + builder.put(s, textureGetter.apply(objModel.getMatLib().getMaterial(s).getTexture().getTextureLocation())); + } + } + + builder.put("missingno", missing); + + return new GlowPanelModel(existingModel, objModel, state, format, builder.build(), new HashMap()); + } catch(Exception e) { + e.printStackTrace(); + } + + return null; + } + @Override public boolean accepts(ResourceLocation modelLocation) { @@ -29,8 +109,11 @@ public class MekanismOBJLoader extends OBJLoader if(model instanceof OBJModel) { - MekanismOBJModel mekModel = new MekanismOBJModel(((OBJModel)model).getMatLib(), loc); - modelCache.put(loc, mekModel); + if(loc.getResourcePath().contains("glow_panel")) + { + MekanismOBJModel mekModel = new MekanismOBJModel(OBJModelType.GLOW_PANEL, ((OBJModel)model).getMatLib(), loc); + modelCache.put(loc, mekModel); + } } } diff --git a/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java b/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java index 0bf0d8cc7..c3f354130 100644 --- a/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java +++ b/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java @@ -11,15 +11,30 @@ import com.google.common.base.Function; public class MekanismOBJModel extends OBJModel { - public MekanismOBJModel(MaterialLibrary matLib, ResourceLocation modelLocation) + public OBJModelType modelType; + + public MekanismOBJModel(OBJModelType type, MaterialLibrary matLib, ResourceLocation modelLocation) { super(matLib, modelLocation); + + modelType = type; } @Override public IFlexibleBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { IFlexibleBakedModel preBaked = super.bake(state, format, bakedTextureGetter); - return new MekanismSmartOBJModel(preBaked, this, state, format, MekanismSmartOBJModel.getTexturesForOBJModel(preBaked), null); + + if(modelType == OBJModelType.GLOW_PANEL) + { + return new GlowPanelModel(preBaked, this, state, format, GlowPanelModel.getTexturesForOBJModel(preBaked), null); + } + + return null; + } + + public static enum OBJModelType + { + GLOW_PANEL } } diff --git a/src/main/java/mekanism/client/render/obj/MekanismSmartOBJModel.java b/src/main/java/mekanism/client/render/obj/MekanismSmartOBJModel.java deleted file mode 100644 index 36581dd9e..000000000 --- a/src/main/java/mekanism/client/render/obj/MekanismSmartOBJModel.java +++ /dev/null @@ -1,96 +0,0 @@ -package mekanism.client.render.obj; - -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import mekanism.api.EnumColor; -import mekanism.common.multipart.GlowPanelBlockState; -import mekanism.common.multipart.PartGlowPanel; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.client.resources.model.IBakedModel; -import net.minecraftforge.client.model.IModelState; -import net.minecraftforge.client.model.obj.OBJModel; -import net.minecraftforge.client.model.obj.OBJModel.Group; -import net.minecraftforge.client.model.obj.OBJModel.OBJBakedModel; -import codechicken.lib.vec.Matrix4; - -import com.google.common.collect.ImmutableMap; - -public class MekanismSmartOBJModel extends OBJBakedModel -{ - private IBakedModel baseModel; - - private HashMap transformationMap = new HashMap(); - - private static Map glowPanelCache = new HashMap(); - - private IBlockState tempState; - - public MekanismSmartOBJModel(IBakedModel base, OBJModel model, IModelState state, VertexFormat format, ImmutableMap textures, HashMap transform) - { - model.super(model, state, format, textures); - baseModel = base; - transformationMap = transform; - } - - @Override - public OBJBakedModel handleBlockState(IBlockState state) - { - if(state instanceof GlowPanelBlockState) - { - EnumColor color = state.getValue(PartGlowPanel.colorProperty); - - if(!glowPanelCache.containsKey(color)) - { - MekanismSmartOBJModel model = new MekanismSmartOBJModel(baseModel, getModel(), getState(), getFormat(), getTextures(), transformationMap); - model.tempState = state; - glowPanelCache.put(color, model); - } - - return glowPanelCache.get(color); - } - - return this; - } - - @Override - public List getGeneralQuads() - { - for(Map.Entry g : getModel().getMatLib().getGroups().entrySet()) - { - System.out.println("BAKED " + g.getKey() + " " + g.getValue().getName() + " " + g.getValue().getFaces()); - } - - return super.getGeneralQuads(); - } - - private static Field f_textures; - - public static ImmutableMap getTexturesForOBJModel(IBakedModel model) - { - try { - if(f_textures == null) - { - f_textures = OBJBakedModel.class.getDeclaredField("textures"); - f_textures.setAccessible(true); - } - - return (ImmutableMap)f_textures.get(model); - } catch(Exception e) { - e.printStackTrace(); - } - - return null; - } - - public ImmutableMap getTextures() - { - return getTexturesForOBJModel(this); - } -} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java deleted file mode 100644 index b1d374a55..000000000 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java +++ /dev/null @@ -1,39 +0,0 @@ -package mekanism.client.render.tileentity; - -import mekanism.client.model.ModelElectricPump; -import mekanism.common.tile.TileEntityElectricPump; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import org.lwjgl.opengl.GL11; - -@SideOnly(Side.CLIENT) -public class RenderElectricPump extends TileEntitySpecialRenderer -{ - private ModelElectricPump model = new ModelElectricPump(); - - @Override - public void renderTileEntityAt(TileEntityElectricPump tileEntity, double x, double y, double z, float partialTick, int destroyStage) - { - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); - - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectricPump.png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 2: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break; - case 3: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break; - case 4: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break; - case 5: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break; - } - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java b/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java deleted file mode 100644 index 0e0906059..000000000 --- a/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java +++ /dev/null @@ -1,39 +0,0 @@ -package mekanism.client.render.tileentity; - -import mekanism.client.model.ModelFluidicPlenisher; -import mekanism.common.tile.TileEntityFluidicPlenisher; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import org.lwjgl.opengl.GL11; - -@SideOnly(Side.CLIENT) -public class RenderFluidicPlenisher extends TileEntitySpecialRenderer -{ - private ModelFluidicPlenisher model = new ModelFluidicPlenisher(); - - @Override - public void renderTileEntityAt(TileEntityFluidicPlenisher tileEntity, double x, double y, double z, float partialTick, int destroyStage) - { - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); - - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidicPlenisher.png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 2: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break; - case 3: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break; - case 4: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break; - case 5: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break; - } - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 69f95c0f0..839a76873 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -63,7 +63,6 @@ import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedFactory; -import mekanism.common.tile.TileEntityAmbientAccumulator; import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityBoilerCasing; import mekanism.common.tile.TileEntityBoilerValve; @@ -95,9 +94,6 @@ import mekanism.common.tile.TileEntityFormulaicAssemblicator; import mekanism.common.tile.TileEntityFuelwoodHeater; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.tile.TileEntityInductionCasing; -import mekanism.common.tile.TileEntityInductionCell; -import mekanism.common.tile.TileEntityInductionPort; -import mekanism.common.tile.TileEntityInductionProvider; import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.tile.TileEntityLaserTractorBeam; import mekanism.common.tile.TileEntityLogisticalSorter; @@ -115,7 +111,6 @@ import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySecurityDesk; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntitySolarNeutronActivator; -import mekanism.common.tile.TileEntityStructuralGlass; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.tile.TileEntityThermalEvaporationController; import net.minecraft.block.Block; @@ -164,7 +159,6 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityMetallurgicInfuser.class, "MetallurgicInfuser"); GameRegistry.registerTileEntity(TileEntityGasTank.class, "GasTank"); GameRegistry.registerTileEntity(TileEntityEnergyCube.class, "EnergyCube"); - GameRegistry.registerTileEntity(TileEntityElectricPump.class, "ElectricPump"); GameRegistry.registerTileEntity(TileEntityPersonalChest.class, "PersonalChest"); GameRegistry.registerTileEntity(TileEntityDynamicTank.class, "DynamicTank"); GameRegistry.registerTileEntity(TileEntityDynamicValve.class, "DynamicValve"); @@ -182,7 +176,6 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator"); GameRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber"); GameRegistry.registerTileEntity(TileEntityFluidTank.class, "FluidTank"); - GameRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher"); GameRegistry.registerTileEntity(TileEntitySolarNeutronActivator.class, "SolarNeutronActivator"); GameRegistry.registerTileEntity(TileEntityFormulaicAssemblicator.class, "FormulaicAssemblicator"); GameRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater"); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index b84d38cd5..0ac813523 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -84,7 +84,9 @@ import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.tile.TileEntityChemicalWasher; import mekanism.common.tile.TileEntityElectricBlock; +import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.tile.TileEntityElectrolyticSeparator; +import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.tile.TileEntityFuelwoodHeater; import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityInductionCell; @@ -159,7 +161,7 @@ import com.mojang.authlib.GameProfile; * */ @Mod(modid = "Mekanism", name = "Mekanism", version = "9.0.0", guiFactory = "mekanism.client.gui.ConfigGuiFactory", - dependencies = "after:ForgeMultipart;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" + + dependencies = "after:JEI;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" + "after:ComputerCraft;after:Galacticraft API;after:MetallurgyCore") public class Mekanism { @@ -757,11 +759,9 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.PlasticBlock, 4, i), "SSS", "SDS", "SSS", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName )); -/* CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 2, i), "PSP", "SDS", "GSG", Character.valueOf('P'), "paneGlass", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName, Character.valueOf('G'), Items.glowstone_dust )); -*/ } for(int i = 0; i < EnumColor.DYES.length; i++) @@ -788,11 +788,9 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 4, i), " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName )); -/* CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 4, i), " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismItems.GlowPanel, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName )); -*/ } CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismBlocks.GlowPlasticBlock, 3, i), @@ -1202,6 +1200,8 @@ public class Mekanism GameRegistry.registerTileEntity(TileEntityChemicalOxidizer.class, "ChemicalOxidizer"); GameRegistry.registerTileEntity(TileEntityChemicalInfuser.class, "ChemicalInfuser"); GameRegistry.registerTileEntity(TileEntityRotaryCondensentrator.class, "RotaryCondensentrator"); + GameRegistry.registerTileEntity(TileEntityElectricPump.class, "ElectricPump"); + GameRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher"); //Load tile entities that have special renderers. proxy.registerSpecialTileEntities(); diff --git a/src/main/java/mekanism/common/OreDictCache.java b/src/main/java/mekanism/common/OreDictCache.java index 1badf146d..873bf9374 100644 --- a/src/main/java/mekanism/common/OreDictCache.java +++ b/src/main/java/mekanism/common/OreDictCache.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.List; import mekanism.api.util.ItemInfo; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.ItemRegistryUtils; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -122,7 +122,7 @@ public final class OreDictCache for(ItemStack stack : OreDictionary.getOres(key)) { ItemStack toAdd = stack.copy(); - String s = MekanismUtils.getMod(toAdd); + String s = ItemRegistryUtils.getMod(toAdd); if(!stacks.contains(stack) && toAdd.getItem() instanceof ItemBlock) { diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index b8d8674c2..e8c21508c 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -46,6 +46,7 @@ import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.tile.TileEntityPersonalChest; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; @@ -864,14 +865,15 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock if(tileEntity instanceof IUpgradeTile) { - ((IUpgradeTile)tileEntity).getComponent().write(itemStack.getTagCompound()); + ((IUpgradeTile)tileEntity).getComponent().write(ItemDataUtils.getDataMap(itemStack)); } if(tileEntity instanceof ISideConfiguration) { ISideConfiguration config = (ISideConfiguration)tileEntity; - config.getConfig().write(itemStack.getTagCompound()); + config.getConfig().write(ItemDataUtils.getDataMap(itemStack)); + config.getEjector().write(ItemDataUtils.getDataMap(itemStack)); } if(tileEntity instanceof ISustainedData) @@ -882,7 +884,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock if(tileEntity instanceof IRedstoneControl) { IRedstoneControl control = (IRedstoneControl)tileEntity; - itemStack.getTagCompound().setInteger("controlType", control.getControlType().ordinal()); + ItemDataUtils.setInt(itemStack, "controlType", control.getControlType().ordinal()); } if(tileEntity instanceof IStrictEnergyStorage) diff --git a/src/main/java/mekanism/common/block/states/BlockStateBasic.java b/src/main/java/mekanism/common/block/states/BlockStateBasic.java index b2cebc522..3e11545a8 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateBasic.java +++ b/src/main/java/mekanism/common/block/states/BlockStateBasic.java @@ -259,20 +259,19 @@ public class BlockStateBasic extends ExtendedBlockState { EnumFacing facing = state.getValue(BlockStateFacing.facingProperty); - if(type.canRotateTo(facing)) + if(!type.canRotateTo(facing)) { - if(builder.length() > 0) - { - builder.append(","); - } - - builder.append(BlockStateFacing.facingProperty.getName()); - builder.append("="); - builder.append(facing.getName()); + facing = EnumFacing.NORTH; } - else { - return new ModelResourceLocation("builtin/missing", "missing"); + + if(builder.length() > 0) + { + builder.append(","); } + + builder.append(BlockStateFacing.facingProperty.getName()); + builder.append("="); + builder.append(facing.getName()); } if(type.tiers) diff --git a/src/main/java/mekanism/common/block/states/BlockStateMachine.java b/src/main/java/mekanism/common/block/states/BlockStateMachine.java index ff97aadc8..5e126c33b 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateMachine.java +++ b/src/main/java/mekanism/common/block/states/BlockStateMachine.java @@ -433,20 +433,19 @@ public class BlockStateMachine extends ExtendedBlockState { EnumFacing facing = state.getValue(BlockStateFacing.facingProperty); - if(type.canRotateTo(facing)) + if(!type.canRotateTo(facing)) { - if(builder.length() > 0) - { - builder.append(","); - } - - builder.append(BlockStateFacing.facingProperty.getName()); - builder.append("="); - builder.append(facing.getName()); + facing = EnumFacing.NORTH; } - else { - return new ModelResourceLocation("builtin/missing", "missing"); + + if(builder.length() > 0) + { + builder.append(","); } + + builder.append(BlockStateFacing.facingProperty.getName()); + builder.append("="); + builder.append(facing.getName()); } if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) diff --git a/src/main/java/mekanism/common/content/transporter/Finder.java b/src/main/java/mekanism/common/content/transporter/Finder.java index f4f13981f..fe885dcb0 100644 --- a/src/main/java/mekanism/common/content/transporter/Finder.java +++ b/src/main/java/mekanism/common/content/transporter/Finder.java @@ -3,6 +3,7 @@ package mekanism.common.content.transporter; import java.util.List; import mekanism.api.util.StackUtils; +import mekanism.common.util.ItemRegistryUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -128,7 +129,7 @@ public abstract class Finder return false; } - String id = MekanismUtils.getMod(stack); + String id = ItemRegistryUtils.getMod(stack); if(modID.equals(id) || modID.equals("*")) { diff --git a/src/main/java/mekanism/common/inventory/InventoryBin.java b/src/main/java/mekanism/common/inventory/InventoryBin.java index ce4adb7f2..b7104fb2b 100644 --- a/src/main/java/mekanism/common/inventory/InventoryBin.java +++ b/src/main/java/mekanism/common/inventory/InventoryBin.java @@ -4,6 +4,7 @@ import mekanism.api.util.StackUtils; import mekanism.common.Tier.BinTier; import mekanism.common.base.ITierItem; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; +import mekanism.common.util.ItemDataUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -101,22 +102,12 @@ public class InventoryBin public int getItemCount() { - if(bin.getTagCompound() == null) - { - return 0; - } - - return bin.getTagCompound().getInteger("itemCount"); + return ItemDataUtils.getInt(bin, "itemCount"); } public void setItemCount(int count) { - if(bin.getTagCompound() == null) - { - bin.setTagCompound(new NBTTagCompound()); - } - - bin.getTagCompound().setInteger("itemCount", Math.max(0, count)); + ItemDataUtils.setInt(bin, "itemCount", Math.max(0, count)); if(getItemCount() == 0) { @@ -126,29 +117,22 @@ public class InventoryBin public ItemStack getItemType() { - if(bin.getTagCompound() == null || getItemCount() == 0) + if(getItemCount() == 0) { return null; } - return ItemStack.loadItemStackFromNBT(bin.getTagCompound().getCompoundTag("storedItem")); + return ItemStack.loadItemStackFromNBT(ItemDataUtils.getCompound(bin, "storedItem")); } public void setItemType(ItemStack stack) { - if(bin.getTagCompound() == null) - { - bin.setTagCompound(new NBTTagCompound()); - } - if(stack == null) { - bin.getTagCompound().removeTag("storedItem"); + ItemDataUtils.removeData(bin, "storedItem"); return; } - ItemStack ret = StackUtils.size(stack, 1); - - bin.getTagCompound().setTag("storedItem", StackUtils.size(stack, 1).writeToNBT(new NBTTagCompound())); + ItemDataUtils.setCompound(bin, "storedItem", StackUtils.size(stack, 1).writeToNBT(new NBTTagCompound())); } } diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index 08b00ed79..8db94439c 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -10,6 +10,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; import mekanism.api.util.ListUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; @@ -18,7 +19,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentText; import net.minecraft.util.DamageSource; @@ -276,12 +276,7 @@ public class ItemAtomicDisassembler extends ItemEnergized public int getMode(ItemStack itemStack) { - if(itemStack.getTagCompound() == null) - { - return 0; - } - - return itemStack.getTagCompound().getInteger("mode"); + return ItemDataUtils.getInt(itemStack, "mode"); } public String getModeName(ItemStack itemStack) @@ -307,12 +302,7 @@ public class ItemAtomicDisassembler extends ItemEnergized public void toggleMode(ItemStack itemStack) { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setInteger("mode", getMode(itemStack) < 4 ? getMode(itemStack)+1 : 0); + ItemDataUtils.setInt(itemStack, "mode", getMode(itemStack) < 4 ? getMode(itemStack)+1 : 0); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 10897e018..9d9f86b4e 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -24,6 +24,7 @@ import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityInductionCell; import mekanism.common.tile.TileEntityInductionProvider; import mekanism.common.tile.TileEntityMultiblock; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; @@ -189,7 +190,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt @Override public boolean hasContainerItem(ItemStack stack) { - return BasicBlockType.get(stack) == BasicBlockType.BIN && stack.getTagCompound() != null && stack.getTagCompound().hasKey("newCount"); + return BasicBlockType.get(stack) == BasicBlockType.BIN && ItemDataUtils.hasData(stack, "newCount"); } @Override @@ -197,16 +198,16 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt { if(BasicBlockType.get(stack) == BasicBlockType.BIN) { - if(stack.getTagCompound() == null || !stack.getTagCompound().hasKey("newCount")) + if(!ItemDataUtils.hasData(stack, "newCount")) { return null; } - int newCount = stack.getTagCompound().getInteger("newCount"); - stack.getTagCompound().removeTag("newCount"); + int newCount = ItemDataUtils.getInt(stack, "newCount"); + ItemDataUtils.removeData(stack, "newCount"); ItemStack ret = stack.copy(); - ret.getTagCompound().setInteger("itemCount", newCount); + ItemDataUtils.setInt(ret, "itemCount", newCount); return ret; } @@ -302,12 +303,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt { if(BasicBlockType.get(itemStack) == BasicBlockType.INDUCTION_CELL) { - if(itemStack.getTagCompound() == null) - { - return 0; - } - - return itemStack.getTagCompound().getDouble("energyStored"); + return ItemDataUtils.getDouble(itemStack, "energyStored"); } return 0; @@ -318,12 +314,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt { if(BasicBlockType.get(itemStack) == BasicBlockType.INDUCTION_CELL) { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setDouble("energyStored", Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0)); + ItemDataUtils.setDouble(itemStack, "energyStored", Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0)); } } diff --git a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java index 2221fbded..4a968bc71 100644 --- a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java +++ b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java @@ -7,6 +7,7 @@ import mekanism.api.MekanismAPI; import mekanism.common.MekanismBlocks; import mekanism.common.block.BlockCardboardBox.BlockData; import mekanism.common.tile.TileEntityCardboardBox; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -139,22 +140,17 @@ public class ItemBlockCardboardBox extends ItemBlock public void setBlockData(ItemStack itemstack, BlockData data) { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - - itemstack.getTagCompound().setTag("blockData", data.write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemstack, "blockData", data.write(new NBTTagCompound())); } public BlockData getBlockData(ItemStack itemstack) { - if(itemstack.getTagCompound() == null || !itemstack.getTagCompound().hasKey("blockData")) + if(!ItemDataUtils.hasData(itemstack, "blockData")) { return null; } - return BlockData.read(itemstack.getTagCompound().getCompoundTag("blockData")); + return BlockData.read(ItemDataUtils.getCompound(itemstack, "blockData")); } @SubscribeEvent diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index baa06eb9d..0597727d3 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -24,6 +24,7 @@ import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityEnergyCube; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; @@ -39,7 +40,6 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; @@ -59,6 +59,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS super(block); metaBlock = block; setMaxStackSize(1); + setHasSubtypes(true); setNoRepair(); setCreativeTab(Mekanism.tabMekanism); } @@ -196,14 +197,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS { if(data[0] instanceof ItemStack) { - ItemStack itemStack = (ItemStack)data[0]; - - if(!itemStack.hasTagCompound()) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setTag("Items", nbtTags); + ItemDataUtils.setList((ItemStack)data[0], "Items", nbtTags); } } @@ -212,14 +206,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS { if(data[0] instanceof ItemStack) { - ItemStack itemStack = (ItemStack)data[0]; - - if(!itemStack.hasTagCompound()) - { - return null; - } - - return itemStack.getTagCompound().getTagList("Items", NBT.TAG_COMPOUND); + return ItemDataUtils.getList((ItemStack)data[0], "Items"); } return null; @@ -233,7 +220,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS return 0; } - return itemStack.getTagCompound().getDouble("electricity"); + return ItemDataUtils.getDouble(itemStack, "energyStored"); } @Override @@ -244,13 +231,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS return; } - if(!itemStack.hasTagCompound()) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - double electricityStored = Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0); - itemStack.getTagCompound().setDouble("electricity", electricityStored); + ItemDataUtils.setDouble(itemStack, "energyStored", Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0)); } @Override @@ -363,9 +344,9 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS @Override public String getOwner(ItemStack stack) { - if(stack.hasTagCompound() && stack.getTagCompound().hasKey("owner")) + if(ItemDataUtils.hasData(stack, "owner")) { - return stack.getTagCompound().getString("owner"); + return ItemDataUtils.getString(stack, "owner"); } return null; @@ -374,40 +355,25 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS @Override public void setOwner(ItemStack stack, String owner) { - if(!stack.hasTagCompound()) - { - stack.setTagCompound(new NBTTagCompound()); - } - if(owner == null || owner.isEmpty()) { - stack.getTagCompound().removeTag("owner"); + ItemDataUtils.removeData(stack, "owner"); return; } - stack.getTagCompound().setString("owner", owner); + ItemDataUtils.setString(stack, "owner", owner); } @Override public SecurityMode getSecurity(ItemStack stack) { - if(!stack.hasTagCompound()) - { - return SecurityMode.PUBLIC; - } - - return SecurityMode.values()[stack.getTagCompound().getInteger("security")]; + return SecurityMode.values()[ItemDataUtils.getInt(stack, "security")]; } @Override public void setSecurity(ItemStack stack, SecurityMode mode) { - if(!stack.hasTagCompound()) - { - stack.setTagCompound(new NBTTagCompound()); - } - - stack.getTagCompound().setInteger("security", mode.ordinal()); + ItemDataUtils.setInt(stack, "security", mode.ordinal()); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 6cba41af2..d8a45c6c1 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -23,6 +23,7 @@ import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityGasTank; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; @@ -38,7 +39,6 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fml.relauncher.Side; public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedInventory, ITierItem, ISecurityItem @@ -147,31 +147,21 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI @Override public GasStack getGas(ItemStack itemstack) { - if(itemstack.getTagCompound() == null) - { - return null; - } - - return GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored")); + return GasStack.readFromNBT(ItemDataUtils.getCompound(itemstack, "stored")); } @Override public void setGas(ItemStack itemstack, GasStack stack) { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - if(stack == null || stack.amount == 0) { - itemstack.getTagCompound().removeTag("stored"); + ItemDataUtils.removeData(itemstack, "stored"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.getTagCompound().setTag("stored", gasStack.write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemstack, "stored", gasStack.write(new NBTTagCompound())); } } @@ -295,14 +285,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI { if(data[0] instanceof ItemStack) { - ItemStack itemStack = (ItemStack)data[0]; - - if(!itemStack.hasTagCompound()) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setTag("Items", nbtTags); + ItemDataUtils.setList((ItemStack)data[0], "Items", nbtTags); } } @@ -311,14 +294,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI { if(data[0] instanceof ItemStack) { - ItemStack itemStack = (ItemStack)data[0]; - - if(!itemStack.hasTagCompound()) - { - return null; - } - - return itemStack.getTagCompound().getTagList("Items", NBT.TAG_COMPOUND); + return ItemDataUtils.getList((ItemStack)data[0], "Items"); } return null; @@ -339,9 +315,9 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI @Override public String getOwner(ItemStack stack) { - if(stack.getTagCompound() != null && stack.getTagCompound().hasKey("owner")) + if(ItemDataUtils.hasData(stack, "owner")) { - return stack.getTagCompound().getString("owner"); + return ItemDataUtils.getString(stack, "owner"); } return null; @@ -350,40 +326,25 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI @Override public void setOwner(ItemStack stack, String owner) { - if(stack.getTagCompound() == null) - { - stack.setTagCompound(new NBTTagCompound()); - } - if(owner == null || owner.isEmpty()) { - stack.getTagCompound().removeTag("owner"); + ItemDataUtils.removeData(stack, "owner"); return; } - stack.getTagCompound().setString("owner", owner); + ItemDataUtils.setString(stack, "owner", owner); } @Override public SecurityMode getSecurity(ItemStack stack) { - if(stack.getTagCompound() == null) - { - return SecurityMode.PUBLIC; - } - - return SecurityMode.values()[stack.getTagCompound().getInteger("security")]; + return SecurityMode.values()[ItemDataUtils.getInt(stack, "security")]; } @Override public void setSecurity(ItemStack stack, SecurityMode mode) { - if(stack.getTagCompound() == null) - { - stack.setTagCompound(new NBTTagCompound()); - } - - stack.getTagCompound().setInteger("security", mode.ordinal()); + ItemDataUtils.setInt(stack, "security", mode.ordinal()); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 3042fcbe1..30e38babc 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -38,6 +38,7 @@ import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; @@ -58,7 +59,6 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -235,9 +235,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec list.add(EnumColor.AQUA + LangUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); } - if(type.supportsUpgrades && itemstack.getTagCompound() != null && itemstack.getTagCompound().hasKey("upgrades")) + if(type.supportsUpgrades && ItemDataUtils.hasData(itemstack, "upgrades")) { - Map upgrades = Upgrade.buildMap(itemstack.getTagCompound()); + Map upgrades = Upgrade.buildMap(ItemDataUtils.getDataMap(itemstack)); for(Map.Entry entry : upgrades.entrySet()) { @@ -326,9 +326,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(tileEntity instanceof IUpgradeTile) { - if(stack.getTagCompound() != null && stack.getTagCompound().hasKey("upgrades")) + if(ItemDataUtils.hasData(stack, "upgrades")) { - ((IUpgradeTile)tileEntity).getComponent().read(stack.getTagCompound()); + ((IUpgradeTile)tileEntity).getComponent().read(ItemDataUtils.getDataMap(stack)); } } @@ -336,9 +336,10 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { ISideConfiguration config = (ISideConfiguration)tileEntity; - if(stack.getTagCompound() != null && stack.getTagCompound().hasKey("sideDataStored")) + if(ItemDataUtils.hasData(stack, "sideDataStored")) { - config.getConfig().read(stack.getTagCompound()); + config.getConfig().read(ItemDataUtils.getDataMap(stack)); + config.getEjector().read(ItemDataUtils.getDataMap(stack)); } } @@ -352,9 +353,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(tileEntity instanceof IRedstoneControl) { - if(stack.getTagCompound() != null && stack.getTagCompound().hasKey("controlType")) + if(ItemDataUtils.hasData(stack, "controlType")) { - ((IRedstoneControl)tileEntity).setControlType(RedstoneControl.values()[stack.getTagCompound().getInteger("controlType")]); + ((IRedstoneControl)tileEntity).setControlType(RedstoneControl.values()[ItemDataUtils.getInt(stack, "controlType")]); } } @@ -611,14 +612,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { if(data[0] instanceof ItemStack) { - ItemStack itemStack = (ItemStack)data[0]; - - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setTag("Items", nbtTags); + ItemDataUtils.setList((ItemStack)data[0], "Items", nbtTags); } } @@ -627,14 +621,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { if(data[0] instanceof ItemStack) { - ItemStack itemStack = (ItemStack)data[0]; - - if(itemStack.getTagCompound() == null) - { - return null; - } - - return itemStack.getTagCompound().getTagList("Items", NBT.TAG_COMPOUND); + return ItemDataUtils.getList((ItemStack)data[0], "Items"); } return null; @@ -646,18 +633,13 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(data[0] instanceof ItemStack) { ItemStack itemStack = (ItemStack)data[0]; - - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } if(fluidStack == null || fluidStack.amount == 0 || fluidStack.getFluid() == null) { - itemStack.getTagCompound().removeTag("fluidTank"); + ItemDataUtils.removeData(itemStack, "fluidTank"); } else { - itemStack.getTagCompound().setTag("fluidTank", fluidStack.writeToNBT(new NBTTagCompound())); + ItemDataUtils.setCompound(itemStack, "fluidTank", fluidStack.writeToNBT(new NBTTagCompound())); } } } @@ -669,15 +651,12 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { ItemStack itemStack = (ItemStack)data[0]; - if(itemStack.getTagCompound() == null) + if(!ItemDataUtils.hasData(itemStack, "fluidTank")) { return null; } - if(itemStack.getTagCompound().hasKey("fluidTank")) - { - return FluidStack.loadFluidStackFromNBT(itemStack.getTagCompound().getCompoundTag("fluidTank")); - } + return FluidStack.loadFluidStackFromNBT(ItemDataUtils.getCompound(itemStack, "fluidTank")); } return null; @@ -698,33 +677,23 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec public void setBucketMode(ItemStack itemStack, boolean bucketMode) { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setBoolean("bucketMode", bucketMode); + ItemDataUtils.setBoolean(itemStack, "bucketMode", bucketMode); } public boolean getBucketMode(ItemStack itemStack) { - if(itemStack.getTagCompound() == null) - { - return false; - } - - return itemStack.getTagCompound().getBoolean("bucketMode"); + return ItemDataUtils.getBoolean(itemStack, "bucketMode"); } @Override public double getEnergy(ItemStack itemStack) { - if(itemStack.getTagCompound() == null || !MachineType.get(itemStack).isElectric) + if(!MachineType.get(itemStack).isElectric) { return 0; } - return itemStack.getTagCompound().getDouble("electricity"); + return ItemDataUtils.getDouble(itemStack, "energyStored"); } @Override @@ -735,13 +704,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return; } - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - double electricityStored = Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0); - itemStack.getTagCompound().setDouble("electricity", electricityStored); + ItemDataUtils.setDouble(itemStack, "energyStored", Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0)); } @Override @@ -774,14 +737,14 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(canReceive(theItem)) { double energyNeeded = getMaxEnergy(theItem)-getEnergy(theItem); - double toReceive = Math.min(energy* general.FROM_TE, energyNeeded); + double toReceive = Math.min(energy*general.FROM_TE, energyNeeded); if(!simulate) { setEnergy(theItem, getEnergy(theItem) + toReceive); } - return (int)Math.round(toReceive* general.TO_TE); + return (int)Math.round(toReceive*general.TO_TE); } return 0; @@ -793,14 +756,14 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(canSend(theItem)) { double energyRemaining = getEnergy(theItem); - double toSend = Math.min((energy* general.FROM_TE), energyRemaining); + double toSend = Math.min((energy*general.FROM_TE), energyRemaining); if(!simulate) { setEnergy(theItem, getEnergy(theItem) - toSend); } - return (int)Math.round(toSend* general.TO_TE); + return (int)Math.round(toSend*general.TO_TE); } return 0; @@ -809,13 +772,13 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override public int getEnergyStored(ItemStack theItem) { - return (int)(getEnergy(theItem) * general.TO_TE); + return (int)(getEnergy(theItem)*general.TO_TE); } @Override public int getMaxEnergyStored(ItemStack theItem) { - return (int)(getMaxEnergy(theItem) * general.TO_TE); + return (int)(getMaxEnergy(theItem)*general.TO_TE); } @Override @@ -933,9 +896,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override public String getOwner(ItemStack stack) { - if(stack.hasTagCompound() && stack.getTagCompound().hasKey("owner")) + if(ItemDataUtils.hasData(stack, "owner")) { - return stack.getTagCompound().getString("owner"); + return ItemDataUtils.getString(stack, "owner"); } return null; @@ -944,40 +907,25 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override public void setOwner(ItemStack stack, String owner) { - if(!stack.hasTagCompound()) - { - stack.setTagCompound(new NBTTagCompound()); - } - if(owner == null || owner.isEmpty()) { - stack.getTagCompound().removeTag("owner"); + ItemDataUtils.removeData(stack, "owner"); return; } - stack.getTagCompound().setString("owner", owner); + ItemDataUtils.setString(stack, "owner", owner); } @Override public SecurityMode getSecurity(ItemStack stack) { - if(stack.getTagCompound() == null) - { - return SecurityMode.PUBLIC; - } - - return SecurityMode.values()[stack.getTagCompound().getInteger("security")]; + return SecurityMode.values()[ItemDataUtils.getInt(stack, "security")]; } @Override public void setSecurity(ItemStack stack, SecurityMode mode) { - if(!stack.hasTagCompound()) - { - stack.setTagCompound(new NBTTagCompound()); - } - - stack.getTagCompound().setInteger("security", mode.ordinal()); + ItemDataUtils.setInt(stack, "security", mode.ordinal()); } @Override 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)); diff --git a/src/main/java/mekanism/common/item/ItemConfigurationCard.java b/src/main/java/mekanism/common/item/ItemConfigurationCard.java index 8c1758cc4..2626f9fd5 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurationCard.java +++ b/src/main/java/mekanism/common/item/ItemConfigurationCard.java @@ -9,6 +9,7 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.IRedstoneControl.RedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -140,35 +141,25 @@ public class ItemConfigurationCard extends ItemMekanism public void setData(ItemStack itemstack, NBTTagCompound data) { - if(itemstack.hasTagCompound()) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - if(data != null) { - itemstack.getTagCompound().setTag("data", data); + ItemDataUtils.setCompound(itemstack, "data", data); } else { - itemstack.getTagCompound().removeTag("data"); + ItemDataUtils.removeData(itemstack, "data"); } } public NBTTagCompound getData(ItemStack itemstack) { - if(!itemstack.hasTagCompound()) - { - return null; - } - - NBTTagCompound data = itemstack.getTagCompound().getCompoundTag("data"); + NBTTagCompound data = ItemDataUtils.getCompound(itemstack, "data"); if(data.hasNoTags()) { return null; } else { - return itemstack.getTagCompound().getCompoundTag("data"); + return ItemDataUtils.getCompound(itemstack, "data"); } } diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 02f9e9856..191f6e555 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -19,6 +19,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.component.TileComponentConfig; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; @@ -238,27 +239,12 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool public void setState(ItemStack itemstack, ConfiguratorMode state) { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - - itemstack.getTagCompound().setInteger("state", state.ordinal()); + ItemDataUtils.setInt(itemstack, "state", state.ordinal()); } public ConfiguratorMode getState(ItemStack itemstack) { - if(itemstack.getTagCompound() == null) - { - return ConfiguratorMode.CONFIGURATE_ITEMS; - } - - if(itemstack.getTagCompound().getTag("state") != null) - { - return ConfiguratorMode.values()[itemstack.getTagCompound().getInteger("state")]; - } - - return ConfiguratorMode.CONFIGURATE_ITEMS; + return ConfiguratorMode.values()[ItemDataUtils.getInt(itemstack, "state")]; } @Override diff --git a/src/main/java/mekanism/common/item/ItemCraftingFormula.java b/src/main/java/mekanism/common/item/ItemCraftingFormula.java index ad98f2759..c5951ead3 100644 --- a/src/main/java/mekanism/common/item/ItemCraftingFormula.java +++ b/src/main/java/mekanism/common/item/ItemCraftingFormula.java @@ -5,6 +5,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; @@ -13,7 +14,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; -import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -110,32 +110,22 @@ public class ItemCraftingFormula extends ItemMekanism public boolean isInvalid(ItemStack stack) { - if(!stack.hasTagCompound()) - { - return false; - } - - return stack.getTagCompound().getBoolean("invalid"); + return ItemDataUtils.getBoolean(stack, "invalid"); } public void setInvalid(ItemStack stack, boolean invalid) { - if(!stack.hasTagCompound()) - { - stack.setTagCompound(new NBTTagCompound()); - } - - stack.getTagCompound().setBoolean("invalid", invalid); + ItemDataUtils.setBoolean(stack, "invalid", invalid); } public ItemStack[] getInventory(ItemStack stack) { - if(!stack.hasTagCompound() || !stack.getTagCompound().hasKey("Items")) + if(!ItemDataUtils.hasData(stack, "Items")) { return null; } - NBTTagList tagList = stack.getTagCompound().getTagList("Items", NBT.TAG_COMPOUND); + NBTTagList tagList = ItemDataUtils.getList(stack, "Items"); ItemStack[] inventory = new ItemStack[9]; for(int tagCount = 0; tagCount < tagList.tagCount(); tagCount++) @@ -154,14 +144,9 @@ public class ItemCraftingFormula extends ItemMekanism public void setInventory(ItemStack stack, ItemStack[] inv) { - if(!stack.hasTagCompound()) - { - stack.setTagCompound(new NBTTagCompound()); - } - if(inv == null) { - stack.getTagCompound().removeTag("Items"); + ItemDataUtils.removeData(stack, "Items"); return; } @@ -178,6 +163,6 @@ public class ItemCraftingFormula extends ItemMekanism } } - stack.getTagCompound().setTag("Items", tagList); + ItemDataUtils.setList(stack, "Items", tagList); } } diff --git a/src/main/java/mekanism/common/item/ItemElectricBow.java b/src/main/java/mekanism/common/item/ItemElectricBow.java index 76892a46b..1db002d2b 100644 --- a/src/main/java/mekanism/common/item/ItemElectricBow.java +++ b/src/main/java/mekanism/common/item/ItemElectricBow.java @@ -3,6 +3,7 @@ package mekanism.common.item; import java.util.List; import mekanism.api.EnumColor; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; @@ -11,7 +12,6 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Items; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; public class ItemElectricBow extends ItemEnergized @@ -107,41 +107,14 @@ public class ItemElectricBow extends ItemEnergized return itemstack; } - /** - * Sets the bow's fire state in NBT. - * @param itemstack - the bow's itemstack - * @param state - state to change to - */ public void setFireState(ItemStack itemstack, boolean state) { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - - itemstack.getTagCompound().setBoolean("fireState", state); + ItemDataUtils.setBoolean(itemstack, "fireState", state); } - /** - * Gets the bow's fire state from NBT. - * @param itemstack - the bow's itemstack - * @return fire state - */ public boolean getFireState(ItemStack itemstack) { - if(itemstack.getTagCompound() == null) - { - return false; - } - - boolean state = false; - - if(itemstack.getTagCompound().getTag("fireState") != null) - { - state = itemstack.getTagCompound().getBoolean("fireState"); - } - - return state; + return ItemDataUtils.getBoolean(itemstack, "fireState"); } @Override diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index 7464c2dd9..2af154ee7 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -10,13 +10,13 @@ import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; import mekanism.common.integration.IC2ItemManager; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; @@ -116,24 +116,13 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec @Override public double getEnergy(ItemStack itemStack) { - if(itemStack.getTagCompound() == null) - { - return 0; - } - - return itemStack.getTagCompound().getDouble("electricity"); + return ItemDataUtils.getDouble(itemStack, "energyStored"); } @Override public void setEnergy(ItemStack itemStack, double amount) { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - double electricityStored = Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0); - itemStack.getTagCompound().setDouble("electricity", electricityStored); + ItemDataUtils.setDouble(itemStack, "energyStored", Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0)); } @Override diff --git a/src/main/java/mekanism/common/item/ItemFlamethrower.java b/src/main/java/mekanism/common/item/ItemFlamethrower.java index 176e682c9..ef3eaf720 100644 --- a/src/main/java/mekanism/common/item/ItemFlamethrower.java +++ b/src/main/java/mekanism/common/item/ItemFlamethrower.java @@ -8,6 +8,7 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -99,17 +100,6 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem { return false; } - - @Override - public GasStack getGas(ItemStack itemstack) - { - if(itemstack.getTagCompound() == null) - { - return null; - } - - return GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored")); - } @Override public boolean showDurabilityBar(ItemStack stack) @@ -123,23 +113,24 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem return 1D-((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack)); } + @Override + public GasStack getGas(ItemStack itemstack) + { + return GasStack.readFromNBT(ItemDataUtils.getCompound(itemstack, "stored")); + } + @Override public void setGas(ItemStack itemstack, GasStack stack) { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - if(stack == null || stack.amount == 0) { - itemstack.getTagCompound().removeTag("stored"); + ItemDataUtils.removeData(itemstack, "stored"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.getTagCompound().setTag("stored", gasStack.write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemstack, "stored", gasStack.write(new NBTTagCompound())); } } @@ -169,22 +160,12 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem public FlamethrowerMode getMode(ItemStack stack) { - if(stack.getTagCompound() == null) - { - return FlamethrowerMode.COMBAT; - } - - return FlamethrowerMode.values()[stack.getTagCompound().getInteger("mode")]; + return FlamethrowerMode.values()[ItemDataUtils.getInt(stack, "mode")]; } public void setMode(ItemStack stack, FlamethrowerMode mode) { - if(stack.getTagCompound() == null) - { - stack.setTagCompound(new NBTTagCompound()); - } - - stack.getTagCompound().setInteger("mode", mode.ordinal()); + ItemDataUtils.setInt(stack, "mode", mode.ordinal()); } public static enum FlamethrowerMode diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index 61961d305..0718b7469 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -12,6 +12,7 @@ import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; import mekanism.common.integration.IC2ItemManager; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.client.model.ModelBiped; @@ -22,7 +23,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingAttackEvent; @@ -49,12 +49,6 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci setCreativeTab(Mekanism.tabMekanism); } -/* - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) {} -*/ - @Override public boolean isValidArmor(ItemStack stack, int armorType, Entity entity) { @@ -142,24 +136,13 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci @Override public double getEnergy(ItemStack itemStack) { - if(itemStack.getTagCompound() == null) - { - return 0; - } - - return itemStack.getTagCompound().getDouble("electricity"); + return ItemDataUtils.getDouble(itemStack, "energyStored"); } @Override public void setEnergy(ItemStack itemStack, double amount) { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - double electricityStored = Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0); - itemStack.getTagCompound().setDouble("electricity", electricityStored); + ItemDataUtils.setDouble(itemStack, "energyStored", Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0)); } @Override diff --git a/src/main/java/mekanism/common/item/ItemGasMask.java b/src/main/java/mekanism/common/item/ItemGasMask.java index 6f6fc758b..e010823dc 100644 --- a/src/main/java/mekanism/common/item/ItemGasMask.java +++ b/src/main/java/mekanism/common/item/ItemGasMask.java @@ -23,12 +23,6 @@ public class ItemGasMask extends ItemArmor setCreativeTab(Mekanism.tabMekanism); } -/* - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) {} -*/ - @Override public boolean isValidArmor(ItemStack stack, int armorType, Entity entity) { diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index 0409e1f51..6e6761194 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -6,6 +6,7 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; import mekanism.common.Mekanism; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -101,14 +102,9 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo private FluidStack getFluid_do(ItemStack container) { - if(container.getTagCompound() == null) + if(ItemDataUtils.hasData(container, "fluidStack")) { - return null; - } - - if(container.getTagCompound().hasKey("fluidStack")) - { - return FluidStack.loadFluidStackFromNBT(container.getTagCompound().getCompoundTag("fluidStack")); + return FluidStack.loadFluidStackFromNBT(ItemDataUtils.getCompound(container, "fluidStack")); } return null; @@ -122,17 +118,12 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo public void setFluid(ItemStack container, FluidStack stack) { - if(container.getTagCompound() == null) - { - container.setTagCompound(new NBTTagCompound()); - } - if(stack == null || stack.amount == 0 || stack.getFluid() == null) { - container.getTagCompound().removeTag("fluidStack"); + ItemDataUtils.removeData(container, "fluidStack"); } else { - container.getTagCompound().setTag("fluidStack", stack.writeToNBT(new NBTTagCompound())); + ItemDataUtils.setCompound(container, "fluidStack", stack.writeToNBT(new NBTTagCompound())); } } @@ -246,12 +237,7 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo private GasStack getGas_do(ItemStack itemstack) { - if(itemstack.getTagCompound() == null) - { - return null; - } - - return GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("gasStack")); + return GasStack.readFromNBT(ItemDataUtils.getCompound(itemstack, "gasStack")); } @Override @@ -261,22 +247,17 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo } @Override - public void setGas(ItemStack itemstack, GasStack stack) + public void setGas(ItemStack itemstack, GasStack stack) { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - if(stack == null || stack.amount == 0) { - itemstack.getTagCompound().removeTag("gasStack"); + ItemDataUtils.removeData(itemstack, "gasStack"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.getTagCompound().setTag("gasStack", gasStack.write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemstack, "gasStack", gasStack.write(new NBTTagCompound())); } } diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java index 4f75d366b..4b66ca481 100644 --- a/src/main/java/mekanism/common/item/ItemJetpack.java +++ b/src/main/java/mekanism/common/item/ItemJetpack.java @@ -12,6 +12,7 @@ import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; import mekanism.common.MekanismItems; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.client.model.ModelBiped; import net.minecraft.creativetab.CreativeTabs; @@ -160,54 +161,34 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor return false; } - @Override - public GasStack getGas(ItemStack itemstack) - { - if(itemstack.getTagCompound() == null) - { - return null; - } - - return GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored")); - } - public JetpackMode getMode(ItemStack stack) { - if(stack.getTagCompound() == null) - { - return JetpackMode.NORMAL; - } - - return JetpackMode.values()[stack.getTagCompound().getInteger("mode")]; + return JetpackMode.values()[ItemDataUtils.getInt(stack, "mode")]; } public void setMode(ItemStack stack, JetpackMode mode) { - if(stack.getTagCompound() == null) - { - stack.setTagCompound(new NBTTagCompound()); - } + ItemDataUtils.setInt(stack, "mode", mode.ordinal()); + } - stack.getTagCompound().setInteger("mode", mode.ordinal()); + @Override + public GasStack getGas(ItemStack itemstack) + { + return GasStack.readFromNBT(ItemDataUtils.getCompound(itemstack, "stored")); } @Override public void setGas(ItemStack itemstack, GasStack stack) { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - if(stack == null || stack.amount == 0) { - itemstack.getTagCompound().removeTag("stored"); + ItemDataUtils.removeData(itemstack, "stored"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.getTagCompound().setTag("stored", gasStack.write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemstack, "stored", gasStack.write(new NBTTagCompound())); } } diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index aa6eb8c23..08c5c0965 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -8,13 +8,13 @@ import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; import mekanism.common.security.IOwnerItem; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.SecurityUtils; import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; @@ -99,9 +99,9 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem @Override public String getOwner(ItemStack stack) { - if(stack.hasTagCompound() && stack.getTagCompound().hasKey("owner")) + if(ItemDataUtils.hasData(stack, "owner")) { - return stack.getTagCompound().getString("owner"); + return ItemDataUtils.getString(stack, "owner"); } return null; @@ -115,11 +115,11 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem if(owner == null || owner.isEmpty()) { - stack.getTagCompound().removeTag("owner"); + ItemDataUtils.removeData(stack, "owner"); return; } - stack.getTagCompound().setString("owner", owner); + ItemDataUtils.setString(stack, "owner", owner); } @Override @@ -130,29 +130,19 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem public boolean isPrivateMode(ItemStack stack) { - if(stack.hasTagCompound()) - { - return stack.getTagCompound().getBoolean("private"); - } - - return false; + return ItemDataUtils.getBoolean(stack, "private"); } public void setPrivateMode(ItemStack stack, boolean isPrivate) { - if(!stack.hasTagCompound()) - { - stack.setTagCompound(new NBTTagCompound()); - } - - stack.getTagCompound().setBoolean("private", isPrivate); + ItemDataUtils.setBoolean(stack, "private", isPrivate); } public String getFrequency(ItemStack stack) { - if(stack.hasTagCompound() && stack.getTagCompound().hasKey("frequency")) + if(ItemDataUtils.hasData(stack, "frequency")) { - return stack.getTagCompound().getString("frequency"); + return ItemDataUtils.getString(stack, "frequency"); } return null; @@ -160,17 +150,12 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem public void setFrequency(ItemStack stack, String frequency) { - if(!stack.hasTagCompound()) - { - stack.setTagCompound(new NBTTagCompound()); - } - if(frequency == null || frequency.isEmpty()) { - stack.getTagCompound().removeTag("frequency"); + ItemDataUtils.removeData(stack, "frequency"); return; } - stack.getTagCompound().setString("frequency", frequency); + ItemDataUtils.setString(stack, "frequency", frequency); } } diff --git a/src/main/java/mekanism/common/item/ItemProxy.java b/src/main/java/mekanism/common/item/ItemProxy.java index 1a8ed9ad1..317842601 100644 --- a/src/main/java/mekanism/common/item/ItemProxy.java +++ b/src/main/java/mekanism/common/item/ItemProxy.java @@ -1,5 +1,6 @@ package mekanism.common.item; +import mekanism.common.util.ItemDataUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -21,14 +22,6 @@ public class ItemProxy extends Item return getSavedItem(stack); } -/* - @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) - { - return stack.getTagCompound() == null || !stack.getTagCompound().getBoolean("hasStack"); - } -*/ - @Override public boolean hasContainerItem(ItemStack itemStack) { @@ -37,32 +30,22 @@ public class ItemProxy extends Item public void setSavedItem(ItemStack stack, ItemStack save) { - if(stack.getTagCompound() == null) - { - stack.setTagCompound(new NBTTagCompound()); - } - if(save == null) { - stack.getTagCompound().setBoolean("hasStack", false); - stack.getTagCompound().removeTag("savedItem"); + ItemDataUtils.setBoolean(stack, "hasStack", false); + ItemDataUtils.removeData(stack, "savedItem"); } else { - stack.getTagCompound().setBoolean("hasStack", true); - stack.getTagCompound().setTag("savedItem", save.writeToNBT(new NBTTagCompound())); + ItemDataUtils.setBoolean(stack, "hasStack", true); + ItemDataUtils.setCompound(stack, "savedItem", save.writeToNBT(new NBTTagCompound())); } } public ItemStack getSavedItem(ItemStack stack) { - if(stack.getTagCompound() == null) + if(ItemDataUtils.getBoolean(stack, "hasStack")) { - return null; - } - - if(stack.getTagCompound().getBoolean("hasStack")) - { - return ItemStack.loadItemStackFromNBT(stack.getTagCompound().getCompoundTag("savedItem")); + return ItemStack.loadItemStackFromNBT(ItemDataUtils.getCompound(stack, "savedItem")); } return null; diff --git a/src/main/java/mekanism/common/item/ItemRobit.java b/src/main/java/mekanism/common/item/ItemRobit.java index c80975890..e647364e7 100644 --- a/src/main/java/mekanism/common/item/ItemRobit.java +++ b/src/main/java/mekanism/common/item/ItemRobit.java @@ -7,10 +7,10 @@ import mekanism.api.EnumColor; import mekanism.common.base.ISustainedInventory; import mekanism.common.entity.EntityRobit; import mekanism.common.tile.TileEntityChargepad; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; @@ -76,24 +76,14 @@ public class ItemRobit extends ItemEnergized implements ISustainedInventory public void setName(ItemStack itemstack, String name) { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - - itemstack.getTagCompound().setString("name", name); + ItemDataUtils.setString(itemstack, "name", name); } public String getName(ItemStack itemstack) { - if(itemstack.getTagCompound() == null) - { - return "Robit"; - } + String name = ItemDataUtils.getString(itemstack, "name"); - String name = itemstack.getTagCompound().getString("name"); - - return name.equals("") ? "Robit" : name; + return name.isEmpty() ? "Robit" : name; } @Override @@ -101,14 +91,7 @@ public class ItemRobit extends ItemEnergized implements ISustainedInventory { if(data[0] instanceof ItemStack) { - ItemStack itemStack = (ItemStack)data[0]; - - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setTag("Items", nbtTags); + ItemDataUtils.setList((ItemStack)data[0], "Items", nbtTags); } } @@ -117,14 +100,7 @@ public class ItemRobit extends ItemEnergized implements ISustainedInventory { if(data[0] instanceof ItemStack) { - ItemStack itemStack = (ItemStack)data[0]; - - if(itemStack.getTagCompound() == null) - { - return null; - } - - return itemStack.getTagCompound().getTagList("Items", 10); + return ItemDataUtils.getList((ItemStack)data[0], "Items"); } return null; diff --git a/src/main/java/mekanism/common/item/ItemScubaTank.java b/src/main/java/mekanism/common/item/ItemScubaTank.java index 127821159..69771b7cf 100644 --- a/src/main/java/mekanism/common/item/ItemScubaTank.java +++ b/src/main/java/mekanism/common/item/ItemScubaTank.java @@ -11,6 +11,7 @@ import mekanism.api.gas.IGasItem; import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.client.model.ModelBiped; import net.minecraft.creativetab.CreativeTabs; @@ -153,12 +154,7 @@ public class ItemScubaTank extends ItemArmor implements IGasItem public boolean getFlowing(ItemStack stack) { - if(stack.getTagCompound() == null) - { - return false; - } - - return stack.getTagCompound().getBoolean("flowing"); + return ItemDataUtils.getBoolean(stack, "flowing"); } public String getFlowingStr(ItemStack stack) @@ -170,12 +166,7 @@ public class ItemScubaTank extends ItemArmor implements IGasItem public void setFlowing(ItemStack stack, boolean flowing) { - if(stack.getTagCompound() == null) - { - stack.setTagCompound(new NBTTagCompound()); - } - - stack.getTagCompound().setBoolean("flowing", flowing); + ItemDataUtils.setBoolean(stack, "flowing", flowing); } @Override @@ -193,31 +184,21 @@ public class ItemScubaTank extends ItemArmor implements IGasItem @Override public GasStack getGas(ItemStack itemstack) { - if(itemstack.getTagCompound() == null) - { - return null; - } - - return GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored")); + return GasStack.readFromNBT(ItemDataUtils.getCompound(itemstack, "stored")); } @Override public void setGas(ItemStack itemstack, GasStack stack) { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - if(stack == null || stack.amount == 0) { - itemstack.getTagCompound().removeTag("stored"); + ItemDataUtils.removeData(itemstack, "stored"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.getTagCompound().setTag("stored", gasStack.write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemstack, "stored", gasStack.write(new NBTTagCompound())); } } diff --git a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java index 7d89b8e90..ed836be29 100644 --- a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java +++ b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java @@ -5,11 +5,11 @@ import java.util.List; import java.util.Map; import mekanism.api.EnumColor; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; public class ItemWalkieTalkie extends ItemMekanism @@ -62,48 +62,29 @@ public class ItemWalkieTalkie extends ItemMekanism public void setOn(ItemStack itemStack, boolean on) { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setBoolean("on", on); + ItemDataUtils.setBoolean(itemStack, "on", on); } public boolean getOn(ItemStack itemStack) { - if(itemStack.getTagCompound() == null) - { - return false; - } - - return itemStack.getTagCompound().getBoolean("on"); + return ItemDataUtils.getBoolean(itemStack, "on"); } public void setChannel(ItemStack itemStack, int channel) { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setInteger("channel", channel); + ItemDataUtils.setInt(itemStack, "channel", channel); } public int getChannel(ItemStack itemStack) { - if(itemStack.getTagCompound() == null) - { - return 1; - } - - int channel = itemStack.getTagCompound().getInteger("channel"); + int channel = ItemDataUtils.getInt(itemStack, "channel"); if(channel == 0) { setChannel(itemStack, 1); + channel = 1; } - return itemStack.getTagCompound().getInteger("channel"); + return channel; } } diff --git a/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java b/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java index 184031f08..3ef65046d 100644 --- a/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java +++ b/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java @@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import net.minecraftforge.fml.common.FMLCommonHandler; import mekanism.common.PacketHandler; import mekanism.common.tile.TileEntityBasicBlock; @@ -19,7 +20,7 @@ public class TileEntityInternalMultiblock extends TileEntityBasicBlock { super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { if(dataStream.readBoolean()) { diff --git a/src/main/java/mekanism/common/multipart/GlowPanelBlockState.java b/src/main/java/mekanism/common/multipart/GlowPanelBlockState.java index ad5f6128e..906060f55 100644 --- a/src/main/java/mekanism/common/multipart/GlowPanelBlockState.java +++ b/src/main/java/mekanism/common/multipart/GlowPanelBlockState.java @@ -1,6 +1,7 @@ package mekanism.common.multipart; import mcmultipart.MCMultiPartMod; +import mekanism.api.EnumColor; import mekanism.common.block.states.BlockStateFacing; import net.minecraft.block.properties.IProperty; import net.minecraftforge.common.property.ExtendedBlockState; @@ -8,8 +9,46 @@ import net.minecraftforge.common.property.IUnlistedProperty; public class GlowPanelBlockState extends ExtendedBlockState { + public static GlowPanelColorProperty colorState = new GlowPanelColorProperty(); + public GlowPanelBlockState() { - super(MCMultiPartMod.multipart, new IProperty[] {BlockStateFacing.facingProperty, PartGlowPanel.colorProperty}, new IUnlistedProperty[] {}); + super(MCMultiPartMod.multipart, new IProperty[] {BlockStateFacing.facingProperty}, new IUnlistedProperty[] {colorState}); + } + + public static class GlowPanelColorProperty implements IUnlistedProperty + { + public EnumColor color; + + public GlowPanelColorProperty() {} + + public GlowPanelColorProperty(EnumColor c) + { + color = c; + } + + @Override + public String getName() + { + return "color"; + } + + @Override + public boolean isValid(GlowPanelColorProperty value) + { + return true; + } + + @Override + public Class getType() + { + return getClass(); + } + + @Override + public String valueToString(GlowPanelColorProperty value) + { + return color.getName(); + } } } diff --git a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java index 986f7ff37..6c3d39108 100644 --- a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java @@ -14,6 +14,7 @@ import mcmultipart.item.ItemMultiPart; import mcmultipart.multipart.IMultipart; import mekanism.api.EnumColor; import mekanism.common.Mekanism; +import mekanism.common.base.IMetaItem; import mekanism.common.util.LangUtils; //import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -26,7 +27,7 @@ import net.minecraft.util.StatCollector; import net.minecraft.util.Vec3; import net.minecraft.world.World; -public class ItemGlowPanel extends ItemMultiPart +public class ItemGlowPanel extends ItemMultiPart implements IMetaItem { public ItemGlowPanel() { @@ -48,53 +49,11 @@ public class ItemGlowPanel extends ItemMultiPart { return new PartGlowPanel(col, orientation); } - -/* - if(world.getTileEntity(pos.x, pos.y, pos.z) instanceof IMultipartContainer && ((TileMultipart) world.getTileEntity(pos.x, pos.y, pos.z)).partMap(orientation.ordinal()) instanceof HollowMicroblock) - { - return new PartGlowPanel(col, orientation); - } -*/ } return null; } -/* - public EnumFacing getSideFromVector3(Vec3 vector) - { - if(Math.abs(vector.xCoord) > Math.abs(vector.yCoord) && Math.abs(vector.xCoord) > Math.abs(vector.zCoord)) - { - if((vector.xCoord < 0.5 && vector.xCoord > 0) || vector.xCoord == -0.5) - { - return EnumFacing.EAST; - } - - return EnumFacing.WEST; - } - else if(Math.abs(vector.y) > Math.abs(vector.x) && Math.abs(vector.y) > Math.abs(vector.z)) - { - if((vector.y < 0.5 && vector.y > 0) || vector.y == -0.5) - { - return EnumFacing.UP; - } - - return EnumFacing.DOWN; - } - else if(Math.abs(vector.z) > Math.abs(vector.x) && Math.abs(vector.z) > Math.abs(vector.y)) - { - if((vector.z < 0.5 && vector.z > 0) || vector.z == -0.5) - { - return EnumFacing.SOUTH; - } - - return EnumFacing.NORTH; - } - - return null; - } -*/ - @Override public void getSubItems(Item item, CreativeTabs tab, List listToAddTo) { @@ -131,4 +90,16 @@ public class ItemGlowPanel extends ItemMultiPart { return true; } + + @Override + public String getTexture(int meta) + { + return "glow_panel"; + } + + @Override + public int getVariants() + { + return EnumColor.DYES.length; + } } diff --git a/src/main/java/mekanism/common/multipart/MultipartMekanism.java b/src/main/java/mekanism/common/multipart/MultipartMekanism.java index 5eb7b12ee..2d87935e7 100644 --- a/src/main/java/mekanism/common/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/multipart/MultipartMekanism.java @@ -8,7 +8,10 @@ import mcmultipart.multipart.MultipartRegistry; import mekanism.common.MekanismBlocks; import mekanism.common.Tier; import mekanism.common.block.states.BlockStateMachine.MachineType; +import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; import net.minecraftforge.fml.common.event.FMLInterModComms; /* import codechicken.microblock.BlockMicroMaterial; @@ -192,4 +195,14 @@ public class MultipartMekanism implements IPartFactory FMLInterModComms.sendMessage("ForgeMicroblock", "microMaterial", new ItemStack(MekanismBlocks.BasicBlock2, 1, 0)); FMLInterModComms.sendMessage("ForgeMicroblock", "microMaterial", new ItemStack(MekanismBlocks.CardboardBox)); } + + public static void dropItem(ItemStack stack, World world, Vec3 pos) + { + EntityItem item = new EntityItem(world, pos.xCoord, pos.yCoord, pos.zCoord, stack); + item.motionX = world.rand.nextGaussian() * 0.05; + item.motionY = world.rand.nextGaussian() * 0.05 + 0.2; + item.motionZ = world.rand.nextGaussian() * 0.05; + item.setDefaultPickupDelay(); + world.spawnEntityInWorld(item); + } } diff --git a/src/main/java/mekanism/common/multipart/PartGlowPanel.java b/src/main/java/mekanism/common/multipart/PartGlowPanel.java index 73bdd0e3d..d20016586 100644 --- a/src/main/java/mekanism/common/multipart/PartGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/PartGlowPanel.java @@ -12,9 +12,10 @@ import mcmultipart.raytrace.PartMOP; import mcmultipart.util.TransformationHelper; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.Pos3D; import mekanism.common.MekanismItems; import mekanism.common.block.states.BlockStateFacing; -import net.minecraft.block.properties.PropertyEnum; +import mekanism.common.multipart.GlowPanelBlockState.GlowPanelColorProperty; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -25,6 +26,7 @@ import net.minecraft.network.PacketBuffer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraft.util.Vec3; +import net.minecraftforge.common.property.IExtendedBlockState; /* import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; @@ -44,8 +46,6 @@ import codechicken.multipart.TileMultipart; public class PartGlowPanel extends Multipart implements IOccludingPart { - public static PropertyEnum colorProperty = PropertyEnum.create("color", EnumColor.class); - public EnumColor colour = EnumColor.WHITE; public EnumFacing side = EnumFacing.DOWN; @@ -101,7 +101,7 @@ public class PartGlowPanel extends Multipart implements IOccludingPart { if(!getWorld().isRemote && !canStay()) { - //TileMultipart.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), getWorld(), Vector3.fromTileEntityCenter(tile())); + MultipartMekanism.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), getWorld(), new Pos3D(getPos()).translate(0.5, 0.5, 0.5)); getContainer().removePart(this); } } @@ -111,7 +111,7 @@ public class PartGlowPanel extends Multipart implements IOccludingPart { if(!getWorld().isRemote && !canStay()) { - //TileMultipart.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), getWorld(), Vector3.fromTileEntityCenter(tile())); + MultipartMekanism.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), getWorld(), new Pos3D(getPos()).translate(0.5, 0.5, 0.5)); getContainer().removePart(this); } } @@ -189,6 +189,22 @@ public class PartGlowPanel extends Multipart implements IOccludingPart @Override public IBlockState getExtendedState(IBlockState state) { - return state.withProperty(BlockStateFacing.facingProperty, side).withProperty(colorProperty, colour); + state = state.withProperty(BlockStateFacing.facingProperty, side); + + if(state instanceof IExtendedBlockState) + { + return ((IExtendedBlockState)state).withProperty(GlowPanelBlockState.colorState, new GlowPanelColorProperty(colour)); + } + + return state; + } + + public static int hash(IExtendedBlockState state) + { + int hash = 1; + hash = 31 * hash + state.getValue(GlowPanelBlockState.colorState).color.ordinal(); + hash = 31 * hash + state.getValue(BlockStateFacing.facingProperty).ordinal(); + + return hash; } } diff --git a/src/main/java/mekanism/common/recipe/BinRecipe.java b/src/main/java/mekanism/common/recipe/BinRecipe.java index aa3ba0505..56b5a0367 100644 --- a/src/main/java/mekanism/common/recipe/BinRecipe.java +++ b/src/main/java/mekanism/common/recipe/BinRecipe.java @@ -4,6 +4,7 @@ import mekanism.common.MekanismItems; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.inventory.InventoryBin; import mekanism.common.item.ItemProxy; +import mekanism.common.util.ItemDataUtils; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; @@ -144,7 +145,7 @@ public class BinRecipe implements IRecipe ItemStack testRemove = inv.removeStack(); - bin.getTagCompound().setInteger("newCount", size-(testRemove != null ? testRemove.stackSize : 0)); + ItemDataUtils.setInt(bin, "newCount", size-(testRemove != null ? testRemove.stackSize : 0)); } } } diff --git a/src/main/java/mekanism/common/recipe/inputs/AdvancedMachineInput.java b/src/main/java/mekanism/common/recipe/inputs/AdvancedMachineInput.java index 0cba3c79a..7725a1dbd 100644 --- a/src/main/java/mekanism/common/recipe/inputs/AdvancedMachineInput.java +++ b/src/main/java/mekanism/common/recipe/inputs/AdvancedMachineInput.java @@ -83,6 +83,7 @@ public class AdvancedMachineInput extends MachineInput { return !other.isValid(); } + return StackUtils.equalsWildcardWithNBT(itemStack, other.itemStack) && gasType.getID() == other.gasType.getID(); } diff --git a/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java b/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java index 06ca6782e..22bb16214 100644 --- a/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java @@ -35,6 +35,5 @@ public abstract class AdvancedMachineRecipe> extends TileEntityBasicMachine implements IGasHandler, ITubeConnection { @@ -314,7 +315,7 @@ public abstract class TileEntityAdvancedElectricMachine, OUTPUT extends MachineOutput, RECIPE extends MachineRecipe> extends TileEntityNoisyElectricBlock implements IElectricMachine, IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess, ISecurityTile { @@ -157,7 +158,7 @@ public abstract class TileEntityBasicMachine, { super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { operatingTicks = dataStream.readInt(); clientActive = dataStream.readBoolean(); diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 96a77d451..9e60f982c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -31,6 +31,7 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; import net.minecraft.util.ITickable; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Optional.Interface; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; @@ -294,7 +295,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento { super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { isActive = dataStream.readBoolean(); clientAmount = dataStream.readInt(); diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index 48fe1a34b..f0f274eed 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -24,6 +24,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityBoilerCasing extends TileEntityMultiblock implements IHeatTransfer { @@ -296,7 +297,7 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock implements IFluidContainerManager { @@ -251,7 +252,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock implements IStrictEnergyStorage, IComputerIntegration { @@ -102,7 +103,7 @@ public class TileEntityInductionCasing extends TileEntityMultiblock> extend { super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { if(structure == null) { diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index 59beede92..d8e53a4e2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -20,6 +20,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -28,6 +29,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.util.Constants.NBT; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.oredict.OreDictionary; public class TileEntityOredictionificator extends TileEntityContainerBlock implements IRedstoneControl, ISpecialConfigData, ISustainedData, ISecurityTile @@ -224,7 +226,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple { super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { int type = dataStream.readInt(); @@ -362,7 +364,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple @Override public void writeSustainedData(ItemStack itemStack) { - itemStack.getTagCompound().setBoolean("hasOredictionificatorConfig", true); + ItemDataUtils.setBoolean(itemStack, "hasOredictionificatorConfig", true); NBTTagList filterTags = new NBTTagList(); @@ -375,18 +377,18 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple if(filterTags.tagCount() != 0) { - itemStack.getTagCompound().setTag("filters", filterTags); + ItemDataUtils.setList(itemStack, "filters", filterTags); } } @Override public void readSustainedData(ItemStack itemStack) { - if(itemStack.getTagCompound().hasKey("hasOredictionificatorConfig")) + if(ItemDataUtils.hasData(itemStack, "hasOredictionificatorConfig")) { - if(itemStack.getTagCompound().hasKey("filters")) + if(ItemDataUtils.hasData(itemStack, "filters")) { - NBTTagList tagList = itemStack.getTagCompound().getTagList("filters", NBT.TAG_COMPOUND); + NBTTagList tagList = ItemDataUtils.getList(itemStack, "filters"); for(int i = 0; i < tagList.tagCount(); i++) { diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index b27204b48..6a350ae11 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -29,6 +29,7 @@ import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; @@ -41,6 +42,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityPRC extends TileEntityBasicMachine implements IFluidHandler, IGasHandler, ITubeConnection, ISustainedData, ITankManager { @@ -247,7 +249,7 @@ public class TileEntityPRC extends TileEntityBasicMachine modIDMap = new HashMap(); + + private static void populateMap() + { + for(Map.Entry entry : Loader.instance().getIndexedModList().entrySet()) + { + modIDMap.put(entry.getKey().toLowerCase(), entry.getValue().getName()); + } + } + + /* Mod ID lookup thanks to JEI */ + public static String getMod(ItemStack stack) + { + if(stack == null || stack.getItem() == null) + { + return "null"; + } + + if(modIDMap.isEmpty()) + { + populateMap(); + } + + ResourceLocation itemResourceLocation = Item.itemRegistry.getNameForObject(stack.getItem()); + String modId = itemResourceLocation.getResourceDomain(); + String lowercaseModId = modId.toLowerCase(Locale.ENGLISH); + String modName = modIDMap.get(lowercaseModId); + + if(modName == null) + { + modName = WordUtils.capitalize(modId); + modIDMap.put(lowercaseModId, modName); + } + + return modName; + } +} diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 154e364c2..218ca6619 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -83,7 +83,6 @@ import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fluids.Fluid; @@ -91,7 +90,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; -import net.minecraftforge.fml.common.ModContainer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; @@ -705,7 +703,7 @@ public final class MekanismUtils */ public static double getMaxEnergy(ItemStack itemStack, double def) { - Map upgrades = Upgrade.buildMap(itemStack.getTagCompound()); + Map upgrades = Upgrade.buildMap(ItemDataUtils.getDataMap(itemStack)); float numUpgrades = upgrades.get(Upgrade.ENERGY) == null ? 0 : (float)upgrades.get(Upgrade.ENERGY); return def * Math.pow(general.maxUpgradeMultiplier, numUpgrades/(float)Upgrade.ENERGY.getMax()); } @@ -1370,8 +1368,8 @@ public final class MekanismUtils if((dmgItems[1] != null) && (dmgItems[0].getItem() == dmgItems[1].getItem()) && (dmgItems[0].stackSize == 1) && (dmgItems[1].stackSize == 1) && dmgItems[0].getItem().isRepairable()) { Item theItem = dmgItems[0].getItem(); - int dmgDiff0 = theItem.getMaxDamage() - dmgItems[0].getItemDamage/*TODO:ForDisplay*/(); - int dmgDiff1 = theItem.getMaxDamage() - dmgItems[1].getItemDamage/*TODO:ForDisplay*/(); + int dmgDiff0 = theItem.getMaxDamage() - dmgItems[0].getItemDamage(); + int dmgDiff1 = theItem.getMaxDamage() - dmgItems[1].getItemDamage(); int value = dmgDiff0 + dmgDiff1 + theItem.getMaxDamage() * 5 / 100; int solve = Math.max(0, theItem.getMaxDamage() - value); @@ -1417,21 +1415,6 @@ public final class MekanismUtils return general.opsBypassRestrictions && player.mcServer.getConfigurationManager().canSendCommands(player.getGameProfile()); } - /** - * Gets the mod ID of the mod owning the given ItemStack. - * @param stack - ItemStack to check - * @return mod ID of the ItemStack's owner - */ - public static String getMod(ItemStack stack) - { - try { - ModContainer mod = null;//TODO:GameData.findModOwner(GameData.getItemRegistry().getNameForObject(stack.getItem())); - return mod == null ? "Minecraft" : mod.getName(); - } catch(Exception e) { - return "null"; - } - } - /** * Gets the item ID from a given ItemStack * @param itemStack - ItemStack to check diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index da8ebe0e9..224da25ce 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -237,7 +237,7 @@ public class RecipeUtils if(itemstack != null && BlockStateMachine.MachineType.get(itemstack) != null && BlockStateMachine.MachineType.get(itemstack).supportsUpgrades) { - Map stackMap = Upgrade.buildMap(itemstack.getTagCompound()); + Map stackMap = Upgrade.buildMap(ItemDataUtils.getDataMap(itemstack)); for(Map.Entry entry : stackMap.entrySet()) { @@ -251,12 +251,7 @@ public class RecipeUtils } } - if(toReturn.getTagCompound() == null) - { - toReturn.setTagCompound(new NBTTagCompound()); - } - - Upgrade.saveMap(upgrades, toReturn.getTagCompound()); + Upgrade.saveMap(upgrades, ItemDataUtils.getDataMap(toReturn)); } return toReturn; diff --git a/src/main/java/mekanism/generators/client/jei/GeneratorsJEI.java b/src/main/java/mekanism/generators/client/jei/GeneratorsJEI.java new file mode 100644 index 000000000..a5d90446e --- /dev/null +++ b/src/main/java/mekanism/generators/client/jei/GeneratorsJEI.java @@ -0,0 +1,34 @@ +package mekanism.generators.client.jei; + +import mekanism.client.jei.MekanismJEI; +import mekanism.generators.common.GeneratorsBlocks; +import mezz.jei.api.IItemRegistry; +import mezz.jei.api.IJeiHelpers; +import mezz.jei.api.IJeiRuntime; +import mezz.jei.api.IModPlugin; +import mezz.jei.api.IModRegistry; +import mezz.jei.api.IRecipeRegistry; +import mezz.jei.api.JEIPlugin; +import net.minecraft.item.Item; + +@JEIPlugin +public class GeneratorsJEI implements IModPlugin +{ + @Override + public void register(IModRegistry registry) + { + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(GeneratorsBlocks.Generator), MekanismJEI.UNUSED_TAGS); + } + + @Override + public void onItemRegistryAvailable(IItemRegistry registry) {} + + @Override + public void onJeiHelpersAvailable(IJeiHelpers helpers) {} + + @Override + public void onRecipeRegistryAvailable(IRecipeRegistry registry) {} + + @Override + public void onRuntimeAvailable(IJeiRuntime runtime) {} +} diff --git a/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java b/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java index eba301bfb..7e9e61894 100644 --- a/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java +++ b/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java @@ -18,10 +18,14 @@ import mekanism.generators.common.block.states.BlockStateGenerator.GeneratorType import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; @@ -39,6 +43,8 @@ public class BakedGeneratorItemModel implements IBakedModel, IPerspectiveAwareMo private IBakedModel baseModel; private ItemStack stack; + private TransformType prevTransform; + private Minecraft mc = Minecraft.getMinecraft(); public static ModelAdvancedSolarGenerator advancedSolarGenerator = new ModelAdvancedSolarGenerator(); @@ -123,8 +129,25 @@ public class BakedGeneratorItemModel implements IBakedModel, IPerspectiveAwareMo @Override public List getGeneralQuads() { + Tessellator tessellator = Tessellator.getInstance(); + tessellator.draw(); + List generalQuads = new LinkedList(); + GlStateManager.pushMatrix(); + GlStateManager.translate(0.5F, 0.5F, 0.5F); + doRender(prevTransform); + GlStateManager.enableLighting(); + GlStateManager.enableLight(0); + GlStateManager.enableLight(1); + GlStateManager.enableColorMaterial(); + GlStateManager.colorMaterial(1032, 5634); + Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.locationBlocksTexture); + GlStateManager.popMatrix(); + + WorldRenderer worldrenderer = tessellator.getWorldRenderer(); + worldrenderer.begin(7, DefaultVertexFormats.ITEM); + if(Block.getBlockFromItem(stack.getItem()) != null) { generalQuads.addAll(baseModel.getGeneralQuads()); @@ -171,22 +194,13 @@ public class BakedGeneratorItemModel implements IBakedModel, IPerspectiveAwareMo @Override public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) - { + { + prevTransform = cameraTransformType; + if(cameraTransformType == TransformType.THIRD_PERSON) { ForgeHooksClient.multiplyCurrentGlMatrix(CTMModelFactory.DEFAULT_BLOCK_THIRD_PERSON_MATRIX); } - - GlStateManager.pushMatrix(); - GlStateManager.scale(0.5F, 0.5F, 0.5F); - doRender(cameraTransformType); - GlStateManager.scale(2.0F, 2.0F, 2.0F); - GlStateManager.enableLighting(); - GlStateManager.enableLight(0); - GlStateManager.enableLight(1); - GlStateManager.enableColorMaterial(); - GlStateManager.colorMaterial(1032, 5634); - GlStateManager.popMatrix(); return Pair.of(this, null); } diff --git a/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java b/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java index 6ae46fa69..1a9776507 100644 --- a/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java +++ b/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java @@ -231,20 +231,19 @@ public class BlockStateGenerator extends ExtendedBlockState { EnumFacing facing = state.getValue(BlockStateFacing.facingProperty); - if(type.canRotateTo(facing)) + if(!type.canRotateTo(facing)) { - if(builder.length() > 0) - { - builder.append(","); - } - - builder.append(BlockStateFacing.facingProperty.getName()); - builder.append("="); - builder.append(facing.getName()); + facing = EnumFacing.NORTH; } - else { - return new ModelResourceLocation("builtin/missing", "missing"); + + if(builder.length() > 0) + { + builder.append(","); } + + builder.append(BlockStateFacing.facingProperty.getName()); + builder.append("="); + builder.append(facing.getName()); } if(builder.length() == 0) diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 706624156..a8b7132c5 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -19,6 +19,7 @@ import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; @@ -303,14 +304,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp { if(data[0] instanceof ItemStack) { - ItemStack itemStack = (ItemStack)data[0]; - - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setTag("Items", nbtTags); + ItemDataUtils.setList((ItemStack)data[0], "Items", nbtTags); } } @@ -319,14 +313,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp { if(data[0] instanceof ItemStack) { - ItemStack itemStack = (ItemStack)data[0]; - - if(itemStack.getTagCompound() == null) - { - return null; - } - - return itemStack.getTagCompound().getTagList("Items", 10); + return ItemDataUtils.getList((ItemStack)data[0], "Items"); } return null; @@ -335,21 +322,17 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp @Override public void setFluidStack(FluidStack fluidStack, Object... data) { - if(fluidStack == null || fluidStack.amount == 0 || fluidStack.getFluid() == null) - { - return; - } - if(data[0] instanceof ItemStack) { ItemStack itemStack = (ItemStack)data[0]; - - if(itemStack.getTagCompound() == null) + + if(fluidStack == null || fluidStack.amount == 0 || fluidStack.getFluid() == null) { - itemStack.setTagCompound(new NBTTagCompound()); + ItemDataUtils.removeData(itemStack, "fluidTank"); + } + else { + ItemDataUtils.setCompound(itemStack, "fluidTank", fluidStack.writeToNBT(new NBTTagCompound())); } - - itemStack.getTagCompound().setTag("fluidTank", fluidStack.writeToNBT(new NBTTagCompound())); } } @@ -360,15 +343,12 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp { ItemStack itemStack = (ItemStack)data[0]; - if(itemStack.getTagCompound() == null) + if(!ItemDataUtils.hasData(itemStack, "fluidTank")) { return null; } - if(itemStack.getTagCompound().hasKey("fluidTank")) - { - return FluidStack.loadFluidStackFromNBT(itemStack.getTagCompound().getCompoundTag("fluidTank")); - } + return FluidStack.loadFluidStackFromNBT(ItemDataUtils.getCompound(itemStack, "fluidTank")); } return null; @@ -383,24 +363,13 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp @Override public double getEnergy(ItemStack itemStack) { - if(itemStack.getTagCompound() == null) - { - return 0; - } - - return itemStack.getTagCompound().getDouble("electricity"); + return ItemDataUtils.getDouble(itemStack, "energyStored"); } @Override public void setEnergy(ItemStack itemStack, double amount) { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - double electricityStored = Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0); - itemStack.getTagCompound().setDouble("electricity", electricityStored); + ItemDataUtils.setDouble(itemStack, "energyStored", Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0)); } @Override @@ -487,9 +456,9 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp @Override public String getOwner(ItemStack stack) { - if(stack.getTagCompound() != null && stack.getTagCompound().hasKey("owner")) + if(ItemDataUtils.hasData(stack, "owner")) { - return stack.getTagCompound().getString("owner"); + return ItemDataUtils.getString(stack, "owner"); } return null; @@ -498,40 +467,25 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp @Override public void setOwner(ItemStack stack, String owner) { - if(stack.getTagCompound() == null) - { - stack.setTagCompound(new NBTTagCompound()); - } - if(owner == null || owner.isEmpty()) { - stack.getTagCompound().removeTag("owner"); + ItemDataUtils.removeData(stack, "owner"); return; } - stack.getTagCompound().setString("owner", owner); + ItemDataUtils.setString(stack, "owner", owner); } @Override public SecurityMode getSecurity(ItemStack stack) { - if(stack.getTagCompound() == null) - { - return SecurityMode.PUBLIC; - } - - return SecurityMode.values()[stack.getTagCompound().getInteger("security")]; + return SecurityMode.values()[ItemDataUtils.getInt(stack, "security")]; } @Override public void setSecurity(ItemStack stack, SecurityMode mode) { - if(stack.getTagCompound() == null) - { - stack.setTagCompound(new NBTTagCompound()); - } - - stack.getTagCompound().setInteger("security", mode.ordinal()); + ItemDataUtils.setInt(stack, "security", mode.ordinal()); } @Override diff --git a/src/main/java/mekanism/generators/common/item/ItemHohlraum.java b/src/main/java/mekanism/generators/common/item/ItemHohlraum.java index 0ed553c04..910394a8c 100644 --- a/src/main/java/mekanism/generators/common/item/ItemHohlraum.java +++ b/src/main/java/mekanism/generators/common/item/ItemHohlraum.java @@ -8,6 +8,7 @@ import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; import mekanism.common.item.ItemMekanism; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -103,17 +104,6 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem return false; } - @Override - public GasStack getGas(ItemStack itemstack) - { - if(itemstack.getTagCompound() == null) - { - return null; - } - - return GasStack.readFromNBT(itemstack.getTagCompound().getCompoundTag("stored")); - } - @Override public boolean showDurabilityBar(ItemStack stack) { @@ -126,23 +116,24 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem return 1D-((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack)); } + @Override + public GasStack getGas(ItemStack itemstack) + { + return GasStack.readFromNBT(ItemDataUtils.getCompound(itemstack, "stored")); + } + @Override public void setGas(ItemStack itemstack, GasStack stack) { - if(itemstack.getTagCompound() == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - if(stack == null || stack.amount == 0) { - itemstack.getTagCompound().removeTag("stored"); + ItemDataUtils.removeData(itemstack, "stored"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.getTagCompound().setTag("stored", gasStack.write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemstack, "stored", gasStack.write(new NBTTagCompound())); } } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 10f6ea566..d5147ee7a 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -9,6 +9,7 @@ import mekanism.common.FluidSlot; import mekanism.common.MekanismItems; import mekanism.common.base.ISustainedData; import mekanism.common.util.ChargeUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -19,6 +20,7 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityBioGenerator extends TileEntityGenerator implements IFluidHandler, ISustainedData { @@ -200,7 +202,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui { super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { bioFuelSlot.fluidStored = dataStream.readInt(); } @@ -308,12 +310,12 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui @Override public void writeSustainedData(ItemStack itemStack) { - itemStack.getTagCompound().setInteger("fluidStored", bioFuelSlot.fluidStored); + ItemDataUtils.setInt(itemStack, "fluidStored", bioFuelSlot.fluidStored); } @Override public void readSustainedData(ItemStack itemStack) { - bioFuelSlot.setFluid(itemStack.getTagCompound().getInteger("fluidStored")); + bioFuelSlot.setFluid(ItemDataUtils.getInt(itemStack, "fluidStored")); } } \ No newline at end of file diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index 70e76d20f..c275c00e4 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -17,10 +17,12 @@ import mekanism.common.FuelHandler; import mekanism.common.FuelHandler.FuelGas; import mekanism.common.base.ISustainedData; import mekanism.common.util.ChargeUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityGasGenerator extends TileEntityGenerator implements IGasHandler, ITubeConnection, ISustainedData { @@ -236,7 +238,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH { super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { if(dataStream.readBoolean()) { @@ -359,16 +361,16 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH { if(fuelTank != null) { - itemStack.getTagCompound().setTag("fuelTank", fuelTank.write(new NBTTagCompound())); + ItemDataUtils.setCompound(itemStack, "fuelTank", fuelTank.write(new NBTTagCompound())); } } @Override public void readSustainedData(ItemStack itemStack) { - if(itemStack.getTagCompound().hasKey("fuelTank")) + if(ItemDataUtils.hasData(itemStack, "fuelTank")) { - fuelTank.read(itemStack.getTagCompound().getCompoundTag("fuelTank")); + fuelTank.read(ItemDataUtils.getCompound(itemStack, "fuelTank")); boolean isTankEmpty = (fuelTank.getGas() == null); //Update energy output based on any existing fuel in tank diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index 48247a842..b69c7941f 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -23,6 +23,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -150,7 +151,7 @@ public abstract class TileEntityGenerator extends TileEntityNoisyElectricBlock i { super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { clientActive = dataStream.readBoolean(); controlType = RedstoneControl.values()[dataStream.readInt()]; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index 0a27d8ecc..136e410f3 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -12,6 +12,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.FluidChecker; import mekanism.common.util.HeatUtils; +import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; import net.minecraft.init.Blocks; @@ -30,6 +31,7 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityHeatGenerator extends TileEntityGenerator implements IFluidHandler, ISustainedData, IHeatTransfer { @@ -265,7 +267,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu { super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { producingEnergy = dataStream.readDouble(); @@ -386,14 +388,14 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu { if(lavaTank.getFluid() != null) { - itemStack.getTagCompound().setTag("lavaTank", lavaTank.getFluid().writeToNBT(new NBTTagCompound())); + ItemDataUtils.setCompound(itemStack, "lavaTank", lavaTank.getFluid().writeToNBT(new NBTTagCompound())); } } @Override public void readSustainedData(ItemStack itemStack) { - lavaTank.setFluid(FluidStack.loadFluidStackFromNBT(itemStack.getTagCompound().getCompoundTag("lavaTank"))); + lavaTank.setFluid(FluidStack.loadFluidStackFromNBT(ItemDataUtils.getCompound(itemStack, "lavaTank"))); } @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index 0b164b9f9..17240d1da 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -12,6 +12,7 @@ import micdoodle8.mods.galacticraft.api.world.ISolarLevel; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.biome.BiomeGenDesert; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -172,7 +173,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator { super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { seesSun = dataStream.readBoolean(); } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java index 3600e6090..b24856f3d 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -29,6 +29,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -229,7 +230,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen @Override public void handlePacketData(ByteBuf dataStream) { - if(!worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isServer()) { int type = dataStream.readInt(); @@ -245,7 +246,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { boolean formed = dataStream.readBoolean(); diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java index ac9e2fb45..3e0a22351 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java @@ -9,6 +9,7 @@ import mekanism.common.util.LangUtils; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fml.common.FMLCommonHandler; import dan200.computercraft.api.lua.LuaException; public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implements IComputerIntegration @@ -98,7 +99,7 @@ public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implem @Override public void handlePacketData(ByteBuf dataStream) { - if(!worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isServer()) { int type = dataStream.readInt(); @@ -116,7 +117,7 @@ public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implem super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { logicType = ReactorLogic.values()[dataStream.readInt()]; activeCooled = dataStream.readBoolean(); diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java index 55cd9114e..2fb7e39b8 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java @@ -25,6 +25,7 @@ import mekanism.generators.common.content.turbine.TurbineUpdateProtocol; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityTurbineCasing extends TileEntityMultiblock implements IStrictEnergyStorage { @@ -201,7 +202,7 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock