tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Standardize the names of machine outputs

Browse source
This commit is contained in:
Aidan C. Brady 2015-03-17 10:29:09 -04:00
parent 1071b57b7d
commit bfbddd3c47
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/mekanism/common/recipe/RecipeHandler.java
View file

@ -47,7 +47,7 @@ import mekanism.common.recipe.outputs.FluidOutput;
import mekanism.common.recipe.outputs.GasOutput; import mekanism.common.recipe.outputs.GasOutput;
import mekanism.common.recipe.outputs.ItemStackOutput; import mekanism.common.recipe.outputs.ItemStackOutput;
import mekanism.common.recipe.outputs.MachineOutput; import mekanism.common.recipe.outputs.MachineOutput;
import mekanism.common.recipe.outputs.PressurizedProducts; import mekanism.common.recipe.outputs.PressurizedOutput;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.Fluid;
@ -548,7 +548,7 @@ public final class RecipeHandler
CHEMICAL_DISSOLUTION_CHAMBER(MachineType.CHEMICAL_DISSOLUTION_CHAMBER.name, ItemStackInput.class, GasOutput.class, DissolutionRecipe.class), CHEMICAL_DISSOLUTION_CHAMBER(MachineType.CHEMICAL_DISSOLUTION_CHAMBER.name, ItemStackInput.class, GasOutput.class, DissolutionRecipe.class),
CHEMICAL_WASHER(MachineType.CHEMICAL_WASHER.name, GasInput.class, GasOutput.class, WasherRecipe.class), CHEMICAL_WASHER(MachineType.CHEMICAL_WASHER.name, GasInput.class, GasOutput.class, WasherRecipe.class),
CHEMICAL_CRYSTALLIZER(MachineType.CHEMICAL_CRYSTALLIZER.name, GasInput.class, ItemStackOutput.class, CrystallizerRecipe.class), CHEMICAL_CRYSTALLIZER(MachineType.CHEMICAL_CRYSTALLIZER.name, GasInput.class, ItemStackOutput.class, CrystallizerRecipe.class),
PRESSURIZED_REACTION_CHAMBER(MachineType.PRESSURIZED_REACTION_CHAMBER.name, PressurizedInput.class, PressurizedProducts.class, PressurizedRecipe.class), PRESSURIZED_REACTION_CHAMBER(MachineType.PRESSURIZED_REACTION_CHAMBER.name, PressurizedInput.class, PressurizedOutput.class, PressurizedRecipe.class),
AMBIENT_ACCUMULATOR(MachineType.AMBIENT_ACCUMULATOR.name, IntegerInput.class, GasOutput.class, AmbientGasRecipe.class), AMBIENT_ACCUMULATOR(MachineType.AMBIENT_ACCUMULATOR.name, IntegerInput.class, GasOutput.class, AmbientGasRecipe.class),
SOLAR_EVAPORATION_PLANT("SolarEvaporationPlant", FluidInput.class, FluidOutput.class, SolarEvaporationRecipe.class), SOLAR_EVAPORATION_PLANT("SolarEvaporationPlant", FluidInput.class, FluidOutput.class, SolarEvaporationRecipe.class),
SOLAR_NEUTRON_ACTIVATOR(MachineType.SOLAR_NEUTRON_ACTIVATOR.name, GasInput.class, GasOutput.class, SolarNeutronRecipe.class); SOLAR_NEUTRON_ACTIVATOR(MachineType.SOLAR_NEUTRON_ACTIVATOR.name, GasInput.class, GasOutput.class, SolarNeutronRecipe.class);

8
src/main/java/mekanism/common/recipe/machines/PressurizedRecipe.java
View file

@ -3,13 +3,13 @@ package mekanism.common.recipe.machines;
import mekanism.api.gas.GasStack; import mekanism.api.gas.GasStack;
import mekanism.api.gas.GasTank; import mekanism.api.gas.GasTank;
import mekanism.common.recipe.inputs.PressurizedInput; import mekanism.common.recipe.inputs.PressurizedInput;
import mekanism.common.recipe.outputs.PressurizedProducts; import mekanism.common.recipe.outputs.PressurizedOutput;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTank;
public class PressurizedRecipe extends MachineRecipe<PressurizedInput, PressurizedProducts, PressurizedRecipe> public class PressurizedRecipe extends MachineRecipe<PressurizedInput, PressurizedOutput, PressurizedRecipe>
{ {
public double extraEnergy; public double extraEnergy;
@ -17,10 +17,10 @@ public class PressurizedRecipe extends MachineRecipe<PressurizedInput, Pressuriz
public PressurizedRecipe(ItemStack inputSolid, FluidStack inputFluid, GasStack inputGas, ItemStack outputSolid, GasStack outputGas, double energy, int duration) public PressurizedRecipe(ItemStack inputSolid, FluidStack inputFluid, GasStack inputGas, ItemStack outputSolid, GasStack outputGas, double energy, int duration)
{ {
this(new PressurizedInput(inputSolid, inputFluid, inputGas), new PressurizedProducts(outputSolid, outputGas), energy, duration); this(new PressurizedInput(inputSolid, inputFluid, inputGas), new PressurizedOutput(outputSolid, outputGas), energy, duration);
} }
public PressurizedRecipe(PressurizedInput pressurizedInput, PressurizedProducts pressurizedProducts, double energy, int duration) public PressurizedRecipe(PressurizedInput pressurizedInput, PressurizedOutput pressurizedProducts, double energy, int duration)
{ {
super(pressurizedInput, pressurizedProducts); super(pressurizedInput, pressurizedProducts);

10
src/main/java/mekanism/common/recipe/outputs/PressurizedProducts.java → src/main/java/mekanism/common/recipe/outputs/PressurizedOutput.java
View file

@ -5,18 +5,18 @@ import mekanism.api.gas.GasTank;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
public class PressurizedProducts extends MachineOutput<PressurizedProducts> public class PressurizedOutput extends MachineOutput<PressurizedOutput>
{ {
private ItemStack itemOutput; private ItemStack itemOutput;
private GasStack gasOutput; private GasStack gasOutput;
public PressurizedProducts(ItemStack item, GasStack gas) public PressurizedOutput(ItemStack item, GasStack gas)
{ {
itemOutput = item; itemOutput = item;
gasOutput = gas; gasOutput = gas;
} }
public PressurizedProducts() {} public PressurizedOutput() {}
@Override @Override
public void load(NBTTagCompound nbtTags) public void load(NBTTagCompound nbtTags)
@ -77,8 +77,8 @@ public class PressurizedProducts extends MachineOutput<PressurizedProducts>
} }
@Override @Override
public PressurizedProducts copy() public PressurizedOutput copy()
{ {
return new PressurizedProducts(itemOutput.copy(), gasOutput.copy()); return new PressurizedOutput(itemOutput.copy(), gasOutput.copy());
} }
} }

4
src/main/java/mekanism/common/tile/TileEntityPRC.java
View file

@ -24,7 +24,7 @@ import mekanism.common.item.ItemUpgrade;
import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler;
import mekanism.common.recipe.inputs.PressurizedInput; import mekanism.common.recipe.inputs.PressurizedInput;
import mekanism.common.recipe.machines.PressurizedRecipe; import mekanism.common.recipe.machines.PressurizedRecipe;
import mekanism.common.recipe.outputs.PressurizedProducts; import mekanism.common.recipe.outputs.PressurizedOutput;
import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentConfig;
import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.tile.component.TileComponentEjector;
import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.tile.component.TileComponentUpgrade;
@ -47,7 +47,7 @@ import dan200.computercraft.api.lua.ILuaContext;
import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.lua.LuaException;
import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IComputerAccess;
public class TileEntityPRC extends TileEntityBasicMachine<PressurizedInput, PressurizedProducts, PressurizedRecipe> implements IFluidHandler, IGasHandler, ITubeConnection, ISustainedData, ITankManager public class TileEntityPRC extends TileEntityBasicMachine<PressurizedInput, PressurizedOutput, PressurizedRecipe> implements IFluidHandler, IGasHandler, ITubeConnection, ISustainedData, ITankManager
{ {
public FluidTank inputFluidTank = new FluidTank(10000); public FluidTank inputFluidTank = new FluidTank(10000);
public GasTank inputGasTank = new GasTank(10000); public GasTank inputGasTank = new GasTank(10000);