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

Merge branch 'master' into development

Browse source
This commit is contained in:
Aidan Brady 2013-12-18 19:20:54 -05:00
commit a57f5c4fd7
3 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1015,7 +1015,7 @@ public class Mekanism
for(ItemStack ore : OreDictionary.getOres("dustObsidian"))
{
RecipeHandler.addCombinerRecipe(MekanismUtils.size(ore, 2), new ItemStack(Block.obsidian));
RecipeHandler.addCombinerRecipe(MekanismUtils.size(ore, 4), new ItemStack(Block.obsidian));
RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("DIAMOND"), 10, MekanismUtils.size(ore, 1)), new ItemStack(Dust, 1, 3));
}

17
common/mekanism/common/tileentity/TileEntityDigitalMiner.java
View file

@ -52,6 +52,8 @@ import dan200.computer.api.IPeripheral;
public class TileEntityDigitalMiner extends TileEntityElectricBlock implements IPeripheral, IUpgradeTile, IRedstoneControl, IActiveState, IAdvancedBoundingBlock
{
public static int[] EJECT_INV;
public List<Object3D> oresToMine = new ArrayList<Object3D>();
public HashList<MinerFilter> filters = new HashList<MinerFilter>();
@ -959,17 +961,20 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
if((location.equals(eject) && side == dir.ordinal()) || (location.equals(pull) && side == 1))
{
int[] ret = new int[27];
for(int i = 0; i < ret.length; i++)
if(EJECT_INV == null)
{
ret[i] = i;
EJECT_INV = new int[27];
for(int i = 0; i < EJECT_INV.length; i++)
{
EJECT_INV[i] = i;
}
}
return ret;
return EJECT_INV;
}
return null;
return InventoryUtils.EMPTY;
}
@Override

15
common/mekanism/common/tileentity/TileEntityElectricChest.java
View file

@ -12,6 +12,8 @@ import com.google.common.io.ByteArrayDataInput;
public class TileEntityElectricChest extends TileEntityElectricBlock
{
public static int[] INV;
public String password = "";
public boolean authenticated = false;
@ -138,14 +140,17 @@ public class TileEntityElectricChest extends TileEntityElectricBlock
return InventoryUtils.EMPTY;
}
else {
int[] ret = new int[55];
for(int i = 0; i < ret.length; i++)
if(INV == null)
{
ret[i] = i;
INV = new int[55];
for(int i = 0; i < INV.length; i++)
{
INV[i] = i;
}
}
return ret;
return INV;
}
}