diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RS.java b/src/main/java/com/raoulvdberge/refinedstorage/RS.java index 32e03541f..e478d41ed 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/RS.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RS.java @@ -1,6 +1,8 @@ package com.raoulvdberge.refinedstorage; import com.raoulvdberge.refinedstorage.item.ItemCore; +import com.raoulvdberge.refinedstorage.item.ItemProcessorBinding; +import com.raoulvdberge.refinedstorage.item.ItemQuartzEnrichedIron; import com.raoulvdberge.refinedstorage.item.group.MainItemGroup; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -32,6 +34,8 @@ public final class RS { public void onRegisterItems(RegistryEvent.Register e) { e.getRegistry().register(new ItemCore(ItemCore.Type.CONSTRUCTION)); e.getRegistry().register(new ItemCore(ItemCore.Type.DESTRUCTION)); + e.getRegistry().register(new ItemQuartzEnrichedIron()); + e.getRegistry().register(new ItemProcessorBinding()); } /* TODO diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSItems.java b/src/main/java/com/raoulvdberge/refinedstorage/RSItems.java index c8d7b30c4..0a19fbae3 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/RSItems.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RSItems.java @@ -8,7 +8,8 @@ public final class RSItems { public static final ItemWirelessGrid WIRELESS_GRID = new ItemWirelessGrid(); public static final ItemWirelessFluidGrid WIRELESS_FLUID_GRID = new ItemWirelessFluidGrid(); public static final ItemWirelessCraftingMonitor WIRELESS_CRAFTING_MONITOR = new ItemWirelessCraftingMonitor(); - public static final ItemQuartzEnrichedIron QUARTZ_ENRICHED_IRON = new ItemQuartzEnrichedIron(); + @ObjectHolder(RS.ID + ":quartz_enriched_iron") + public static final ItemQuartzEnrichedIron QUARTZ_ENRICHED_IRON = null; @ObjectHolder(RS.ID + ":core") public static final ItemCore CORE = null; public static final ItemSilicon SILICON = new ItemSilicon(); @@ -26,5 +27,6 @@ public final class RSItems { public static final ItemCover COVER = new ItemCover(); public static final ItemHollowCover HOLLOW_COVER = new ItemHollowCover(); public static final ItemWrench WRENCH = new ItemWrench(); - public static final ItemProcessorBinding PROCESSOR_BINDING = new ItemProcessorBinding(); + @ObjectHolder(RS.ID + ":processor_binding") + public static final ItemProcessorBinding PROCESSOR_BINDING = null; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessorBinding.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessorBinding.java index 75042968a..3d2587258 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessorBinding.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessorBinding.java @@ -1,17 +1,12 @@ package com.raoulvdberge.refinedstorage.item; import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.item.info.ItemInfo; +import net.minecraft.item.Item; -public class ItemProcessorBinding extends ItemBase { +public class ItemProcessorBinding extends Item { public ItemProcessorBinding() { - super(new ItemInfo(RS.ID, "processor_binding")); - } -/* TODO - @Override - public void registerModels(IModelRegistration modelRegistration) { - super.registerModels(modelRegistration); + super(new Item.Properties().group(RS.MAIN_GROUP)); - modelRegistration.setModel(this, 0, new ModelResourceLocation(RS.ID + ":processor_binding", "inventory")); - }*/ + this.setRegistryName(RS.ID, "processor_binding"); + } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemQuartzEnrichedIron.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemQuartzEnrichedIron.java index 891607cb8..d94b6307b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemQuartzEnrichedIron.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemQuartzEnrichedIron.java @@ -1,16 +1,12 @@ package com.raoulvdberge.refinedstorage.item; import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.item.info.ItemInfo; +import net.minecraft.item.Item; -public class ItemQuartzEnrichedIron extends ItemBase { +public class ItemQuartzEnrichedIron extends Item { public ItemQuartzEnrichedIron() { - super(new ItemInfo(RS.ID, "quartz_enriched_iron")); + super(new Item.Properties().group(RS.MAIN_GROUP)); + + this.setRegistryName(RS.ID, "quartz_enriched_iron"); } -/* TODO - @Override - @SideOnly(Side.CLIENT) - public void registerModels(IModelRegistration modelRegistration) { - modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); - }*/ } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessCraftingMonitor.java index 9112a71f9..8116dac97 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessCraftingMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessCraftingMonitor.java @@ -8,7 +8,7 @@ public class ItemWirelessCraftingMonitor extends ItemNetworkItem { public static final String NBT_TAB_PAGE = "TabPage"; public ItemWirelessCraftingMonitor() { - super(new ItemInfo(RS.ID, "wireless_crafting_monitor"), RS.INSTANCE.config.wirelessCraftingMonitorCapacity); + super(new ItemInfo(RS.ID, "wireless_crafting_monitor"), 0); } /* TODO @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessFluidGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessFluidGrid.java index f74d733ac..fef93bdee 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessFluidGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessFluidGrid.java @@ -5,7 +5,7 @@ import com.raoulvdberge.refinedstorage.item.info.ItemInfo; public class ItemWirelessFluidGrid extends ItemNetworkItem { public ItemWirelessFluidGrid() { - super(new ItemInfo(RS.ID, "wireless_fluid_grid"), RS.INSTANCE.config.wirelessFluidGridCapacity); + super(new ItemInfo(RS.ID, "wireless_fluid_grid"), 0); } /* TODO @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java index a16887c06..d1648d850 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java @@ -6,7 +6,7 @@ import com.raoulvdberge.refinedstorage.item.info.ItemInfo; public class ItemWirelessGrid extends ItemNetworkItem { public ItemWirelessGrid(IItemInfo info) { - super(info, RS.INSTANCE.config.wirelessGridCapacity); + super(info, 0); } public ItemWirelessGrid() { diff --git a/src/main/resources/assets/refinedstorage/lang/en_us.json b/src/main/resources/assets/refinedstorage/lang/en_us.json index ec3a5458a..fa6177e8d 100644 --- a/src/main/resources/assets/refinedstorage/lang/en_us.json +++ b/src/main/resources/assets/refinedstorage/lang/en_us.json @@ -239,7 +239,7 @@ "item.refinedstorage:wireless_fluid_grid.1": "Creative Wireless Fluid Grid", "item.refinedstorage:wireless_crafting_monitor.0": "Wireless Crafting Monitor", "item.refinedstorage:wireless_crafting_monitor.1": "Creative Wireless Crafting Monitor", - "item.refinedstorage:quartz_enriched_iron": "Quartz Enriched Iron", + "item.refinedstorage.quartz_enriched_iron": "Quartz Enriched Iron", "item.refinedstorage.construction_core": "Construction Core", "item.refinedstorage.destruction_core": "Destruction Core", "item.refinedstorage:silicon": "Silicon", @@ -276,7 +276,7 @@ "item.refinedstorage:cutting_tool": "Cutting Tool", "item.refinedstorage:cover": "Cover", "item.refinedstorage:hollow_cover": "Hollow Cover", - "item.refinedstorage:processor_binding": "Processor Binding", + "item.refinedstorage.processor_binding": "Processor Binding", "commands.refinedstorage.createdisk.usage": "/createdisk ", "commands.refinedstorage.createdisk.error.notADisk": "The given disk item is not a disk.", "commands.refinedstorage.createdisk.error.diskNotFound": "Disk %s was not found.",