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

v6.0.4 push

Browse source
This commit is contained in:
Aidan C. Brady 2014-03-07 10:46:43 -05:00
parent 0d7a1ef340
commit 8b70e0d50d
13 changed files with 87 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -25,7 +25,7 @@ dependencies {
compile ':forgemultipart:1.0.0.228'
}
version = "6.0.3." + "$System.env.BUILD_NUMBER"
version = "6.0.4." + "$System.env.BUILD_NUMBER"
archivesBaseName = "MekanismAll"
libsDirName = "../output"
distsDirName = "../output"

2
build.properties
View file

@ -3,4 +3,4 @@ dir.mcp=${dir.development}forge/mcp
version.minecraft=1.6.4
version.mod.major=6
version.mod.minor=0
version.mod.revis=3
version.mod.revis=4

11
common/mekanism/api/ISalinationSolar.java Normal file
View file

@ -0,0 +1,11 @@
package mekanism.api;
/**
* Implement this class in a TileEntity if you wish for it to be able to heat up a Salination Plant.
* @author aidancbrady
*
*/
public interface ISalinationSolar
{
public boolean seesSun();
}

52
common/mekanism/client/render/MekanismRenderer.java
View file

@ -354,31 +354,33 @@ public class MekanismRenderer
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
Tessellator tessellator = Tessellator.instance;
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, -1.0F, 0.0F);
renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, metadata));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 0.0F);
renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, metadata));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, -1.0F);
renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, metadata));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, 1.0F);
renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, metadata));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(-1.0F, 0.0F, 0.0F);
renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, metadata));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(1.0F, 0.0F, 0.0F);
renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, metadata));
tessellator.draw();
try {
Tessellator tessellator = Tessellator.instance;
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, -1.0F, 0.0F);
renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, metadata));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 0.0F);
renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, metadata));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, -1.0F);
renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, metadata));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, 1.0F);
renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, metadata));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(-1.0F, 0.0F, 0.0F);
renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, metadata));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(1.0F, 0.0F, 0.0F);
renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, metadata));
tessellator.draw();
} catch(Exception e) {}
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
}

2
common/mekanism/client/render/tileentity/RenderDynamicTank.java
View file

@ -65,7 +65,7 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer
displayList[getStages(data.height)-1].render();
}
else {
displayList[(int)(tileEntity.prevScale*((float)getStages(data.height)-1))].render();
displayList[Math.min(getStages(data.height)-1, (int)(tileEntity.prevScale*((float)getStages(data.height)-1)))].render();
}
MekanismRenderer.glowOff();

6
common/mekanism/common/Mekanism.java
View file

@ -159,7 +159,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
* @author AidanBrady
*
*/
@Mod(modid = "Mekanism", name = "Mekanism", version = "6.0.3")
@Mod(modid = "Mekanism", name = "Mekanism", version = "6.0.4")
@NetworkMod(channels = {"MEK"}, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
public class Mekanism
{
@ -184,7 +184,7 @@ public class Mekanism
public static Configuration configuration;
/** Mekanism version number */
public static Version versionNumber = new Version(6, 0, 3);
public static Version versionNumber = new Version(6, 0, 4);
/** Map of Teleporters */
public static Map<Teleporter.Code, ArrayList<Coord4D>> teleporters = new HashMap<Teleporter.Code, ArrayList<Coord4D>>();
@ -805,7 +805,7 @@ public class Mekanism
Jetpack = (ItemJetpack)new ItemJetpack(configuration.getItem("Jetpack", ITEM_ID++).getInt()).setUnlocalizedName("Jetpack");
ArmoredJetpack = (ItemJetpack)new ItemJetpack(configuration.getItem("ArmoredJetpack", ITEM_ID++).getInt()).setUnlocalizedName("ArmoredJetpack");
FreeRunners = new ItemFreeRunners(configuration.getItem("FreeRunners", ITEM_ID++).getInt()).setUnlocalizedName("FreeRunners");
BrineBucket = new ItemMekanism(configuration.getItem("BrineBucket", ITEM_ID++).getInt()).setMaxStackSize(1).setUnlocalizedName("BrineBucket");
BrineBucket = new ItemMekanism(configuration.getItem("BrineBucket", ITEM_ID++).getInt()).setMaxStackSize(1).setContainerItem(Item.bucketEmpty).setUnlocalizedName("BrineBucket");
Sawdust = new ItemMekanism(configuration.getItem("Sawdust", ITEM_ID++).getInt()).setUnlocalizedName("Sawdust");
Salt = new ItemMekanism(configuration.getItem("Salt", ITEM_ID++).getInt()).setUnlocalizedName("Salt");
Ingot = new ItemIngot(configuration.getItem("Ingot", ITEM_ID++).getInt());

7
common/mekanism/common/integration/OreDictManager.java
View file

@ -298,6 +298,13 @@ public final class OreDictManager
} catch(Exception e) {}
}
for(ItemStack ore : OreDictionary.getOres("oreYellorium"))
{
try {
RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), StackUtils.size(OreDictionary.getOres("dustYellorium").get(0), 2));
} catch(Exception e) {}
}
for(ItemStack ore : OreDictionary.getOres("ingotCopper"))
{
RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 1, 6));

30
common/mekanism/common/network/PacketPortableTeleport.java
View file

@ -50,20 +50,22 @@ public class PacketPortableTeleport implements IMekanismPacket
if(teleporter != null)
{
teleporter.didTeleport.add(player);
teleporter.teleDelay = 5;
item.setEnergy(itemstack, item.getEnergy(itemstack) - item.calculateEnergyCost(player, coords));
if(world.provider.dimensionId != coords.dimensionId)
{
((EntityPlayerMP)player).travelToDimension(coords.dimensionId);
}
((EntityPlayerMP)player).playerNetServerHandler.setPlayerLocation(coords.xCoord+0.5, coords.yCoord+1, coords.zCoord+0.5, player.rotationYaw, player.rotationPitch);
world.playSoundAtEntity(player, "mob.endermen.portal", 1.0F, 1.0F);
PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketPortalFX().setParams(coords), coords, 40D);
try {
teleporter.didTeleport.add(player);
teleporter.teleDelay = 5;
item.setEnergy(itemstack, item.getEnergy(itemstack) - item.calculateEnergyCost(player, coords));
if(world.provider.dimensionId != coords.dimensionId)
{
((EntityPlayerMP)player).travelToDimension(coords.dimensionId);
}
((EntityPlayerMP)player).playerNetServerHandler.setPlayerLocation(coords.xCoord+0.5, coords.yCoord+1, coords.zCoord+0.5, player.rotationYaw, player.rotationPitch);
world.playSoundAtEntity(player, "mob.endermen.portal", 1.0F, 1.0F);
PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketPortalFX().setParams(coords), coords, 40D);
} catch(Exception e) {}
}
}
}

14
common/mekanism/common/tile/TileEntitySalinationController.java
View file

@ -5,13 +5,13 @@ import java.util.HashSet;
import java.util.Set;
import mekanism.api.Coord4D;
import mekanism.api.ISalinationSolar;
import mekanism.common.IConfigurable;
import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketTileEntity;
import mekanism.common.tank.TankUpdateProtocol;
import mekanism.common.util.MekanismUtils;
import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@ -39,7 +39,7 @@ public class TileEntitySalinationController extends TileEntitySalinationTank imp
public FluidTank brineTank = new FluidTank(MAX_BRINE);
public Set<TileEntitySalinationTank> tankParts = new HashSet<TileEntitySalinationTank>();
public TileEntityAdvancedSolarGenerator[] solars = new TileEntityAdvancedSolarGenerator[4];
public ISalinationSolar[] solars = new ISalinationSolar[4];
public boolean temperatureSet = false;
@ -332,9 +332,9 @@ public class TileEntitySalinationController extends TileEntitySalinationTank imp
int ret = 0;
for(TileEntityAdvancedSolarGenerator solar : solars)
for(ISalinationSolar solar : solars)
{
if(solar != null && solar.seesSun)
if(solar != null && solar.seesSun())
{
ret++;
}
@ -589,9 +589,9 @@ public class TileEntitySalinationController extends TileEntitySalinationTank imp
public boolean addSolarPanel(TileEntity tile, int i)
{
if(tile instanceof TileEntityAdvancedSolarGenerator && !tile.isInvalid())
if(tile instanceof ISalinationSolar && !tile.isInvalid())
{
solars[i] = (TileEntityAdvancedSolarGenerator)tile;
solars[i] = (ISalinationSolar)tile;
return true;
}
else {
@ -777,7 +777,7 @@ public class TileEntitySalinationController extends TileEntitySalinationTank imp
}
tankParts.clear();
solars = new TileEntityAdvancedSolarGenerator[] {null, null, null, null};
solars = new ISalinationSolar[] {null, null, null, null};
}
@Override

2
common/mekanism/common/transporter/TransporterManager.java
View file

@ -276,7 +276,7 @@ public class TransporterManager
ItemStack inSlot = testInv[i];
if(inSlot == null)
if(inSlot == null || toInsert == null)
{
return null;
}

4
common/mekanism/generators/common/MekanismGenerators.java
View file

@ -35,7 +35,7 @@ import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "6.0.3", dependencies = "required-after:Mekanism")
@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "6.0.4", dependencies = "required-after:Mekanism")
@NetworkMod(clientSideRequired = true, serverSideRequired = false)
public class MekanismGenerators implements IModule
{
@ -46,7 +46,7 @@ public class MekanismGenerators implements IModule
public static MekanismGenerators instance;
/** MekanismGenerators version number */
public static Version versionNumber = new Version(6, 0, 3);
public static Version versionNumber = new Version(6, 0, 4);
//Items
public static Item BioFuel;

10
common/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java
View file

@ -3,13 +3,13 @@ package mekanism.generators.common.tile;
import java.util.EnumSet;
import mekanism.api.Coord4D;
import mekanism.api.ISalinationSolar;
import mekanism.common.IBoundingBlock;
import mekanism.common.Mekanism;
import mekanism.common.util.MekanismUtils;
import mekanism.generators.common.MekanismGenerators;
import net.minecraftforge.common.ForgeDirection;
public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator implements IBoundingBlock
public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator implements IBoundingBlock, ISalinationSolar
{
public TileEntityAdvancedSolarGenerator()
{
@ -53,4 +53,10 @@ public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator i
invalidate();
worldObj.setBlockToAir(xCoord, yCoord, zCoord);
}
@Override
public boolean seesSun()
{
return seesSun;
}
}

4
common/mekanism/tools/common/MekanismTools.java
View file

@ -35,7 +35,7 @@ import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
@Mod(modid = "MekanismTools", name = "MekanismTools", version = "6.0.3", dependencies = "required-after:Mekanism")
@Mod(modid = "MekanismTools", name = "MekanismTools", version = "6.0.4", dependencies = "required-after:Mekanism")
@NetworkMod(clientSideRequired = true, serverSideRequired = false)
public class MekanismTools implements IModule
{
@ -43,7 +43,7 @@ public class MekanismTools implements IModule
public static MekanismTools instance;
/** MekanismTools version number */
public static Version versionNumber = new Version(6, 0, 3);
public static Version versionNumber = new Version(6, 0, 4);
//Enums: Tools
public static EnumToolMaterial toolOBSIDIAN = EnumHelper.addToolMaterial("OBSIDIAN", 3, 2500, 20F, 10, 100);