From 9a353e3e83bfc44d9206358b2182f497093a6d20 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 2 Jan 2016 18:13:49 +0100 Subject: [PATCH] 1.8.9 port --- build.gradle | 18 ++++-- .../inventory/InventorySimple.java | 2 +- .../java/storagecraft/proxy/ClientProxy.java | 55 +++++++++---------- src/main/java/storagecraft/tile/TileBase.java | 4 +- .../storagecraft/tile/TileConstructor.java | 4 +- .../java/storagecraft/tile/TileDetector.java | 4 +- .../java/storagecraft/tile/TileDrive.java | 4 +- .../java/storagecraft/tile/TileExporter.java | 4 +- .../java/storagecraft/tile/TileImporter.java | 4 +- .../java/storagecraft/tile/TileSolderer.java | 4 +- .../tile/TileWirelessTransmitter.java | 4 +- 11 files changed, 57 insertions(+), 50 deletions(-) diff --git a/build.gradle b/build.gradle index 493c929a8..ccb7e1d11 100755 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,25 @@ -plugins { - id "net.minecraftforge.gradle.forge" version "2.0.2" +buildscript { + repositories { + jcenter() + maven { + name = "forge" + url = "http://files.minecraftforge.net/maven" + } + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' + } } +apply plugin: 'net.minecraftforge.gradle.forge' version = "1.0" group = "storagecraft" archivesBaseName = "storagecraft" minecraft { - version = "1.8-11.14.4.1577" + version = "1.8.9-11.15.0.1671" runDir = "run" - mappings = "snapshot_20141130" + mappings = "stable_20" } dependencies { diff --git a/src/main/java/storagecraft/inventory/InventorySimple.java b/src/main/java/storagecraft/inventory/InventorySimple.java index ffe2aac60..218e951a9 100755 --- a/src/main/java/storagecraft/inventory/InventorySimple.java +++ b/src/main/java/storagecraft/inventory/InventorySimple.java @@ -56,7 +56,7 @@ public class InventorySimple implements IInventory } @Override - public ItemStack getStackInSlotOnClosing(int slot) + public ItemStack removeStackFromSlot(int slot) { ItemStack stack = getStackInSlot(slot); diff --git a/src/main/java/storagecraft/proxy/ClientProxy.java b/src/main/java/storagecraft/proxy/ClientProxy.java index d1e2a7f42..5caf0411b 100755 --- a/src/main/java/storagecraft/proxy/ClientProxy.java +++ b/src/main/java/storagecraft/proxy/ClientProxy.java @@ -7,8 +7,8 @@ import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.ForgeHooksClient; -import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; @@ -16,7 +16,6 @@ import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import storagecraft.StorageCraft; import storagecraft.StorageCraftBlocks; import storagecraft.StorageCraftItems; import storagecraft.block.EnumControllerType; @@ -32,39 +31,39 @@ public class ClientProxy extends CommonProxy { super.preInit(e); - ModelBakery.addVariantName(StorageCraftItems.STORAGE_CELL, - "storagecraft:1k_storage_cell", - "storagecraft:4k_storage_cell", - "storagecraft:16k_storage_cell", - "storagecraft:64k_storage_cell", - "storagecraft:creative_storage_cell" + ModelBakery.registerItemVariants(StorageCraftItems.STORAGE_CELL, + new ResourceLocation("storagecraft:1k_storage_cell"), + new ResourceLocation("storagecraft:4k_storage_cell"), + new ResourceLocation("storagecraft:16k_storage_cell"), + new ResourceLocation("storagecraft:64k_storage_cell"), + new ResourceLocation("storagecraft:creative_storage_cell") ); - ModelBakery.addVariantName(StorageCraftItems.STORAGE_PART, - "storagecraft:1k_storage_part", - "storagecraft:4k_storage_part", - "storagecraft:16k_storage_part", - "storagecraft:64k_storage_part" + ModelBakery.registerItemVariants(StorageCraftItems.STORAGE_PART, + new ResourceLocation("storagecraft:1k_storage_part"), + new ResourceLocation("storagecraft:4k_storage_part"), + new ResourceLocation("storagecraft:16k_storage_part"), + new ResourceLocation("storagecraft:64k_storage_part") ); - ModelBakery.addVariantName(StorageCraftItems.PROCESSOR, - "storagecraft:basic_printed_processor", - "storagecraft:improved_printed_processor", - "storagecraft:advanced_printed_processor", - "storagecraft:basic_processor", - "storagecraft:improved_processor", - "storagecraft:advanced_processor", - "storagecraft:printed_silicon" + ModelBakery.registerItemVariants(StorageCraftItems.PROCESSOR, + new ResourceLocation("storagecraft:basic_printed_processor"), + new ResourceLocation("storagecraft:improved_printed_processor"), + new ResourceLocation("storagecraft:advanced_printed_processor"), + new ResourceLocation("storagecraft:basic_processor"), + new ResourceLocation("storagecraft:improved_processor"), + new ResourceLocation("storagecraft:advanced_processor"), + new ResourceLocation("storagecraft:printed_silicon") ); - ModelBakery.addVariantName(StorageCraftItems.CORE, - "storagecraft:construction_core", - "storagecraft:destruction_core" + ModelBakery.registerItemVariants(StorageCraftItems.CORE, + new ResourceLocation("storagecraft:construction_core"), + new ResourceLocation("storagecraft:destruction_core") ); - ModelBakery.addVariantName(StorageCraftItems.WIRELESS_GRID, - "storagecraft:wireless_grid_connected", - "storagecraft:wireless_grid_disconnected" + ModelBakery.registerItemVariants(StorageCraftItems.WIRELESS_GRID, + new ResourceLocation("storagecraft:wireless_grid_connected"), + new ResourceLocation("storagecraft:wireless_grid_disconnected") ); ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(StorageCraftBlocks.CABLE), 0, TileCable.class); @@ -76,8 +75,6 @@ public class ClientProxy extends CommonProxy { public static final BakeEventHandler instance = new BakeEventHandler(); - public BakeEventHandler() {} - @SubscribeEvent public void onModelBakeEvent(ModelBakeEvent event) { diff --git a/src/main/java/storagecraft/tile/TileBase.java b/src/main/java/storagecraft/tile/TileBase.java index b0dc78d9a..24ec33b06 100755 --- a/src/main/java/storagecraft/tile/TileBase.java +++ b/src/main/java/storagecraft/tile/TileBase.java @@ -6,16 +6,16 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; import storagecraft.StorageCraft; import storagecraft.network.MessageTileUpdate; -public abstract class TileBase extends TileEntity implements IUpdatePlayerListBox +public abstract class TileBase extends TileEntity implements ITickable { public static final String NBT_DIRECTION = "Direction"; diff --git a/src/main/java/storagecraft/tile/TileConstructor.java b/src/main/java/storagecraft/tile/TileConstructor.java index 311a5fd02..e30b8f0d4 100755 --- a/src/main/java/storagecraft/tile/TileConstructor.java +++ b/src/main/java/storagecraft/tile/TileConstructor.java @@ -118,9 +118,9 @@ public class TileConstructor extends TileMachine implements IInventory, ISidedIn } @Override - public ItemStack getStackInSlotOnClosing(int slot) + public ItemStack removeStackFromSlot(int slot) { - return inventory.getStackInSlotOnClosing(slot); + return inventory.removeStackFromSlot(slot); } @Override diff --git a/src/main/java/storagecraft/tile/TileDetector.java b/src/main/java/storagecraft/tile/TileDetector.java index 5156fed87..6c9437a43 100755 --- a/src/main/java/storagecraft/tile/TileDetector.java +++ b/src/main/java/storagecraft/tile/TileDetector.java @@ -233,9 +233,9 @@ public class TileDetector extends TileMachine implements IInventory, ISidedInven } @Override - public ItemStack getStackInSlotOnClosing(int slot) + public ItemStack removeStackFromSlot(int slot) { - return inventory.getStackInSlotOnClosing(slot); + return inventory.removeStackFromSlot(slot); } @Override diff --git a/src/main/java/storagecraft/tile/TileDrive.java b/src/main/java/storagecraft/tile/TileDrive.java index c32ccafaa..7e90e90ea 100755 --- a/src/main/java/storagecraft/tile/TileDrive.java +++ b/src/main/java/storagecraft/tile/TileDrive.java @@ -85,9 +85,9 @@ public class TileDrive extends TileMachine implements IInventory, IStorageProvid } @Override - public ItemStack getStackInSlotOnClosing(int slot) + public ItemStack removeStackFromSlot(int slot) { - return inventory.getStackInSlotOnClosing(slot); + return inventory.removeStackFromSlot(slot); } @Override diff --git a/src/main/java/storagecraft/tile/TileExporter.java b/src/main/java/storagecraft/tile/TileExporter.java index e86c2b243..f38f3dc06 100755 --- a/src/main/java/storagecraft/tile/TileExporter.java +++ b/src/main/java/storagecraft/tile/TileExporter.java @@ -161,9 +161,9 @@ public class TileExporter extends TileMachine implements IInventory, ISidedInven } @Override - public ItemStack getStackInSlotOnClosing(int slot) + public ItemStack removeStackFromSlot(int slot) { - return inventory.getStackInSlotOnClosing(slot); + return inventory.removeStackFromSlot(slot); } @Override diff --git a/src/main/java/storagecraft/tile/TileImporter.java b/src/main/java/storagecraft/tile/TileImporter.java index f29552e49..b7e776a80 100755 --- a/src/main/java/storagecraft/tile/TileImporter.java +++ b/src/main/java/storagecraft/tile/TileImporter.java @@ -214,9 +214,9 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven } @Override - public ItemStack getStackInSlotOnClosing(int slot) + public ItemStack removeStackFromSlot(int slot) { - return inventory.getStackInSlotOnClosing(slot); + return inventory.removeStackFromSlot(slot); } @Override diff --git a/src/main/java/storagecraft/tile/TileSolderer.java b/src/main/java/storagecraft/tile/TileSolderer.java index e6e11e8f3..d334e7aaa 100755 --- a/src/main/java/storagecraft/tile/TileSolderer.java +++ b/src/main/java/storagecraft/tile/TileSolderer.java @@ -186,9 +186,9 @@ public class TileSolderer extends TileMachine implements IInventory, ISidedInven } @Override - public ItemStack getStackInSlotOnClosing(int slot) + public ItemStack removeStackFromSlot(int slot) { - return inventory.getStackInSlotOnClosing(slot); + return inventory.removeStackFromSlot(slot); } @Override diff --git a/src/main/java/storagecraft/tile/TileWirelessTransmitter.java b/src/main/java/storagecraft/tile/TileWirelessTransmitter.java index da6913b9a..8092fe499 100755 --- a/src/main/java/storagecraft/tile/TileWirelessTransmitter.java +++ b/src/main/java/storagecraft/tile/TileWirelessTransmitter.java @@ -192,9 +192,9 @@ public class TileWirelessTransmitter extends TileMachine implements IInventory } @Override - public ItemStack getStackInSlotOnClosing(int slot) + public ItemStack removeStackFromSlot(int slot) { - return inventory.getStackInSlotOnClosing(slot); + return inventory.removeStackFromSlot(slot); } @Override