Skip to content

Commit ef1058e

Browse files
committed
Properly update for 1.8.9
1 parent 3b63013 commit ef1058e

File tree

7 files changed

+27
-17
lines changed

7 files changed

+27
-17
lines changed

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ archivesBaseName = "ironchest"
3434

3535
// Setup the forge minecraft plugin data. Specify the preferred forge/minecraft version here
3636
minecraft {
37-
version = "1.8.8-11.14.4.1576-1.8.8"
38-
mappings = "snapshot_20151122"
37+
version = "1.8.9-11.15.0.1689"
38+
mappings = "stable_20"
3939
runDir = "run"
4040
}
4141

@@ -76,7 +76,7 @@ uploadArchives {
7676
if (project.hasProperty('forgeMavenPass'))
7777
{
7878
repository(url: "http://files.minecraftforge.net/maven/manage/upload") {
79-
authentication(userName: "forge", password: project.getProperty('forgeMavenPass')) // the elvis operator. look it up.
79+
authentication(userName: project.getProperty('forgeMavenUser'), password: project.getProperty('forgeMavenPassword')) // the elvis operator. look it up.
8080
}
8181
}
8282
else
@@ -94,7 +94,7 @@ uploadArchives {
9494
name project.archivesBaseName
9595
packaging 'jar'
9696
description 'IronChest'
97-
url 'https://github.com/cpw/IronChest'
97+
url 'https://github.com/progwml6/IronChest'
9898

9999
scm {
100100
url 'https://github.com/progwml6/IronChest'
@@ -146,7 +146,7 @@ def getGitVersion()
146146
def maj = matcher[0][1]
147147
def min = matcher[0][2]
148148
def rev = matcher[0][3]
149-
def bn = System.getenv("BUILD_NUMBER") ?: "1"
149+
def bn = System.getenv("PROMOTED_NUMBER") ?: System.getenv("BUILD_NUMBER") ?: "1"
150150

151151
out['IronChest.build.major.number'] = maj.toString()
152152
out['IronChest.build.minor.number'] = min.toString()

src/main/java/cpw/mods/ironchest/CommonProxy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void registerRenderInformation()
2222

2323
}
2424

25-
public void registerTileEntitySpecialRenderer(IronChestType typ)
25+
public <T extends TileEntityIronChest> void registerTileEntitySpecialRenderer(Class<T> typ)
2626
{
2727

2828
}

src/main/java/cpw/mods/ironchest/ContainerIronChest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@
1010
******************************************************************************/
1111
package cpw.mods.ironchest;
1212

13-
import invtweaks.api.container.ChestContainer;
1413
import net.minecraft.entity.player.EntityPlayer;
1514
import net.minecraft.entity.player.InventoryPlayer;
1615
import net.minecraft.inventory.Container;
1716
import net.minecraft.inventory.IInventory;
1817
import net.minecraft.inventory.Slot;
1918
import net.minecraft.item.ItemStack;
2019

21-
@ChestContainer(isLargeChest = true)
2220
public class ContainerIronChest extends Container {
2321
private IronChestType type;
2422
private EntityPlayer player;
@@ -118,7 +116,6 @@ public EntityPlayer getPlayer()
118116
return player;
119117
}
120118

121-
@ChestContainer.RowSizeCallback
122119
public int getNumColumns() {
123120
return type.getRowLength();
124121
}

src/main/java/cpw/mods/ironchest/IronChest.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,29 @@
1010
******************************************************************************/
1111
package cpw.mods.ironchest;
1212

13+
import io.netty.buffer.ByteBuf;
14+
import net.minecraft.client.renderer.entity.Render;
15+
import net.minecraft.client.renderer.entity.RenderFireball;
16+
import net.minecraft.client.renderer.entity.RenderManager;
17+
import net.minecraft.entity.projectile.EntitySmallFireball;
1318
import net.minecraftforge.common.MinecraftForge;
19+
import net.minecraftforge.fml.client.registry.IRenderFactory;
20+
import net.minecraftforge.fml.client.registry.RenderingRegistry;
1421
import net.minecraftforge.fml.common.Mod;
1522
import net.minecraftforge.fml.common.Mod.EventHandler;
1623
import net.minecraftforge.fml.common.Mod.Instance;
1724
import net.minecraftforge.fml.common.SidedProxy;
1825
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
1926
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
2027
import net.minecraftforge.fml.common.network.NetworkRegistry;
28+
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
29+
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
30+
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
31+
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
2132
import net.minecraftforge.fml.common.registry.GameRegistry;
33+
import net.minecraftforge.fml.relauncher.Side;
2234

23-
@Mod(modid = "IronChest", name = "Iron Chests", dependencies = "required-after:Forge@[11.14.4,]", acceptedMinecraftVersions="[1.8,1.8.8]")
35+
@Mod(modid = "IronChest", name = "Iron Chests", dependencies = "required-after:Forge@[11.15.0,12.0]", acceptedMinecraftVersions="[1.8,1.8.9]")
2436
public class IronChest
2537
{
2638
public static BlockIronChest ironChestBlock;
@@ -48,7 +60,7 @@ public void load(FMLInitializationEvent evt)
4860
for (IronChestType typ : IronChestType.values())
4961
{
5062
GameRegistry.registerTileEntityWithAlternatives(typ.clazz, "IronChest." + typ.name(), typ.name());
51-
proxy.registerTileEntitySpecialRenderer(typ);
63+
proxy.registerTileEntitySpecialRenderer(typ.clazz);
5264
}
5365
IronChestType.registerBlocksAndRecipes(ironChestBlock);
5466
ChestChangerType.generateRecipes();

src/main/java/cpw/mods/ironchest/TileEntityIronChest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public void setInventorySlotContents(int i, ItemStack itemstack)
221221
}
222222

223223
@Override
224-
public String getCommandSenderName()
224+
public String getName()
225225
{
226226
return this.hasCustomName() ? this.customName : type.name();
227227
}
@@ -439,6 +439,7 @@ public TileEntityIronChest updateFromMetadata(int l)
439439
@Override
440440
public Packet<?> getDescriptionPacket()
441441
{
442+
442443
NBTTagCompound nbt = new NBTTagCompound();
443444
nbt.setInteger("type", getType().ordinal());
444445
nbt.setByte("facing", facing);
@@ -524,7 +525,7 @@ public ItemStack[] buildItemStackDataList()
524525
}
525526

526527
@Override
527-
public ItemStack getStackInSlotOnClosing(int par1)
528+
public ItemStack removeStackFromSlot(int par1)
528529
{
529530
if (this.chestContents[par1] != null)
530531
{

src/main/java/cpw/mods/ironchest/client/ClientProxy.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ public void registerRenderInformation()
4646
}
4747

4848
@Override
49-
public void registerTileEntitySpecialRenderer(IronChestType typ)
49+
public <T extends TileEntityIronChest> void registerTileEntitySpecialRenderer(Class<T> type)
5050
{
51-
ClientRegistry.bindTileEntitySpecialRenderer(typ.clazz, new TileEntityIronChestRenderer());
51+
ClientRegistry.bindTileEntitySpecialRenderer(type, new TileEntityIronChestRenderer<T>(type));
5252
}
5353

5454
@Override

src/main/java/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import net.minecraft.item.ItemStack;
3232
import net.minecraft.util.ResourceLocation;
3333

34-
public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer<TileEntityIronChest>
34+
public class TileEntityIronChestRenderer<T extends TileEntityIronChest> extends TileEntitySpecialRenderer<T>
3535
{
3636
private static Map<IronChestType, ResourceLocation> locations;
3737

@@ -50,7 +50,7 @@ public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer<TileE
5050
private static float[][] shifts = { { 0.3F, 0.45F, 0.3F }, { 0.7F, 0.45F, 0.3F }, { 0.3F, 0.45F, 0.7F }, { 0.7F, 0.45F, 0.7F }, { 0.3F, 0.1F, 0.3F },
5151
{ 0.7F, 0.1F, 0.3F }, { 0.3F, 0.1F, 0.7F }, { 0.7F, 0.1F, 0.7F }, { 0.5F, 0.32F, 0.5F }, };
5252

53-
public TileEntityIronChestRenderer()
53+
public TileEntityIronChestRenderer(Class<T> type)
5454
{
5555
model = new ModelChest();
5656
random = new Random();

0 commit comments

Comments
 (0)