From b087d86f9a270bff2e8384a01b7b7cfbb06c2b5c Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 2 Apr 2016 22:44:28 +0200 Subject: [PATCH] Upgrade Forge. JEI crashes with it, so this build is unusable. --- build.gradle | 2 +- .../java/refinedstorage/block/BlockBase.java | 9 +++ .../refinedstorage/block/BlockController.java | 7 +++ .../java/refinedstorage/block/BlockGrid.java | 7 +++ .../refinedstorage/block/BlockStorage.java | 6 ++ .../java/refinedstorage/item/ItemBase.java | 1 + .../refinedstorage/item/ItemBlockBase.java | 2 + .../item/ItemBlockController.java | 6 +- .../refinedstorage/item/ItemBlockGrid.java | 6 +- .../refinedstorage/item/ItemBlockStorage.java | 6 +- .../refinedstorage/item/ItemWirelessGrid.java | 1 + .../refinedstorage/proxy/CommonProxy.java | 57 +++++++++++-------- 12 files changed, 77 insertions(+), 33 deletions(-) diff --git a/build.gradle b/build.gradle index ef8581b76..320ece576 100755 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ group = "refinedstorage" archivesBaseName = "refinedstorage" minecraft { - version = "1.9-12.16.0.1811-1.9" + version = "1.9-12.16.0.1826-1.9" runDir = "run" useDepAts = true mappings = "snapshot_20160312" diff --git a/src/main/java/refinedstorage/block/BlockBase.java b/src/main/java/refinedstorage/block/BlockBase.java index be09b393d..ad80b89ec 100755 --- a/src/main/java/refinedstorage/block/BlockBase.java +++ b/src/main/java/refinedstorage/block/BlockBase.java @@ -8,6 +8,7 @@ import net.minecraft.block.properties.PropertyDirection; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -30,6 +31,7 @@ public abstract class BlockBase extends Block { this.name = name; setHardness(0.6F); + setRegistryName(RefinedStorage.ID, name); setCreativeTab(RefinedStorage.TAB); } @@ -123,4 +125,11 @@ public abstract class BlockBase extends Block { super.breakBlock(world, pos, state); } + + public ItemBlock createItemForBlock() { + ItemBlock itemBlock = new ItemBlock(this); + itemBlock.setRegistryName(getRegistryName()); + + return itemBlock; + } } diff --git a/src/main/java/refinedstorage/block/BlockController.java b/src/main/java/refinedstorage/block/BlockController.java index 5cad921a8..2794c6d5f 100755 --- a/src/main/java/refinedstorage/block/BlockController.java +++ b/src/main/java/refinedstorage/block/BlockController.java @@ -8,6 +8,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -17,6 +18,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; +import refinedstorage.item.ItemBlockController; import refinedstorage.tile.TileController; import java.util.List; @@ -96,4 +98,9 @@ public class BlockController extends BlockBase { public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { return ((TileController) world.getTileEntity(pos)).getEnergyScaled(15); } + + @Override + public ItemBlock createItemForBlock() { + return new ItemBlockController(); + } } diff --git a/src/main/java/refinedstorage/block/BlockGrid.java b/src/main/java/refinedstorage/block/BlockGrid.java index 49fd0bbbe..2848c8b5b 100755 --- a/src/main/java/refinedstorage/block/BlockGrid.java +++ b/src/main/java/refinedstorage/block/BlockGrid.java @@ -7,6 +7,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -15,6 +16,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; +import refinedstorage.item.ItemBlockGrid; import refinedstorage.tile.grid.TileGrid; import java.util.List; @@ -65,4 +67,9 @@ public class BlockGrid extends BlockMachine { return true; } + + @Override + public ItemBlock createItemForBlock() { + return new ItemBlockGrid(); + } } diff --git a/src/main/java/refinedstorage/block/BlockStorage.java b/src/main/java/refinedstorage/block/BlockStorage.java index c4fc6f8b3..4c2fb01df 100755 --- a/src/main/java/refinedstorage/block/BlockStorage.java +++ b/src/main/java/refinedstorage/block/BlockStorage.java @@ -8,6 +8,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -113,4 +114,9 @@ public class BlockStorage extends BlockMachine { world.setBlockToAir(pos); } + + @Override + public ItemBlock createItemForBlock() { + return new ItemBlockStorage(); + } } diff --git a/src/main/java/refinedstorage/item/ItemBase.java b/src/main/java/refinedstorage/item/ItemBase.java index 1f4beb7b5..c5afe2ab1 100755 --- a/src/main/java/refinedstorage/item/ItemBase.java +++ b/src/main/java/refinedstorage/item/ItemBase.java @@ -10,6 +10,7 @@ public abstract class ItemBase extends Item { public ItemBase(String name) { this.name = name; + setRegistryName(RefinedStorage.ID, name); setCreativeTab(RefinedStorage.TAB); } diff --git a/src/main/java/refinedstorage/item/ItemBlockBase.java b/src/main/java/refinedstorage/item/ItemBlockBase.java index b2a21469a..14d8d2de4 100755 --- a/src/main/java/refinedstorage/item/ItemBlockBase.java +++ b/src/main/java/refinedstorage/item/ItemBlockBase.java @@ -7,6 +7,8 @@ import net.minecraft.item.ItemStack; public abstract class ItemBlockBase extends ItemColored { public ItemBlockBase(Block block) { super(block, true); + + setRegistryName(block.getRegistryName()); } @Override diff --git a/src/main/java/refinedstorage/item/ItemBlockController.java b/src/main/java/refinedstorage/item/ItemBlockController.java index bd5c4e62d..0d7c33c41 100755 --- a/src/main/java/refinedstorage/item/ItemBlockController.java +++ b/src/main/java/refinedstorage/item/ItemBlockController.java @@ -1,9 +1,9 @@ package refinedstorage.item; -import net.minecraft.block.Block; +import refinedstorage.RefinedStorageBlocks; public class ItemBlockController extends ItemBlockBase { - public ItemBlockController(Block block) { - super(block); + public ItemBlockController() { + super(RefinedStorageBlocks.CONTROLLER); } } diff --git a/src/main/java/refinedstorage/item/ItemBlockGrid.java b/src/main/java/refinedstorage/item/ItemBlockGrid.java index ef8aa2ede..3c813813b 100755 --- a/src/main/java/refinedstorage/item/ItemBlockGrid.java +++ b/src/main/java/refinedstorage/item/ItemBlockGrid.java @@ -1,9 +1,9 @@ package refinedstorage.item; -import net.minecraft.block.Block; +import refinedstorage.RefinedStorageBlocks; public class ItemBlockGrid extends ItemBlockBase { - public ItemBlockGrid(Block block) { - super(block); + public ItemBlockGrid() { + super(RefinedStorageBlocks.GRID); } } diff --git a/src/main/java/refinedstorage/item/ItemBlockStorage.java b/src/main/java/refinedstorage/item/ItemBlockStorage.java index 0eec56106..7310b2ffb 100755 --- a/src/main/java/refinedstorage/item/ItemBlockStorage.java +++ b/src/main/java/refinedstorage/item/ItemBlockStorage.java @@ -1,11 +1,11 @@ package refinedstorage.item; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import refinedstorage.RefinedStorageBlocks; import refinedstorage.block.EnumStorageType; import refinedstorage.storage.NBTStorage; import refinedstorage.tile.TileStorage; @@ -13,8 +13,8 @@ import refinedstorage.tile.TileStorage; import java.util.List; public class ItemBlockStorage extends ItemBlockBase { - public ItemBlockStorage(Block block) { - super(block); + public ItemBlockStorage() { + super(RefinedStorageBlocks.STORAGE); } @Override diff --git a/src/main/java/refinedstorage/item/ItemWirelessGrid.java b/src/main/java/refinedstorage/item/ItemWirelessGrid.java index 4044ec028..14e0948ee 100755 --- a/src/main/java/refinedstorage/item/ItemWirelessGrid.java +++ b/src/main/java/refinedstorage/item/ItemWirelessGrid.java @@ -45,6 +45,7 @@ public class ItemWirelessGrid extends ItemEnergyContainer { } }); + setRegistryName(RefinedStorage.ID, "wireless_grid"); setMaxDamage(3200); setMaxStackSize(1); setHasSubtypes(false); diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index 2c2d6d0fe..0faacbb1f 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -1,7 +1,9 @@ package refinedstorage.proxy; +import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; @@ -12,11 +14,15 @@ import net.minecraftforge.fml.relauncher.Side; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageItems; +import refinedstorage.block.BlockBase; import refinedstorage.block.EnumControllerType; import refinedstorage.block.EnumGridType; import refinedstorage.block.EnumStorageType; import refinedstorage.gui.GuiHandler; -import refinedstorage.item.*; +import refinedstorage.item.ItemCore; +import refinedstorage.item.ItemProcessor; +import refinedstorage.item.ItemStorageDisk; +import refinedstorage.item.ItemStoragePart; import refinedstorage.network.*; import refinedstorage.storage.NBTStorage; import refinedstorage.tile.*; @@ -58,29 +64,29 @@ public class CommonProxy { GameRegistry.registerTileEntity(TileRelay.class, ID + ":relay"); GameRegistry.registerTileEntity(TileInterface.class, ID + ":interface"); - GameRegistry.registerBlock(RefinedStorageBlocks.CONTROLLER, ItemBlockController.class, ID + ":controller"); - GameRegistry.registerBlock(RefinedStorageBlocks.CABLE, ID + ":cable"); - GameRegistry.registerBlock(RefinedStorageBlocks.GRID, ItemBlockGrid.class, ID + ":grid"); - GameRegistry.registerBlock(RefinedStorageBlocks.DISK_DRIVE, ID + ":disk_drive"); - GameRegistry.registerBlock(RefinedStorageBlocks.EXTERNAL_STORAGE, ID + ":external_storage"); - GameRegistry.registerBlock(RefinedStorageBlocks.IMPORTER, ID + ":importer"); - GameRegistry.registerBlock(RefinedStorageBlocks.EXPORTER, ID + ":exporter"); - GameRegistry.registerBlock(RefinedStorageBlocks.DETECTOR, ID + ":detector"); - GameRegistry.registerBlock(RefinedStorageBlocks.MACHINE_CASING, ID + ":machine_casing"); - GameRegistry.registerBlock(RefinedStorageBlocks.SOLDERER, ID + ":solderer"); - GameRegistry.registerBlock(RefinedStorageBlocks.DESTRUCTOR, ID + ":destructor"); - GameRegistry.registerBlock(RefinedStorageBlocks.CONSTRUCTOR, ID + ":constructor"); - GameRegistry.registerBlock(RefinedStorageBlocks.STORAGE, ItemBlockStorage.class, ID + ":storage"); - GameRegistry.registerBlock(RefinedStorageBlocks.RELAY, ID + ":relay"); - GameRegistry.registerBlock(RefinedStorageBlocks.INTERFACE, ID + ":interface"); + registerBlock(RefinedStorageBlocks.CONTROLLER); + registerBlock(RefinedStorageBlocks.CABLE); + registerBlock(RefinedStorageBlocks.GRID); + registerBlock(RefinedStorageBlocks.DISK_DRIVE); + registerBlock(RefinedStorageBlocks.EXTERNAL_STORAGE); + registerBlock(RefinedStorageBlocks.IMPORTER); + registerBlock(RefinedStorageBlocks.EXPORTER); + registerBlock(RefinedStorageBlocks.DETECTOR); + registerBlock(RefinedStorageBlocks.MACHINE_CASING); + registerBlock(RefinedStorageBlocks.SOLDERER); + registerBlock(RefinedStorageBlocks.DESTRUCTOR); + registerBlock(RefinedStorageBlocks.CONSTRUCTOR); + registerBlock(RefinedStorageBlocks.STORAGE); + registerBlock(RefinedStorageBlocks.RELAY); + registerBlock(RefinedStorageBlocks.INTERFACE); - GameRegistry.registerItem(RefinedStorageItems.STORAGE_DISK, ID + ":storage_disk"); - GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID, ID + ":wireless_grid"); - GameRegistry.registerItem(RefinedStorageItems.QUARTZ_ENRICHED_IRON, ID + ":quartz_enriched_iron"); - GameRegistry.registerItem(RefinedStorageItems.CORE, ID + ":core"); - GameRegistry.registerItem(RefinedStorageItems.SILICON, ID + ":silicon"); - GameRegistry.registerItem(RefinedStorageItems.PROCESSOR, ID + ":processor"); - GameRegistry.registerItem(RefinedStorageItems.STORAGE_PART, ID + ":storage_part"); + GameRegistry.register(RefinedStorageItems.STORAGE_DISK); + GameRegistry.register(RefinedStorageItems.WIRELESS_GRID); + GameRegistry.register(RefinedStorageItems.QUARTZ_ENRICHED_IRON); + GameRegistry.register(RefinedStorageItems.CORE); + GameRegistry.register(RefinedStorageItems.SILICON); + GameRegistry.register(RefinedStorageItems.PROCESSOR); + GameRegistry.register(RefinedStorageItems.STORAGE_PART); // Processors SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_BASIC)); @@ -350,4 +356,9 @@ public class CommonProxy { public void postInit(FMLPostInitializationEvent e) { } + + private void registerBlock(BlockBase block) { + GameRegistry.register(block); + GameRegistry.register(block.createItemForBlock()); + } }