Merge branch 'master' into development
This commit is contained in:
commit
a57f5c4fd7
3 changed files with 22 additions and 12 deletions
common/mekanism/common
|
@ -1015,7 +1015,7 @@ public class Mekanism
|
||||||
|
|
||||||
for(ItemStack ore : OreDictionary.getOres("dustObsidian"))
|
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));
|
RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("DIAMOND"), 10, MekanismUtils.size(ore, 1)), new ItemStack(Dust, 1, 3));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -52,6 +52,8 @@ import dan200.computer.api.IPeripheral;
|
||||||
|
|
||||||
public class TileEntityDigitalMiner extends TileEntityElectricBlock implements IPeripheral, IUpgradeTile, IRedstoneControl, IActiveState, IAdvancedBoundingBlock
|
public class TileEntityDigitalMiner extends TileEntityElectricBlock implements IPeripheral, IUpgradeTile, IRedstoneControl, IActiveState, IAdvancedBoundingBlock
|
||||||
{
|
{
|
||||||
|
public static int[] EJECT_INV;
|
||||||
|
|
||||||
public List<Object3D> oresToMine = new ArrayList<Object3D>();
|
public List<Object3D> oresToMine = new ArrayList<Object3D>();
|
||||||
|
|
||||||
public HashList<MinerFilter> filters = new HashList<MinerFilter>();
|
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))
|
if((location.equals(eject) && side == dir.ordinal()) || (location.equals(pull) && side == 1))
|
||||||
{
|
{
|
||||||
int[] ret = new int[27];
|
if(EJECT_INV == null)
|
||||||
|
|
||||||
for(int i = 0; i < ret.length; i++)
|
|
||||||
{
|
{
|
||||||
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
|
@Override
|
||||||
|
|
|
@ -12,6 +12,8 @@ import com.google.common.io.ByteArrayDataInput;
|
||||||
|
|
||||||
public class TileEntityElectricChest extends TileEntityElectricBlock
|
public class TileEntityElectricChest extends TileEntityElectricBlock
|
||||||
{
|
{
|
||||||
|
public static int[] INV;
|
||||||
|
|
||||||
public String password = "";
|
public String password = "";
|
||||||
|
|
||||||
public boolean authenticated = false;
|
public boolean authenticated = false;
|
||||||
|
@ -138,14 +140,17 @@ public class TileEntityElectricChest extends TileEntityElectricBlock
|
||||||
return InventoryUtils.EMPTY;
|
return InventoryUtils.EMPTY;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
int[] ret = new int[55];
|
if(INV == null)
|
||||||
|
|
||||||
for(int i = 0; i < ret.length; i++)
|
|
||||||
{
|
{
|
||||||
ret[i] = i;
|
INV = new int[55];
|
||||||
|
|
||||||
|
for(int i = 0; i < INV.length; i++)
|
||||||
|
{
|
||||||
|
INV[i] = i;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return INV;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue