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

Start work on inverse DM filter system

Browse source
This commit is contained in:
Aidan C. Brady 2014-01-04 01:41:43 -05:00
parent 5a3595778a
commit c824aea5d4
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -64,7 +64,7 @@ task moveRes(type: Sync) {
task coreJar(type: Jar) { task coreJar(type: Jar) {
dependsOn 'reobf' dependsOn 'reobf'
baseName = 'MekanismCore' baseName = 'Mekanism'
from 'etc/core' from 'etc/core'
from zipTree(reobf.outputs.getFiles().getSingleFile()).matching { from zipTree(reobf.outputs.getFiles().getSingleFile()).matching {
exclude 'mekanism/tools/**', 'mekanism/generators/**' exclude 'mekanism/tools/**', 'mekanism/generators/**'

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

@ -65,6 +65,8 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
public int radius; public int radius;
public boolean inverse;
public int minY = 0; public int minY = 0;
public int maxY = 60; public int maxY = 60;
@ -512,6 +514,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
silkTouch = nbtTags.getBoolean("silkTouch"); silkTouch = nbtTags.getBoolean("silkTouch");
searcher.state = State.values()[nbtTags.getInteger("state")]; searcher.state = State.values()[nbtTags.getInteger("state")];
controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")];
inverse = nbtTags.getBoolean("inverse");
if(nbtTags.hasKey("replaceStack")) if(nbtTags.hasKey("replaceStack"))
{ {
@ -550,6 +553,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
nbtTags.setBoolean("silkTouch", silkTouch); nbtTags.setBoolean("silkTouch", silkTouch);
nbtTags.setInteger("state", searcher.state.ordinal()); nbtTags.setInteger("state", searcher.state.ordinal());
nbtTags.setInteger("controlType", controlType.ordinal()); nbtTags.setInteger("controlType", controlType.ordinal());
nbtTags.setBoolean("inverse", inverse);
if(replaceStack != null) if(replaceStack != null)
{ {
@ -659,6 +663,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
clientToMine = dataStream.readInt(); clientToMine = dataStream.readInt();
controlType = RedstoneControl.values()[dataStream.readInt()]; controlType = RedstoneControl.values()[dataStream.readInt()];
inverse = dataStream.readBoolean();
filters.clear(); filters.clear();
@ -691,6 +696,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
clientToMine = dataStream.readInt(); clientToMine = dataStream.readInt();
controlType = RedstoneControl.values()[dataStream.readInt()]; controlType = RedstoneControl.values()[dataStream.readInt()];
inverse = dataStream.readBoolean();
} }
else if(type == 2) else if(type == 2)
{ {