From 59799cad7771597dd58e8a26edcdcecfa37c0624 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Sat, 15 Aug 2015 12:34:37 +0100 Subject: Added a config option to disable curses. --- build.gradle | 7 +- .../java/darkknight/jewelrycraft/api/Curse.java | 8 + .../jewelrycraft/block/BlockCrystal.java | 208 +++++++++++---------- .../jewelrycraft/client/gui/GuiCurseInfo.java | 6 +- .../jewelrycraft/client/gui/GuiTabCurses.java | 6 +- .../jewelrycraft/config/ConfigHandler.java | 26 +-- .../darkknight/jewelrycraft/curses/CurseBlind.java | 6 + .../jewelrycraft/curses/CurseDeathsTouch.java | 7 + .../jewelrycraft/curses/CurseFlamingSoul.java | 2 +- .../darkknight/jewelrycraft/curses/CurseGreed.java | 2 +- .../jewelrycraft/curses/CurseHumbleBundle.java | 2 +- .../jewelrycraft/curses/CurseInfamy.java | 2 +- .../jewelrycraft/curses/CurseMidasTouch.java | 6 + .../jewelrycraft/curses/CursePentagram.java | 2 +- .../jewelrycraft/curses/CurseRabbitsPaw.java | 2 +- .../jewelrycraft/curses/CurseRottenHeart.java | 6 + .../jewelrycraft/curses/CurseVampireHunger.java | 2 +- .../jewelrycraft/events/EntityEventHandler.java | 133 ++++++------- .../jewelrycraft/tileentity/TileEntityCrystal.java | 4 +- .../jewelrycraft/util/JewelrycraftUtil.java | 36 ++-- .../darkknight/jewelrycraft/util/Variables.java | 3 +- .../worldGen/village/ComponentJewelry.java | 121 ------------ .../resources/assets/jewelrycraft2/lang/en_US.lang | 2 + 23 files changed, 254 insertions(+), 345 deletions(-) diff --git a/build.gradle b/build.gradle index a19a94f..ae7bbf9 100644 --- a/build.gradle +++ b/build.gradle @@ -20,9 +20,8 @@ apply plugin: 'curseforge' project.ext { massive = "1" - major = "0" - minor = "12" - build = "4" + major = "1" + minor = "0" mcVersion = "1.7.10" ee3Version = "0.3.505" alpacaVersion = "1.2" @@ -34,7 +33,7 @@ if (System.getenv().BUILD_NUMBER != null) { version += "-err" } -version = "${project.ext.massive}.${project.ext.major}.${project.minor}.${project.build}" +version = "${project.ext.massive}.${project.ext.major}.${project.ext.minor}" group= "darkknight.jewelrycraft2" archivesBaseName = "[${project.ext.mcVersion}] Jewelrycraft2" diff --git a/src/main/java/darkknight/jewelrycraft/api/Curse.java b/src/main/java/darkknight/jewelrycraft/api/Curse.java index 84e425f..5fe5642 100644 --- a/src/main/java/darkknight/jewelrycraft/api/Curse.java +++ b/src/main/java/darkknight/jewelrycraft/api/Curse.java @@ -213,6 +213,14 @@ public abstract class Curse * @return True for curses to be used; False otherwise (by default true) */ public boolean canCurseBeActivated(World world) + { + return canCurseBeActivated(); + } + /** + * This controls whether a curse can be activated or not (makes it easy to do things like disable certain curses if in hardcore) + * @return True for curses to be used; False otherwise (by default true) + */ + public boolean canCurseBeActivated() { return true; } diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockCrystal.java b/src/main/java/darkknight/jewelrycraft/block/BlockCrystal.java index 6963084..28f154c 100644 --- a/src/main/java/darkknight/jewelrycraft/block/BlockCrystal.java +++ b/src/main/java/darkknight/jewelrycraft/block/BlockCrystal.java @@ -1,100 +1,108 @@ -/** - * - */ -package darkknight.jewelrycraft.block; - -import java.io.IOException; -import java.util.List; -import java.util.Random; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import darkknight.jewelrycraft.proxy.ClientProxy.BlockRenderIDs; -import darkknight.jewelrycraft.tileentity.TileEntityCrystal; -import darkknight.jewelrycraft.tileentity.TileEntityShadowEye; -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.ITileEntityProvider; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -/** - * @author Sorin - * - */ -public class BlockCrystal extends Block implements ITileEntityProvider -{ - public static int[] colors = {1973019, 11743532, 3887386, 5320730, 2437522, 8073150, 2651799, 11250603, 4408131, 14188952, 4312372, 14602026, 6719955, 12801229, 15435844, 15790320}; - - protected BlockCrystal() - { - super(Material.glass); - setBlockBounds(0.2F, 0F, 0.2F, 0.8F, 1.0F, 0.8F); - setHarvestLevel("pickaxe", 0); - } - - @Override - public TileEntity createNewTileEntity(World world, int var2) - { - return new TileEntityCrystal(); - } - - @Override - public boolean renderAsNormalBlock() - { - return false; - } - - @Override - public boolean isOpaqueCube() - { - return false; - } - - @SideOnly(Side.CLIENT) - public int getRenderBlockPass() - { - return 1; - } - - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list) - { - for(int i = 0; i < 16; ++i) list.add(new ItemStack(item, 1, i)); - } - - @Override - public int getRenderType() - { - return BlockRenderIDs.CRYSTAL.id(); - } - - @Override - @SideOnly (Side.CLIENT) - public int colorMultiplier(IBlockAccess world, int i, int j, int k) - { - return colors[world.getBlockMetadata(i, j, k)]; - } - - public int damageDropped(int meta) - { - return meta; - } - - public void breakBlock(World world, int x, int y, int z, Block block, int meta) - { - super.breakBlock(world, x, y, z, block, meta); - world.removeTileEntity(x, y, z); - } - - public boolean onBlockEventReceived(World world, int x, int y, int z, int eventNo, int arg) - { - super.onBlockEventReceived(world, x, y, z, eventNo, arg); - TileEntity tileentity = world.getTileEntity(x, y, z); - return tileentity != null ? tileentity.receiveClientEvent(eventNo, arg) : false; - } -} +/** + * + */ +package darkknight.jewelrycraft.block; + +import java.io.IOException; +import java.util.List; +import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import darkknight.jewelrycraft.config.ConfigHandler; +import darkknight.jewelrycraft.proxy.ClientProxy.BlockRenderIDs; +import darkknight.jewelrycraft.tileentity.TileEntityCrystal; +import darkknight.jewelrycraft.tileentity.TileEntityShadowEye; +import net.minecraft.block.Block; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +/** + * @author Sorin + * + */ +public class BlockCrystal extends Block implements ITileEntityProvider +{ + public static int[] colors = {1973019, 11743532, 3887386, 5320730, 2437522, 8073150, 2651799, 11250603, 4408131, 14188952, 4312372, 14602026, 6719955, 12801229, 15435844, 15790320}; + + protected BlockCrystal() + { + super(Material.glass); + setBlockBounds(0.2F, 0F, 0.2F, 0.8F, 1.0F, 0.8F); + setHarvestLevel("pickaxe", 0); + this.setTickRandomly(true); + } + + @Override + public TileEntity createNewTileEntity(World world, int var2) + { + return new TileEntityCrystal(); + } + + @Override + public boolean renderAsNormalBlock() + { + return false; + } + + @Override + public boolean isOpaqueCube() + { + return false; + } + + @SideOnly(Side.CLIENT) + public int getRenderBlockPass() + { + return 1; + } + + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item item, CreativeTabs tab, List list) + { + for(int i = 0; i < 16; ++i) list.add(new ItemStack(item, 1, i)); + } + + @Override + public int getRenderType() + { + return BlockRenderIDs.CRYSTAL.id(); + } + + @Override + @SideOnly (Side.CLIENT) + public int colorMultiplier(IBlockAccess world, int i, int j, int k) + { + return colors[world.getBlockMetadata(i, j, k)]; + } + + public int damageDropped(int meta) + { + return meta; + } + + public void breakBlock(World world, int x, int y, int z, Block block, int meta) + { + super.breakBlock(world, x, y, z, block, meta); + world.removeTileEntity(x, y, z); + } + + public boolean onBlockEventReceived(World world, int x, int y, int z, int eventNo, int arg) + { + super.onBlockEventReceived(world, x, y, z, eventNo, arg); + TileEntity tileentity = world.getTileEntity(x, y, z); + return tileentity != null ? tileentity.receiveClientEvent(eventNo, arg) : false; + } + + @SideOnly(Side.CLIENT) + public void randomDisplayTick(World world, int x, int y, int z, Random rand) + { + if(ConfigHandler.CRYSTAL_PARTICLES) world.spawnParticle("instantSpell", x + rand.nextFloat(), y + rand.nextFloat(), z + rand.nextFloat(), 0.0D, -1.0D, 0.0D); + } +} diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java index 752a2a7..c0c48cd 100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java @@ -9,6 +9,7 @@ import darkknight.jewelrycraft.JewelrycraftMod; import darkknight.jewelrycraft.api.Curse; import darkknight.jewelrycraft.client.TabCurses; import darkknight.jewelrycraft.client.TabRegistry; +import darkknight.jewelrycraft.config.ConfigHandler; import darkknight.jewelrycraft.events.KeyBindings; import darkknight.jewelrycraft.network.PacketSendClientPlayerInfo; import darkknight.jewelrycraft.network.PacketSendServerPlayerInfo; @@ -124,7 +125,8 @@ public class GuiCurseInfo extends GuiContainer { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1f, 1f, 1f, 0.5f); + if(!curse.canCurseBeActivated() || !ConfigHandler.CURSES_ENABLED) GL11.glColor4f(1f, 0f, 0f, 0.5f); + else GL11.glColor4f(1f, 1f, 1f, 0.5f); } mc.renderEngine.bindTexture(Variables.MISC_TEXTURE); drawTexturedModalRect(guiLeft + 43, guiTop + 8 + (size - 8) * (ind - page * 5), 0, 32, 112, 22); @@ -196,7 +198,7 @@ public class GuiCurseInfo extends GuiContainer { Curse.availableCurses.add(curse); JewelrycraftMod.netWrapper.sendToServer(new PacketSendServerPlayerInfo("remove", curse.getName(), playerInfo)); JewelrycraftMod.netWrapper.sendToAll(new PacketSendServerPlayersInfo()); - } else if (player.capabilities.isCreativeMode && isCtrlKeyDown() && playerInfo.getInteger(curse.getName()) <= 0) { + } else if (player.capabilities.isCreativeMode && isCtrlKeyDown() && playerInfo.getInteger(curse.getName()) <= 0 && curse.canCurseBeActivated() && ConfigHandler.CURSES_ENABLED) { playerInfo.setInteger(curse.getName(), 1); playerInfo.setInteger("activeCurses", playerInfo.getInteger("activeCurses") + 1); Curse.availableCurses.remove(curse); diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabCurses.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabCurses.java index 0bbf258..4157a38 100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabCurses.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabCurses.java @@ -75,13 +75,17 @@ public class GuiTabCurses extends GuiTab text = "Any mob you kill or block you destroy(eg. Diamond Ore, Redstone Ore, stuff that drops items not the block itself) drops double the amount of items it normally would."; Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop() - 5, new ItemStack(ItemList.testItem, 1, 9), text, 40f, 0, 0, Curse.getCurseList().get(page-1).getDisplayName(), 45, 10, false); break; + case 11: + text = "All the damage you do pierces through armor or any other type of defense, but creatures no longer drop XP."; + Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop() - 5, new ItemStack(ItemList.testItem, 1, 10), text, 40f, 0, 0, Curse.getCurseList().get(page-1).getDisplayName(), 45, 10, false); + break; default:; } } @Override public int getMaxPages() { - return 10; + return 11; } @Override diff --git a/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java b/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java index 6324a86..12239e5 100644 --- a/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java +++ b/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java @@ -11,7 +11,7 @@ public class ConfigHandler { public static Configuration config; public static final ConfigHandler INSTANCE = new ConfigHandler(); - public static final String[] categories = {"Timers", "Village Generation", "Misc", "World Generation"}; + public static final String[] categories = {"Timers", "Village Generation", "Misc", "World Generation", "Curses"}; public static int INGOT_COOLING_TIME; public static int INGOT_MELTING_TIME; @@ -47,6 +47,7 @@ public class ConfigHandler public static boolean CURSE_PENTAGRAM = true; public static boolean CURSE_VAMPIRE_HUNGER = true; public static boolean CURSE_HUMBLE_BUNDLE = true; + public static boolean CURSE_DEATHS_TOUCH = true; public static boolean ENABLE_WORLD_GEN = true; public static boolean ORE_GEN = true; @@ -92,17 +93,18 @@ public class ConfigHandler for(int i = 0; i < STRUCTURES.length; i++) STRUCTURES[i] = config.getBoolean("Structure "+(i+1)+" Generation", categories[3], true, "If false, structure no."+(i+1)+" won't generate"); -// CURSES_ENABLED = config.getBoolean("Curses", categories[3], true, "If set to false curses will be deactivated."); -// CURSE_ROTTEN_HEART = config.getBoolean("Rotten Heart", categories[3], true, "If set to false this curse will be deactivated."); -// CURSE_FLAMING_SOUL = config.getBoolean("Flaming Soul", categories[3], true, "If set to false this curse will be deactivated."); -// CURSE_GREED = config.getBoolean("Greed", categories[3], true, "If set to false this curse will be deactivated."); -// CURSE_BLIND = config.getBoolean("Blind", categories[3], true, "If set to false this curse will be deactivated."); -// CURSE_INFAMY = config.getBoolean("Infamy", categories[3], true, "If set to false this curse will be deactivated."); -// CURSE_MIDAS_TOUCH = config.getBoolean("Midas Touch", categories[3], true, "If set to false this curse will be deactivated."); -// CURSE_RABBIT_PAW = config.getBoolean("Rabbit's Paw", categories[3], true, "If set to false this curse will be deactivated."); -// CURSE_PENTAGRAM = config.getBoolean("Pentagram", categories[3], true, "If set to false this curse will be deactivated."); -// CURSE_VAMPIRE_HUNGER = config.getBoolean("Vampire Hunger", categories[3], true, "If set to false this curse will be deactivated."); -// CURSE_HUMBLE_BUNDLE = config.getBoolean("Humble Bundle", categories[3], true, "If set to false this curse will be deactivated."); + CURSES_ENABLED = config.getBoolean("Curses", categories[4], true, "If set to false curses will be deactivated."); + CURSE_ROTTEN_HEART = config.getBoolean("Rotten Heart", categories[4], true, "If set to false this curse will be deactivated."); + CURSE_FLAMING_SOUL = config.getBoolean("Flaming Soul", categories[4], true, "If set to false this curse will be deactivated."); + CURSE_GREED = config.getBoolean("Greed", categories[4], true, "If set to false this curse will be deactivated."); + CURSE_BLIND = config.getBoolean("Blind", categories[4], true, "If set to false this curse will be deactivated."); + CURSE_INFAMY = config.getBoolean("Infamy", categories[4], true, "If set to false this curse will be deactivated."); + CURSE_MIDAS_TOUCH = config.getBoolean("Midas Touch", categories[4], true, "If set to false this curse will be deactivated."); + CURSE_RABBIT_PAW = config.getBoolean("Rabbit's Paw", categories[4], true, "If set to false this curse will be deactivated."); + CURSE_PENTAGRAM = config.getBoolean("Pentagram", categories[4], true, "If set to false this curse will be deactivated."); + CURSE_VAMPIRE_HUNGER = config.getBoolean("Vampire Hunger", categories[4], true, "If set to false this curse will be deactivated."); + CURSE_HUMBLE_BUNDLE = config.getBoolean("Humble Bundle", categories[4], true, "If set to false this curse will be deactivated."); + CURSE_DEATHS_TOUCH = config.getBoolean("Deaths Touch", categories[4], true, "If set to false this curse will be deactivated."); if (config.hasChanged()) config.save(); } diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java b/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java index f7ab76f..47a7667 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java @@ -35,6 +35,12 @@ public class CurseBlind extends Curse return world.getWorldInfo().isHardcoreModeEnabled() ? false : ConfigHandler.CURSE_BLIND; } + @Override + public boolean canCurseBeActivated() + { + return ConfigHandler.CURSE_BLIND; + } + @Override public int weight(World world, EntityPlayer player, Random random) { diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java b/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java index 3a4d984..3e4da7f 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java @@ -2,6 +2,7 @@ package darkknight.jewelrycraft.curses; import darkknight.jewelrycraft.JewelrycraftMod; import darkknight.jewelrycraft.api.Curse; +import darkknight.jewelrycraft.config.ConfigHandler; import darkknight.jewelrycraft.entities.EntityHalfHeart; import darkknight.jewelrycraft.entities.EntityHeart; import darkknight.jewelrycraft.network.PacketSendClientPlayerInfo; @@ -45,5 +46,11 @@ public class CurseDeathsTouch extends Curse { return StatCollector.translateToLocal("curse." + Variables.MODID + ".deathsTouch"); } + + @Override + public boolean canCurseBeActivated() + { + return ConfigHandler.CURSE_DEATHS_TOUCH; + } } diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java b/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java index 4a559b6..6772d92 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java @@ -26,7 +26,7 @@ public class CurseFlamingSoul extends Curse } @Override - public boolean canCurseBeActivated(World world) + public boolean canCurseBeActivated() { return ConfigHandler.CURSE_FLAMING_SOUL; } diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java b/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java index 37a774a..9a1901b 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java @@ -33,7 +33,7 @@ public class CurseGreed extends Curse } @Override - public boolean canCurseBeActivated(World world) + public boolean canCurseBeActivated() { return ConfigHandler.CURSE_GREED; } diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java b/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java index 855277c..8f3272a 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java @@ -67,7 +67,7 @@ public class CurseHumbleBundle extends Curse } @Override - public boolean canCurseBeActivated(World world) + public boolean canCurseBeActivated() { return ConfigHandler.CURSE_HUMBLE_BUNDLE; } diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java index f56c66d..600548f 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java @@ -86,7 +86,7 @@ public class CurseInfamy extends Curse } @Override - public boolean canCurseBeActivated(World world) + public boolean canCurseBeActivated() { return ConfigHandler.CURSE_INFAMY; } diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java index 0ce2810..8395647 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java @@ -110,6 +110,12 @@ public class CurseMidasTouch extends Curse { return world.getWorldInfo().isHardcoreModeEnabled() ? false : ConfigHandler.CURSE_MIDAS_TOUCH; } + + @Override + public boolean canCurseBeActivated() + { + return ConfigHandler.CURSE_MIDAS_TOUCH; + } @Override public int weight(World world, EntityPlayer player, Random random) diff --git a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java index 56a1b11..1ac9361 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java @@ -139,7 +139,7 @@ public class CursePentagram extends Curse { } @Override - public boolean canCurseBeActivated(World world) { + public boolean canCurseBeActivated() { return ConfigHandler.CURSE_PENTAGRAM; } } diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java b/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java index ed4d294..32ea0fb 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java @@ -73,7 +73,7 @@ public class CurseRabbitsPaw extends Curse } @Override - public boolean canCurseBeActivated(World world) + public boolean canCurseBeActivated() { return ConfigHandler.CURSE_RABBIT_PAW; } diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java b/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java index 5cb47cd..95f1a2c 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java @@ -38,4 +38,10 @@ public class CurseRottenHeart extends Curse { return world.getWorldInfo().isHardcoreModeEnabled() ? false : ConfigHandler.CURSE_ROTTEN_HEART; } + + @Override + public boolean canCurseBeActivated() + { + return ConfigHandler.CURSE_ROTTEN_HEART; + } } diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java b/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java index 3d6a2da..e2d278e 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java @@ -46,7 +46,7 @@ public class CurseVampireHunger extends Curse } @Override - public boolean canCurseBeActivated(World world) + public boolean canCurseBeActivated() { return ConfigHandler.CURSE_VAMPIRE_HUNGER; } diff --git a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java index edf22bf..10f9568 100644 --- a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java @@ -89,45 +89,20 @@ public class EntityEventHandler { Entity entity = event.entity; EntityLivingBase entityLiving = event.entityLiving; for (PotionBase potion : PotionBase.getPotionList()) - if(entityLiving.isPotionActive(potion)) potion.action(entityLiving); + if (entityLiving.isPotionActive(potion)) potion.action(entityLiving); if (entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) entity; NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID); playerInfo.setBoolean("fancyRender", JewelrycraftMod.fancyRender); if (updateTime > 0) updateTime--; for (int i = 0; i < 18; i++) - if (playerInfo.hasKey("ext" + i)) { - NBTTagCompound nbt = (NBTTagCompound) playerInfo.getTag("ext" + i); - ItemStack item = ItemStack.loadItemStackFromNBT(nbt); - if (item != null) { - if (item.getItem() instanceof ItemBaseJewelry) ((ItemBaseJewelry) item.getItem()).action(item, player); - if (item.getItem() instanceof IJewelryItem) ((IJewelryItem) item.getItem()).onWearAction(item, player); - } + if (getJewelryItems(playerInfo, i) != null) { + if (getJewelryItems(playerInfo, i).getItem() instanceof ItemBaseJewelry) ((ItemBaseJewelry) getJewelryItems(playerInfo, i).getItem()).action(getJewelryItems(playerInfo, i), player); + if (getJewelryItems(playerInfo, i).getItem() instanceof IJewelryItem) ((IJewelryItem) getJewelryItems(playerInfo, i).getItem()).onWearAction(getJewelryItems(playerInfo, i), player); } if (!player.worldObj.isRemote) { - if (playerInfo.hasKey("reselectCurses") && !playerInfo.getBoolean("reselectCurses")) { - playerInfo.setInteger("curseTime", playerInfo.getInteger("curseTime") - 10000); - if (playerInfo.getInteger("curseTime") <= 0) playerInfo.setBoolean("reselectCurses", true); - } - if (playerInfo.hasKey("playerCursePointsChanged") && playerInfo.getBoolean("playerCursePointsChanged")) { - int points = playerInfo.getInteger("cursePoints"); - int maxCurses = playerInfo.getInteger("cursePoints") / 1750 + 1; - if (points > 0 && playerInfo.getInteger("activeCurses") < maxCurses) while (playerInfo.getInteger("activeCurses") < maxCurses && Curse.availableCurses.size() > 0 && playerInfo.getInteger("activeCurses") < Curse.getCurseList().size()) { - addCurse(player, playerInfo); - System.out.println("Curse added"); - } - if (!playerInfo.hasKey("curseTime") || !playerInfo.hasKey("reselectCurses") || playerInfo.getBoolean("reselectCurses")) { - playerInfo.setInteger("curseTime", 23000); - playerInfo.setBoolean("reselectCurses", false); - } - JewelrycraftMod.netWrapper.sendTo(new PacketSendClientPlayerInfo(playerInfo), (EntityPlayerMP) player); - if (addedCurses) { - JewelrycraftMod.netWrapper.sendToAll(new PacketSendServerPlayersInfo()); - player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("curse." + Variables.MODID + ".activated"))); - addedCurses = false; - } - } - if (playerInfo.getBoolean("playerCursePointsChanged")) playerInfo.setBoolean("playerCursePointsChanged", false); + timeUntilYouCanResetCurses(playerInfo); + updateCurses(playerInfo, player); if (updateTime == 0) { JewelrycraftMod.netWrapper.sendToAll(new PacketSendServerPlayersInfo()); updateTime = 200; @@ -138,6 +113,42 @@ public class EntityEventHandler { } } + public void updateCurses(NBTTagCompound playerInfo, EntityPlayer player) { + if (playerInfo.hasKey("playerCursePointsChanged") && playerInfo.getBoolean("playerCursePointsChanged")) { + int points = playerInfo.getInteger("cursePoints"); + int maxCurses = playerInfo.getInteger("cursePoints") / 1750 + 1; + if (points > 0 && playerInfo.getInteger("activeCurses") < maxCurses) while (playerInfo.getInteger("activeCurses") < maxCurses && Curse.availableCurses.size() > 0 && playerInfo.getInteger("activeCurses") < Curse.getCurseList().size()) + addCurse(player, playerInfo); + if (!playerInfo.hasKey("curseTime") || !playerInfo.hasKey("reselectCurses") || playerInfo.getBoolean("reselectCurses")) { + playerInfo.setInteger("curseTime", 23000); + playerInfo.setBoolean("reselectCurses", false); + } + JewelrycraftMod.netWrapper.sendTo(new PacketSendClientPlayerInfo(playerInfo), (EntityPlayerMP) player); + if (addedCurses) { + JewelrycraftMod.netWrapper.sendToAll(new PacketSendServerPlayersInfo()); + player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("curse." + Variables.MODID + ".activated"))); + addedCurses = false; + } + } + if (playerInfo.getBoolean("playerCursePointsChanged")) playerInfo.setBoolean("playerCursePointsChanged", false); + } + + public void timeUntilYouCanResetCurses(NBTTagCompound playerInfo) { + if (playerInfo.hasKey("reselectCurses") && !playerInfo.getBoolean("reselectCurses")) { + playerInfo.setInteger("curseTime", playerInfo.getInteger("curseTime") - 10000); + if (playerInfo.getInteger("curseTime") <= 0) playerInfo.setBoolean("reselectCurses", true); + } + } + + public ItemStack getJewelryItems(NBTTagCompound playerInfo, int i) { + if (playerInfo.hasKey("ext" + i)) { + NBTTagCompound nbt = (NBTTagCompound) playerInfo.getTag("ext" + i); + ItemStack item = ItemStack.loadItemStackFromNBT(nbt); + if (item != null) return item; + } + return null; + } + @SubscribeEvent public void onEntityLivingDropItems(LivingDropsEvent event) { if (event.source.getEntity() != null && event.source.getEntity() instanceof EntityPlayer) { @@ -157,16 +168,12 @@ public class EntityEventHandler { NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID); if (!(event.source.getEntity() instanceof EntityPlayer) && !player.capabilities.isCreativeMode) { if (!player.worldObj.isRemote) for (int i = 0; i < 18; i++) - if (playerInfo.hasKey("ext" + i)) { - NBTTagCompound nbt = (NBTTagCompound) playerInfo.getTag("ext" + i); - ItemStack item = ItemStack.loadItemStackFromNBT(nbt); - if (item != null) { - if (item.getItem() instanceof ItemBaseJewelry) { - ((ItemBaseJewelry) item.getItem()).onPlayerAttacked(item, player, event.source, event.ammount); - if (((ItemBaseJewelry) item.getItem()).onPlayerAttackedCacellable(item, player, event.source, event.ammount)) event.setCanceled(true); - } - if (item.getItem() instanceof IJewelryItem) ((IJewelryItem) item.getItem()).onPlayerAttackedAction(item, player, event.source, event.ammount); + if (getJewelryItems(playerInfo, i) != null) { + if (getJewelryItems(playerInfo, i).getItem() instanceof ItemBaseJewelry) { + ((ItemBaseJewelry) getJewelryItems(playerInfo, i).getItem()).onPlayerAttacked(getJewelryItems(playerInfo, i), player, event.source, event.ammount); + if (((ItemBaseJewelry) getJewelryItems(playerInfo, i).getItem()).onPlayerAttackedCacellable(getJewelryItems(playerInfo, i), player, event.source, event.ammount)) event.setCanceled(true); } + if (getJewelryItems(playerInfo, i).getItem() instanceof IJewelryItem) ((IJewelryItem) getJewelryItems(playerInfo, i).getItem()).onPlayerAttackedAction(getJewelryItems(playerInfo, i), player, event.source, event.ammount); } if (ConfigHandler.CURSES_ENABLED) for (Curse curse : Curse.getCurseList()) if (curse.canCurseBeActivated(player.worldObj) && playerInfo.getInteger(curse.getName()) > 0) curse.attackedAction(player.worldObj, player); @@ -179,16 +186,12 @@ public class EntityEventHandler { EntityPlayer player = (EntityPlayer) event.source.getEntity(); NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID); for (int i = 0; i < 18; i++) - if (playerInfo.hasKey("ext" + i)) { - NBTTagCompound nbt = (NBTTagCompound) playerInfo.getTag("ext" + i); - ItemStack item = ItemStack.loadItemStackFromNBT(nbt); - if (item != null) { - if (item.getItem() instanceof ItemBaseJewelry) { - ((ItemBaseJewelry) item.getItem()).onEntityAttacked(item, player, entity, event.ammount); - if (((ItemBaseJewelry) item.getItem()).onEntityAttackedCacellable(item, player, entity, event.ammount)) event.setCanceled(true); - } - if (item.getItem() instanceof IJewelryItem) ((IJewelryItem) item.getItem()).onEntityAttackedByPlayer(item, player, entity, event.ammount); + if (getJewelryItems(playerInfo, i) != null) { + if (getJewelryItems(playerInfo, i).getItem() instanceof ItemBaseJewelry) { + ((ItemBaseJewelry) getJewelryItems(playerInfo, i).getItem()).onEntityAttacked(getJewelryItems(playerInfo, i), player, entity, event.ammount); + if (((ItemBaseJewelry) getJewelryItems(playerInfo, i).getItem()).onEntityAttackedCacellable(getJewelryItems(playerInfo, i), player, entity, event.ammount)) event.setCanceled(true); } + if (getJewelryItems(playerInfo, i).getItem() instanceof IJewelryItem) ((IJewelryItem) getJewelryItems(playerInfo, i).getItem()).onEntityAttackedByPlayer(getJewelryItems(playerInfo, i), player, entity, event.ammount); } if (ConfigHandler.CURSES_ENABLED) for (Curse curse : Curse.getCurseList()) if (curse.canCurseBeActivated(player.worldObj) && playerInfo.getInteger(curse.getName()) > 0) { @@ -264,13 +267,9 @@ public class EntityEventHandler { if (ConfigHandler.CURSES_ENABLED) for (Curse curse : Curse.getCurseList()) if (curse.canCurseBeActivated(player.worldObj) && playerInfo.getInteger(curse.getName()) > 0) curse.respawnAction(player.worldObj, player); for (int i = 0; i < 18; i++) - if (playerInfo.hasKey("ext" + i)) { - NBTTagCompound nbt = (NBTTagCompound) playerInfo.getTag("ext" + i); - ItemStack item = ItemStack.loadItemStackFromNBT(nbt); - if (item != null) { - if (item.getItem() instanceof ItemBaseJewelry) ((ItemBaseJewelry) item.getItem()).onPlayerRespawn(item, event); - if (item.getItem() instanceof IJewelryItem) ((IJewelryItem) item.getItem()).onPlayerRespawnAction(item, event); - } + if (getJewelryItems(playerInfo, i) != null) { + if (getJewelryItems(playerInfo, i).getItem() instanceof ItemBaseJewelry) ((ItemBaseJewelry) getJewelryItems(playerInfo, i).getItem()).onPlayerRespawn(getJewelryItems(playerInfo, i), event); + if (getJewelryItems(playerInfo, i).getItem() instanceof IJewelryItem) ((IJewelryItem) getJewelryItems(playerInfo, i).getItem()).onPlayerRespawnAction(getJewelryItems(playerInfo, i), event); } JewelrycraftMod.netWrapper.sendTo(new PacketSendClientPlayerInfo(playerInfo), (EntityPlayerMP) player); if (addedCurses) { @@ -368,27 +367,11 @@ public class EntityEventHandler { if (ConfigHandler.CURSES_ENABLED) for (Curse curse : Curse.getCurseList()) if (curse.canCurseBeActivated(player.worldObj) && playerInfo.getInteger(curse.getName()) > 0) curse.playerDeathAction(player.worldObj, player); for (int i = 0; i < 18; i++) - if (playerInfo.hasKey("ext" + i)) { - NBTTagCompound nbt = (NBTTagCompound) playerInfo.getTag("ext" + i); - ItemStack item = ItemStack.loadItemStackFromNBT(nbt); - if (item != null) { - if (item.getItem() instanceof ItemBaseJewelry) ((ItemBaseJewelry) item.getItem()).onPlayerDead(item, player, event.source); - if (item.getItem() instanceof IJewelryItem) ((IJewelryItem) item.getItem()).onPlayerDeadAction(item, player, event.source); - } + if (getJewelryItems(playerInfo, i) != null) { + if (getJewelryItems(playerInfo, i).getItem() instanceof ItemBaseJewelry) ((ItemBaseJewelry) getJewelryItems(playerInfo, i).getItem()).onPlayerDead(getJewelryItems(playerInfo, i), player, event.source); + if (getJewelryItems(playerInfo, i).getItem() instanceof IJewelryItem) ((IJewelryItem) getJewelryItems(playerInfo, i).getItem()).onPlayerDeadAction(getJewelryItems(playerInfo, i), player, event.source); } } if (event.entity instanceof EntityPlayer && !(event.entity instanceof EntityPlayerMP)) JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo()); } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void fogColors(EntityViewRenderEvent.FogColors event) {} - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void fogDensity(EntityViewRenderEvent.FogDensity event) {} - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void renderFog(EntityViewRenderEvent.RenderFogEvent event) {} } \ No newline at end of file diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityCrystal.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityCrystal.java index 9cb60e4..9f97969 100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityCrystal.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityCrystal.java @@ -33,13 +33,11 @@ public class TileEntityCrystal extends TileEntity timer = 0; } } - if(ConfigHandler.CRYSTAL_PARTICLES) - worldObj.spawnParticle("instantSpell", xCoord + worldObj.rand.nextFloat(), yCoord + worldObj.rand.nextFloat(), zCoord + worldObj.rand.nextFloat(), 0.0D, -1.0D, 0.0D); } public boolean canUpdate() { - return ConfigHandler.CRYSTAL_GLOW || ConfigHandler.CRYSTAL_PARTICLES; + return ConfigHandler.CRYSTAL_GLOW; } } diff --git a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java index cb3b622..0279b58 100644 --- a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java +++ b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java @@ -230,26 +230,26 @@ public class JewelrycraftUtil { } /** - * Adds the UUID's of the jamcrafters in a list + * Adds the UUID's of the jamcrafters in a list (+ special people) */ public static void jamcrafters() { - jamcraftPlayers.add("d3214311-7550-4c9c-a372-d9292c10b8a6"); - jamcraftPlayers.add("a690119f-c4a2-4bd6-a99d-d63679abb328"); - jamcraftPlayers.add("de7c9903-51fa-4a24-88cd-48faf122ca36"); - jamcraftPlayers.add("70aeb298-3a7b-46da-a393-ab10df9359f2"); - jamcraftPlayers.add("6fbe603c-14bf-4085-afdd-abe592c26e7c"); - jamcraftPlayers.add("b0d21306-36bf-4d85-84df-a956d183c45a"); - jamcraftPlayers.add("1733a31f-01f9-4f4d-82aa-7de30ca810d3"); - jamcraftPlayers.add("4833eacf-1d94-49a7-9f89-4cf88d69dcf9"); - jamcraftPlayers.add("718cf671-9084-4e78-b91f-033e80aa11bf"); - jamcraftPlayers.add("bea5e0c4-85c4-454d-a081-e1eaae6895ee"); - jamcraftPlayers.add("7ecf3e2f-fedf-4f7e-8d24-6731d078db4f"); - jamcraftPlayers.add("1b11ad3a-f0ca-4695-a019-2d7e5d83a5fd"); - jamcraftPlayers.add("3ec9ac58-2f1b-4d3f-b4eb-3b875da877ae"); - jamcraftPlayers.add("cf9fa23f-205e-4eed-aba3-9f2848cd6a4d"); - jamcraftPlayers.add("91880caa-b032-48e3-bfe8-c2c7ed31824e"); - jamcraftPlayers.add("8d0b3804-f71c-4219-897b-8c315448ea7c"); - jamcraftPlayers.add("bbb87dbe-690f-4205-bdc5-72ffb8ebc29d"); + jamcraftPlayers.add("d3214311-7550-4c9c-a372-d9292c10b8a6"); //allout58 + jamcraftPlayers.add("a690119f-c4a2-4bd6-a99d-d63679abb328"); //ChewBaker + jamcraftPlayers.add("de7c9903-51fa-4a24-88cd-48faf122ca36"); //domi1819 + jamcraftPlayers.add("70aeb298-3a7b-46da-a393-ab10df9359f2"); //founderio + jamcraftPlayers.add("6fbe603c-14bf-4085-afdd-abe592c26e7c"); //GerbShert + jamcraftPlayers.add("b0d21306-36bf-4d85-84df-a956d183c45a"); //isomgirls6 + jamcraftPlayers.add("1733a31f-01f9-4f4d-82aa-7de30ca810d3"); //TH3N00B + jamcraftPlayers.add("4833eacf-1d94-49a7-9f89-4cf88d69dcf9"); //Joban + jamcraftPlayers.add("718cf671-9084-4e78-b91f-033e80aa11bf"); //KJ4IPS + jamcraftPlayers.add("bea5e0c4-85c4-454d-a081-e1eaae6895ee"); //Mitchellbrine + jamcraftPlayers.add("7ecf3e2f-fedf-4f7e-8d24-6731d078db4f"); //MrComputerGhost + jamcraftPlayers.add("1b11ad3a-f0ca-4695-a019-2d7e5d83a5fd"); //Resinresin + jamcraftPlayers.add("3ec9ac58-2f1b-4d3f-b4eb-3b875da877ae"); //sci4me + jamcraftPlayers.add("cf9fa23f-205e-4eed-aba3-9f2848cd6a4d"); //OnyxDarkKnight + jamcraftPlayers.add("91880caa-b032-48e3-bfe8-c2c7ed31824e"); //theminecoder + jamcraftPlayers.add("8d0b3804-f71c-4219-897b-8c315448ea7c"); //YSPilot + jamcraftPlayers.add("bbb87dbe-690f-4205-bdc5-72ffb8ebc29d"); //direwolf20 } /** diff --git a/src/main/java/darkknight/jewelrycraft/util/Variables.java b/src/main/java/darkknight/jewelrycraft/util/Variables.java index bab281d..016bd54 100644 --- a/src/main/java/darkknight/jewelrycraft/util/Variables.java +++ b/src/main/java/darkknight/jewelrycraft/util/Variables.java @@ -6,14 +6,13 @@ public class Variables { public static final String MODID = "jewelrycraft2"; public static final String MODNAME = "Jewelrycraft 2"; - public static final String VERSION = "1.0.12.4"; + public static final String VERSION = "1.1.0"; public static final String PACKET_CHANNEL = "jewelrycraft2"; public static final String CONFIG_GUI = "darkknight.jewelrycraft.config.ConfigGuiFactory"; public static final String CLIENT_PROXY = "darkknight.jewelrycraft.proxy.ClientProxy"; public static final String SERVER_PROXY = "darkknight.jewelrycraft.proxy.CommonProxy"; - public static final int MAX_CURSES = 1000; public static final ResourceLocation PEDESTAL_TEXTURE = new ResourceLocation(Variables.MODID, "textures/tileentities/BricksPedestal.png"); public static final ResourceLocation SHADOW_HAND_TEXTURE = new ResourceLocation(Variables.MODID, "textures/tileentities/ShadowHand.png"); public static final ResourceLocation VILLAGER_TEXTURE = new ResourceLocation(Variables.MODID, "textures/entities/jeweler.png"); diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java b/src/main/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java index bc676b7..d1fbe87 100644 --- a/src/main/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java +++ b/src/main/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java @@ -29,51 +29,21 @@ import darkknight.jewelrycraft.util.Variables; public class ComponentJewelry extends StructureVillagePieces.House1 { private int averageGroundLevel = -1; - /** - * - */ public ComponentJewelry() { } - /** - * @param par1ComponentVillageStartPiece - * @param par2 - * @param par3Random - * @param par4StructureBoundingBox - * @param par5 - */ public ComponentJewelry(Start par1ComponentVillageStartPiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) { super(); coordBaseMode = par5; boundingBox = par4StructureBoundingBox; } - /** - * @param villagePiece - * @param pieces - * @param random - * @param p1 - * @param p2 - * @param p3 - * @param p4 - * @param p5 - * @return - */ @SuppressWarnings("rawtypes") public static ComponentJewelry buildComponent(Start villagePiece, List pieces, Random random, int p1, int p2, int p3, int p4, int p5) { StructureBoundingBox structureboundingbox = StructureBoundingBox.getComponentToAddBoundingBox(p1, p2, p3, 0, 0, 0, 11, 5, 12, p4); return canVillageGoDeeper(structureboundingbox) && StructureComponent.findIntersecting(pieces, structureboundingbox) == null ? new ComponentJewelry(villagePiece, p5, random, structureboundingbox, p4) : null; } - /** - * second Part of Structure generating, this for example places Spiderwebs, - * Mob Spawners, it closes Mineshafts at the end, it adds Fences... - * - * @param world - * @param random - * @param sbb - * @return - */ @Override public boolean addComponentParts(World world, Random random, StructureBoundingBox sbb) { if (averageGroundLevel < 0) { @@ -81,11 +51,6 @@ public class ComponentJewelry extends StructureVillagePieces.House1 { if (averageGroundLevel < 0) return true; boundingBox.offset(0, averageGroundLevel - boundingBox.maxY + 3, 0); } - /** - * arguments: (World worldObj, StructureBoundingBox structBB, int minX, - * int minY, int minZ, int maxX, int maxY, int maxZ, int placeBlockId, - * int replaceBlockId, boolean alwaysreplace) - */ fillWithBlocks(world, sbb, 0, 0, 6, 10, 5, 11, Block.getBlockById(0), Block.getBlockById(0), false); fillWithBlocks(world, sbb, 2, 0, 0, 8, 5, 5, Block.getBlockById(0), Block.getBlockById(0), false); // Pillars @@ -204,17 +169,6 @@ public class ComponentJewelry extends StructureVillagePieces.House1 { return true; } - /** - * @param world - * @param i - * @param j - * @param k - * @param metadata - * @param random - * @param sbb - * @param min - * @param max - */ public void generateChest(World world, int i, int j, int k, int metadata, Random random, StructureBoundingBox sbb, int min, int max) { int i1 = getXWithOffset(i, k); int j1 = getYWithOffset(j); @@ -235,19 +189,6 @@ public class ComponentJewelry extends StructureVillagePieces.House1 { } } - /** - * @param world - * @param i - * @param j - * @param k - * @param metadata - * @param random - * @param sbb - * @param min - * @param max - * @param chestB - * @param randomAmount - */ public void generateIngotChest(World world, int i, int j, int k, int metadata, Random random, StructureBoundingBox sbb, int min, int max, Block chestB, int randomAmount) { int i1 = getXWithOffset(i, k); int j1 = getYWithOffset(j); @@ -269,19 +210,6 @@ public class ComponentJewelry extends StructureVillagePieces.House1 { } } - /** - * @param world - * @param i - * @param j - * @param k - * @param metadata - * @param random - * @param sbb - * @param min - * @param max - * @param chestB - * @param randomAmount - */ public void generateOresChest(World world, int i, int j, int k, int metadata, Random random, StructureBoundingBox sbb, int min, int max, Block chestB, int randomAmount) { int i1 = getXWithOffset(i, k); int j1 = getYWithOffset(j); @@ -303,15 +231,6 @@ public class ComponentJewelry extends StructureVillagePieces.House1 { } } - /** - * @param world - * @param i - * @param j - * @param k - * @param metadata - * @param random - * @param sbb - */ public void generateDisplayer(World world, int i, int j, int k, int metadata, Random random, StructureBoundingBox sbb) { int i1 = getXWithOffset(i, k); int j1 = getYWithOffset(j); @@ -332,16 +251,6 @@ public class ComponentJewelry extends StructureVillagePieces.House1 { } } - /** - * @param world - * @param i - * @param j - * @param k - * @param metadata - * @param random - * @param sbb - * @param isEmpty - */ public void generateSmelter(World world, int i, int j, int k, int metadata, Random random, StructureBoundingBox sbb, boolean isEmpty) { int i1 = getXWithOffset(i, k); int j1 = getYWithOffset(j); @@ -359,17 +268,6 @@ public class ComponentJewelry extends StructureVillagePieces.House1 { } } - /** - * @param world - * @param i - * @param j - * @param k - * @param metadata - * @param random - * @param sbb - * @param hasMold - * @param hasStuff - */ public void generateMolder(World world, int i, int j, int k, int metadata, Random random, StructureBoundingBox sbb, boolean hasMold, boolean hasStuff) { int i1 = getXWithOffset(i, k); int j1 = getYWithOffset(j); @@ -401,18 +299,6 @@ public class ComponentJewelry extends StructureVillagePieces.House1 { } } - /** - * @param world - * @param i - * @param j - * @param k - * @param metadata - * @param random - * @param sbb - * @param min - * @param max - * @param hasMetal - */ public void generateFurnace(World world, int i, int j, int k, int metadata, Random random, StructureBoundingBox sbb, int min, int max, boolean hasMetal) { int i1 = getXWithOffset(i, k); int j1 = getYWithOffset(j); @@ -432,13 +318,6 @@ public class ComponentJewelry extends StructureVillagePieces.House1 { } } - /** - * Returns the villager type to spawn in this component, based on the number - * of villagers already spawned. - * - * @param par1 - * @return - */ @Override protected int getVillagerType(int par1) { return 3000; diff --git a/src/main/resources/assets/jewelrycraft2/lang/en_US.lang b/src/main/resources/assets/jewelrycraft2/lang/en_US.lang index c45d28c..e55463e 100644 --- a/src/main/resources/assets/jewelrycraft2/lang/en_US.lang +++ b/src/main/resources/assets/jewelrycraft2/lang/en_US.lang @@ -123,6 +123,7 @@ curse.jewelrycraft2.pentagram.description=The Dark Lord has mysterious ways of s curse.jewelrycraft2.rabbitspaw.description=The Dark Lord is giving you a gift. Don't lose it. curse.jewelrycraft2.rottenheart.description=Your heart slowly rots inside curse.jewelrycraft2.vampirehunger.description=You feel the need for blood +curse.jewelrycraft2.deathsTouch.description=Death does not wait to see if things are done or not done curse.jewelrycraft2.blind=Blind curse.jewelrycraft2.flamingsoul=Flaming Soul @@ -134,6 +135,7 @@ curse.jewelrycraft2.pentagram=Pentagram curse.jewelrycraft2.rabbitspaw=Rabbit's Paw curse.jewelrycraft2.rottenheart=Rotten Heart curse.jewelrycraft2.vampirehunger=Vampire Hunger +curse.jewelrycraft2.deathsTouch=Deaths Touch curse.jewelrycraft2.activated=You got cursed, press C to open the tab to see the active curses. -- cgit v1.2.3