Add creative wireless grid

CHANGELOG.md

@@ -7,6 +7,7 @@
 
 **Features**
 - Made the mod way less network intensive
+- Added a Creative Wireless Grid
 
 ### 0.5.2
 **Bugfixes**

src/main/java/refinedstorage/item/ItemWirelessGrid.java

@@ -21,6 +21,9 @@ import refinedstorage.tile.grid.TileGrid;
 import java.util.List;
 
 public class ItemWirelessGrid extends ItemEnergyContainer {
+    public static final int TYPE_NORMAL = 0;
+    public static final int TYPE_CREATIVE = 1;
+
     public static final String NBT_CONTROLLER_X = "ControllerX";
     public static final String NBT_CONTROLLER_Y = "ControllerY";
     public static final String NBT_CONTROLLER_Z = "ControllerZ";
@@ -48,7 +51,7 @@ public class ItemWirelessGrid extends ItemEnergyContainer {
         setRegistryName(RefinedStorage.ID, "wireless_grid");
         setMaxDamage(3200);
         setMaxStackSize(1);
-        setHasSubtypes(false);
+        setHasSubtypes(true);
         setCreativeTab(RefinedStorage.TAB);
     }
 
@@ -69,7 +72,7 @@ public class ItemWirelessGrid extends ItemEnergyContainer {
 
     @Override
     public boolean isDamaged(ItemStack stack) {
-        return true;
+        return stack.getItemDamage() == 0;
     }
 
     @Override
@@ -79,16 +82,20 @@ public class ItemWirelessGrid extends ItemEnergyContainer {
 
     @Override
     public void getSubItems(Item item, CreativeTabs tab, List list) {
-        list.add(new ItemStack(item));
+        list.add(new ItemStack(item, 1, TYPE_NORMAL));
 
-        ItemStack fullyCharged = new ItemStack(item);
+        ItemStack fullyCharged = new ItemStack(item, 1, TYPE_NORMAL);
         receiveEnergy(fullyCharged, getMaxEnergyStored(fullyCharged), false);
         list.add(fullyCharged);
+
+        list.add(new ItemStack(item, 1, TYPE_CREATIVE));
     }
 
     @Override
     public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) {
-        list.add(I18n.translateToLocalFormatted("misc.refinedstorage:energy_stored", getEnergyStored(stack), getMaxEnergyStored(stack)));
+        if (stack.getItemDamage() != TYPE_CREATIVE) {
+            list.add(I18n.translateToLocalFormatted("misc.refinedstorage:energy_stored", getEnergyStored(stack), getMaxEnergyStored(stack)));
+        }
 
         if (canOpenWirelessGrid(player.worldObj, player, stack)) {
             list.add(I18n.translateToLocalFormatted("misc.refinedstorage:wireless_grid.tooltip.0", getX(stack)));
@@ -204,6 +211,6 @@ public class ItemWirelessGrid extends ItemEnergyContainer {
 
     @Override
     public String getUnlocalizedName(ItemStack stack) {
-        return getUnlocalizedName();
+        return getUnlocalizedName() + "." + stack.getItemDamage();
     }
 }

src/main/java/refinedstorage/proxy/CommonProxy.java

@@ -19,10 +19,7 @@ import refinedstorage.block.EnumControllerType;
 import refinedstorage.block.EnumGridType;
 import refinedstorage.block.EnumStorageType;
 import refinedstorage.gui.GuiHandler;
-import refinedstorage.item.ItemCore;
+import refinedstorage.item.*;
-import refinedstorage.item.ItemProcessor;
-import refinedstorage.item.ItemStorageDisk;
-import refinedstorage.item.ItemStoragePart;
 import refinedstorage.network.*;
 import refinedstorage.storage.NBTStorage;
 import refinedstorage.tile.*;
@@ -191,7 +188,7 @@ public class CommonProxy {
         SoldererRegistry.addRecipe(new SoldererRecipeCraftingGrid());
 
         // Wireless Grid
-        GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.WIRELESS_GRID),
+        GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.WIRELESS_GRID, 1, ItemWirelessGrid.TYPE_NORMAL),
             " P ",
             "ERE",
             "EEE",

src/main/java/refinedstorage/tile/TileController.java

@@ -305,11 +305,13 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
             ItemWirelessGrid item = RefinedStorageItems.WIRELESS_GRID;
             ItemStack held = consumer.getPlayer().getHeldItem(consumer.getHand());
 
-            item.extractEnergy(held, energy, false);
+            if (held.getItemDamage() != ItemWirelessGrid.TYPE_CREATIVE) {
+                item.extractEnergy(held, energy, false);
 
-            if (item.getEnergyStored(held) <= 0) {
+                if (item.getEnergyStored(held) <= 0) {
-                onCloseWirelessGrid(player);
+                    onCloseWirelessGrid(player);
-                consumer.getPlayer().closeScreen();
+                    consumer.getPlayer().closeScreen();
+                }
             }
         }
     }

src/main/resources/assets/refinedstorage/lang/en_US.lang

@@ -94,7 +94,8 @@ item.refinedstorage:storage_disk.1.name=4k Storage Disk
 item.refinedstorage:storage_disk.2.name=16k Storage Disk
 item.refinedstorage:storage_disk.3.name=64k Storage Disk
 item.refinedstorage:storage_disk.4.name=Creative Storage Disk
-item.refinedstorage:wireless_grid.name=Wireless Grid
+item.refinedstorage:wireless_grid.0.name=Wireless Grid
+item.refinedstorage:wireless_grid.1.name=Creative Wireless Grid
 item.refinedstorage:quartz_enriched_iron.name=Quartz Enriched Iron
 item.refinedstorage:core.0.name=Construction Core
 item.refinedstorage:core.1.name=Destruction Core

src/main/resources/assets/refinedstorage/lang/nl_NL.lang

@@ -94,7 +94,8 @@ item.refinedstorage:storage_disk.1.name=4k Opslagschijf
 item.refinedstorage:storage_disk.2.name=16k Opslagschijf
 item.refinedstorage:storage_disk.3.name=64k Opslagschijf
 item.refinedstorage:storage_disk.4.name=Creative Opslagschijf
-item.refinedstorage:wireless_grid.name=Draadloos Rooster
+item.refinedstorage:wireless_grid.0.name=Draadloos Rooster
+item.refinedstorage:wireless_grid.1.name=Creative Draadloos Rooster
 item.refinedstorage:quartz_enriched_iron.name=Quartz Verrijkt Iron
 item.refinedstorage:core.0.name=Constructie Core
 item.refinedstorage:core.1.name=Destructie Core