Correct markdirty order, fixes #66
This commit is contained in:
@@ -41,9 +41,9 @@ public abstract class TileBase extends TileEntity implements ITickable {
|
||||
}
|
||||
|
||||
public void setDirection(EnumFacing direction) {
|
||||
markDirty();
|
||||
|
||||
this.direction = direction;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
public EnumFacing getDirection() {
|
||||
|
||||
@@ -67,9 +67,9 @@ public class TileConstructor extends TileMachine implements ICompareConfig {
|
||||
|
||||
@Override
|
||||
public void setCompare(int compare) {
|
||||
markDirty();
|
||||
|
||||
this.compare = compare;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -284,6 +284,8 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
|
||||
|
||||
public void addCraftingTask(ICraftingTask task) {
|
||||
craftingTasksToAdd.add(task);
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
public void addCraftingTask(CraftingPattern pattern) {
|
||||
@@ -296,6 +298,8 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
|
||||
|
||||
public void cancelCraftingTask(ICraftingTask task) {
|
||||
craftingTasksToCancel.add(task);
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
public List<CraftingPattern> getPatterns() {
|
||||
@@ -593,9 +597,9 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
|
||||
|
||||
@Override
|
||||
public void setRedstoneMode(RedstoneMode mode) {
|
||||
markDirty();
|
||||
|
||||
this.redstoneMode = mode;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -72,9 +72,9 @@ public class TileDestructor extends TileMachine implements ICompareConfig, IMode
|
||||
|
||||
@Override
|
||||
public void setCompare(int compare) {
|
||||
markDirty();
|
||||
|
||||
this.compare = compare;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -85,6 +85,8 @@ public class TileDestructor extends TileMachine implements ICompareConfig, IMode
|
||||
@Override
|
||||
public void setMode(int mode) {
|
||||
this.mode = mode;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -110,9 +110,9 @@ public class TileDetector extends TileMachine implements ICompareConfig {
|
||||
|
||||
@Override
|
||||
public void setCompare(int compare) {
|
||||
markDirty();
|
||||
|
||||
this.compare = compare;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
public int getMode() {
|
||||
@@ -120,9 +120,9 @@ public class TileDetector extends TileMachine implements ICompareConfig {
|
||||
}
|
||||
|
||||
public void setMode(int mode) {
|
||||
markDirty();
|
||||
|
||||
this.mode = mode;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
public int getAmount() {
|
||||
@@ -130,9 +130,9 @@ public class TileDetector extends TileMachine implements ICompareConfig {
|
||||
}
|
||||
|
||||
public void setAmount(int amount) {
|
||||
markDirty();
|
||||
|
||||
this.amount = amount;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -144,9 +144,9 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto
|
||||
|
||||
@Override
|
||||
public void setCompare(int compare) {
|
||||
markDirty();
|
||||
|
||||
this.compare = compare;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -157,6 +157,8 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto
|
||||
@Override
|
||||
public void setMode(int mode) {
|
||||
this.mode = mode;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -195,9 +197,9 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto
|
||||
}
|
||||
|
||||
public void setPriority(int priority) {
|
||||
markDirty();
|
||||
|
||||
this.priority = priority;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -66,9 +66,9 @@ public class TileExporter extends TileMachine implements ICompareConfig {
|
||||
|
||||
@Override
|
||||
public void setCompare(int compare) {
|
||||
markDirty();
|
||||
|
||||
this.compare = compare;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -247,9 +247,9 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
|
||||
|
||||
@Override
|
||||
public void setCompare(int compare) {
|
||||
markDirty();
|
||||
|
||||
this.compare = compare;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -260,6 +260,8 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
|
||||
@Override
|
||||
public void setMode(int mode) {
|
||||
this.mode = mode;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -268,9 +270,9 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
|
||||
}
|
||||
|
||||
public void setPriority(int priority) {
|
||||
markDirty();
|
||||
|
||||
this.priority = priority;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -86,9 +86,9 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo
|
||||
|
||||
@Override
|
||||
public void setCompare(int compare) {
|
||||
markDirty();
|
||||
|
||||
this.compare = compare;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -99,6 +99,8 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo
|
||||
@Override
|
||||
public void setMode(int mode) {
|
||||
this.mode = mode;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -106,9 +106,9 @@ public class TileInterface extends TileMachine implements ICompareConfig, ISided
|
||||
|
||||
@Override
|
||||
public void setCompare(int compare) {
|
||||
markDirty();
|
||||
|
||||
this.compare = compare;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -49,10 +49,10 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
|
||||
}
|
||||
|
||||
if (storage != null && storage.isDirty()) {
|
||||
markDirty();
|
||||
|
||||
storage.writeToNBT(storageTag);
|
||||
storage.markClean();
|
||||
|
||||
markDirty();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -138,9 +138,9 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
|
||||
|
||||
@Override
|
||||
public void setCompare(int compare) {
|
||||
markDirty();
|
||||
|
||||
this.compare = compare;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -151,6 +151,8 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
|
||||
@Override
|
||||
public void setMode(int mode) {
|
||||
this.mode = mode;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -197,9 +199,9 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
|
||||
}
|
||||
|
||||
public void setPriority(int priority) {
|
||||
markDirty();
|
||||
|
||||
this.priority = priority;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -237,9 +237,9 @@ public class TileGrid extends TileMachine implements IGrid {
|
||||
}
|
||||
|
||||
public void setSortingDirection(int sortingDirection) {
|
||||
markDirty();
|
||||
|
||||
this.sortingDirection = sortingDirection;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
public int getSortingType() {
|
||||
@@ -247,9 +247,9 @@ public class TileGrid extends TileMachine implements IGrid {
|
||||
}
|
||||
|
||||
public void setSortingType(int sortingType) {
|
||||
markDirty();
|
||||
|
||||
this.sortingType = sortingType;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
public int getSearchBoxMode() {
|
||||
@@ -257,9 +257,9 @@ public class TileGrid extends TileMachine implements IGrid {
|
||||
}
|
||||
|
||||
public void setSearchBoxMode(int searchBoxMode) {
|
||||
markDirty();
|
||||
|
||||
this.searchBoxMode = searchBoxMode;
|
||||
|
||||
markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user