From c824aea5d4491cfee980eaf1400886f11ac5de8f Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Sat, 4 Jan 2014 01:41:43 -0500 Subject: [PATCH] Start work on inverse DM filter system --- build.gradle | 2 +- .../mekanism/common/tileentity/TileEntityDigitalMiner.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5dbb1ddce..8156e78bd 100644 --- a/build.gradle +++ b/build.gradle @@ -64,7 +64,7 @@ task moveRes(type: Sync) { task coreJar(type: Jar) { dependsOn 'reobf' - baseName = 'MekanismCore' + baseName = 'Mekanism' from 'etc/core' from zipTree(reobf.outputs.getFiles().getSingleFile()).matching { exclude 'mekanism/tools/**', 'mekanism/generators/**' diff --git a/common/mekanism/common/tileentity/TileEntityDigitalMiner.java b/common/mekanism/common/tileentity/TileEntityDigitalMiner.java index e95c8056e..36130290a 100644 --- a/common/mekanism/common/tileentity/TileEntityDigitalMiner.java +++ b/common/mekanism/common/tileentity/TileEntityDigitalMiner.java @@ -65,6 +65,8 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I public int radius; + public boolean inverse; + public int minY = 0; public int maxY = 60; @@ -512,6 +514,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I silkTouch = nbtTags.getBoolean("silkTouch"); searcher.state = State.values()[nbtTags.getInteger("state")]; controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; + inverse = nbtTags.getBoolean("inverse"); if(nbtTags.hasKey("replaceStack")) { @@ -550,6 +553,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I nbtTags.setBoolean("silkTouch", silkTouch); nbtTags.setInteger("state", searcher.state.ordinal()); nbtTags.setInteger("controlType", controlType.ordinal()); + nbtTags.setBoolean("inverse", inverse); if(replaceStack != null) { @@ -659,6 +663,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I clientToMine = dataStream.readInt(); controlType = RedstoneControl.values()[dataStream.readInt()]; + inverse = dataStream.readBoolean(); filters.clear(); @@ -691,6 +696,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I clientToMine = dataStream.readInt(); controlType = RedstoneControl.values()[dataStream.readInt()]; + inverse = dataStream.readBoolean(); } else if(type == 2) {