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

Fix class

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-11-04 12:22:31 +01:00
parent 9842726f3f
commit 5e2cfc7a7e
2 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java
View File

@@ -9,7 +9,6 @@ import com.raoulvdberge.refinedstorage.integration.ic2.IntegrationIC2;
import com.raoulvdberge.refinedstorage.integration.tesla.IntegrationTesla; import com.raoulvdberge.refinedstorage.integration.tesla.IntegrationTesla;
import com.raoulvdberge.refinedstorage.integration.tesla.NetworkItemEnergyTesla; import com.raoulvdberge.refinedstorage.integration.tesla.NetworkItemEnergyTesla;
import com.raoulvdberge.refinedstorage.tile.TileController; import com.raoulvdberge.refinedstorage.tile.TileController;
import com.raoulvdberge.refinedstorage.tile.grid.TileGrid;
import ic2.api.item.IElectricItemManager; import ic2.api.item.IElectricItemManager;
import ic2.api.item.ISpecialElectricItem; import ic2.api.item.ISpecialElectricItem;
import net.darkhax.tesla.capability.TeslaCapabilities; import net.darkhax.tesla.capability.TeslaCapabilities;
@@ -149,10 +148,8 @@ public abstract class ItemNetworkItem extends ItemEnergyContainer implements INe
tag.setInteger(NBT_CONTROLLER_Y, pos.getY()); tag.setInteger(NBT_CONTROLLER_Y, pos.getY());
tag.setInteger(NBT_CONTROLLER_Z, pos.getZ()); tag.setInteger(NBT_CONTROLLER_Z, pos.getZ());
tag.setInteger(NBT_DIMENSION_ID, player.dimension); tag.setInteger(NBT_DIMENSION_ID, player.dimension);
tag.setInteger(TileGrid.NBT_VIEW_TYPE, TileGrid.VIEW_TYPE_NORMAL);
tag.setInteger(TileGrid.NBT_SORTING_DIRECTION, TileGrid.SORTING_DIRECTION_DESCENDING); initializeDefaults(tag);
tag.setInteger(TileGrid.NBT_SORTING_TYPE, TileGrid.SORTING_TYPE_NAME);
tag.setInteger(TileGrid.NBT_SEARCH_BOX_MODE, TileGrid.SEARCH_BOX_MODE_NORMAL);
stack.setTagCompound(tag); stack.setTagCompound(tag);
@@ -162,6 +159,10 @@ public abstract class ItemNetworkItem extends ItemEnergyContainer implements INe
return EnumActionResult.PASS; return EnumActionResult.PASS;
} }
public void initializeDefaults(NBTTagCompound tag) {
// NO OP
}
public static int getDimensionId(ItemStack stack) { public static int getDimensionId(ItemStack stack) {
return stack.getTagCompound().getInteger(NBT_DIMENSION_ID); return stack.getTagCompound().getInteger(NBT_DIMENSION_ID);
} }

38
src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java
View File

@@ -6,12 +6,37 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.item.NetworkItemWirelessG
import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; import com.raoulvdberge.refinedstorage.tile.grid.TileGrid;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
public class ItemWirelessGrid extends ItemNetworkItem { public class ItemWirelessGrid extends ItemNetworkItem {
public ItemWirelessGrid() { public ItemWirelessGrid() {
super("wireless_grid"); super("wireless_grid");
} }
@Override
public void initializeDefaults(NBTTagCompound tag) {
super.initializeDefaults(tag);
tag.setInteger(TileGrid.NBT_VIEW_TYPE, TileGrid.VIEW_TYPE_NORMAL);
tag.setInteger(TileGrid.NBT_SORTING_DIRECTION, TileGrid.SORTING_DIRECTION_DESCENDING);
tag.setInteger(TileGrid.NBT_SORTING_TYPE, TileGrid.SORTING_TYPE_NAME);
tag.setInteger(TileGrid.NBT_SEARCH_BOX_MODE, TileGrid.SEARCH_BOX_MODE_NORMAL);
}
@Override
public boolean isValid(ItemStack stack) {
return super.isValid(stack)
&& stack.getTagCompound().hasKey(TileGrid.NBT_VIEW_TYPE)
&& stack.getTagCompound().hasKey(TileGrid.NBT_SORTING_DIRECTION)
&& stack.getTagCompound().hasKey(TileGrid.NBT_SORTING_TYPE)
&& stack.getTagCompound().hasKey(TileGrid.NBT_SEARCH_BOX_MODE);
}
@Override
public INetworkItem provide(INetworkItemHandler handler, EntityPlayer player, ItemStack stack) {
return new NetworkItemWirelessGrid(handler, player, stack);
}
public static int getViewType(ItemStack stack) { public static int getViewType(ItemStack stack) {
return stack.getTagCompound().getInteger(TileGrid.NBT_VIEW_TYPE); return stack.getTagCompound().getInteger(TileGrid.NBT_VIEW_TYPE);
} }
@@ -27,17 +52,4 @@ public class ItemWirelessGrid extends ItemNetworkItem {
public static int getSearchBoxMode(ItemStack stack) { public static int getSearchBoxMode(ItemStack stack) {
return stack.getTagCompound().getInteger(TileGrid.NBT_SEARCH_BOX_MODE); return stack.getTagCompound().getInteger(TileGrid.NBT_SEARCH_BOX_MODE);
} }
public boolean isValid(ItemStack stack) {
return super.isValid(stack)
&& stack.getTagCompound().hasKey(TileGrid.NBT_VIEW_TYPE)
&& stack.getTagCompound().hasKey(TileGrid.NBT_SORTING_DIRECTION)
&& stack.getTagCompound().hasKey(TileGrid.NBT_SORTING_TYPE)
&& stack.getTagCompound().hasKey(TileGrid.NBT_SEARCH_BOX_MODE);
}
@Override
public INetworkItem provide(INetworkItemHandler handler, EntityPlayer player, ItemStack stack) {
return new NetworkItemWirelessGrid(handler, player, stack);
}
} }