dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compiler errors

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-07-19 05:15:13 +02:00
parent 8743aaa214
commit 0923702b3e
14 changed files with 56 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/refinedstorage/tile/TileConstructor.java
View File

@@ -91,8 +91,8 @@ public class TileConstructor extends TileNode implements ICompareConfig {
compare = tag.getInteger(NBT_COMPARE);
}
TileBase.readItems(filter, 0, tag);
TileBase.readItems(upgrades, 1, tag);
readItems(filter, 0, tag);
readItems(upgrades, 1, tag);
scheduler.read(tag);
}
@@ -103,8 +103,8 @@ public class TileConstructor extends TileNode implements ICompareConfig {
tag.setInteger(NBT_COMPARE, compare);
TileBase.writeItems(filter, 0, tag);
TileBase.writeItems(upgrades, 1, tag);
writeItems(filter, 0, tag);
writeItems(upgrades, 1, tag);
scheduler.writeToNBT(tag);

10
src/main/java/refinedstorage/tile/TileCrafter.java
View File

@@ -78,16 +78,16 @@ public class TileCrafter extends TileNode implements ICraftingPatternContainer {
public void read(NBTTagCompound nbt) {
super.read(nbt);
TileBase.readItems(patterns, 0, nbt);
TileBase.readItems(upgrades, 1, nbt);
readItems(patterns, 0, nbt);
readItems(upgrades, 1, nbt);
}
@Override
public NBTTagCompound write(NBTTagCompound tag) {
super.write(tag);
TileBase.writeItems(patterns, 0, tag);
TileBase.writeItems(upgrades, 1, tag);
writeItems(patterns, 0, tag);
writeItems(upgrades, 1, tag);
return tag;
}
@@ -99,7 +99,7 @@ public class TileCrafter extends TileNode implements ICraftingPatternContainer {
@Override
public IItemHandler getConnectedItems() {
return TileBase.getItemHandler(getFacingTile(), getDirection().getOpposite());
return getItemHandler(getFacingTile(), getDirection().getOpposite());
}
public IItemHandler getPatterns() {

8
src/main/java/refinedstorage/tile/TileDestructor.java
View File

@@ -110,8 +110,8 @@ public class TileDestructor extends TileNode implements ICompareConfig, IModeCon
mode = nbt.getInteger(NBT_MODE);
}
TileBase.readItems(filters, 0, nbt);
TileBase.readItems(upgrades, 1, nbt);
readItems(filters, 0, nbt);
readItems(upgrades, 1, nbt);
}
@Override
@@ -121,8 +121,8 @@ public class TileDestructor extends TileNode implements ICompareConfig, IModeCon
tag.setInteger(NBT_COMPARE, compare);
tag.setInteger(NBT_MODE, mode);
TileBase.writeItems(filters, 0, tag);
TileBase.writeItems(upgrades, 1, tag);
writeItems(filters, 0, tag);
writeItems(upgrades, 1, tag);
return tag;
}

4
src/main/java/refinedstorage/tile/TileDetector.java
View File

@@ -148,7 +148,7 @@ public class TileDetector extends TileNode implements ICompareConfig {
amount = nbt.getInteger(NBT_AMOUNT);
}
TileBase.readItems(filter, 0, nbt);
readItems(filter, 0, nbt);
}
@Override
@@ -159,7 +159,7 @@ public class TileDetector extends TileNode implements ICompareConfig {
tag.setInteger(NBT_MODE, mode);
tag.setInteger(NBT_AMOUNT, amount);
TileBase.writeItems(filter, 0, tag);
writeItems(filter, 0, tag);
return tag;
}

8
src/main/java/refinedstorage/tile/TileDiskDrive.java
View File

@@ -156,8 +156,8 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag
public void read(NBTTagCompound nbt) {
super.read(nbt);
TileBase.readItems(disks, 0, nbt);
TileBase.readItems(filters, 1, nbt);
readItems(disks, 0, nbt);
readItems(filters, 1, nbt);
if (nbt.hasKey(NBT_PRIORITY)) {
priority = nbt.getInteger(NBT_PRIORITY);
@@ -182,8 +182,8 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag
}
}
TileBase.writeItems(disks, 0, tag);
TileBase.writeItems(filters, 1, tag);
writeItems(disks, 0, tag);
writeItems(filters, 1, tag);
tag.setInteger(NBT_PRIORITY, priority);
tag.setInteger(NBT_COMPARE, compare);

10
src/main/java/refinedstorage/tile/TileExporter.java
View File

@@ -34,7 +34,7 @@ public class TileExporter extends TileNode implements ICompareConfig {
@Override
public void updateNode() {
IItemHandler handler = TileBase.getItemHandler(getFacingTile(), getDirection().getOpposite());
IItemHandler handler = getItemHandler(getFacingTile(), getDirection().getOpposite());
int size = upgrades.hasUpgrade(ItemUpgrade.TYPE_STACK) ? 64 : 1;
@@ -83,8 +83,8 @@ public class TileExporter extends TileNode implements ICompareConfig {
compare = nbt.getInteger(NBT_COMPARE);
}
TileBase.readItems(filters, 0, nbt);
TileBase.readItems(upgrades, 1, nbt);
readItems(filters, 0, nbt);
readItems(upgrades, 1, nbt);
scheduler.read(nbt);
}
@@ -95,8 +95,8 @@ public class TileExporter extends TileNode implements ICompareConfig {
tag.setInteger(NBT_COMPARE, compare);
TileBase.writeItems(filters, 0, tag);
TileBase.writeItems(upgrades, 1, tag);
writeItems(filters, 0, tag);
writeItems(upgrades, 1, tag);
scheduler.writeToNBT(tag);

10
src/main/java/refinedstorage/tile/TileImporter.java
View File

@@ -37,7 +37,7 @@ public class TileImporter extends TileNode implements ICompareConfig, IModeConfi
@Override
public void updateNode() {
IItemHandler handler = TileBase.getItemHandler(getFacingTile(), getDirection().getOpposite());
IItemHandler handler = getItemHandler(getFacingTile(), getDirection().getOpposite());
if (getFacingTile() instanceof TileDiskDrive || handler == null) {
return;
@@ -104,8 +104,8 @@ public class TileImporter extends TileNode implements ICompareConfig, IModeConfi
mode = nbt.getInteger(NBT_MODE);
}
TileBase.readItems(filters, 0, nbt);
TileBase.readItems(upgrades, 1, nbt);
readItems(filters, 0, nbt);
readItems(upgrades, 1, nbt);
}
@Override
@@ -115,8 +115,8 @@ public class TileImporter extends TileNode implements ICompareConfig, IModeConfi
tag.setInteger(NBT_COMPARE, compare);
tag.setInteger(NBT_MODE, mode);
TileBase.writeItems(filters, 0, tag);
TileBase.writeItems(upgrades, 1, tag);
writeItems(filters, 0, tag);
writeItems(upgrades, 1, tag);
return tag;
}

16
src/main/java/refinedstorage/tile/TileInterface.java
View File

@@ -105,10 +105,10 @@ public class TileInterface extends TileNode implements ICompareConfig {
public void read(NBTTagCompound nbt) {
super.read(nbt);
TileBase.readItems(importItems, 0, nbt);
TileBase.readItems(exportSpecimenItems, 1, nbt);
TileBase.readItems(exportItems, 2, nbt);
TileBase.readItems(upgrades, 3, nbt);
readItems(importItems, 0, nbt);
readItems(exportSpecimenItems, 1, nbt);
readItems(exportItems, 2, nbt);
readItems(upgrades, 3, nbt);
if (nbt.hasKey(NBT_COMPARE)) {
compare = nbt.getInteger(NBT_COMPARE);
@@ -119,10 +119,10 @@ public class TileInterface extends TileNode implements ICompareConfig {
public NBTTagCompound write(NBTTagCompound tag) {
super.write(tag);
TileBase.writeItems(importItems, 0, tag);
TileBase.writeItems(exportSpecimenItems, 1, tag);
TileBase.writeItems(exportItems, 2, tag);
TileBase.writeItems(upgrades, 3, tag);
writeItems(importItems, 0, tag);
writeItems(exportSpecimenItems, 1, tag);
writeItems(exportItems, 2, tag);
writeItems(upgrades, 3, tag);
tag.setInteger(NBT_COMPARE, compare);

8
src/main/java/refinedstorage/tile/TileProcessingPatternEncoder.java
View File

@@ -19,8 +19,8 @@ public class TileProcessingPatternEncoder extends TileBase {
public NBTTagCompound write(NBTTagCompound tag) {
super.write(tag);
TileBase.writeItems(patterns, 0, tag);
TileBase.writeItems(configuration, 1, tag);
writeItems(patterns, 0, tag);
writeItems(configuration, 1, tag);
return tag;
}
@@ -29,8 +29,8 @@ public class TileProcessingPatternEncoder extends TileBase {
public void read(NBTTagCompound nbt) {
super.read(nbt);
TileBase.readItems(patterns, 0, nbt);
TileBase.readItems(configuration, 1, nbt);
readItems(patterns, 0, nbt);
readItems(configuration, 1, nbt);
}
public void onCreatePattern() {

8
src/main/java/refinedstorage/tile/TileSolderer.java
View File

@@ -110,8 +110,8 @@ public class TileSolderer extends TileNode {
public void read(NBTTagCompound nbt) {
super.read(nbt);
TileBase.readItems(items, 0, nbt);
TileBase.readItems(upgrades, 1, nbt);
readItems(items, 0, nbt);
readItems(upgrades, 1, nbt);
recipe = RefinedStorageAPI.SOLDERER_REGISTRY.getRecipe(items);
@@ -128,8 +128,8 @@ public class TileSolderer extends TileNode {
public NBTTagCompound write(NBTTagCompound tag) {
super.write(tag);
TileBase.writeItems(items, 0, tag);
TileBase.writeItems(upgrades, 1, tag);
writeItems(items, 0, tag);
writeItems(upgrades, 1, tag);
tag.setBoolean(NBT_WORKING, working);
tag.setInteger(NBT_PROGRESS, progress);

4
src/main/java/refinedstorage/tile/TileStorage.java
View File

@@ -107,7 +107,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG
public void read(NBTTagCompound nbt) {
super.read(nbt);
TileBase.readItems(filters, 0, nbt);
readItems(filters, 0, nbt);
if (nbt.hasKey(NBT_PRIORITY)) {
priority = nbt.getInteger(NBT_PRIORITY);
@@ -130,7 +130,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG
public NBTTagCompound write(NBTTagCompound tag) {
super.write(tag);
TileBase.writeItems(filters, 0, tag);
writeItems(filters, 0, tag);
tag.setInteger(NBT_PRIORITY, priority);

4
src/main/java/refinedstorage/tile/TileWirelessTransmitter.java
View File

@@ -30,14 +30,14 @@ public class TileWirelessTransmitter extends TileNode implements IWirelessTransm
public void read(NBTTagCompound nbt) {
super.read(nbt);
TileBase.readItems(upgrades, 0, nbt);
readItems(upgrades, 0, nbt);
}
@Override
public NBTTagCompound write(NBTTagCompound tag) {
super.write(tag);
TileBase.writeItems(upgrades, 0, tag);
writeItems(upgrades, 0, tag);
return tag;
}

7
src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java
View File

@@ -16,7 +16,6 @@ import refinedstorage.container.ContainerStorage;
import refinedstorage.inventory.BasicItemHandler;
import refinedstorage.network.MessagePriorityUpdate;
import refinedstorage.tile.IStorageGui;
import refinedstorage.tile.TileBase;
import refinedstorage.tile.TileNode;
import refinedstorage.tile.config.ICompareConfig;
import refinedstorage.tile.config.IModeConfig;
@@ -119,7 +118,7 @@ public class TileExternalStorage extends TileNode implements IStorageProvider, I
public void read(NBTTagCompound nbt) {
super.read(nbt);
TileBase.readItems(filters, 0, nbt);
readItems(filters, 0, nbt);
if (nbt.hasKey(NBT_PRIORITY)) {
priority = nbt.getInteger(NBT_PRIORITY);
@@ -138,7 +137,7 @@ public class TileExternalStorage extends TileNode implements IStorageProvider, I
public NBTTagCompound write(NBTTagCompound tag) {
super.write(tag);
TileBase.writeItems(filters, 0, tag);
writeItems(filters, 0, tag);
tag.setInteger(NBT_PRIORITY, priority);
tag.setInteger(NBT_COMPARE, compare);
@@ -200,7 +199,7 @@ public class TileExternalStorage extends TileNode implements IStorageProvider, I
} else if (facing instanceof IDeepStorageUnit) {
storages.add(new DeepStorageUnitStorage(this, (IDeepStorageUnit) facing));
} else {
IItemHandler handler = TileBase.getItemHandler(facing, getDirection().getOpposite());
IItemHandler handler = getItemHandler(facing, getDirection().getOpposite());
if (handler != null) {
storages.add(new ItemHandlerStorage(this, handler));

9
src/main/java/refinedstorage/tile/grid/TileGrid.java
View File

@@ -23,7 +23,6 @@ import refinedstorage.inventory.BasicItemHandler;
import refinedstorage.inventory.BasicItemValidator;
import refinedstorage.item.ItemPattern;
import refinedstorage.network.MessageGridSettingsUpdate;
import refinedstorage.tile.TileBase;
import refinedstorage.tile.TileNode;
import refinedstorage.tile.config.IRedstoneModeConfig;
@@ -333,8 +332,8 @@ public class TileGrid extends TileNode implements IGrid {
public void read(NBTTagCompound tag) {
super.read(tag);
TileBase.readItemsLegacy(matrix, 0, tag);
TileBase.readItems(patterns, 1, tag);
readItemsLegacy(matrix, 0, tag);
readItems(patterns, 1, tag);
if (tag.hasKey(NBT_VIEW_TYPE)) {
viewType = tag.getInteger(NBT_VIEW_TYPE);
@@ -357,8 +356,8 @@ public class TileGrid extends TileNode implements IGrid {
public NBTTagCompound write(NBTTagCompound tag) {
super.write(tag);
TileBase.writeItemsLegacy(matrix, 0, tag);
TileBase.writeItems(patterns, 1, tag);
writeItemsLegacy(matrix, 0, tag);
writeItems(patterns, 1, tag);
tag.setInteger(NBT_VIEW_TYPE, viewType);
tag.setInteger(NBT_SORTING_DIRECTION, sortingDirection);