From c918a1b6d8008773e9beebb48ba1a770405aee20 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 22 Aug 2019 19:54:41 -0400 Subject: Bulk update back to sanity --- .../fyresmodjam/handlers/CommonTickHandler.java | 241 ++++++--------------- 1 file changed, 68 insertions(+), 173 deletions(-) (limited to 'YWD/src/main/java/fyresmodjam/handlers/CommonTickHandler.java') diff --git a/YWD/src/main/java/fyresmodjam/handlers/CommonTickHandler.java b/YWD/src/main/java/fyresmodjam/handlers/CommonTickHandler.java index 1a50f3f..2df3e3a 100755 --- a/YWD/src/main/java/fyresmodjam/handlers/CommonTickHandler.java +++ b/YWD/src/main/java/fyresmodjam/handlers/CommonTickHandler.java @@ -26,10 +26,8 @@ public class CommonTickHandler { @SubscribeEvent public void worldTick(WorldTickEvent event) { if (event.phase == TickEvent.Phase.START) { - if (event.world != null - && event.world.provider.dimensionId == 0) { - worldData = FyresWorldData - .forWorld(event.world); + if (event.world != null && event.world.provider.dimensionId == 0) { + worldData = FyresWorldData.forWorld(event.world); worldData.markDirty(); } } @@ -37,12 +35,10 @@ public class CommonTickHandler { @SubscribeEvent public void serverTick(ServerTickEvent event) { - MinecraftServer server = FMLCommonHandler.instance() - .getMinecraftServerInstance(); + MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); for (int i = 0; i < server.worldServers.length; i++) { - WorldServer s = FMLCommonHandler.instance() - .getMinecraftServerInstance().worldServers[i]; + WorldServer s = FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[i]; if (s == null) { continue; @@ -57,10 +53,8 @@ public class CommonTickHandler { String blessing; - if (player.getEntityData() - .hasKey("Blessing")) { - blessing = player.getEntityData() - .getString("Blessing"); + if (player.getEntityData().hasKey("Blessing")) { + blessing = player.getEntityData().getString("Blessing"); } else { blessing = null; } @@ -69,32 +63,21 @@ public class CommonTickHandler { boolean blessingActive; - if (EntityStatHelper.hasStat(player, - "BlessingActive")) { - blessingActive = Boolean - .parseBoolean(EntityStatHelper - .getStat(player, "BlessingActive")); + if (EntityStatHelper.hasStat(player, "BlessingActive")) { + blessingActive = Boolean.parseBoolean(EntityStatHelper.getStat(player, "BlessingActive")); } else { blessingActive = false; } - if (EntityStatHelper.hasStat(player, - "BlessingCooldown")) { - coolDown = Integer.parseInt( - EntityStatHelper.getStat( - player, - "BlessingCooldown")); + if (EntityStatHelper.hasStat(player, "BlessingCooldown")) { + coolDown = Integer.parseInt(EntityStatHelper.getStat(player, "BlessingCooldown")); if (coolDown > 0) { coolDown--; } } - if (EntityStatHelper.hasStat(player, - "BlessingTimer")) { - timer = Integer.parseInt( - EntityStatHelper.getStat( - player, - "BlessingTimer")); + if (EntityStatHelper.hasStat(player, "BlessingTimer")) { + timer = Integer.parseInt(EntityStatHelper.getStat(player, "BlessingTimer")); if (blessingActive) { timer++; } else { @@ -102,25 +85,16 @@ public class CommonTickHandler { } } - if (EntityStatHelper.hasStat(player, - "BlessingCounter")) { - counter = Integer.parseInt( - EntityStatHelper.getStat( - player, - "BlessingCounter")); + if (EntityStatHelper.hasStat(player, "BlessingCounter")) { + counter = Integer.parseInt(EntityStatHelper.getStat(player, "BlessingCounter")); if (BlessingUtils.hasBlessing(player)) { - if (blessingActive - && BlessingUtils.hasBlessing(player, "BlessingBerserker") + if (blessingActive && BlessingUtils.hasBlessing(player, "BlessingBerserker") && timer % 40 == 0) { - counter = Math.max( - 0, - counter - 1); + counter = Math.max(0, counter - 1); if (counter == 0) { - NewPacketHandler.SEND_MESSAGE - .sendToPlayer(player, - "\u00A7cYou calm down."); + NewPacketHandler.SEND_MESSAGE.sendToPlayer(player, "\u00A7cYou calm down."); coolDown = 1200; timer = 0; blessingActive = false; @@ -133,29 +107,15 @@ public class CommonTickHandler { BlessingUtils.getBlessingInstance(blessing).commonTick(event, player); } - if (EntityStatHelper.hasStat(player, - "BlessingCounter") - && Integer.parseInt( - EntityStatHelper.getStat( - player, - "BlessingCounter")) != counter) { - NewPacketHandler.UPDATE_STAT - .sendToPlayer(player, - "BlessingCounter", - "" + counter); + if (EntityStatHelper.hasStat(player, "BlessingCounter") + && Integer.parseInt(EntityStatHelper.getStat(player, "BlessingCounter")) != counter) { + NewPacketHandler.UPDATE_STAT.sendToPlayer(player, "BlessingCounter", "" + counter); } - EntityStatHelper.giveStat(player, - "BlessingActive", - blessingActive); - EntityStatHelper.giveStat(player, - "BlessingCooldown", - coolDown); - EntityStatHelper.giveStat(player, - "BlessingCounter", - counter); - EntityStatHelper.giveStat(player, - "BlessingTimer", timer); + EntityStatHelper.giveStat(player, "BlessingActive", blessingActive); + EntityStatHelper.giveStat(player, "BlessingCooldown", coolDown); + EntityStatHelper.giveStat(player, "BlessingCounter", counter); + EntityStatHelper.giveStat(player, "BlessingTimer", timer); } @@ -168,128 +128,77 @@ public class CommonTickHandler { EntityItem item = (EntityItem) o; if (((EntityItem) o).isBurning()) { - ItemStack stack = item - .getDataWatcher() - .getWatchableObjectItemStack( - 10); + ItemStack stack = item.getDataWatcher().getWatchableObjectItemStack(10); - if (canAdvanceBurnTaskProgress( - stack)) { + if (canAdvanceBurnTaskProgress(stack)) { worldData.progress += stack.stackSize; ((EntityItem) o).isDead = true; String name1; - if (CommonTickHandler.worldData.currentTask - .equals("Kill")) { + if (CommonTickHandler.worldData.currentTask.equals("Kill")) { name1 = FyresWorldData.validMobNames[CommonTickHandler.worldData.currentTaskID]; } else { name1 = FyresWorldData.validItems[CommonTickHandler.worldData.currentTaskID] .getDisplayName(); } - if (name1.contains( - "Block")) { - if (name1.contains( - "Block")) { - name1 = name1.replace( - "Block", - "Blocks") - .replace("block", - "blocks"); + if (name1.contains("Block")) { + if (name1.contains("Block")) { + name1 = name1.replace("Block", "Blocks").replace("block", "blocks"); } } else { name1 += "s"; } - NewPacketHandler.SEND_MESSAGE - .sendToAllPlayers( - "\u00A7fCurrent Goal Progress: " - + worldData.progress - + "/" - + worldData.currentTaskAmount - + " " - + name1 - + " " - + worldData.currentTask - + "ed."); + NewPacketHandler.SEND_MESSAGE.sendToAllPlayers("\u00A7fCurrent Goal Progress: " + + worldData.progress + "/" + worldData.currentTaskAmount + " " + name1 + " " + + worldData.currentTask + "ed."); if (worldData.progress >= worldData.currentTaskAmount) { worldData.progress = 0; worldData.tasksCompleted++; - NewPacketHandler.LEVEL_UP - .sendToAllPlayers( - worldData.rewardLevels); + NewPacketHandler.LEVEL_UP.sendToAllPlayers(worldData.rewardLevels); worldData.giveNewTask(); String name; - if (worldData.currentTask - .equals("Kill")) { + if (worldData.currentTask.equals("Kill")) { name = FyresWorldData.validMobNames[worldData.currentTaskID]; } else { - name = FyresWorldData.validItems[worldData.currentTaskID] - .getDisplayName(); + name = FyresWorldData.validItems[worldData.currentTaskID].getDisplayName(); } if (worldData.currentTaskAmount > 1) { - if (name.contains( - "Block")) { - if (name.contains( - "Block")) { - name = name.replace( - "Block", - "Blocks") - .replace("block", - "blocks"); + if (name.contains("Block")) { + if (name.contains("Block")) { + name = name.replace("Block", "Blocks").replace("block", "blocks"); } } else { name += "s"; } } - NewPacketHandler.SEND_MESSAGE - .sendToAllPlayers( - "\u00A7eA world goal has been completed!" - + (!worldData.getDisadvantage() - .equals("None") ? " World disadvantage has been lifted!" - : "")); - - NewPacketHandler.SEND_MESSAGE - .sendToAllPlayers( - "\u00A7eA new world goal has been set: " - + (worldData.currentTask - + " " - + worldData.currentTaskAmount - + " " - + name - + ". (" - + worldData.progress - + " " - + worldData.currentTask - + "ed)")); + NewPacketHandler.SEND_MESSAGE.sendToAllPlayers("\u00A7eA world goal has been completed!" + + (!worldData.getDisadvantage().equals("None") + ? " World disadvantage has been lifted!" + : "")); + + NewPacketHandler.SEND_MESSAGE.sendToAllPlayers("\u00A7eA new world goal has been set: " + + (worldData.currentTask + " " + worldData.currentTaskAmount + " " + name + + ". (" + worldData.progress + " " + worldData.currentTask + "ed)")); worldData.currentDisadvantage = "None"; } - NewPacketHandler.UPDATE_WORLD_DATA - .sendToAllPlayers( - worldData.potionValues, - worldData.potionDurations, - worldData.getDisadvantage(), - worldData.currentTask, - worldData.currentTaskID, - worldData.currentTaskAmount, - worldData.progress, - worldData.tasksCompleted, - worldData.enderDragonKilled, - ConfigData.spawnTraps, - worldData.rewardLevels, - worldData.mushroomColors); - - worldData.setDirty( - true); + NewPacketHandler.UPDATE_WORLD_DATA.sendToAllPlayers(worldData.potionValues, + worldData.potionDurations, worldData.getDisadvantage(), worldData.currentTask, + worldData.currentTaskID, worldData.currentTaskAmount, worldData.progress, + worldData.tasksCompleted, worldData.enderDragonKilled, ConfigData.spawnTraps, + worldData.rewardLevels, worldData.mushroomColors); + + worldData.setDirty(true); } } } @@ -299,8 +208,7 @@ public class CommonTickHandler { for (Entity e : addLater) { WorldServer world = null; - for (WorldServer s : MinecraftServer - .getServer().worldServers) { + for (WorldServer s : MinecraftServer.getServer().worldServers) { if (s.provider.dimensionId == e.dimension) { world = s; break; @@ -315,30 +223,16 @@ public class CommonTickHandler { addLater.clear(); if (worldData != null) { - if (worldData.getDisadvantage() - .equals("Neverending Rain")) { - if (!MinecraftServer - .getServer().worldServers[0] - .getWorldInfo() - .isRaining()) { - MinecraftServer.getServer().worldServers[0] - .getWorldInfo() - .setRaining(true); + if (worldData.getDisadvantage().equals("Neverending Rain")) { + if (!MinecraftServer.getServer().worldServers[0].getWorldInfo().isRaining()) { + MinecraftServer.getServer().worldServers[0].getWorldInfo().setRaining(true); } - if (!MinecraftServer - .getServer().worldServers[0] - .getWorldInfo() - .isThundering()) { - MinecraftServer.getServer().worldServers[0] - .getWorldInfo() - .setThundering(true); + if (!MinecraftServer.getServer().worldServers[0].getWorldInfo().isThundering()) { + MinecraftServer.getServer().worldServers[0].getWorldInfo().setThundering(true); } - } else if (worldData.getDisadvantage() - .equals("Neverending Night")) { - MinecraftServer.getServer().worldServers[0] - .getWorldInfo() - .setWorldTime(18000); + } else if (worldData.getDisadvantage().equals("Neverending Night")) { + MinecraftServer.getServer().worldServers[0].getWorldInfo().setWorldTime(18000); } } } @@ -346,17 +240,18 @@ public class CommonTickHandler { private boolean canAdvanceBurnTaskProgress(ItemStack stack) { String task = worldData.currentTask; - if(task == null || !(task.equals("Burn"))) return false; + if (task == null || !(task.equals("Burn"))) + return false; - if(stack != null && stack.getItem() != null) { + if (stack != null && stack.getItem() != null) { ItemStack target = FyresWorldData.validItems[worldData.currentTaskID]; - if(target != null && target.getItem() != null) { - if(stack.getItem() != target.getItem()) { + if (target != null && target.getItem() != null) { + if (stack.getItem() != target.getItem()) { return false; } - if(stack.getItemDamage() != target.getItemDamage()) { + if (stack.getItemDamage() != target.getItemDamage()) { return false; } -- cgit v1.2.3