From bc52440e62898aebdce087839d67417a78444def Mon Sep 17 00:00:00 2001 From: Azanor Date: Fri, 5 Dec 2014 08:05:33 +0200 Subject: [PATCH] 1.0.1.10 updates - api package-info.java cleanup (closes #80) - now you won't lose items in bauble crafting grid when switching back to vanilla inventory --- build.gradle | 2 +- src/main/java/baubles/api/package-info.java | 2 +- src/main/java/baubles/common/Baubles.java | 2 +- .../baubles/common/container/ContainerPlayerExpanded.java | 4 ++-- .../baubles/common/network/PacketOpenNormalInventory.java | 1 + src/main/resources/changelog.txt | 4 ++++ 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 7e3e94a..eb2d8bb 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-1.0.1.9" +version = "1.7.10-1.0.1.10" group= "com.azanor.baubles" archivesBaseName = "Baubles" diff --git a/src/main/java/baubles/api/package-info.java b/src/main/java/baubles/api/package-info.java index 15b770d..497a7dd 100644 --- a/src/main/java/baubles/api/package-info.java +++ b/src/main/java/baubles/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Baubles", apiVersion = baubles.common.Baubles.VERSION, provides = "Baubles|API") +@API(owner = "Baubles", apiVersion = "1.0.1.10", provides = "Baubles|API") package baubles.api; import cpw.mods.fml.common.API; diff --git a/src/main/java/baubles/common/Baubles.java b/src/main/java/baubles/common/Baubles.java index d38c2d7..ccc6fdb 100644 --- a/src/main/java/baubles/common/Baubles.java +++ b/src/main/java/baubles/common/Baubles.java @@ -26,7 +26,7 @@ public class Baubles { public static final String MODID = "Baubles"; public static final String MODNAME = "Baubles"; - public static final String VERSION = "1.0.1.9"; + public static final String VERSION = "1.0.1.10"; @SidedProxy(clientSide = "baubles.client.ClientProxy", serverSide = "baubles.common.CommonProxy") public static CommonProxy proxy; diff --git a/src/main/java/baubles/common/container/ContainerPlayerExpanded.java b/src/main/java/baubles/common/container/ContainerPlayerExpanded.java index 6bf09ea..04c741a 100644 --- a/src/main/java/baubles/common/container/ContainerPlayerExpanded.java +++ b/src/main/java/baubles/common/container/ContainerPlayerExpanded.java @@ -105,7 +105,6 @@ public class ContainerPlayerExpanded extends Container public void onContainerClosed(EntityPlayer player) { super.onContainerClosed(player); - for (int i = 0; i < 4; ++i) { ItemStack itemstack = this.craftMatrix.getStackInSlotOnClosing(i); @@ -119,7 +118,6 @@ public class ContainerPlayerExpanded extends Container this.craftResult.setInventorySlotContents(0, (ItemStack)null); if (!player.worldObj.isRemote) { PlayerHandler.setPlayerBaubles(player, baubles); -// PlayerHandler.savePlayerBaubles(player); } } @@ -372,5 +370,7 @@ public class ContainerPlayerExpanded extends Container { return par2Slot.inventory != this.craftResult && super.func_94530_a(par1ItemStack, par2Slot); } + + } diff --git a/src/main/java/baubles/common/network/PacketOpenNormalInventory.java b/src/main/java/baubles/common/network/PacketOpenNormalInventory.java index 5acf8cb..254da78 100644 --- a/src/main/java/baubles/common/network/PacketOpenNormalInventory.java +++ b/src/main/java/baubles/common/network/PacketOpenNormalInventory.java @@ -20,6 +20,7 @@ public class PacketOpenNormalInventory implements IMessage, IMessageHandler