From 27b6d250ba6005bfa9cdd9d291e0656f5e02fa65 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Wed, 21 May 2014 18:48:35 +0300 Subject: Liquids! --- .../jewelrycraft/events/BucketHandler.java | 7 ++- .../jewelrycraft/events/EntityEventHandler.java | 58 ++++++++++++++++--- .../jewelrycraft/events/EventHandler.java | 65 ++++++++++++++++++++++ 3 files changed, 122 insertions(+), 8 deletions(-) create mode 100644 src/main/java/darkknight/jewelrycraft/events/EventHandler.java (limited to 'src/main/java/darkknight/jewelrycraft/events') diff --git a/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java b/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java index 64a02c3..cf16847 100644 --- a/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java @@ -18,6 +18,9 @@ import net.minecraft.world.World; import net.minecraftforge.event.entity.player.FillBucketEvent; import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import darkknight.jewelrycraft.JewelrycraftMod; +import darkknight.jewelrycraft.block.BlockMoltenMetal; +import darkknight.jewelrycraft.util.JewelryNBT; public class BucketHandler { @@ -47,7 +50,9 @@ public class BucketHandler { Item bucket = buckets.get(block); if (bucket != null && world.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ) == 0) { world.setBlockToAir(pos.blockX, pos.blockY, pos.blockZ); - return new ItemStack(bucket); + ItemStack item = new ItemStack(bucket); + JewelryNBT.addMetal(item, new ItemStack(Item.getItemById(JewelrycraftMod.saveData.getInteger(BlockMoltenMetal.coords(pos.blockX, pos.blockY, pos.blockZ))))); + return item; } else return null; diff --git a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java index d8d49a2..957705c 100644 --- a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java @@ -1,27 +1,31 @@ package darkknight.jewelrycraft.events; +import java.io.EOFException; import java.io.File; +import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.WorldServer; import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.event.world.WorldEvent; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import darkknight.jewelrycraft.JewelrycraftMod; import darkknight.jewelrycraft.item.ItemList; import darkknight.jewelrycraft.util.BlockUtils; import darkknight.jewelrycraft.util.PlayerUtils; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; /** * Code taken from OpenBlocks */ + public class EntityEventHandler { public static final String OPENBLOCKS_PERSIST_TAG = "Jewelrycraft"; @@ -31,10 +35,7 @@ public class EntityEventHandler public void onEntityJoinWorld(EntityJoinWorldEvent event) { final Entity entity = event.entity; - /** - * If the player hasn't been given a manual, we'll give him one! (or - * throw it on the floor..) - */ + if (!event.world.isRemote && entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer)entity; @@ -52,4 +53,47 @@ public class EntityEventHandler } } } + + @SubscribeEvent + public void onWorldLoad(WorldEvent.Load event) + { + if(!event.world.isRemote) + { + JewelrycraftMod.liquidsConf = new File(JewelrycraftMod.dir, "JLP" + event.world.getWorldInfo().getWorldName() + ".cfg"); + try { + if(!JewelrycraftMod.liquidsConf.exists()) JewelrycraftMod.liquidsConf.createNewFile(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + if(FMLCommonHandler.instance().getEffectiveSide().isServer()) + { + try { + if(JewelrycraftMod.liquidsConf.exists()) + JewelrycraftMod.saveData = CompressedStreamTools.readCompressed(new FileInputStream(JewelrycraftMod.liquidsConf)); + } catch (EOFException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + } + + @SubscribeEvent + public void onWorldSave(WorldEvent.Save event) + { + if(FMLCommonHandler.instance().getEffectiveSide().isServer()) + { + try { + if(JewelrycraftMod.liquidsConf.exists()) + CompressedStreamTools.writeCompressed(JewelrycraftMod.saveData, new FileOutputStream(JewelrycraftMod.liquidsConf)); + } catch (EOFException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } } \ No newline at end of file diff --git a/src/main/java/darkknight/jewelrycraft/events/EventHandler.java b/src/main/java/darkknight/jewelrycraft/events/EventHandler.java new file mode 100644 index 0000000..019deab --- /dev/null +++ b/src/main/java/darkknight/jewelrycraft/events/EventHandler.java @@ -0,0 +1,65 @@ +package darkknight.jewelrycraft.events; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.WorldServer; +import net.minecraftforge.event.entity.EntityJoinWorldEvent; +import net.minecraftforge.event.world.WorldEvent; +import darkknight.jewelrycraft.JewelrycraftMod; +import darkknight.jewelrycraft.item.ItemList; +import darkknight.jewelrycraft.util.BlockUtils; +import darkknight.jewelrycraft.util.PlayerUtils; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + +/** + * Code taken from OpenBlocks + */ +public class EventHandler +{ + public static final String OPENBLOCKS_PERSIST_TAG = "Jewelrycraft"; + public static final String GIVEN_GUIDE_TAG = "givenGuive"; + + @SubscribeEvent + public void onEntityJoinWorld(EntityJoinWorldEvent event) + { + final Entity entity = event.entity; + /** + * If the player hasn't been given a manual, we'll give him one! (or + * throw it on the floor..) + */ + if (!event.world.isRemote && entity instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer)entity; + NBTTagCompound persistTag = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft"); + + boolean shouldGiveManual = ItemList.guide != null && !persistTag.getBoolean(GIVEN_GUIDE_TAG); + if (shouldGiveManual) + { + ItemStack manual = new ItemStack(ItemList.guide); + if (!player.inventory.addItemStackToInventory(manual)) + { + BlockUtils.dropItemStackInWorld(player.worldObj, player.posX, player.posY, player.posZ, manual); + } + persistTag.setBoolean(GIVEN_GUIDE_TAG, true); + } + } + } + + @SubscribeEvent + public void onWorldLoad(WorldEvent.Load event) + { + } + + @SubscribeEvent + public void onWorldSave(WorldEvent.Save event) + { + } +} \ No newline at end of file -- cgit v1.2.3