pull in additional tweaks from cpw

This commit is contained in:
Progwml6 2016-01-12 17:54:30 -05:00
commit edb3454d8b
5 changed files with 22 additions and 12 deletions

View File

@ -34,8 +34,8 @@ archivesBaseName = "ironchest"
// Setup the forge minecraft plugin data. Specify the preferred forge/minecraft version here // Setup the forge minecraft plugin data. Specify the preferred forge/minecraft version here
minecraft { minecraft {
mappings = "snapshot_20151122" version = "1.8.9-11.15.0.1689"
version = "1.8.9-11.15.0.1663" mappings = "stable_20"
runDir = "run" runDir = "run"
} }
@ -76,7 +76,7 @@ uploadArchives {
if (project.hasProperty('forgeMavenPass')) if (project.hasProperty('forgeMavenPass'))
{ {
repository(url: "http://files.minecraftforge.net/maven/manage/upload") { repository(url: "http://files.minecraftforge.net/maven/manage/upload") {
authentication(userName: "forge", password: project.getProperty('forgeMavenPass')) // the elvis operator. look it up. authentication(userName: project.getProperty('forgeMavenUser'), password: project.getProperty('forgeMavenPassword')) // the elvis operator. look it up.
} }
} }
else else
@ -94,7 +94,7 @@ uploadArchives {
name project.archivesBaseName name project.archivesBaseName
packaging 'jar' packaging 'jar'
description 'IronChest' description 'IronChest'
url 'https://github.com/cpw/IronChest' url 'https://github.com/progwml6/IronChest'
scm { scm {
url 'https://github.com/progwml6/IronChest' url 'https://github.com/progwml6/IronChest'
@ -146,7 +146,7 @@ def getGitVersion()
def maj = matcher[0][1] def maj = matcher[0][1]
def min = matcher[0][2] def min = matcher[0][2]
def rev = matcher[0][3] def rev = matcher[0][3]
def bn = System.getenv("BUILD_NUMBER") ?: "1" def bn = System.getenv("PROMOTED_NUMBER") ?: System.getenv("BUILD_NUMBER") ?: "1"
out['IronChest.build.major.number'] = maj.toString() out['IronChest.build.major.number'] = maj.toString()
out['IronChest.build.minor.number'] = min.toString() out['IronChest.build.minor.number'] = min.toString()

View File

@ -10,7 +10,6 @@
******************************************************************************/ ******************************************************************************/
package cpw.mods.ironchest; package cpw.mods.ironchest;
import invtweaks.api.container.ChestContainer;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
@ -18,7 +17,6 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ChestContainer(isLargeChest = true)
public class ContainerIronChest extends Container { public class ContainerIronChest extends Container {
private IronChestType type; private IronChestType type;
private EntityPlayer player; private EntityPlayer player;
@ -118,7 +116,6 @@ public class ContainerIronChest extends Container {
return player; return player;
} }
@ChestContainer.RowSizeCallback
public int getNumColumns() { public int getNumColumns() {
return type.getRowLength(); return type.getRowLength();
} }

View File

@ -10,7 +10,14 @@
******************************************************************************/ ******************************************************************************/
package cpw.mods.ironchest; package cpw.mods.ironchest;
import io.netty.buffer.ByteBuf;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.entity.RenderFireball;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.entity.projectile.EntitySmallFireball;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.client.registry.IRenderFactory;
import net.minecraftforge.fml.client.registry.RenderingRegistry;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.Mod.Instance; import net.minecraftforge.fml.common.Mod.Instance;
@ -18,9 +25,14 @@ import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
@Mod(modid = "IronChest", name = "Iron Chests", dependencies = "required-after:Forge@[11.14.4,]") @Mod(modid = "IronChest", name = "Iron Chests", dependencies = "required-after:Forge@[11.15.0,12.0]", acceptedMinecraftVersions="[1.8,1.8.9]")
public class IronChest public class IronChest
{ {
public static BlockIronChest ironChestBlock; public static BlockIronChest ironChestBlock;

View File

@ -221,7 +221,7 @@ public class TileEntityIronChest extends TileEntityLockable implements ITickable
} }
@Override @Override
public String getCommandSenderName() public String getName()
{ {
return this.hasCustomName() ? this.customName : type.name(); return this.hasCustomName() ? this.customName : type.name();
} }
@ -439,6 +439,7 @@ public class TileEntityIronChest extends TileEntityLockable implements ITickable
@Override @Override
public Packet<?> getDescriptionPacket() public Packet<?> getDescriptionPacket()
{ {
NBTTagCompound nbt = new NBTTagCompound(); NBTTagCompound nbt = new NBTTagCompound();
nbt.setInteger("type", getType().ordinal()); nbt.setInteger("type", getType().ordinal());
nbt.setByte("facing", facing); nbt.setByte("facing", facing);
@ -524,7 +525,7 @@ public class TileEntityIronChest extends TileEntityLockable implements ITickable
} }
@Override @Override
public ItemStack getStackInSlotOnClosing(int par1) public ItemStack removeStackFromSlot(int par1)
{ {
if (this.chestContents[par1] != null) if (this.chestContents[par1] != null)
{ {

View File

@ -48,7 +48,7 @@ public class ClientProxy extends CommonProxy
@Override @Override
public <T extends TileEntityIronChest> void registerTileEntitySpecialRenderer(Class<T> type) public <T extends TileEntityIronChest> void registerTileEntitySpecialRenderer(Class<T> type)
{ {
ClientRegistry.bindTileEntitySpecialRenderer(type, new TileEntityIronChestRenderer(type)); ClientRegistry.bindTileEntitySpecialRenderer(type, new TileEntityIronChestRenderer<T>(type));
} }
@Override @Override