Rename Solar Evaporation Plant to Thermal Evaporation Plant

This commit is contained in:
aidancbrady committed 2016-02-18 18:37:38 -05:00
1 parent 4d60d234f3
commit 84da514b54
32 files changed
+190 -155

No files matched your search

@@ -50,7 +50,7 @@ public class MekanismConfig
public static int armoredJetpackDamageMax;
public static boolean aestheticWorldDamage;
public static boolean opsBypassRestrictions;
public static double solarEvaporationSpeed;
public static double thermalEvaporationSpeed;
public static int maxJetpackGas;
public static int maxScubaGas;
public static int maxFlamethrowerGas;
@@ -4,7 +4,6 @@ import java.lang.reflect.Method;
import mekanism.api.gas.GasStack;
import mekanism.api.infuse.InfuseType;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
@@ -286,15 +285,15 @@ public final class RecipeHelper
}
/**
* Add a Solar Evaporation Plant recipe.
* Add a Thermal Evaporation Plant recipe.
* @param input - input GasStack
* @param output - output GasStack
*/
public static void addSolarEvaporationRecipe(FluidStack input, FluidStack output)
public static void addThermalEvaporationRecipe(FluidStack input, FluidStack output)
{
try {
Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
Method m = recipeClass.getMethod("addSolarEvaporationRecipe", FluidStack.class, FluidStack.class);
Method m = recipeClass.getMethod("addThermalEvaporationRecipe", FluidStack.class, FluidStack.class);
m.invoke(null, input, output);
} catch(Exception e) {
System.err.println("Error while adding recipe: " + e.getMessage());
@@ -310,7 +309,7 @@ public final class RecipeHelper
{
try {
Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler");
Method m = recipeClass.getMethod("addSolarEvaporationRecipe", GasStack.class, GasStack.class);
Method m = recipeClass.getMethod("addSolarNeutronRecipe", GasStack.class, GasStack.class);
m.invoke(null, input, output);
} catch(Exception e) {
System.err.println("Error while adding recipe: " + e.getMessage());
@@ -53,7 +53,7 @@ import mekanism.client.gui.GuiRotaryCondensentrator;
import mekanism.client.gui.GuiSeismicReader;
import mekanism.client.gui.GuiSeismicVibrator;
import mekanism.client.gui.GuiSideConfiguration;
import mekanism.client.gui.GuiSolarEvaporationController;
import mekanism.client.gui.GuiThermalEvaporationController;
import mekanism.client.gui.GuiSolarNeutronActivator;
import mekanism.client.gui.GuiTeleporter;
import mekanism.client.gui.GuiTransporterConfig;
@@ -96,7 +96,7 @@ import mekanism.client.render.tileentity.RenderObsidianTNT;
import mekanism.client.render.tileentity.RenderPortableTank;
import mekanism.client.render.tileentity.RenderPressurizedReactionChamber;
import mekanism.client.render.tileentity.RenderRotaryCondensentrator;
import mekanism.client.render.tileentity.RenderSalinationController;
import mekanism.client.render.tileentity.RenderThermalEvaporationController;
import mekanism.client.render.tileentity.RenderSeismicVibrator;
import mekanism.client.render.tileentity.RenderSolarNeutronActivator;
import mekanism.client.render.tileentity.RenderTeleporter;
@@ -165,7 +165,7 @@ import mekanism.common.tile.TileEntityPrecisionSawmill;
import mekanism.common.tile.TileEntityPurificationChamber;
import mekanism.common.tile.TileEntityRotaryCondensentrator;
import mekanism.common.tile.TileEntitySeismicVibrator;
import mekanism.common.tile.TileEntitySolarEvaporationController;
import mekanism.common.tile.TileEntityThermalEvaporationController;
import mekanism.common.tile.TileEntitySolarNeutronActivator;
import mekanism.common.tile.TileEntityStructuralGlass;
import mekanism.common.tile.TileEntityTeleporter;
@@ -313,7 +313,7 @@ public class ClientProxy extends CommonProxy
ClientRegistry.registerTileEntity(TileEntityChemicalInfuser.class, "ChemicalInfuser", new RenderChemicalInfuser());
ClientRegistry.registerTileEntity(TileEntityChemicalInjectionChamber.class, "ChemicalInjectionChamber", new RenderConfigurableMachine());
ClientRegistry.registerTileEntity(TileEntityElectrolyticSeparator.class, "ElectrolyticSeparator", new RenderElectrolyticSeparator());
ClientRegistry.registerTileEntity(TileEntitySolarEvaporationController.class, "SalinationController", new RenderSalinationController());
ClientRegistry.registerTileEntity(TileEntityThermalEvaporationController.class, "SalinationController", new RenderThermalEvaporationController()); //TODO rename
ClientRegistry.registerTileEntity(TileEntityPrecisionSawmill.class, "PrecisionSawmill", new RenderConfigurableMachine());
ClientRegistry.registerTileEntity(TileEntityChemicalDissolutionChamber.class, "ChemicalDissolutionChamber", new RenderChemicalDissolutionChamber());
ClientRegistry.registerTileEntity(TileEntityChemicalWasher.class, "ChemicalWasher", new RenderChemicalWasher());
@@ -469,7 +469,7 @@ public class ClientProxy extends CommonProxy
case 32:
return new GuiElectrolyticSeparator(player.inventory, (TileEntityElectrolyticSeparator)tileEntity);
case 33:
return new GuiSolarEvaporationController(player.inventory, (TileEntitySolarEvaporationController)tileEntity);
return new GuiThermalEvaporationController(player.inventory, (TileEntityThermalEvaporationController)tileEntity);
case 34:
return new GuiPrecisionSawmill(player.inventory, (TileEntityPrecisionSawmill)tileEntity);
case 35:
@@ -4,8 +4,8 @@ import mekanism.api.util.UnitDisplayUtils.TemperatureUnit;
import mekanism.client.gui.element.GuiFluidGauge;
import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler;
import mekanism.client.gui.element.GuiGauge;
import mekanism.common.inventory.container.ContainerSolarEvaporationController;
import mekanism.common.tile.TileEntitySolarEvaporationController;
import mekanism.common.inventory.container.ContainerThermalEvaporationController;
import mekanism.common.tile.TileEntityThermalEvaporationController;
import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
@@ -18,13 +18,13 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class GuiSolarEvaporationController extends GuiMekanism
public class GuiThermalEvaporationController extends GuiMekanism
{
public TileEntitySolarEvaporationController tileEntity;
public TileEntityThermalEvaporationController tileEntity;
public GuiSolarEvaporationController(InventoryPlayer inventory, TileEntitySolarEvaporationController tentity)
public GuiThermalEvaporationController(InventoryPlayer inventory, TileEntityThermalEvaporationController tentity)
{
super(tentity, new ContainerSolarEvaporationController(inventory, tentity));
super(tentity, new ContainerThermalEvaporationController(inventory, tentity));
tileEntity = tentity;
guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() {
@@ -33,14 +33,14 @@ public class GuiSolarEvaporationController extends GuiMekanism
{
return tileEntity.inputTank;
}
}, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiSolarEvaporationController.png"), 6, 13));
}, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiThermalEvaporationController.png"), 6, 13));
guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() {
@Override
public FluidTank getTank()
{
return tileEntity.outputTank;
}
}, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiSolarEvaporationController.png"), 152, 13));
}, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiThermalEvaporationController.png"), 152, 13));
}
@Override
@@ -102,7 +102,7 @@ public class GuiSolarEvaporationController extends GuiMekanism
@Override
protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY)
{
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiSolarEvaporationController.png"));
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiThermalEvaporationController.png"));
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
int guiWidth = (width - xSize) / 2;
int guiHeight = (height - ySize) / 2;
@@ -16,7 +16,7 @@ import mekanism.client.gui.GuiPRC;
import mekanism.client.gui.GuiPrecisionSawmill;
import mekanism.client.gui.GuiPurificationChamber;
import mekanism.client.gui.GuiRotaryCondensentrator;
import mekanism.client.gui.GuiSolarEvaporationController;
import mekanism.client.gui.GuiThermalEvaporationController;
import mekanism.client.gui.GuiSolarNeutronActivator;
import mekanism.common.MekanismBlocks;
import mekanism.common.MekanismItems;
@@ -66,8 +66,8 @@ public class NEIMekanismConfig implements IConfigureNEI
API.registerRecipeHandler(new PrecisionSawmillRecipeHandler());
API.registerUsageHandler(new PrecisionSawmillRecipeHandler());
API.registerRecipeHandler(new SolarEvaporationRecipeHandler());
API.registerUsageHandler(new SolarEvaporationRecipeHandler());
API.registerRecipeHandler(new ThermalEvaporationRecipeHandler());
API.registerUsageHandler(new ThermalEvaporationRecipeHandler());
API.registerRecipeHandler(new ChemicalDissolutionChamberRecipeHandler());
API.registerUsageHandler(new ChemicalDissolutionChamberRecipeHandler());
@@ -102,12 +102,12 @@ public class NEIMekanismConfig implements IConfigureNEI
API.setGuiOffset(GuiRotaryCondensentrator.class, RotaryCondensentratorRecipeHandler.xOffset, RotaryCondensentratorRecipeHandler.yOffset);
API.setGuiOffset(GuiElectrolyticSeparator.class, ElectrolyticSeparatorRecipeHandler.xOffset, ElectrolyticSeparatorRecipeHandler.yOffset);
API.setGuiOffset(GuiPrecisionSawmill.class, 16, 6);
API.setGuiOffset(GuiSolarEvaporationController.class, SolarEvaporationRecipeHandler.xOffset, SolarEvaporationRecipeHandler.yOffset);
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(GuiSolarEvaporationController.class, SolarEvaporationRecipeHandler.xOffset, SolarEvaporationRecipeHandler.yOffset);
API.setGuiOffset(GuiThermalEvaporationController.class, ThermalEvaporationRecipeHandler.xOffset, ThermalEvaporationRecipeHandler.yOffset);
API.setGuiOffset(GuiSolarNeutronActivator.class, SolarNeutronRecipeHandler.xOffset, SolarNeutronRecipeHandler.yOffset);
GuiContainerManager.addSlotClickHandler(new MekanismSlotClickHandler());
@@ -9,10 +9,10 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import mekanism.client.gui.GuiSolarEvaporationController;
import mekanism.client.gui.GuiThermalEvaporationController;
import mekanism.common.ObfuscatedNames;
import mekanism.common.recipe.RecipeHandler.Recipe;
import mekanism.common.recipe.machines.SolarEvaporationRecipe;
import mekanism.common.recipe.machines.ThermalEvaporationRecipe;
import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils;
import net.minecraft.client.gui.inventory.GuiContainer;
@@ -26,7 +26,7 @@ import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.GuiRecipe;
import codechicken.nei.recipe.TemplateRecipeHandler;
public class SolarEvaporationRecipeHandler extends BaseRecipeHandler
public class ThermalEvaporationRecipeHandler extends BaseRecipeHandler
{
private int ticksPassed;
@@ -36,35 +36,35 @@ public class SolarEvaporationRecipeHandler extends BaseRecipeHandler
@Override
public String getRecipeName()
{
return LangUtils.localize("gui.solarEvaporationController.short");
return LangUtils.localize("gui.thermalEvaporationController.short");
}
@Override
public String getOverlayIdentifier()
{
return "solarevaporation";
return "thermalevaporation";
}
@Override
public String getGuiTexture()
{
return "mekanism:gui/nei/GuiSolarEvaporationController.png";
return "mekanism:gui/nei/GuiThermalEvaporationController.png";
}
@Override
public Class getGuiClass()
{
return GuiSolarEvaporationController.class;
return GuiThermalEvaporationController.class;
}
public String getRecipeId()
{
return "mekanism.solarevaporation";
return "mekanism.thermalevaporation";
}
public Collection<SolarEvaporationRecipe> getRecipes()
public Collection<ThermalEvaporationRecipe> getRecipes()
{
return Recipe.SOLAR_EVAPORATION_PLANT.get().values();
return Recipe.THERMAL_EVAPORATION_PLANT.get().values();
}
@Override
@@ -112,14 +112,14 @@ public class SolarEvaporationRecipeHandler extends BaseRecipeHandler
{
if(outputId.equals(getRecipeId()))
{
for(SolarEvaporationRecipe irecipe : getRecipes())
for(ThermalEvaporationRecipe irecipe : getRecipes())
{
arecipes.add(new CachedIORecipe(irecipe));
}
}
else if(outputId.equals("fluid") && results.length == 1 && results[0] instanceof FluidStack)
{
for(SolarEvaporationRecipe irecipe : getRecipes())
for(ThermalEvaporationRecipe irecipe : getRecipes())
{
if(((FluidStack)results[0]).isFluidEqual(irecipe.recipeOutput.output))
{
@@ -137,7 +137,7 @@ public class SolarEvaporationRecipeHandler extends BaseRecipeHandler
{
if(inputId.equals("fluid") && ingredients.length == 1 && ingredients[0] instanceof FluidStack)
{
for(SolarEvaporationRecipe irecipe : getRecipes())
for(ThermalEvaporationRecipe irecipe : getRecipes())
{
if(irecipe.recipeInput.ingredient.isFluidEqual((FluidStack)ingredients[0]))
{
@@ -279,7 +279,7 @@ public class SolarEvaporationRecipeHandler extends BaseRecipeHandler
fluidOutput = output;
}
public CachedIORecipe(SolarEvaporationRecipe recipe)
public CachedIORecipe(ThermalEvaporationRecipe recipe)
{
this((FluidStack)recipe.recipeInput.ingredient, (FluidStack)recipe.recipeOutput.output);
}
@@ -16,7 +16,7 @@ import mekanism.api.transmitters.TransmissionType;
import mekanism.client.render.tileentity.RenderConfigurableMachine;
import mekanism.client.render.tileentity.RenderDynamicTank;
import mekanism.client.render.tileentity.RenderPortableTank;
import mekanism.client.render.tileentity.RenderSalinationController;
import mekanism.client.render.tileentity.RenderThermalEvaporationController;
import mekanism.common.ObfuscatedNames;
import mekanism.common.base.ISpecialBounds;
import mekanism.common.util.MekanismUtils;
@@ -141,7 +141,7 @@ public class MekanismRenderer
}
RenderDynamicTank.resetDisplayInts();
RenderSalinationController.resetDisplayInts();
RenderThermalEvaporationController.resetDisplayInts();
RenderPortableTank.resetDisplayInts();
}
}
@@ -8,7 +8,7 @@ import mekanism.client.render.MekanismRenderer;
import mekanism.client.render.MekanismRenderer.DisplayInteger;
import mekanism.client.render.MekanismRenderer.Model3D;
import mekanism.common.content.tank.TankUpdateProtocol;
import mekanism.common.tile.TileEntitySolarEvaporationController;
import mekanism.common.tile.TileEntityThermalEvaporationController;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@@ -22,17 +22,17 @@ import cpw.mods.fml.relauncher.SideOnly;
import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT)
public class RenderSalinationController extends TileEntitySpecialRenderer
public class RenderThermalEvaporationController extends TileEntitySpecialRenderer
{
private static Map<SalinationRenderData, HashMap<Fluid, DisplayInteger[]>> cachedCenterFluids = new HashMap<SalinationRenderData, HashMap<Fluid, DisplayInteger[]>>();
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick)
{
renderAModelAt((TileEntitySolarEvaporationController)tileEntity, x, y, z, partialTick);
renderAModelAt((TileEntityThermalEvaporationController)tileEntity, x, y, z, partialTick);
}
public void renderAModelAt(TileEntitySolarEvaporationController tileEntity, double x, double y, double z, float partialTick)
public void renderAModelAt(TileEntityThermalEvaporationController tileEntity, double x, double y, double z, float partialTick)
{
if(tileEntity.structured && tileEntity.inputTank.getFluid() != null)
{
@@ -49,7 +49,7 @@ import mekanism.common.inventory.container.ContainerRobitRepair;
import mekanism.common.inventory.container.ContainerRobitSmelting;
import mekanism.common.inventory.container.ContainerRotaryCondensentrator;
import mekanism.common.inventory.container.ContainerSeismicVibrator;
import mekanism.common.inventory.container.ContainerSolarEvaporationController;
import mekanism.common.inventory.container.ContainerThermalEvaporationController;
import mekanism.common.inventory.container.ContainerSolarNeutronActivator;
import mekanism.common.inventory.container.ContainerTeleporter;
import mekanism.common.inventory.container.ContainerUpgradeManagement;
@@ -103,7 +103,7 @@ import mekanism.common.tile.TileEntityPrecisionSawmill;
import mekanism.common.tile.TileEntityPurificationChamber;
import mekanism.common.tile.TileEntityRotaryCondensentrator;
import mekanism.common.tile.TileEntitySeismicVibrator;
import mekanism.common.tile.TileEntitySolarEvaporationController;
import mekanism.common.tile.TileEntityThermalEvaporationController;
import mekanism.common.tile.TileEntitySolarNeutronActivator;
import mekanism.common.tile.TileEntityStructuralGlass;
import mekanism.common.tile.TileEntityTeleporter;
@@ -173,7 +173,7 @@ public class CommonProxy implements IGuiProvider
GameRegistry.registerTileEntity(TileEntityChemicalInfuser.class, "ChemicalInfuser");
GameRegistry.registerTileEntity(TileEntityChemicalInjectionChamber.class, "ChemicalInjectionChamber");
GameRegistry.registerTileEntity(TileEntityElectrolyticSeparator.class, "ElectrolyticSeparator");
GameRegistry.registerTileEntity(TileEntitySolarEvaporationController.class, "SalinationController");
GameRegistry.registerTileEntity(TileEntityThermalEvaporationController.class, "SalinationController"); //TODO rename
GameRegistry.registerTileEntity(TileEntityPrecisionSawmill.class, "PrecisionSawmill");
GameRegistry.registerTileEntity(TileEntityChemicalDissolutionChamber.class, "ChemicalDissolutionChamber");
GameRegistry.registerTileEntity(TileEntityChemicalWasher.class, "ChemicalWasher");
@@ -263,7 +263,7 @@ public class CommonProxy implements IGuiProvider
general.armoredJetpackDamageMax = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ArmoredJepackDamageMax", 115).getInt();
general.aestheticWorldDamage = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AestheticWorldDamage", true).getBoolean();
general.opsBypassRestrictions = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OpsBypassRestrictions", true).getBoolean();
general.solarEvaporationSpeed = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SolarEvaporationSpeed", 1.0D).getDouble();
general.thermalEvaporationSpeed = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ThermalEvaporationSpeed", 1.0D).getDouble();
general.maxJetpackGas = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MaxJetpackGas", 24000).getInt();
general.maxScubaGas = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MaxScubaGas", 24000).getInt();
general.maxFlamethrowerGas = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MaxFlamethrowerGas", 24000).getInt();
@@ -494,7 +494,7 @@ public class CommonProxy implements IGuiProvider
case 32:
return new ContainerElectrolyticSeparator(player.inventory, (TileEntityElectrolyticSeparator)tileEntity);
case 33:
return new ContainerSolarEvaporationController(player.inventory, (TileEntitySolarEvaporationController)tileEntity);
return new ContainerThermalEvaporationController(player.inventory, (TileEntityThermalEvaporationController)tileEntity);
case 34:
return new ContainerChanceMachine(player.inventory, (TileEntityChanceMachine)tileEntity);
case 35:
+7 -7
View File
@@ -78,8 +78,8 @@ import mekanism.common.tile.TileEntityCardboardBox;
import mekanism.common.tile.TileEntityElectricBlock;
import mekanism.common.tile.TileEntityEntangledBlock;
import mekanism.common.tile.TileEntityPressureDisperser;
import mekanism.common.tile.TileEntitySolarEvaporationBlock;
import mekanism.common.tile.TileEntitySolarEvaporationValve;
import mekanism.common.tile.TileEntityThermalEvaporationBlock;
import mekanism.common.tile.TileEntityThermalEvaporationValve;
import mekanism.common.tile.TileEntitySuperheatingElement;
import mekanism.common.util.MekanismUtils;
import mekanism.common.voice.VoiceServerManager;
@@ -853,9 +853,9 @@ public class Mekanism
RecipeHandler.addElectrolyticSeparatorRecipe(FluidRegistry.getFluidStack("brine", 10), 2 * general.FROM_H2, new GasStack(GasRegistry.getGas("sodium"), 1), new GasStack(GasRegistry.getGas("chlorine"), 1));
RecipeHandler.addElectrolyticSeparatorRecipe(FluidRegistry.getFluidStack("heavywater", 2), usage.heavyWaterElectrolysisUsage, new GasStack(GasRegistry.getGas("deuterium"), 2), new GasStack(GasRegistry.getGas("oxygen"), 1));
//Solar Evaporation Plant Recipes
RecipeHandler.addSolarEvaporationRecipe(FluidRegistry.getFluidStack("water", 10), FluidRegistry.getFluidStack("brine", 1));
RecipeHandler.addSolarEvaporationRecipe(FluidRegistry.getFluidStack("brine", 10), FluidRegistry.getFluidStack("lithium", 1));
//Thermal Evaporation Plant Recipes
RecipeHandler.addThermalEvaporationRecipe(FluidRegistry.getFluidStack("water", 10), FluidRegistry.getFluidStack("brine", 1));
RecipeHandler.addThermalEvaporationRecipe(FluidRegistry.getFluidStack("brine", 10), FluidRegistry.getFluidStack("lithium", 1));
//Chemical Crystallizer Recipes
RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(GasRegistry.getGas("lithium"), 100), new ItemStack(MekanismItems.OtherDust, 1, 4));
@@ -1085,8 +1085,8 @@ public class Mekanism
GameRegistry.registerTileEntity(TileEntityBoundingBlock.class, "BoundingBlock");
GameRegistry.registerTileEntity(TileEntityAdvancedBoundingBlock.class, "AdvancedBoundingBlock");
GameRegistry.registerTileEntity(TileEntityCardboardBox.class, "CardboardBox");
GameRegistry.registerTileEntity(TileEntitySolarEvaporationValve.class, "SalinationValve");
GameRegistry.registerTileEntity(TileEntitySolarEvaporationBlock.class, "SalinationTank");
GameRegistry.registerTileEntity(TileEntityThermalEvaporationValve.class, "SalinationValve"); //TODO rename
GameRegistry.registerTileEntity(TileEntityThermalEvaporationBlock.class, "SalinationTank"); //TODO rename
GameRegistry.registerTileEntity(TileEntityEntangledBlock.class, "EntangledBlock");
GameRegistry.registerTileEntity(TileEntityPressureDisperser.class, "PressureDisperser");
GameRegistry.registerTileEntity(TileEntitySuperheatingElement.class, "SuperheatingElement");
@@ -33,9 +33,9 @@ import mekanism.common.tile.TileEntityInductionCell;
import mekanism.common.tile.TileEntityInductionPort;
import mekanism.common.tile.TileEntityInductionProvider;
import mekanism.common.tile.TileEntityPressureDisperser;
import mekanism.common.tile.TileEntitySolarEvaporationBlock;
import mekanism.common.tile.TileEntitySolarEvaporationController;
import mekanism.common.tile.TileEntitySolarEvaporationValve;
import mekanism.common.tile.TileEntityThermalEvaporationBlock;
import mekanism.common.tile.TileEntityThermalEvaporationController;
import mekanism.common.tile.TileEntityThermalEvaporationValve;
import mekanism.common.tile.TileEntityStructuralGlass;
import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils;
@@ -81,9 +81,9 @@ import cpw.mods.fml.relauncher.SideOnly;
* 0:11: Dynamic Valve
* 0:12: Copper Block
* 0:13: Tin Block
* 0:14: Solar Evaporation Controller
* 0:15: Solar Evaporation Valve
* 1:0: Solar Evaporation Block
* 0:14: Thermal Evaporation Controller
* 0:15: Thermal Evaporation Valve
* 1:0: Thermal Evaporation Block
* 1:1: Induction Casing
* 1:2: Induction Port
* 1:3: Induction Cell
@@ -165,9 +165,9 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
ctms[10][0] = new CTMData("ctm/StructuralGlass", this, Arrays.asList(10)).registerIcons(register);
ctms[11][0] = new CTMData("ctm/DynamicValve", this, Arrays.asList(11, 9)).registerIcons(register);
ctms[14][0] = new CTMData("ctm/SolarEvaporationBlock", this, Arrays.asList(14, 15)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock2, Arrays.asList(0)).addFacingOverride("ctm/SolarEvaporationController").registerIcons(register);
ctms[14][1] = new CTMData("ctm/SolarEvaporationBlock", this, Arrays.asList(14, 15)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock2, Arrays.asList(0)).addFacingOverride("ctm/SolarEvaporationControllerOn").registerIcons(register);
ctms[15][0] = new CTMData("ctm/SolarEvaporationValve", this, Arrays.asList(15, 14)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock2, Arrays.asList(0)).registerIcons(register);
ctms[14][0] = new CTMData("ctm/ThermalEvaporationBlock", this, Arrays.asList(14, 15)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock2, Arrays.asList(0)).addFacingOverride("ctm/ThermalEvaporationController").registerIcons(register);
ctms[14][1] = new CTMData("ctm/ThermalEvaporationBlock", this, Arrays.asList(14, 15)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock2, Arrays.asList(0)).addFacingOverride("ctm/ThermalEvaporationControllerOn").registerIcons(register);
ctms[15][0] = new CTMData("ctm/ThermalEvaporationValve", this, Arrays.asList(15, 14)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock2, Arrays.asList(0)).registerIcons(register);
icons[0][0] = register.registerIcon("mekanism:OsmiumBlock");
icons[1][0] = register.registerIcon("mekanism:BronzeBlock");
@@ -192,7 +192,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
icons[15][0] = ctms[15][0].mainTextureData.icon;
break;
case BASIC_BLOCK_2:
ctms[0][0] = new CTMData("ctm/SolarEvaporationBlock", this, Arrays.asList(0)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock, Arrays.asList(14, 15)).registerIcons(register);
ctms[0][0] = new CTMData("ctm/ThermalEvaporationBlock", this, Arrays.asList(0)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock, Arrays.asList(14, 15)).registerIcons(register);
ctms[1][0] = new CTMData("ctm/InductionCasing", this, Arrays.asList(1, 2)).registerIcons(register);
ctms[2][0] = new CTMData("ctm/InductionPortInput", this, Arrays.asList(1, 2)).registerIcons(register);
ctms[2][1] = new CTMData("ctm/InductionPortOutput", this, Arrays.asList(1, 2)).registerIcons(register);
@@ -247,7 +247,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
boolean active = MekanismUtils.isActive(world, x, y, z);
return icons[meta][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)];
case 14:
TileEntitySolarEvaporationController tileEntity1 = (TileEntitySolarEvaporationController)world.getTileEntity(x, y, z);
TileEntityThermalEvaporationController tileEntity1 = (TileEntityThermalEvaporationController)world.getTileEntity(x, y, z);
if(side == tileEntity1.facing)
{
@@ -456,7 +456,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
return true;
}
if(tile instanceof TileEntitySolarEvaporationController)
if(tile instanceof TileEntityThermalEvaporationController)
{
if(!entityplayer.isSneaking())
{
@@ -997,9 +997,9 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
DYNAMIC_VALVE(BasicBlock.BASIC_BLOCK_1, 11, "DynamicValve", TileEntityDynamicValve.class, true),
COPPER_BLOCK(BasicBlock.BASIC_BLOCK_1, 12, "CopperBlock", null, false),
TIN_BLOCK(BasicBlock.BASIC_BLOCK_1, 13, "TinBlock", null, false),
SOLAR_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, "SolarEvaporationController", TileEntitySolarEvaporationController.class, true),
SOLAR_EVAPORATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, "SolarEvaporationValve", TileEntitySolarEvaporationValve.class, true),
SOLAR_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, "SolarEvaporationBlock", TileEntitySolarEvaporationBlock.class, true),
THERMAL_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, "ThermalEvaporationController", TileEntityThermalEvaporationController.class, true),
THERMAL_EVAPORATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, "ThermalEvaporationValve", TileEntityThermalEvaporationValve.class, true),
THERMAL_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, "ThermalEvaporationBlock", TileEntityThermalEvaporationBlock.class, true),
INDUCTION_CASING(BasicBlock.BASIC_BLOCK_2, 1, "InductionCasing", TileEntityInductionCasing.class, true),
INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, "InductionPort", TileEntityInductionPort.class, true),
INDUCTION_CELL(BasicBlock.BASIC_BLOCK_2, 3, "InductionCell", TileEntityInductionCell.class, true),
@@ -1,7 +1,7 @@
package mekanism.common.inventory.container;
import mekanism.common.inventory.slot.SlotOutput;
import mekanism.common.tile.TileEntitySolarEvaporationController;
import mekanism.common.tile.TileEntityThermalEvaporationController;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
@@ -11,11 +11,11 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
public class ContainerSolarEvaporationController extends Container
public class ContainerThermalEvaporationController extends Container
{
private TileEntitySolarEvaporationController tileEntity;
private TileEntityThermalEvaporationController tileEntity;
public ContainerSolarEvaporationController(InventoryPlayer inventory, TileEntitySolarEvaporationController tentity)
public ContainerThermalEvaporationController(InventoryPlayer inventory, TileEntityThermalEvaporationController tentity)
{
tileEntity = tentity;
@@ -52,9 +52,9 @@ import cpw.mods.fml.relauncher.SideOnly;
* 0:11: Dynamic Valve
* 0:12: Copper Block
* 0:13: Tin Block
* 0:14: Solar Evaporation Controller
* 0:15: Solar Evaporation Valve
* 1:0: Solar Evaporation Block
* 0:14: Thermal Evaporation Controller
* 0:15: Thermal Evaporation Valve
* 1:0: Thermal Evaporation Block
* 1:1: Induction Casing
* 1:2: Induction Port
* 1:3: Induction Cell
@@ -57,7 +57,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
dataStream.writeInt(general.armoredJetpackDamageMax);
dataStream.writeBoolean(general.aestheticWorldDamage);
dataStream.writeBoolean(general.opsBypassRestrictions);
dataStream.writeDouble(general.solarEvaporationSpeed);
dataStream.writeDouble(general.thermalEvaporationSpeed);
dataStream.writeInt(general.maxJetpackGas);
dataStream.writeInt(general.maxScubaGas);
dataStream.writeInt(general.maxFlamethrowerGas);
@@ -140,7 +140,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
general.armoredJetpackDamageMax = dataStream.readInt();
general.aestheticWorldDamage = dataStream.readBoolean();
general.opsBypassRestrictions = dataStream.readBoolean();
general.solarEvaporationSpeed = dataStream.readDouble();
general.thermalEvaporationSpeed = dataStream.readDouble();
general.maxJetpackGas = dataStream.readInt();
general.maxScubaGas = dataStream.readInt();
general.maxFlamethrowerGas = dataStream.readInt();
@@ -1,23 +1,59 @@
package mekanism.common.recipe;
import java.lang.reflect.Constructor;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import mekanism.api.gas.Gas;
import mekanism.api.gas.GasStack;
import mekanism.api.infuse.InfuseType;
import mekanism.api.util.StackUtils;
import mekanism.common.block.BlockMachine.MachineType;
import mekanism.common.recipe.inputs.*;
import mekanism.common.recipe.machines.*;
import mekanism.common.recipe.outputs.*;
import mekanism.common.recipe.inputs.AdvancedMachineInput;
import mekanism.common.recipe.inputs.ChemicalPairInput;
import mekanism.common.recipe.inputs.FluidInput;
import mekanism.common.recipe.inputs.GasInput;
import mekanism.common.recipe.inputs.InfusionInput;
import mekanism.common.recipe.inputs.IntegerInput;
import mekanism.common.recipe.inputs.ItemStackInput;
import mekanism.common.recipe.inputs.MachineInput;
import mekanism.common.recipe.inputs.PressurizedInput;
import mekanism.common.recipe.machines.AdvancedMachineRecipe;
import mekanism.common.recipe.machines.AmbientGasRecipe;
import mekanism.common.recipe.machines.BasicMachineRecipe;
import mekanism.common.recipe.machines.ChanceMachineRecipe;
import mekanism.common.recipe.machines.ChemicalInfuserRecipe;
import mekanism.common.recipe.machines.CombinerRecipe;
import mekanism.common.recipe.machines.CrusherRecipe;
import mekanism.common.recipe.machines.CrystallizerRecipe;
import mekanism.common.recipe.machines.DissolutionRecipe;
import mekanism.common.recipe.machines.EnrichmentRecipe;
import mekanism.common.recipe.machines.InjectionRecipe;
import mekanism.common.recipe.machines.MachineRecipe;
import mekanism.common.recipe.machines.MetallurgicInfuserRecipe;
import mekanism.common.recipe.machines.OsmiumCompressorRecipe;
import mekanism.common.recipe.machines.OxidationRecipe;
import mekanism.common.recipe.machines.PressurizedRecipe;
import mekanism.common.recipe.machines.PurificationRecipe;
import mekanism.common.recipe.machines.SawmillRecipe;
import mekanism.common.recipe.machines.SeparatorRecipe;
import mekanism.common.recipe.machines.SmeltingRecipe;
import mekanism.common.recipe.machines.SolarNeutronRecipe;
import mekanism.common.recipe.machines.ThermalEvaporationRecipe;
import mekanism.common.recipe.machines.WasherRecipe;
import mekanism.common.recipe.outputs.ChanceOutput;
import mekanism.common.recipe.outputs.ChemicalPairOutput;
import mekanism.common.recipe.outputs.FluidOutput;
import mekanism.common.recipe.outputs.GasOutput;
import mekanism.common.recipe.outputs.ItemStackOutput;
import mekanism.common.recipe.outputs.MachineOutput;
import mekanism.common.recipe.outputs.PressurizedOutput;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import java.lang.reflect.Constructor;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
/**
* Class used to handle machine recipes. This is used for both adding and fetching recipes.
* @author AidanBrady, unpairedbracket
@@ -206,9 +242,9 @@ public final class RecipeHandler
addRecipe(Recipe.PRESSURIZED_REACTION_CHAMBER, new PressurizedRecipe(inputSolid, inputFluid, inputGas, outputSolid, outputGas, extraEnergy, ticks));
}
public static void addSolarEvaporationRecipe(FluidStack inputFluid, FluidStack outputFluid)
public static void addThermalEvaporationRecipe(FluidStack inputFluid, FluidStack outputFluid)
{
addRecipe(Recipe.SOLAR_EVAPORATION_PLANT, new SolarEvaporationRecipe(inputFluid, outputFluid));
addRecipe(Recipe.THERMAL_EVAPORATION_PLANT, new ThermalEvaporationRecipe(inputFluid, outputFluid));
}
public static void addSolarNeutronRecipe(GasStack inputGas, GasStack outputGas)
@@ -397,13 +433,13 @@ public final class RecipeHandler
return null;
}
public static SolarEvaporationRecipe getSolarEvaporationRecipe(FluidInput input)
public static ThermalEvaporationRecipe getThermalEvaporationRecipe(FluidInput input)
{
if(input.isValid())
{
HashMap<FluidInput, SolarEvaporationRecipe> recipes = Recipe.SOLAR_EVAPORATION_PLANT.get();
HashMap<FluidInput, ThermalEvaporationRecipe> recipes = Recipe.THERMAL_EVAPORATION_PLANT.get();
SolarEvaporationRecipe recipe = recipes.get(input);
ThermalEvaporationRecipe recipe = recipes.get(input);
return recipe == null ? null : recipe.copy();
}
@@ -520,7 +556,7 @@ public final class RecipeHandler
CHEMICAL_CRYSTALLIZER(MachineType.CHEMICAL_CRYSTALLIZER.name, GasInput.class, ItemStackOutput.class, CrystallizerRecipe.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),
SOLAR_EVAPORATION_PLANT("SolarEvaporationPlant", FluidInput.class, FluidOutput.class, SolarEvaporationRecipe.class),
THERMAL_EVAPORATION_PLANT("ThermalEvaporationPlant", FluidInput.class, FluidOutput.class, ThermalEvaporationRecipe.class),
SOLAR_NEUTRON_ACTIVATOR(MachineType.SOLAR_NEUTRON_ACTIVATOR.name, GasInput.class, GasOutput.class, SolarNeutronRecipe.class);
private HashMap recipes;
@@ -5,22 +5,22 @@ import mekanism.common.recipe.outputs.FluidOutput;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
public class SolarEvaporationRecipe extends MachineRecipe<FluidInput, FluidOutput, SolarEvaporationRecipe>
public class ThermalEvaporationRecipe extends MachineRecipe<FluidInput, FluidOutput, ThermalEvaporationRecipe>
{
public SolarEvaporationRecipe(FluidStack input, FluidStack output)
public ThermalEvaporationRecipe(FluidStack input, FluidStack output)
{
super(new FluidInput(input), new FluidOutput(output));
}
public SolarEvaporationRecipe(FluidInput input, FluidOutput output)
public ThermalEvaporationRecipe(FluidInput input, FluidOutput output)
{
super(input, output);
}
@Override
public SolarEvaporationRecipe copy()
public ThermalEvaporationRecipe copy()
{
return new SolarEvaporationRecipe(getInput(), getOutput());
return new ThermalEvaporationRecipe(getInput(), getOutput());
}
public boolean canOperate(FluidTank inputTank, FluidTank outputTank)
@@ -9,20 +9,20 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
public class TileEntitySolarEvaporationBlock extends TileEntityContainerBlock
public class TileEntityThermalEvaporationBlock extends TileEntityContainerBlock
{
public Coord4D master;
public boolean attempted;
public TileEntitySolarEvaporationBlock()
public TileEntityThermalEvaporationBlock()
{
super("SolarEvaporationBlock");
super("ThermalEvaporationBlock");
inventory = new ItemStack[0];
}
public TileEntitySolarEvaporationBlock(String fullName)
public TileEntityThermalEvaporationBlock(String fullName)
{
super(fullName);
@@ -57,11 +57,11 @@ public class TileEntitySolarEvaporationBlock extends TileEntityContainerBlock
if(master != null)
{
TileEntitySolarEvaporationController tile = getController();
TileEntityThermalEvaporationController tile = getController();
if(tile != null)
{
((TileEntitySolarEvaporationController)tile).refresh();
((TileEntityThermalEvaporationController)tile).refresh();
}
}
}
@@ -73,11 +73,11 @@ public class TileEntitySolarEvaporationBlock extends TileEntityContainerBlock
if(!worldObj.isRemote)
{
TileEntitySolarEvaporationController tile = getController();
TileEntityThermalEvaporationController tile = getController();
if(tile != null)
{
((TileEntitySolarEvaporationController)tile).refresh();
((TileEntityThermalEvaporationController)tile).refresh();
}
else {
updateController();
@@ -87,9 +87,9 @@ public class TileEntitySolarEvaporationBlock extends TileEntityContainerBlock
public void updateController()
{
if(!(this instanceof TileEntitySolarEvaporationController))
if(!(this instanceof TileEntityThermalEvaporationController))
{
TileEntitySolarEvaporationController found = new ControllerFinder().find();
TileEntityThermalEvaporationController found = new ControllerFinder().find();
if(found != null)
{
@@ -98,15 +98,15 @@ public class TileEntitySolarEvaporationBlock extends TileEntityContainerBlock
}
}
public TileEntitySolarEvaporationController getController()
public TileEntityThermalEvaporationController getController()
{
if(master != null)
{
TileEntity tile = master.getTileEntity(worldObj);
if(tile instanceof TileEntitySolarEvaporationController)
if(tile instanceof TileEntityThermalEvaporationController)
{
return (TileEntitySolarEvaporationController)tile;
return (TileEntityThermalEvaporationController)tile;
}
}
@@ -115,7 +115,7 @@ public class TileEntitySolarEvaporationBlock extends TileEntityContainerBlock
public class ControllerFinder
{
public TileEntitySolarEvaporationController found;
public TileEntityThermalEvaporationController found;
public Set<Coord4D> iterated = new HashSet<Coord4D>();
@@ -132,13 +132,13 @@ public class TileEntitySolarEvaporationBlock extends TileEntityContainerBlock
{
Coord4D coord = pos.getFromSide(side);
if(!iterated.contains(coord) && coord.getTileEntity(worldObj) instanceof TileEntitySolarEvaporationBlock)
if(!iterated.contains(coord) && coord.getTileEntity(worldObj) instanceof TileEntityThermalEvaporationBlock)
{
((TileEntitySolarEvaporationBlock)coord.getTileEntity(worldObj)).attempted = true;
((TileEntityThermalEvaporationBlock)coord.getTileEntity(worldObj)).attempted = true;
if(coord.getTileEntity(worldObj) instanceof TileEntitySolarEvaporationController)
if(coord.getTileEntity(worldObj) instanceof TileEntityThermalEvaporationController)
{
found = (TileEntitySolarEvaporationController)coord.getTileEntity(worldObj);
found = (TileEntityThermalEvaporationController)coord.getTileEntity(worldObj);
return;
}
@@ -147,9 +147,9 @@ public class TileEntitySolarEvaporationBlock extends TileEntityContainerBlock
}
}
public TileEntitySolarEvaporationController find()
public TileEntityThermalEvaporationController find()
{
loop(Coord4D.get(TileEntitySolarEvaporationBlock.this));
loop(Coord4D.get(TileEntityThermalEvaporationBlock.this));
return found;
}
@@ -19,7 +19,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.recipe.RecipeHandler;
import mekanism.common.recipe.RecipeHandler.Recipe;
import mekanism.common.recipe.inputs.FluidInput;
import mekanism.common.recipe.machines.SolarEvaporationRecipe;
import mekanism.common.recipe.machines.ThermalEvaporationRecipe;
import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
@@ -34,7 +34,7 @@ import net.minecraftforge.fluids.FluidTank;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class TileEntitySolarEvaporationController extends TileEntitySolarEvaporationBlock implements IActiveState, ITankManager
public class TileEntityThermalEvaporationController extends TileEntityThermalEvaporationBlock implements IActiveState, ITankManager
{
public static final int MAX_OUTPUT = 10000;
public static final int MAX_SOLARS = 4;
@@ -71,9 +71,9 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora
public float prevScale;
public TileEntitySolarEvaporationController()
public TileEntityThermalEvaporationController()
{
super("SolarEvaporationController");
super("ThermalEvaporationController");
inventory = new ItemStack[4];
}
@@ -99,7 +99,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora
manageBuckets();
SolarEvaporationRecipe recipe = getRecipe();
ThermalEvaporationRecipe recipe = getRecipe();
if(canOperate(recipe))
{
@@ -143,9 +143,9 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora
}
}
public SolarEvaporationRecipe getRecipe()
public ThermalEvaporationRecipe getRecipe()
{
return RecipeHandler.getSolarEvaporationRecipe(new FluidInput(inputTank.getFluid()));
return RecipeHandler.getThermalEvaporationRecipe(new FluidInput(inputTank.getFluid()));
}
@Override
@@ -171,7 +171,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora
return false;
}
return Recipe.SOLAR_EVAPORATION_PLANT.containsRecipe(fluid);
return Recipe.THERMAL_EVAPORATION_PLANT.containsRecipe(fluid);
}
protected void refresh()
@@ -206,7 +206,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora
}
}
public boolean canOperate(SolarEvaporationRecipe recipe)
public boolean canOperate(ThermalEvaporationRecipe recipe)
{
if(!structured || height < 3 || height > MAX_HEIGHT || inputTank.getFluid() == null)
{
@@ -383,13 +383,13 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora
Coord4D startPoint = Coord4D.get(this);
while(startPoint.getFromSide(ForgeDirection.UP).getTileEntity(worldObj) instanceof TileEntitySolarEvaporationBlock)
while(startPoint.getFromSide(ForgeDirection.UP).getTileEntity(worldObj) instanceof TileEntityThermalEvaporationBlock)
{
startPoint.step(ForgeDirection.UP);
}
Coord4D test = startPoint.getFromSide(ForgeDirection.DOWN).getFromSide(right, 2);
isLeftOnFace = test.getTileEntity(worldObj) instanceof TileEntitySolarEvaporationBlock;
isLeftOnFace = test.getTileEntity(worldObj) instanceof TileEntityThermalEvaporationBlock;
startPoint = startPoint.getFromSide(left, isLeftOnFace ? 1 : 2);
@@ -440,7 +440,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora
{
continue;
}
else if(pointer.getFromSide(ForgeDirection.UP).getTileEntity(worldObj) instanceof TileEntitySolarEvaporationBlock || !addTankPart(pointerTile))
else if(pointer.getFromSide(ForgeDirection.UP).getTileEntity(worldObj) instanceof TileEntityThermalEvaporationBlock || !addTankPart(pointerTile))
{
return false;
}
@@ -454,7 +454,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora
}
}
else {
if(pointer.getFromSide(ForgeDirection.UP).getTileEntity(worldObj) instanceof TileEntitySolarEvaporationBlock || !addTankPart(pointerTile))
if(pointer.getFromSide(ForgeDirection.UP).getTileEntity(worldObj) instanceof TileEntityThermalEvaporationBlock || !addTankPart(pointerTile))
{
return false;
}
@@ -509,7 +509,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora
if((x == 1 || x == 2) && (z == 1 || z == 2))
{
if(pointerTile instanceof TileEntitySolarEvaporationBlock)
if(pointerTile instanceof TileEntityThermalEvaporationBlock)
{
if(!foundCenter)
{
@@ -548,18 +548,18 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora
public boolean addTankPart(TileEntity tile)
{
if(tile instanceof TileEntitySolarEvaporationBlock && (tile == this || !(tile instanceof TileEntitySolarEvaporationController)))
if(tile instanceof TileEntityThermalEvaporationBlock && (tile == this || !(tile instanceof TileEntityThermalEvaporationController)))
{
if(tile != this)
{
((TileEntitySolarEvaporationBlock)tile).addToStructure(Coord4D.get(this));
((TileEntityThermalEvaporationBlock)tile).addToStructure(Coord4D.get(this));
tankParts.add(Coord4D.get(tile));
}
return true;
}
else {
if(tile != this && tile instanceof TileEntitySolarEvaporationController)
if(tile != this && tile instanceof TileEntityThermalEvaporationController)
{
controllerConflict = true;
}
@@ -655,7 +655,7 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora
@Override
public boolean isNode(TileEntity tile)
{
return tile instanceof TileEntitySolarEvaporationBlock;
return tile instanceof TileEntityThermalEvaporationBlock;
}
});
}
@@ -741,9 +741,9 @@ public class TileEntitySolarEvaporationController extends TileEntitySolarEvapora
{
TileEntity tile = tankPart.getTileEntity(worldObj);
if(tile instanceof TileEntitySolarEvaporationBlock)
if(tile instanceof TileEntityThermalEvaporationBlock)
{
((TileEntitySolarEvaporationBlock)tile).controllerGone();
((TileEntityThermalEvaporationBlock)tile).controllerGone();
}
}
@@ -8,7 +8,7 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
public class TileEntitySolarEvaporationValve extends TileEntitySolarEvaporationBlock implements IFluidHandler
public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporationBlock implements IFluidHandler
{
public boolean prevMaster = false;
@@ -25,7 +25,7 @@ public class TileEntitySolarEvaporationValve extends TileEntitySolarEvaporationB
{
Coord4D obj = Coord4D.get(this).getFromSide(side);
if(!obj.isAirBlock(worldObj) && !(obj.getTileEntity(worldObj) instanceof TileEntitySolarEvaporationBlock))
if(!obj.isAirBlock(worldObj) && !(obj.getTileEntity(worldObj) instanceof TileEntityThermalEvaporationBlock))
{
obj.getBlock(worldObj).onNeighborChange(worldObj, obj.xCoord, obj.yCoord, obj.zCoord, xCoord, yCoord, zCoord);
}
@@ -39,14 +39,14 @@ public class TileEntitySolarEvaporationValve extends TileEntitySolarEvaporationB
@Override
public int fill(ForgeDirection from, FluidStack resource, boolean doFill)
{
TileEntitySolarEvaporationController controller = getController();
TileEntityThermalEvaporationController controller = getController();
return controller == null ? 0 : controller.inputTank.fill(resource, doFill);
}
@Override
public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain)
{
TileEntitySolarEvaporationController controller = getController();
TileEntityThermalEvaporationController controller = getController();
if(controller != null && (resource == null || resource.isFluidEqual(controller.outputTank.getFluid())))
{
@@ -59,7 +59,7 @@ public class TileEntitySolarEvaporationValve extends TileEntitySolarEvaporationB
@Override
public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain)
{
TileEntitySolarEvaporationController controller = getController();
TileEntityThermalEvaporationController controller = getController();
if(controller != null)
{
@@ -72,21 +72,21 @@ public class TileEntitySolarEvaporationValve extends TileEntitySolarEvaporationB
@Override
public boolean canFill(ForgeDirection from, Fluid fluid)
{
TileEntitySolarEvaporationController controller = getController();
TileEntityThermalEvaporationController controller = getController();
return controller != null && controller.hasRecipe(fluid);
}
@Override
public boolean canDrain(ForgeDirection from, Fluid fluid)
{
TileEntitySolarEvaporationController controller = getController();
TileEntityThermalEvaporationController controller = getController();
return controller != null && controller.outputTank.getFluidAmount() > 0;
}
@Override
public FluidTankInfo[] getTankInfo(ForgeDirection from)
{
TileEntitySolarEvaporationController controller = getController();
TileEntityThermalEvaporationController controller = getController();
if(controller == null)
{
File renamed without changes.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

@@ -82,11 +82,11 @@ tile.BasicBlock.StructuralGlass.name=Structural Glass
tile.BasicBlock.DynamicValve.name=Dynamic Valve
tile.BasicBlock.CopperBlock.name=Copper Block
tile.BasicBlock.TinBlock.name=Tin Block
tile.BasicBlock.SolarEvaporationController.name=Solar Evaporation Controller
tile.BasicBlock.SolarEvaporationValve.name=Solar Evaporation Valve
tile.BasicBlock.ThermalEvaporationController.name=Thermal Evaporation Controller
tile.BasicBlock.ThermalEvaporationValve.name=Thermal Evaporation Valve
//Basic Block 2 (second ID iteration)
tile.BasicBlock2.SolarEvaporationBlock.name=Solar Evaporation Block
tile.BasicBlock2.ThermalEvaporationBlock.name=Thermal Evaporation Block
tile.BasicBlock2.InductionCasing.name=Induction Casing
tile.BasicBlock2.InductionPort.name=Induction Port
tile.BasicBlock2.InductionCellBasic.name=Basic Induction Cell
@@ -520,7 +520,7 @@ gui.upgrades.effect=Effect
gui.chemicalInfuser.short=C. Infuser
gui.chemicalDissolutionChamber.short=C. Dissolution Chamber
gui.solarEvaporationController.short=Solar E. Controller
gui.thermalEvaporationController.short=Thermal E. Controller
gui.dictionary.noKey=No key.
@@ -730,9 +730,9 @@ tooltip.SteelCasing=A sturdy, steel-based casing used as a foundation for machin
tooltip.DynamicTank=The casing used in the Dynamic Tank multiblock, a structure capable of storing great amounts of fluid.
tooltip.StructuralGlass=An advanced, reinforced material of glass that drops when broken and can be used in the structure of any applicable multiblock.
tooltip.DynamicValve=A valve that can be placed on a Dynamic Tank multiblock, allowing for fluids to be inserted and extracted via external piping.
tooltip.SolarEvaporationController=The controller for a Solar Evaporation Plant, acting as the master block of the structure. Only one of these should be placed on a multiblock.
tooltip.SolarEvaporationValve=A valve that can be placed on a Solar Evaporation Plant multiblock, allowing for fluids to be inserted and extracted via external piping.
tooltip.SolarEvaporationBlock=A copper-alloyed casing used in the structure of a Solar Evaporation Plant, using its advanced material to conduct the great amounts of heat necessary for processing.
tooltip.ThermalEvaporationController=The controller for a Thermal Evaporation Plant, acting as the master block of the structure. Only one of these should be placed on a multiblock.
tooltip.ThermalEvaporationValve=A valve that can be placed on a Thermal Evaporation Plant multiblock, allowing for fluids to be inserted and extracted via external piping.
tooltip.ThermalEvaporationBlock=A copper-alloyed casing used in the structure of a Thermal Evaporation Plant, using its advanced material to conduct the great amounts of heat necessary for processing.
tooltip.InductionCasing=A type of energy-resistant casing used in the creation of an Energized Induction Matrix multiblock.
tooltip.InductionPort=A port that can be placed on an Energized Induction Matrix multiblock, allowing for energy to be inserted from and output to external cabling.
tooltip.InductionCell=A highly conductive energy capacitor capable of storing massive amounts of energy in a single block. Housed in an Energized Induction Matrix to expand the multiblock's energy storage.
File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB