From 06f62473f0622efe6decc32b70516a7c5d3d3572 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Wed, 17 Sep 2014 19:10:05 +0300 Subject: 1.7.10 --- .../jewelrycraft/events/BucketHandler.java | 60 ------------- .../jewelrycraft/events/EntityEventHandler.java | 100 --------------------- .../jewelrycraft/events/EventHandler.java | 65 -------------- 3 files changed, 225 deletions(-) delete mode 100644 src/main/java/darkknight/jewelrycraft/events/BucketHandler.java delete mode 100644 src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java delete 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 deleted file mode 100644 index cf16847..0000000 --- a/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java +++ /dev/null @@ -1,60 +0,0 @@ -/** - * Copyright (c) SpaceToad, 2011 http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public License - * 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ -package darkknight.jewelrycraft.events; - -import java.util.HashMap; -import java.util.Map; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MovingObjectPosition; -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 { - - public static BucketHandler INSTANCE = new BucketHandler(); - public Map buckets = new HashMap(); - - private BucketHandler() { - } - - @SubscribeEvent - public void onBucketFill(FillBucketEvent event) { - - ItemStack result = fillCustomBucket(event.world, event.target); - - if (result == null) - return; - - event.result = result; - event.setResult(Result.ALLOW); - } - - - private ItemStack fillCustomBucket(World world, MovingObjectPosition pos) { - - Block block = world.getBlock(pos.blockX, pos.blockY, pos.blockZ); - - 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); - 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; - - } -} \ No newline at end of file diff --git a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java deleted file mode 100644 index 42dc5a7..0000000 --- a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java +++ /dev/null @@ -1,100 +0,0 @@ -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.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; - -/** - * Code taken from OpenBlocks - */ - -public class EntityEventHandler -{ - 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 (!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) - { - if(!event.world.isRemote) - { - new File(JewelrycraftMod.dir + File.separator + "Jewelrycraft").mkdirs(); - JewelrycraftMod.liquidsConf = new File(JewelrycraftMod.dir + File.separator + "Jewelrycraft", "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 deleted file mode 100644 index 019deab..0000000 --- a/src/main/java/darkknight/jewelrycraft/events/EventHandler.java +++ /dev/null @@ -1,65 +0,0 @@ -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