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

1.8.9 port

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-01-02 18:13:49 +01:00
parent 7b38bce072
commit 9a353e3e83
11 changed files with 57 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
build.gradle
View File

@@ -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 {

2
src/main/java/storagecraft/inventory/InventorySimple.java
View File

@@ -56,7 +56,7 @@ public class InventorySimple implements IInventory
}
@Override
public ItemStack getStackInSlotOnClosing(int slot)
public ItemStack removeStackFromSlot(int slot)
{
ItemStack stack = getStackInSlot(slot);

55
src/main/java/storagecraft/proxy/ClientProxy.java
View File

@@ -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)
{

4
src/main/java/storagecraft/tile/TileBase.java
View File

@@ -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";

4
src/main/java/storagecraft/tile/TileConstructor.java
View File

@@ -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

4
src/main/java/storagecraft/tile/TileDetector.java
View File

@@ -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

4
src/main/java/storagecraft/tile/TileDrive.java
View File

@@ -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

4
src/main/java/storagecraft/tile/TileExporter.java
View File

@@ -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

4
src/main/java/storagecraft/tile/TileImporter.java
View File

@@ -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

4
src/main/java/storagecraft/tile/TileSolderer.java
View File

@@ -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

4
src/main/java/storagecraft/tile/TileWirelessTransmitter.java
View File

@@ -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