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

Changed name of boiler to fix conflicts

Browse source
This commit is contained in:
aidancbrady 2016-01-13 18:02:47 -05:00
parent 3f158d26da
commit 2a78265419
8 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/mekanism/common/Mekanism.java
View file

@ -71,8 +71,8 @@ import mekanism.common.recipe.inputs.ItemStackInput;
import mekanism.common.recipe.machines.SmeltingRecipe; import mekanism.common.recipe.machines.SmeltingRecipe;
import mekanism.common.recipe.outputs.ItemStackOutput; import mekanism.common.recipe.outputs.ItemStackOutput;
import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityAdvancedBoundingBlock;
import mekanism.common.tile.TileEntityBoiler; import mekanism.common.tile.TileEntityThermoelectricBoiler;
import mekanism.common.tile.TileEntityBoilerValve; import mekanism.common.tile.TileEntityThermoelectricValve;
import mekanism.common.tile.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock;
import mekanism.common.tile.TileEntityCardboardBox; import mekanism.common.tile.TileEntityCardboardBox;
import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityElectricBlock;
@ -1061,8 +1061,8 @@ public class Mekanism
GameRegistry.registerTileEntity(TileEntitySolarEvaporationValve.class, "SalinationValve"); GameRegistry.registerTileEntity(TileEntitySolarEvaporationValve.class, "SalinationValve");
GameRegistry.registerTileEntity(TileEntitySolarEvaporationBlock.class, "SalinationTank"); GameRegistry.registerTileEntity(TileEntitySolarEvaporationBlock.class, "SalinationTank");
GameRegistry.registerTileEntity(TileEntityEntangledBlock.class, "EntangledBlock"); GameRegistry.registerTileEntity(TileEntityEntangledBlock.class, "EntangledBlock");
GameRegistry.registerTileEntity(TileEntityBoiler.class, "SteamBoiler"); GameRegistry.registerTileEntity(TileEntityThermoelectricBoiler.class, "ThermoelectricBoiler");
GameRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve"); GameRegistry.registerTileEntity(TileEntityThermoelectricValve.class, "ThermoelectricValve");
//Load tile entities that have special renderers. //Load tile entities that have special renderers.
proxy.registerSpecialTileEntities(); proxy.registerSpecialTileEntities();

12
src/main/java/mekanism/common/content/boiler/BoilerManager.java
View file

@ -8,7 +8,7 @@ import java.util.Map;
import mekanism.api.Coord4D; import mekanism.api.Coord4D;
import mekanism.common.multiblock.MultiblockCache; import mekanism.common.multiblock.MultiblockCache;
import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.MultiblockManager;
import mekanism.common.tile.TileEntityBoiler; import mekanism.common.tile.TileEntityThermoelectricBoiler;
import mekanism.common.tile.TileEntityMultiblock; import mekanism.common.tile.TileEntityMultiblock;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
@ -32,7 +32,7 @@ public class BoilerManager extends MultiblockManager<SynchronizedBoilerData>
{ {
int inventoryID = entry.getKey(); int inventoryID = entry.getKey();
HashSet<TileEntityBoiler> boilers = new HashSet<TileEntityBoiler>(); HashSet<TileEntityThermoelectricBoiler> boilers = new HashSet<TileEntityThermoelectricBoiler>();
for(Coord4D obj : entry.getValue().locations) for(Coord4D obj : entry.getValue().locations)
{ {
@ -49,10 +49,10 @@ public class BoilerManager extends MultiblockManager<SynchronizedBoilerData>
tilesToKill.get(inventoryID).add(obj); tilesToKill.get(inventoryID).add(obj);
} }
else if(tileEntity instanceof TileEntityBoiler) else if(tileEntity instanceof TileEntityThermoelectricBoiler)
{ {
((TileEntityBoiler)tileEntity).simulateHeat(); ((TileEntityThermoelectricBoiler)tileEntity).simulateHeat();
boilers.add((TileEntityBoiler) tileEntity); boilers.add((TileEntityThermoelectricBoiler) tileEntity);
} }
} }
} }
@ -66,7 +66,7 @@ public class BoilerManager extends MultiblockManager<SynchronizedBoilerData>
boilers.iterator().next().getSynchronizedData().applyTemperatureChange(); boilers.iterator().next().getSynchronizedData().applyTemperatureChange();
} }
for (TileEntityBoiler boiler : boilers) for (TileEntityThermoelectricBoiler boiler : boilers)
{ {
boiler.applyTemperatureChange(); boiler.applyTemperatureChange();
} }

4
src/main/java/mekanism/common/content/boiler/BoilerSteamTank.java
View file

@ -1,12 +1,12 @@
package mekanism.common.content.boiler; package mekanism.common.content.boiler;
import mekanism.common.tile.TileEntityBoiler; import mekanism.common.tile.TileEntityThermoelectricBoiler;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
public class BoilerSteamTank extends BoilerTank public class BoilerSteamTank extends BoilerTank
{ {
public BoilerSteamTank(TileEntityBoiler tileEntity) public BoilerSteamTank(TileEntityThermoelectricBoiler tileEntity)
{ {
super(tileEntity); super(tileEntity);
} }

6
src/main/java/mekanism/common/content/boiler/BoilerTank.java
View file

@ -2,7 +2,7 @@ package mekanism.common.content.boiler;
import mekanism.api.Coord4D; import mekanism.api.Coord4D;
import mekanism.common.content.boiler.SynchronizedBoilerData.ValveData; import mekanism.common.content.boiler.SynchronizedBoilerData.ValveData;
import mekanism.common.tile.TileEntityBoiler; import mekanism.common.tile.TileEntityThermoelectricBoiler;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
@ -11,9 +11,9 @@ import net.minecraftforge.fluids.IFluidTank;
public abstract class BoilerTank implements IFluidTank public abstract class BoilerTank implements IFluidTank
{ {
public TileEntityBoiler steamBoiler; public TileEntityThermoelectricBoiler steamBoiler;
public BoilerTank(TileEntityBoiler tileEntity) public BoilerTank(TileEntityThermoelectricBoiler tileEntity)
{ {
steamBoiler = tileEntity; steamBoiler = tileEntity;
} }

8
src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java
View file

@ -10,8 +10,8 @@ import mekanism.common.content.boiler.SynchronizedBoilerData.ValveData;
import mekanism.common.multiblock.MultiblockCache; import mekanism.common.multiblock.MultiblockCache;
import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.MultiblockManager;
import mekanism.common.multiblock.UpdateProtocol; import mekanism.common.multiblock.UpdateProtocol;
import mekanism.common.tile.TileEntityBoiler; import mekanism.common.tile.TileEntityThermoelectricBoiler;
import mekanism.common.tile.TileEntityBoilerValve; import mekanism.common.tile.TileEntityThermoelectricValve;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -20,7 +20,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol<SynchronizedBoilerData>
public static final int WATER_PER_TANK = 16000; public static final int WATER_PER_TANK = 16000;
public static final int STEAM_PER_TANK = 160000; public static final int STEAM_PER_TANK = 160000;
public BoilerUpdateProtocol(TileEntityBoiler tileEntity) public BoilerUpdateProtocol(TileEntityThermoelectricBoiler tileEntity)
{ {
super(tileEntity); super(tileEntity);
} }
@ -98,7 +98,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol<SynchronizedBoilerData>
{ {
for(Coord4D obj : structure.locations) for(Coord4D obj : structure.locations)
{ {
if(obj.getTileEntity(pointer.getWorldObj()) instanceof TileEntityBoilerValve) if(obj.getTileEntity(pointer.getWorldObj()) instanceof TileEntityThermoelectricValve)
{ {
ValveData data = new ValveData(); ValveData data = new ValveData();
data.location = obj; data.location = obj;

4
src/main/java/mekanism/common/content/boiler/BoilerWaterTank.java
View file

@ -1,12 +1,12 @@
package mekanism.common.content.boiler; package mekanism.common.content.boiler;
import mekanism.common.tile.TileEntityBoiler; import mekanism.common.tile.TileEntityThermoelectricBoiler;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
public class BoilerWaterTank extends BoilerTank public class BoilerWaterTank extends BoilerTank
{ {
public BoilerWaterTank(TileEntityBoiler tileEntity) public BoilerWaterTank(TileEntityThermoelectricBoiler tileEntity)
{ {
super(tileEntity); super(tileEntity);
} }

8
src/main/java/mekanism/common/tile/TileEntityBoiler.java → src/main/java/mekanism/common/tile/TileEntityThermoelectricBoiler.java
View file

@ -27,7 +27,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidContainerItem;
public class TileEntityBoiler extends TileEntityMultiblock<SynchronizedBoilerData> implements IFluidContainerManager, IHeatTransfer public class TileEntityThermoelectricBoiler extends TileEntityMultiblock<SynchronizedBoilerData> implements IFluidContainerManager, IHeatTransfer
{ {
/** A client-sided and server-sided map of valves on this tank's structure, used on the client for rendering fluids. */ /** A client-sided and server-sided map of valves on this tank's structure, used on the client for rendering fluids. */
public Map<ValveData, Integer> valveViewing = new HashMap<ValveData, Integer>(); public Map<ValveData, Integer> valveViewing = new HashMap<ValveData, Integer>();
@ -45,12 +45,12 @@ public class TileEntityBoiler extends TileEntityMultiblock<SynchronizedBoilerDat
public double heatToAbsorb; public double heatToAbsorb;
public double invHeatCapacity = 5; public double invHeatCapacity = 5;
public TileEntityBoiler() public TileEntityThermoelectricBoiler()
{ {
this("SteamBoiler"); this("SteamBoiler");
} }
public TileEntityBoiler(String name) public TileEntityThermoelectricBoiler(String name)
{ {
super(name); super(name);
inventory = new ItemStack[2]; inventory = new ItemStack[2];
@ -399,7 +399,7 @@ public class TileEntityBoiler extends TileEntityMultiblock<SynchronizedBoilerDat
valveViewing.put(data, viewingTicks); valveViewing.put(data, viewingTicks);
TileEntityBoiler tileEntity = (TileEntityBoiler)data.location.getTileEntity(worldObj); TileEntityThermoelectricBoiler tileEntity = (TileEntityThermoelectricBoiler)data.location.getTileEntity(worldObj);
if(tileEntity != null) if(tileEntity != null)
{ {

4
src/main/java/mekanism/common/tile/TileEntityBoilerValve.java → src/main/java/mekanism/common/tile/TileEntityThermoelectricValve.java
View file

@ -11,12 +11,12 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidHandler;
public class TileEntityBoilerValve extends TileEntityBoiler implements IFluidHandler public class TileEntityThermoelectricValve extends TileEntityThermoelectricBoiler implements IFluidHandler
{ {
public BoilerTank waterTank; public BoilerTank waterTank;
public BoilerTank steamTank; public BoilerTank steamTank;
public TileEntityBoilerValve() public TileEntityThermoelectricValve()
{ {
super("Boiler Valve"); super("Boiler Valve");
waterTank = new BoilerWaterTank(this); waterTank = new BoilerWaterTank(this);