diff --git a/build.gradle b/build.gradle index 677fb97..2190753 100644 --- a/build.gradle +++ b/build.gradle @@ -97,7 +97,10 @@ tasks.build.dependsOn('sourceJar', 'deobfJar') processResources { - // First we just copy in the mcmod.info file + inputs.property "mod_version", project.config.mod_version + inputs.property "tfc_version", project.config.tfc_version + inputs.property "minecraft_version", project.config.minecraft_version + from(sourceSets.main.resources.srcDirs) { include '**/*.info' diff --git a/build.prop b/build.prop index feea7d3..dfc334e 100644 --- a/build.prop +++ b/build.prop @@ -1,6 +1,6 @@ minecraft_version=1.7.10 forge_version=10.13.4.1566-1.7.10 tfc_version=0.79.27 -mod_version=1.18 +mod_version=1.19 mod_id=TerraFirmaPunkTweaks group_name=com.JAWolfe.TerraFirmaPunkTweaks \ No newline at end of file diff --git a/builds/TerraFirmaPunkTweaks-1.7.10-1.19.jar b/builds/TerraFirmaPunkTweaks-1.7.10-1.19.jar new file mode 100644 index 0000000..2143d47 Binary files /dev/null and b/builds/TerraFirmaPunkTweaks-1.7.10-1.19.jar differ diff --git a/changelog.txt b/changelog.txt index a949531..171bce0 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,11 @@ Changelog ================================================= +------------------------------------------------- +TFP Tweaks 1.19 +------------------------------------------------- +Bug Fix ++Fixed Forestry Backpack duping vanilla chests + ------------------------------------------------- TFP Tweaks 1.18 ------------------------------------------------- diff --git a/src/main/java/com/JAWolfe/terrafirmapunktweaks/handlers/PlayerInteractionHandler.java b/src/main/java/com/JAWolfe/terrafirmapunktweaks/handlers/PlayerInteractionHandler.java index 9bf2f9f..4bf8d65 100644 --- a/src/main/java/com/JAWolfe/terrafirmapunktweaks/handlers/PlayerInteractionHandler.java +++ b/src/main/java/com/JAWolfe/terrafirmapunktweaks/handlers/PlayerInteractionHandler.java @@ -13,6 +13,7 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.eventhandler.Event.Result; import flaxbeard.steamcraft.SteamcraftBlocks; +import forestry.api.storage.BackpackStowEvent; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -31,24 +32,44 @@ public class PlayerInteractionHandler { @SubscribeEvent public void onItemPickup(EntityItemPickupEvent event) - { - EntityItem item = event.item; - ItemStack is = item.getEntityItem(); - EntityPlayer player = event.entityPlayer; - Item droppedItem = is.getItem(); - - if(droppedItem.equals(Item.getItemFromBlock(Blocks.chest)) && ConfigSettings.VanillaChestConversion) + { + if(event.item.getEntityItem().getItem().equals(Item.getItemFromBlock(Blocks.chest)) && + ConfigSettings.VanillaChestConversion) { + EntityItem item = event.item; + EntityPlayer player = event.entityPlayer; + item.delayBeforeCanPickup = 100; item.setDead(); item.setInvisible(true); Random rand = player.worldObj.rand; player.worldObj.playSoundAtEntity(player, "random.pop", 0.2F, ((rand.nextFloat() - rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); - - player.inventory.addItemStackToInventory(new ItemStack(TFCBlocks.chest, 1, 0)); + + if(item.getEntityItem().stackSize == 0) + player.inventory.addItemStackToInventory(new ItemStack(TFCBlocks.chest)); + else + player.inventory.addItemStackToInventory(new ItemStack(TFCBlocks.chest, item.getEntityItem().stackSize)); + + for(int i = 0; i < player.inventory.getSizeInventory(); i++) + { + ItemStack is = player.inventory.getStackInSlot(i); + + if(is != null && is.getItem().equals(Item.getItemFromBlock(Blocks.chest))) + { + player.inventory.setInventorySlotContents(i, new ItemStack(TFCBlocks.chest, is.stackSize - 1)); + } + } } } + @SubscribeEvent + public void stowItemBackpack(BackpackStowEvent event) + { + if(event.stackToStow != null && event.stackToStow.getItem().equals(Item.getItemFromBlock(Blocks.chest)) && + ConfigSettings.VanillaChestConversion) + event.setCanceled(true); + } + @SubscribeEvent public void onFillBucket(FillBucketEvent event) {