From 21e98a5d1a02fe00059f47602073e1f4efb87701 Mon Sep 17 00:00:00 2001 From: brandon3055 Date: Thu, 26 Mar 2015 15:24:02 +1100 Subject: [PATCH] 1.0.1 release candidate 1 (snapshot 6) --- Change Log.txt | 39 +- VERSION.json | 4 +- build.gradle | 4 +- .../draconicevolution/client/ClientProxy.java | 8 + .../client/creativetab/DETab.java | 7 +- .../client/gui/GUIDraconiumChest.java | 17 + .../client/gui/GUIParticleGenerator.java | 4 +- .../client/gui/GUITeleporter.java | 53 +- .../client/gui/GuiHandler.java | 4 +- .../client/gui/componentguis/GUIManual.java | 30 +- .../guicomponents/ComponentManualPage.java | 20 +- .../client/gui/manual/GuiManual.java | 7 +- .../client/render/block/RenderCrystal.java | 7 +- .../render/particle/ParticleEnergyField.java | 9 +- .../client/render/particle/Particles.java | 93 +- .../client/render/tile/RenderTileCrystal.java | 6 +- .../render/tile/RenderTileEnergyPylon.java | 14 +- .../draconicevolution/common/CommonProxy.java | 73 +- .../draconicevolution/common/ModBlocks.java | 18 +- .../draconicevolution/common/ModItems.java | 15 +- .../common/achievements/Achievements.java | 4 +- .../common/blocks/CustomSpawner.java | 36 +- .../common/blocks/PlacedItem.java | 6 +- .../common/blocks/TeleporterStand.java | 12 +- .../common/blocks/machine/EnergyCrystal.java | 23 +- .../blocks/multiblock/EnergyStorageCore.java | 27 +- .../multiblock/InvisibleMultiblock.java | 37 +- .../common/container/ContainerAdvTool.java | 3 +- .../container/ContainerDraconiumChest.java | 25 +- .../common/entity/EntityCustomDragon.java | 8 +- .../common/handler/ConfigHandler.java | 26 +- .../common/handler/CraftingHandler.java | 85 +- .../common/handler/FMLEventHandler.java | 1 - .../handler/MinecraftForgeEventHandler.java | 34 + .../common/items/InfoTablet.java | 1 + .../common/items/armor/DraconicArmor.java | 8 +- .../common/items/armor/WyvernArmor.java | 2 +- .../items/tools/DraconicDistructionStaff.java | 25 +- .../common/items/tools/DraconicHoe.java | 2 +- .../common/items/tools/TeleporterMKI.java | 16 +- .../common/items/tools/Wrench.java | 49 +- .../items/tools/baseclasses/MiningTool.java | 131 ++- .../items/tools/baseclasses/ToolBase.java | 36 +- .../items/tools/baseclasses/ToolHandler.java | 125 +-- .../common/items/weapons/DraconicBow.java | 5 +- .../common/items/weapons/DraconicSword.java | 18 +- .../common/items/weapons/WyvernBow.java | 7 +- .../common/items/weapons/WyvernSword.java | 18 +- .../common/lib/References.java | 2 + .../common/network/BlockUpdatePacket.java | 45 + .../common/network/ButtonPacket.java | 10 + .../common/network/SpeedRequestPacket.java | 54 ++ .../common/network/TeleporterPacket.java | 5 + .../tileentities/CustomSpawnerBaseLogic.java | 2 +- .../tileentities/TileDraconiumChest.java | 87 +- .../energynet/LinkedReceiver.java | 89 ++ .../energynet/TileRemoteEnergyBase.java | 8 +- .../TileWirelessEnergyTransceiver.java | 224 +++++ .../multiblocktiles/TileEnergyPylon.java | 2 +- .../common/utills/InfoHelper.java | 4 + .../common/utills/Teleporter.java | 11 +- .../common/world/DraconicWorldGenerator.java | 5 + .../assets/draconicevolution/lang/en_US.lang | 151 +-- .../assets/draconicevolution/manual.json | 913 +++++++++++++----- .../textures/gui/Widgets.png | Bin 2713 -> 2862 bytes .../textures/particle/particles.png | Bin 33333 -> 12604 bytes 66 files changed, 2056 insertions(+), 758 deletions(-) create mode 100644 src/main/java/com/brandon3055/draconicevolution/common/network/BlockUpdatePacket.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/common/network/SpeedRequestPacket.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/LinkedReceiver.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileWirelessEnergyTransceiver.java diff --git a/Change Log.txt b/Change Log.txt index b01e73b1..2abb7206 100644 --- a/Change Log.txt +++ b/Change Log.txt @@ -6,12 +6,39 @@ -fixed charging exployt with draconium blocks. -added block break event to aoe mining tools. -added comparator output to the energy pylon. --changed. Pylons can now be placed up to 16 blocks above and bellow the core --Special additions for FTB - > added option to set where the dragon egg will spawn - > added option to disable dragon block destruction - > added a beam option for the particle gen - > added the ability to copy settings from one particle gen to another +-changed. Pylons can now be placed up to 16 blocks above and bellow the core. +-option to set where the dragon egg will spawn. +-added option to disable dragon block destruction. +-added a beam option for the particle gen. +-added the ability to copy settings from one particle gen to another. +-added base safe AOE mode. +-added Crtl + right click to change dig depth. +-added Ctrl + Shift + right click to change attack aoe. +-fixed dragon health bar glitchiness. +-fixed advanced dislocator crash related to moving destinations in the gui. +-fixed crash when trying to teleport to a dimension that has been removed. +-fixed staff breaking liquid. +-fixed tool config gui not accepting enchant type "all". +-added night vision lock option to draconic helm. +-added draconium ore, draconium dust, draconium ingot and awakened draconium ingot to the ore dictionary. +-added ore generation to mod dimensions (configurable) +-re-added right click information to stabilized mob spawner and energy core. +-fixed minor syncing issue with the dislocator stand. +-fixed a little bugines when crafting with the draconic chest. +-mobs spawned from the stabilized spawner are now only persistent if the spawner has the "ignore players" upgrade. +-fixed weapon attack damage tool tips. +-buffed sword and staff attack damage. +-fixed some enchants not working properly with the swords and staff. +-fixed dig depth on staff breaking blocks behind player. +-bows no longer need a single arrow when enchanted with infinity. +-fixed tools not using energy in 1x1 mode. +-adjusted mining tool power usage. +-added option to lock the last 5 slots in the draconic chest. +-energy core tiers now range from 1 to 7 instead of 0 to 6. +-reduced the mining level of the stabilized spawner to 1 (iron) +-added config to disable any blocks or items in the mod +-removed old config to disable distortion flame and sun dial +-added config option to limit player speed ######## 1.0.1-Snapshot(5) ######## -fixed tesseracts not accepting energy from pylons. diff --git a/VERSION.json b/VERSION.json index a78ee916..2e0ee06f 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1,3 +1,3 @@ Version:1.0.1 -Snapshot:5 -ReleaseNote: +Snapshot:6 +ReleaseNote:This is the first release candidate for 1.0.1! diff --git a/build.gradle b/build.gradle index 82f94f61..4177e1df 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ repositories { apply plugin: 'forge' -version = "1.7.10-v1.0.1-snapshot_6" //Version System A.B.CD A=Minecraft version (increments with each new minecraft version) B=Major mod change (Will break saves) C=Release Number (Increments with each public release) D=Bugfix version (a-z) +version = "1.7.10-v1.0.1-release_candidate-1" //Version System A.B.CD A=Minecraft version (increments with each new minecraft version) B=Major mod change (Will break saves) C=Release Number (Increments with each public release) D=Bugfix version (a-z) group= "com.brandon3055.draconicevolution" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Draconic-Evolution" @@ -52,7 +52,7 @@ dependencies { // http://www.gradle.org/docs/current/userguide/dependency_management.html compile "codechicken:CodeChickenLib:1.7.10-1.1.1.99:dev" compile "codechicken:CodeChickenCore:1.7.10-1.0.4.29:dev" - compile "codechicken:NotEnoughItems:1.7.10-1.0.3.64:dev" + compile "codechicken:NotEnoughItems:1.7.10-1.0.3.74:dev" } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java b/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java index 3097c46e..23109bb2 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java @@ -25,6 +25,7 @@ import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.tileentities.*; import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyRelay; import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyTransceiver; +import com.brandon3055.draconicevolution.common.tileentities.energynet.TileWirelessEnergyTransceiver; import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyPylon; import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyStorageCore; import com.brandon3055.draconicevolution.common.utills.UpdateChecker; @@ -35,6 +36,7 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import net.minecraft.client.Minecraft; import net.minecraft.item.Item; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; @@ -149,6 +151,7 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileDraconiumChest.class, new RenderTileDraconiumChest()); ClientRegistry.bindTileEntitySpecialRenderer(TileEnergyRelay.class, new RenderTileCrystal()); ClientRegistry.bindTileEntitySpecialRenderer(TileEnergyTransceiver.class, new RenderTileCrystal()); + ClientRegistry.bindTileEntitySpecialRenderer(TileWirelessEnergyTransceiver.class, new RenderTileCrystal()); //Entitys RenderingRegistry.registerEntityRenderingHandler(EntityCustomDragon.class, new RenderDragon()); @@ -217,4 +220,9 @@ public class ClientProxy extends CommonProxy { } return beam; } + + public boolean isOp(String paramString) + { + return Minecraft.getMinecraft().theWorld.getWorldInfo().getGameType().isCreative(); + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/creativetab/DETab.java b/src/main/java/com/brandon3055/draconicevolution/client/creativetab/DETab.java index 6eedbb22..03929619 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/creativetab/DETab.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/creativetab/DETab.java @@ -6,6 +6,7 @@ import com.brandon3055.draconicevolution.common.ModItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -16,7 +17,8 @@ public class DETab extends CreativeTabs { static ItemStack iconStackStaff; public static void initialize() { - iconStackStaff = ItemNBTHelper.setInteger(new ItemStack(ModItems.draconicDestructionStaff), "Energy", 30000000); + if (ModItems.isEnabled(ModItems.draconicDestructionStaff)) iconStackStaff = ItemNBTHelper.setInteger(new ItemStack(ModItems.draconicDestructionStaff), "Energy", 30000000); + else iconStackStaff = new ItemStack(Items.stick); } public DETab(int id, String modid, String label, int tab) { @@ -30,7 +32,8 @@ public class DETab extends CreativeTabs { public ItemStack getIconItemStack() { if (tab == 0) return iconStackStaff; - else return new ItemStack(ModBlocks.energyInfuser); + else if (ModBlocks.isEnabled(ModBlocks.energyInfuser)) return new ItemStack(ModBlocks.energyInfuser); + return new ItemStack(Items.ender_eye); } @Override diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDraconiumChest.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDraconiumChest.java index c43b0ba5..4659dabd 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDraconiumChest.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDraconiumChest.java @@ -5,6 +5,7 @@ import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.TaggedInventoryArea; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.gui.manual.GuiButtonAHeight; +import com.brandon3055.draconicevolution.client.handler.ResourceHandler; import com.brandon3055.draconicevolution.common.container.ContainerDraconiumChest; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.network.ButtonPacket; @@ -60,6 +61,13 @@ public class GUIDraconiumChest extends GuiContainer implements INEIGuiHandler drawTexturedModalRect(guiLeft+387, guiTop+236, 44, 177, 90, 16); drawTexturedModalRect(guiLeft+387, guiTop+180, 44, 177, 90, 16); + if (tile.lockOutputSlots) { + ResourceHandler.bindResource("textures/gui/Widgets.png"); + GL11.glColor4f(1f, 1f, 1f, 1f); + for (int i = 0; i < 5; i++) drawTexturedModalRect(guiLeft + 385 + i * 18, guiTop + 158, 138, 18, 18, 18); + Minecraft.getMinecraft().getTextureManager().bindTexture(textureLeft); + } + int arrowHight = (int)(((float)tile.smeltingProgressTime / (float)tile.smeltingCompleateTime) * 22f); drawTexturedModalRect(guiLeft+140, guiTop+192+22-arrowHight, 140, 216+22-arrowHight, 16, arrowHight); @@ -101,6 +109,12 @@ public class GUIDraconiumChest extends GuiContainer implements INEIGuiHandler list.add(s.substring(s.indexOf(".")+1)); drawHoveringText(list, x-guiLeft, y-guiTop, fontRendererObj); } + if (GuiHelper.isInRect(398, 180, 70, 12, x-guiLeft, y-guiTop)){ + s = StatCollector.translateToLocal("button.de.chestLockOutput.txt"); + list.add(s.substring(s.indexOf(".")+1)); + drawHoveringText(list, x-guiLeft, y-guiTop, fontRendererObj); + } + RenderHelper.enableGUIStandardItemLighting(); } @@ -119,6 +133,8 @@ public class GUIDraconiumChest extends GuiContainer implements INEIGuiHandler buttonList.add(new GuiButtonAHeight(2, posX+4, posY+206, 38, 12, s.substring(0, s.indexOf(".")))); s = StatCollector.translateToLocal("button.de.chestAutoFeed3.txt"); buttonList.add(new GuiButtonAHeight(3, posX+4, posY+219, 38, 12, s.substring(0, s.indexOf(".")))); + s = StatCollector.translateToLocal("button.de.chestLockOutput.txt"); + buttonList.add(new GuiButtonAHeight(4, posX+398, posY+180, 70, 12, s.substring(0, s.indexOf(".")))); } @Override @@ -127,6 +143,7 @@ public class GUIDraconiumChest extends GuiContainer implements INEIGuiHandler else if (button.id == 1)DraconicEvolution.network.sendToServer(new ButtonPacket(ButtonPacket.ID_DRACONIUMCHEST1, false)); else if (button.id == 2)DraconicEvolution.network.sendToServer(new ButtonPacket(ButtonPacket.ID_DRACONIUMCHEST2, false)); else if (button.id == 3)DraconicEvolution.network.sendToServer(new ButtonPacket(ButtonPacket.ID_DRACONIUMCHEST3, false)); + else if (button.id == 4)DraconicEvolution.network.sendToServer(new ButtonPacket(ButtonPacket.ID_DRACONIUMCHEST4, false)); } @Override diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIParticleGenerator.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIParticleGenerator.java index c337fe79..ebad23e5 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIParticleGenerator.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIParticleGenerator.java @@ -680,9 +680,9 @@ public class GUIParticleGenerator extends GuiScreen { fontRendererObj.drawString("Blue:", col1, posY + ln1 + 2 * 22, 0x000000, false); fontRendererObj.drawString(String.valueOf(beam_blue), col1, posY + ln2 + 2 * 22, 0x000000, false); - fontRendererObj.drawString("Z Rot:", col1, posY + ln1 + 3 * 22, 0x000000, false); + fontRendererObj.drawString("Y Rot:", col1, posY + ln1 + 3 * 22, 0x000000, false); fontRendererObj.drawString(pitch, col1, posY + ln2 + 3 * 22, 0x000000, false); - fontRendererObj.drawString("X Rot:", col1, posY + ln1 + 4 * 22, 0x000000, false); + fontRendererObj.drawString("Z,X Rot:", col1, posY + ln1 + 4 * 22, 0x000000, false); fontRendererObj.drawString(yaw, col1, posY + ln2 + 4 * 22, 0x000000, false); fontRendererObj.drawString("Length:", col1, posY + ln1 + 5 * 22, 0x000000, false); fontRendererObj.drawString(length, col1, posY + ln2 + 5 * 22, 0x000000, false); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUITeleporter.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUITeleporter.java index 159572ae..5c361184 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUITeleporter.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUITeleporter.java @@ -23,7 +23,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.WorldProvider; +import net.minecraft.util.StatCollector; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; @@ -84,14 +84,14 @@ public class GUITeleporter extends GuiScreen String colour = EnumChatFormatting.GREEN + ""; if (fuel < 10) colour = EnumChatFormatting.YELLOW + ""; if (fuel == 0) colour = EnumChatFormatting.DARK_RED + ""; - fontRendererObj.drawString(colour+"Fuel: " + fuel, posX + 115, posY + 87, 0x000000); + fontRendererObj.drawString(colour+StatCollector.translateToLocal("info.teleporterInfFuel.txt") + " " + fuel, posX + 115, posY + 87, 0x000000); super.drawScreen(x, y, f); for (int i = 0; i < Math.min(12, locations.size()); i++){ if (GuiHelper.isInRect(17, 6+i*11, 80, 10, x - posX, y - posY)) { List l = new ArrayList(); - l.add("Right click to teleport"); + l.add(StatCollector.translateToLocal("info.de.rightClickToTeleport.txt")); drawHoveringText(l, x, y, fontRendererObj); } } @@ -165,7 +165,7 @@ public class GUITeleporter extends GuiScreen fontRendererObj.drawString(EnumChatFormatting.GOLD+"X: "+(int)locations.get(selected+selrctionOffset).getXCoord(), posX+114, posY+7, 0x000000); fontRendererObj.drawString(EnumChatFormatting.GOLD + "Y: " + (int) locations.get(selected + selrctionOffset).getYCoord(), posX + 114, posY + 16, 0x000000); fontRendererObj.drawString(EnumChatFormatting.GOLD + "Z: " + (int) locations.get(selected + selrctionOffset).getZCoord(), posX + 114, posY + 25, 0x000000); - fontRendererObj.drawString(EnumChatFormatting.GOLD+""+WorldProvider.getProviderForDimension(locations.get(selected + selrctionOffset).getDimension()).getDimensionName(), posX+114, posY+34, 0x000000); + fontRendererObj.drawString(EnumChatFormatting.GOLD+""+ locations.get(selected + selrctionOffset).getDimensionName(), posX+114, posY+34, 0x000000); } @Override @@ -214,7 +214,7 @@ public class GUITeleporter extends GuiScreen } if (player.capabilities.isCreativeMode || fuel > 0) { - fuel--; + if (!player.capabilities.isCreativeMode) fuel--; DraconicEvolution.network.sendToServer(new TeleporterPacket(TeleporterPacket.TELEPORT, i+selrctionOffset, false)); } } @@ -269,7 +269,7 @@ public class GUITeleporter extends GuiScreen super.handleMouseInput(); } - private void updateButtons(){ + private void updateButtons(){ if (locations.size() > 12) maxOffset = locations.size() - 12; else maxOffset = 0; if (selrctionOffset > maxOffset) selrctionOffset = maxOffset; @@ -291,11 +291,11 @@ public class GUITeleporter extends GuiScreen } if (editingNew){ ((GuiButton) buttonList.get(4)).enabled = !textBeingEdited.getText().isEmpty(); - ((GuiButton) buttonList.get(4)).displayString = "Commit"; + ((GuiButton) buttonList.get(4)).displayString = StatCollector.translateToLocal("button.de.commit.txt"); } if (editingExisting){ ((GuiButton) buttonList.get(0)).enabled = !textBeingEdited.getText().isEmpty(); - ((GuiButton) buttonList.get(0)).displayString = "Commit"; + ((GuiButton) buttonList.get(0)).displayString = StatCollector.translateToLocal("button.de.commit.txt"); } if (locations.size() >= 100) ((GuiButton) buttonList.get(4)).enabled = false; else if (!editingNew) ((GuiButton) buttonList.get(4)).enabled = true; @@ -303,24 +303,24 @@ public class GUITeleporter extends GuiScreen @SuppressWarnings("unchecked") @Override - public void initGui(){//todo Localization + public void initGui(){ buttonList.clear(); int posX = (this.width - xSize) / 2; int posY = (this.height - ySize) / 2; //updateTeleporter(); - buttonList.add(new GuiButtonAHeight(0, posX + 112, posY + 45, 66, 12, "Rename")); - buttonList.add(new GuiButtonAHeight(1, posX + 112, posY + 58, 66, 12, "Set Here")); - buttonList.add(new GuiButtonAHeight(2, posX + 112, posY + 71, 66, 12, "Remove")); + buttonList.add(new GuiButtonAHeight(0, posX + 112, posY + 45, 66, 12, StatCollector.translateToLocal("button.de.rename.txt"))); + buttonList.add(new GuiButtonAHeight(1, posX + 112, posY + 58, 66, 12, StatCollector.translateToLocal("button.de.setHere.txt"))); + buttonList.add(new GuiButtonAHeight(2, posX + 112, posY + 71, 66, 12, StatCollector.translateToLocal("button.de.remove.txt"))); - buttonList.add(new GuiButtonAHeight(3, posX + 112, posY + 99, 33, 12, "UP")); + buttonList.add(new GuiButtonAHeight(3, posX + 112, posY + 99, 33, 12, StatCollector.translateToLocal("button.de.UP.txt"))); - buttonList.add(new GuiButtonAHeight(4, posX + 112, posY + 112, 66, 12, "Add New")); - buttonList.add(new GuiButtonAHeight(5, posX + 112, posY + 125, 66, 12, "Add Fuel")); - buttonList.add(new GuiButtonAHeight(6, posX+xSize-63, posY-15, 60, 15, "Cancel")); + buttonList.add(new GuiButtonAHeight(4, posX + 112, posY + 112, 66, 12, StatCollector.translateToLocal("button.de.addNew.txt"))); + buttonList.add(new GuiButtonAHeight(5, posX + 112, posY + 125, 66, 12, StatCollector.translateToLocal("button.de.addFuel.txt"))); + buttonList.add(new GuiButtonAHeight(6, posX+xSize-63, posY-15, 60, 15, StatCollector.translateToLocal("button.de.cancel.txt"))); - buttonList.add(new GuiButtonAHeight(7, posX + 112 + 34, posY + 99, 33, 12, "DOWN")); + buttonList.add(new GuiButtonAHeight(7, posX + 112 + 34, posY + 99, 33, 12, StatCollector.translateToLocal("button.de.DOWN.txt"))); ((GuiButton) buttonList.get(6)).visible = false; textBeingEdited = new GuiTextField(fontRendererObj, posX+3, posY-14, xSize-67, 12); @@ -338,7 +338,7 @@ public class GUITeleporter extends GuiScreen if (button.id == 0 || button.id == 6 && !editingNew){ if(button.id == 6){ editingExisting = false; - ((GuiButton) buttonList.get(0)).displayString = "Rename"; + ((GuiButton) buttonList.get(0)).displayString = StatCollector.translateToLocal("button.de.rename.txt"); ((GuiButton) buttonList.get(6)).visible = false; textBeingEdited.setVisible(false); ((GuiButton) buttonList.get(0)).enabled = true; @@ -357,7 +357,7 @@ public class GUITeleporter extends GuiScreen TeleportLocation location = new TeleportLocation(); location.setName(textBeingEdited.getText()); DraconicEvolution.network.sendToServer(new TeleporterPacket(location, TeleporterPacket.UPDATENAME, selected+selrctionOffset)); - ((GuiButton) buttonList.get(0)).displayString = "Rename"; + ((GuiButton) buttonList.get(0)).displayString = StatCollector.translateToLocal("button.de.rename.txt"); editingExisting = false; textBeingEdited.setVisible(false); ((GuiButton) buttonList.get(6)).visible = false; @@ -392,7 +392,7 @@ public class GUITeleporter extends GuiScreen } else { - if (selected < Math.min(11, locations.size())) + if (selected < Math.min(11, locations.size()-1)) { TeleportLocation temp = locations.get(selected + selrctionOffset); locations.set(selected + selrctionOffset, locations.get(selected + selrctionOffset + 1)); @@ -407,7 +407,7 @@ public class GUITeleporter extends GuiScreen if (button.id == 4 || button.id == 6 && !editingExisting){ if(button.id == 6){ editingNew = false; - ((GuiButton) buttonList.get(4)).displayString = "Add New"; + ((GuiButton) buttonList.get(4)).displayString = StatCollector.translateToLocal("button.de.addNew.txt"); ((GuiButton) buttonList.get(6)).visible = false; ((GuiButton) buttonList.get(4)).enabled = true; textBeingEdited.setVisible(false); @@ -423,7 +423,7 @@ public class GUITeleporter extends GuiScreen }else{ if (!textBeingEdited.getText().isEmpty()){ addCurrentLocationToList(textBeingEdited.getText()); - ((GuiButton) buttonList.get(4)).displayString = "Add New"; + ((GuiButton) buttonList.get(4)).displayString = StatCollector.translateToLocal("button.de.addNew.txt"); editingNew = false; textBeingEdited.setVisible(false); ((GuiButton) buttonList.get(6)).visible = false; @@ -472,11 +472,11 @@ public class GUITeleporter extends GuiScreen if(this.textBeingEdited.textboxKeyTyped(key, keyN)) { if (editingNew){ ((GuiButton) buttonList.get(4)).enabled = !textBeingEdited.getText().isEmpty(); - ((GuiButton) buttonList.get(4)).displayString = "Commit"; + ((GuiButton) buttonList.get(4)).displayString = StatCollector.translateToLocal("button.de.commit.txt"); } if (editingExisting){ ((GuiButton) buttonList.get(0)).enabled = !textBeingEdited.getText().isEmpty(); - ((GuiButton) buttonList.get(0)).displayString = "Commit"; + ((GuiButton) buttonList.get(0)).displayString = StatCollector.translateToLocal("button.de.commit.txt"); } return; } @@ -499,6 +499,7 @@ public class GUITeleporter extends GuiScreen this.mc.setIngameFocus(); } + if (tick % 5 == 0 && locations.size() > 0 && locations.get(selected + selrctionOffset).getDimensionName().equals("") && player.getHeldItem() != null && player.getHeldItem().getItem() == ModItems.teleporterMKII) readDataFromItem(player.getHeldItem()); tick++; if (tick >= 10){ @@ -527,7 +528,9 @@ public class GUITeleporter extends GuiScreen for (int i = 0; i < list.tagCount(); i++){ NBTTagCompound tagLocation = list.getCompoundTagAt(i); - TeleportLocation location = new TeleportLocation(tagLocation.getDouble("X"), tagLocation.getDouble("Y"), tagLocation.getDouble("Z"), tagLocation.getInteger("Dimension"), tagLocation.getFloat("Pitch"), tagLocation.getFloat("Yaw"), tagLocation.getString("Name")); + //TeleportLocation location = new TeleportLocation(tagLocation.getDouble("X"), tagLocation.getDouble("Y"), tagLocation.getDouble("Z"), tagLocation.getInteger("Dimension"), tagLocation.getFloat("Pitch"), tagLocation.getFloat("Yaw"), tagLocation.getString("Name")); + TeleportLocation location = new TeleportLocation(); + location.readFromNBT(tagLocation); location.setWriteProtected(tagLocation.getBoolean("WP")); locations.add(location); } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java index 29de700a..697d7082 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java @@ -1,8 +1,8 @@ package com.brandon3055.draconicevolution.client.gui; import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.client.gui.componentguis.GUIManual; import com.brandon3055.draconicevolution.client.gui.componentguis.GUIToolConfig; -import com.brandon3055.draconicevolution.client.gui.manual.GuiManual; import com.brandon3055.draconicevolution.common.container.*; import com.brandon3055.draconicevolution.common.inventory.InventoryTool; import com.brandon3055.draconicevolution.common.tileentities.*; @@ -144,7 +144,7 @@ public class GuiHandler implements IGuiHandler { } break; case GUIID_MANUAL: - return new GuiManual(); + return new GUIManual(); case GUIID_DISSENCHANTER: TileEntity dissenchanter = world.getTileEntity(x, y, z); if (dissenchanter != null && dissenchanter instanceof TileDissEnchanter) { diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java index 038252af..99346ae0 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java @@ -3,6 +3,7 @@ package com.brandon3055.draconicevolution.client.gui.componentguis; import com.brandon3055.draconicevolution.client.gui.guicomponents.*; import com.brandon3055.draconicevolution.client.handler.ResourceHandler; import com.brandon3055.draconicevolution.common.container.DummyContainer; +import com.brandon3055.draconicevolution.common.handler.ConfigHandler; import com.brandon3055.draconicevolution.common.lib.References; import com.google.gson.stream.JsonReader; import net.minecraft.client.Minecraft; @@ -50,7 +51,6 @@ public class GUIManual extends GUIScrollingBase { @Override protected ComponentCollection assembleComponents() { - loadPages();//todo remove collection = new ComponentCollection(0, 0, xSize, ySize + 20, this); collection.addComponent(new ComponentTexturedRect(0, 0, 255, 255, ResourceHandler.getResource("textures/gui/manualTop.png"))).setGroup(GR_BACKGROUND); @@ -60,14 +60,6 @@ public class GUIManual extends GUIScrollingBase { collection.addComponent(new ComponentButton(75, 260, 100, 20, 0, this, StatCollector.translateToLocal("info.de.manual.indexButton.txt"), StatCollector.translateToLocal("info.de.manual.indexButtonTip.txt"))).setGroup(GR_INTRO); -// ITextureObject iTextureObject = mc.getTextureManager().getTexture(ResourceHandler.getResource("textures/gui/manualBottom.png")); -// mc.getResourceManager().getResource(ResourceHandler.getResource("textures/gui/manualBottom.png")). -// LogHelper.info(iTextureObject); -// if (iTextureObject instanceof TextureMap) -// { -// LogHelper.info(((TextureMap) iTextureObject).getTextureExtry("textures/gui/manualBottom.png")); -// }todo old - for (int i = 0; i < pageList.size(); i++) { collection.addComponent(new ComponentIndexButton(20, 20 + i * 20, this, pageList.get(i))).setGroup(GR_INDEX); @@ -94,6 +86,12 @@ public class GUIManual extends GUIScrollingBase { int posX = (this.width - xSize) / 2; int posY = (this.height - ySize) / 2; if (collection.getComponent("BANNER") != null && collection.getComponent("BANNER").isEnabled()) fontRendererObj.drawSplitString(StatCollector.translateToLocal("info.de.manual.introTxt.txt"), posX + 20, posY + 190, 150, 0x000000); + if (collection.getComponent("BANNER") != null && collection.getComponent("BANNER").isEnabled()) { + GL11.glPushMatrix(); + GL11.glScalef(0.8F, 0.8F, 0.8F); + fontRendererObj.drawSplitString("I am still in the process of adding documentation to this manual. There is also some fine tuning that i still need to do.", posX + 110, posY + 380, 280, 0xFF0000); + GL11.glPopMatrix(); + } } @Override @@ -132,11 +130,8 @@ public class GUIManual extends GUIScrollingBase { public static void loadPages() { - //LogHelper.info("loading pages"); try { - pageList.clear();//todo remove these (only needed for testing) - imageURLs.clear(); File manualJSON = new File(ResourceHandler.getConfigFolder(), "manual.json"); InputStream is = Minecraft.getMinecraft().getResourceManager().getResource(new ResourceLocation(References.RESOURCESPREFIX + "manual.json")).getInputStream(); @@ -213,7 +208,7 @@ public class GUIManual extends GUIScrollingBase { reader.endObject(); - pageList.add(new ManualPage(name, images.toArray(new String[images.size()]), content.toArray(new String[content.size()]), nameL, meta)); + if (isValidPage(name))pageList.add(new ManualPage(name, images.toArray(new String[images.size()]), content.toArray(new String[content.size()]), nameL, meta)); } reader.endArray(); @@ -227,8 +222,6 @@ public class GUIManual extends GUIScrollingBase { { e.printStackTrace(); } - - //for (ManualPage p : pageList) LogHelper.info(p.getLocalizedName()); } @Override @@ -250,4 +243,11 @@ public class GUIManual extends GUIScrollingBase { } } } + + private static boolean isValidPage(String name) + { + if (name.contains("info.")) return true; + else if (!ConfigHandler.disabledNamesList.contains(name)) return true; + return false; + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentManualPage.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentManualPage.java index fa63dcf0..d71d9a43 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentManualPage.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentManualPage.java @@ -4,7 +4,6 @@ import com.brandon3055.draconicevolution.client.gui.componentguis.ManualPage; import com.brandon3055.draconicevolution.client.handler.ResourceHandler; import com.brandon3055.draconicevolution.client.utill.CustomResourceLocation; import com.brandon3055.draconicevolution.common.utills.GuiHelper; -import com.brandon3055.draconicevolution.common.utills.LogHelper; import com.brandon3055.draconicevolution.common.utills.Utills; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; @@ -38,26 +37,25 @@ public class ComponentManualPage extends ComponentScrollingBase { pageLength += c.getHeight(); contentList.add(c); } - pageLength += 100; - LogHelper.info(page.scrollOffset); + pageLength += 25; } @Override public void handleScrollInput(int direction) { page.scrollOffset += direction * 10; if (page.scrollOffset < 0) page.scrollOffset = 0; - if (page.scrollOffset > pageLength - getHeight() + 40) page.scrollOffset = pageLength - getHeight() + 40; - if (pageLength + 40 <= getHeight()) page.scrollOffset = 0; + if (page.scrollOffset > pageLength - getHeight()) page.scrollOffset = pageLength - getHeight(); + if (pageLength <= getHeight()) page.scrollOffset = 0; } @Override public int getWidth() { - return gui.width; + return gui.getXSize(); } @Override public int getHeight() { - return gui.height; + return gui.getYSize(); } @Override @@ -109,14 +107,14 @@ public class ComponentManualPage extends ComponentScrollingBase { else if (type == 2) { String s = content.substring(content.indexOf("[c]") + 3); - LogHelper.info(content + " " + s); +// LogHelper.info(content + " " + s); String name = s.substring(0, s.lastIndexOf(":")); ItemStack stack = Utills.getStackFromName(name, Integer.parseInt(s.substring(s.lastIndexOf(":") + 1))); result = stack; if (stack != null) { - LogHelper.info(stack); +// LogHelper.info(stack); for (IRecipe recipe : (List) CraftingManager.getInstance().getRecipeList()) { @@ -143,8 +141,8 @@ public class ComponentManualPage extends ComponentScrollingBase { } } - LogHelper.info(recipes); - LogHelper.info(smeltingRecipes); +// LogHelper.info(recipes); +// LogHelper.info(smeltingRecipes); } } else textLines = null; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/manual/GuiManual.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/manual/GuiManual.java index 89c37f9d..696ec2a7 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/manual/GuiManual.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/manual/GuiManual.java @@ -1,9 +1,8 @@ package com.brandon3055.draconicevolution.client.gui.manual; import com.brandon3055.draconicevolution.common.ModBlocks; -import com.brandon3055.draconicevolution.common.handler.ConfigHandler; -import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.ModItems; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; @@ -87,7 +86,7 @@ public class GuiManual extends GuiScreen { pageCollection.addPage(new CraftingInfoPage("ITEM_PAGE."+getNextPageIndex(), pageCollection, mobSoul, "")); pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.weatherController), "")); - if (ConfigHandler.disableSunDial != 2) pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.sunDial), "")); + //if (ConfigHandler.disableSunDial != 2) pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.sunDial), "")); pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.playerDetector), "")); pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.playerDetectorAdvanced), "")); pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.grinder, 1, 3), "")); @@ -99,7 +98,7 @@ public class GuiManual extends GuiScreen { pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.draconiumChest), "")); pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.particleGenerator), "")); - if (ConfigHandler.disableXrayBlock != 2) pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.xRayBlock), "")); + // if (ConfigHandler.disableXrayBlock != 2) pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.xRayBlock), "")); pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.potentiometer), "")); pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.rainSensor), "")); pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.draconiumBlock), "")); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderCrystal.java b/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderCrystal.java index 1d6ae2b6..9bc5367a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderCrystal.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderCrystal.java @@ -2,6 +2,7 @@ package com.brandon3055.draconicevolution.client.render.block; import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyRelay; import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyTransceiver; +import com.brandon3055.draconicevolution.common.tileentities.energynet.TileWirelessEnergyTransceiver; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; @@ -17,12 +18,16 @@ public class RenderCrystal implements IItemRenderer { private TileEnergyRelay relay2; private TileEnergyTransceiver transceiver1; private TileEnergyTransceiver transceiver2; + private TileWirelessEnergyTransceiver wirelessTransceiver1; + private TileWirelessEnergyTransceiver wirelessTransceiver2; public RenderCrystal() { relay1 = new TileEnergyRelay(0); relay2 = new TileEnergyRelay(1); transceiver1 = new TileEnergyTransceiver(0); transceiver2 = new TileEnergyTransceiver(1); + wirelessTransceiver1 = new TileWirelessEnergyTransceiver(0); + wirelessTransceiver2 = new TileWirelessEnergyTransceiver(1); transceiver1.facing = 1; transceiver2.facing = 1; } @@ -57,7 +62,7 @@ public class RenderCrystal implements IItemRenderer { else GL11.glTranslatef(0.0F, -0.6F, 0.0F); } int meta = item.getItemDamage(); - TileEntityRendererDispatcher.instance.renderTileEntityAt(meta == 0 ? relay1 : meta == 1 ? relay2 : meta == 2 ? transceiver1 : transceiver2, 0.0D, 0.0D, 0.0D, 0.0F); + TileEntityRendererDispatcher.instance.renderTileEntityAt(meta == 0 ? relay1 : meta == 1 ? relay2 : meta == 2 ? transceiver1 : meta == 3 ? transceiver2 : meta == 4 ? wirelessTransceiver1 : wirelessTransceiver2, 0.0D, 0.0D, 0.0D, 0.0F); GL11.glPopMatrix(); RenderHelper.enableStandardItemLighting(); } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyField.java b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyField.java index 6cda8120..47ff08c8 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyField.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyField.java @@ -64,6 +64,11 @@ public class ParticleEnergyField extends EntityFX {//todo Fancy Animated Particl float minU = 0.0F + 0.125F * (advanced ? 4 : 3); float maxU = 0.0F + 0.125F * (advanced ? 5 : 4);//minU + 0.124F; + if (type == 2) + { + minU = 0.0F + 0.125F * 5; + maxU = 0.0F + 0.125F * 6; + } float minV = 0F;//(float)this.particleTextureIndexY / 32.0F; float maxV = 0.123F;//minV + 0.124F; float drawScale = 0.2f; @@ -81,7 +86,7 @@ public class ParticleEnergyField extends EntityFX {//todo Fancy Animated Particl float drawZ = (float) (this.prevPosZ + (this.posZ - this.prevPosZ) * (double) partialTick - interpPosZ); - if (type == 0) + if (type == 0 || type == 2) { tessellator.startDrawingQuads(); tessellator.setBrightness(200); @@ -106,7 +111,7 @@ public class ParticleEnergyField extends EntityFX {//todo Fancy Animated Particl tessellator.draw(); } - else + else if (type == 1) { tessellator.startDrawingQuads(); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/particle/Particles.java b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/Particles.java index 1a6a3e82..45e6752c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/particle/Particles.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/Particles.java @@ -218,8 +218,8 @@ public final class Particles { prevPosY = posY; prevPosZ = posZ; moveEntity(motionX, motionY, motionZ); - return; } + @Override @SideOnly(Side.CLIENT) public void renderParticle(Tessellator tesselator, float par2, float par3, float par4, float par5, float par6, float par7) {//Note U=X V=Y @@ -459,4 +459,95 @@ public final class Particles { } } + + public static class TransceiverParticle extends EntityFX + { + public double targetX; + public double targetY; + public double targetZ; + private int textureIndex = 0; + + public TransceiverParticle(World world, double x, double y, double z, double tx, double ty, double tz) { + super(world, x, y, z, 0.0D, 0.0D, 0.0D); + this.targetX = tx; + this.targetY = ty; + this.targetZ = tz; + this.motionX = 0; + this.motionY = 0; + this.motionZ = 0; + this.particleMaxAge = 1000; + this.noClip = true; + this.particleRed = this.particleGreen = this.particleBlue = 1.0f; + } + + @Override + public void onUpdate() { + //super.onUpdate(); + if (particleAge > particleMaxAge) setDead(); + if (particleAge > particleMaxAge || this.getDistanceSq(targetX, targetY, targetZ) < 0.05) setDead(); + particleAge ++; + float speed = (float)particleAge * 0.00002F; + motionX += (targetX - posX) * speed; + motionY += (targetY - posY) * speed; + motionZ += (targetZ - posZ) * speed; + prevPosX = posX; + prevPosY = posY; + prevPosZ = posZ; + moveEntity(motionX, motionY, motionZ); + + textureIndex = worldObj.rand.nextInt(5); + } + + @Override + @SideOnly(Side.CLIENT) + public void renderParticle(Tessellator tesselator, float par2, float par3, float par4, float par5, float par6, float par7) {//Note U=X V=Y + + tesselator.draw(); + ResourceHandler.bindParticles(); + tesselator.startDrawingQuads(); + tesselator.setBrightness(200); + + int uIndex = textureIndex; + int vIndex = 1; + + float minU = uIndex * 0.125F; + float maxU = (uIndex+1) * 0.125F; + float minV = vIndex * 0.125F; + float maxV = (vIndex+1) * 0.125F; + + float drawScale = 0.1F * this.particleScale; + + if (this.particleIcon != null) { + minU = this.particleIcon.getMinU(); + maxU = this.particleIcon.getMaxU(); + minV = this.particleIcon.getMinV(); + maxV = this.particleIcon.getMaxV(); + } + + float drawX = (float) (this.prevPosX + (this.posX - this.prevPosX) * (double) par2 - interpPosX); + float drawY = (float) (this.prevPosY + (this.posY - this.prevPosY) * (double) par2 - interpPosY); + float drawZ = (float) (this.prevPosZ + (this.posZ - this.prevPosZ) * (double) par2 - interpPosZ); + + tesselator.setColorRGBA_F(this.particleRed, this.particleGreen, this.particleBlue, this.particleAlpha); + + //tesselator.setColorRGBA(0, 255, 255, (int) (this.particleAlpha * 255F)); + + tesselator.addVertexWithUV((double) (drawX - par3 * drawScale - par6 * drawScale), (double) (drawY - par4 * drawScale), (double) (drawZ - par5 * drawScale - par7 * drawScale), (double) maxU, (double) maxV); + tesselator.addVertexWithUV((double) (drawX - par3 * drawScale + par6 * drawScale), (double) (drawY + par4 * drawScale), (double) (drawZ - par5 * drawScale + par7 * drawScale), (double) maxU, (double) minV); + tesselator.addVertexWithUV((double) (drawX + par3 * drawScale + par6 * drawScale), (double) (drawY + par4 * drawScale), (double) (drawZ + par5 * drawScale + par7 * drawScale), (double) minU, (double) minV); + tesselator.addVertexWithUV((double) (drawX + par3 * drawScale - par6 * drawScale), (double) (drawY - par4 * drawScale), (double) (drawZ + par5 * drawScale - par7 * drawScale), (double) minU, (double) maxV); + + tesselator.draw(); + ResourceHandler.bindDefaultParticles(); + tesselator.startDrawingQuads(); + + } + } } +//int uIndex = 0; +//int vIndex = 0; +// +//float minU = uIndex * 0.125F; +//float maxU = (uIndex+1) * 0.125F; +//float minV = vIndex * 0.125F; +//float maxV = (vIndex+1) * 0.125F; \ No newline at end of file diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileCrystal.java b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileCrystal.java index 3cbfa60e..6966dcb6 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileCrystal.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileCrystal.java @@ -4,6 +4,8 @@ import com.brandon3055.draconicevolution.client.handler.ClientEventHandler; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyRelay; import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyTransceiver; +import com.brandon3055.draconicevolution.common.tileentities.energynet.TileRemoteEnergyBase; +import com.brandon3055.draconicevolution.common.tileentities.energynet.TileWirelessEnergyTransceiver; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -38,12 +40,12 @@ public class RenderTileCrystal extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) { - if (tileEntity instanceof TileEnergyRelay) renderEnergyRelay((TileEnergyRelay) tileEntity, x, y, z, partialTick); + if (tileEntity instanceof TileEnergyRelay || tileEntity instanceof TileWirelessEnergyTransceiver) renderEnergyRelay((TileRemoteEnergyBase) tileEntity, x, y, z, partialTick); else if (tileEntity instanceof TileEnergyTransceiver) renderTransceiver((TileEnergyTransceiver) tileEntity, x, y, z, partialTick); } - public void renderEnergyRelay(TileEnergyRelay tileEntity, double x, double y, double z, float partialTick) { + public void renderEnergyRelay(TileRemoteEnergyBase tileEntity, double x, double y, double z, float partialTick) { //--- Pre Render ---// tileEntity.inView = 10; GL11.glPushMatrix(); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileEnergyPylon.java b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileEnergyPylon.java index 4b9c3d74..ae52b3d8 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileEnergyPylon.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileEnergyPylon.java @@ -25,14 +25,12 @@ public class RenderTileEnergyPylon extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float timeSinceLastTick) { - if (tile == null || !(tile instanceof TileEnergyPylon)) return; TileEnergyPylon pylon = (TileEnergyPylon) tile; if (!pylon.active) return; float scale = pylon.modelScale + (timeSinceLastTick *= !pylon.reciveEnergy ? -0.01F : 0.01F); float rotation = pylon.modelRotation + (timeSinceLastTick / 2F); - GL11.glPushMatrix(); GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); @@ -43,14 +41,7 @@ public class RenderTileEnergyPylon extends TileEntitySpecialRenderer { GL11.glTranslated(0, -1, 0); } -// //GL11.glDepthMask(false); -// FMLClientHandler.instance().getClient().getTextureManager().bindTexture(model_texture); -// OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 200F, 200F); -// GL11.glEnable(GL11.GL_CULL_FACE); -// //GL11.glEnable(GL11.GL_BLEND); -// //GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); -// //GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); + GL11.glAlphaFunc(GL11.GL_GREATER, 0.0F); bindTexture(model_texture); GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, 10497.0F); @@ -63,8 +54,6 @@ public class RenderTileEnergyPylon extends TileEntitySpecialRenderer { GL11.glDepthMask(false); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 200F, 200F); - - GL11.glPushMatrix(); float scale1 = scale % 1F; GL11.glScalef(scale1, scale1, scale1); @@ -97,7 +86,6 @@ public class RenderTileEnergyPylon extends TileEntitySpecialRenderer { model.renderAll(); GL11.glPopMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_TEXTURE_2D); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java index 601a8422..6a1b7d3c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java @@ -19,6 +19,7 @@ import com.brandon3055.draconicevolution.common.network.*; import com.brandon3055.draconicevolution.common.tileentities.*; import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyRelay; import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyTransceiver; +import com.brandon3055.draconicevolution.common.tileentities.energynet.TileWirelessEnergyTransceiver; import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnderResurrection; import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyPylon; import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyStorageCore; @@ -33,13 +34,10 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; -import net.minecraft.potion.Potion; import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; - -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; +import net.minecraftforge.oredict.OreDictionary; public class CommonProxy { //private final static boolean debug = DraconicEvolution.debug; @@ -53,30 +51,35 @@ public class CommonProxy { registerTileEntities(); initializeNetwork(); + if (ModBlocks.isEnabled(ModBlocks.draconiumOre)) OreDictionary.registerOre("oreDraconium", ModBlocks.draconiumOre); + if (ModItems.isEnabled(ModItems.draconiumIngot)) OreDictionary.registerOre("ingotDraconium", ModItems.draconiumIngot); + if (ModItems.isEnabled(ModItems.draconiumDust)) OreDictionary.registerOre("dustDraconium", ModItems.draconiumDust); + if (ModItems.isEnabled(ModItems.draconicIngot)) OreDictionary.registerOre("ingotDraconiumAwakened", ModItems.draconicIngot); + DraconicEvolution.reaperEnchant = new EnchantmentReaper(ConfigHandler.reaperEnchantID); - - Potion[] potionTypes = null; - LogHelper.info("Expanding Potion array size to 256"); - - for (Field f : Potion.class.getDeclaredFields()) { - f.setAccessible(true); - - try { - if (f.getName().equals("potionTypes") || f.getName().equals("field_76425_a")) { - Field modfield = Field.class.getDeclaredField("modifiers"); - modfield.setAccessible(true); - modfield.setInt(f, f.getModifiers() & ~Modifier.FINAL); - potionTypes = (Potion[]) f.get(null); - final Potion[] newPotionTypes = new Potion[256]; - System.arraycopy(potionTypes, 0, newPotionTypes, 0, potionTypes.length); - f.set(null, newPotionTypes); - } - } - catch (Exception e) { - LogHelper.error("Severe error, please report this to the mod author:"); - e.printStackTrace(); - } - } +// +// Potion[] potionTypes = null; +// LogHelper.info("Expanding Potion array size to 256"); +// +// for (Field f : Potion.class.getDeclaredFields()) { +// f.setAccessible(true); +// +// try { +// if (f.getName().equals("potionTypes") || f.getName().equals("field_76425_a")) { +// Field modfield = Field.class.getDeclaredField("modifiers"); +// modfield.setAccessible(true); +// modfield.setInt(f, f.getModifiers() & ~Modifier.FINAL); +// potionTypes = (Potion[]) f.get(null); +// final Potion[] newPotionTypes = new Potion[256]; +// System.arraycopy(potionTypes, 0, newPotionTypes, 0, potionTypes.length); +// f.set(null, newPotionTypes); +// } +// } +// catch (Exception e) { +// LogHelper.error("Severe error, please report this to the mod author:"); +// e.printStackTrace(); +// } +// } Achievements.addModAchievements(); LogHelper.info("Finished PreInitialization"); @@ -112,6 +115,9 @@ public class CommonProxy { DraconicEvolution.network.registerMessage(MountUpdatePacket.Handler.class, MountUpdatePacket.class, 8, Side.SERVER); DraconicEvolution.network.registerMessage(ItemConfigPacket.Handler.class, ItemConfigPacket.class, 9, Side.SERVER); DraconicEvolution.network.registerMessage(TileObjectPacket.Handler.class, TileObjectPacket.class, 10, Side.SERVER); + DraconicEvolution.network.registerMessage(BlockUpdatePacket.Handler.class, BlockUpdatePacket.class, 11, Side.SERVER); + DraconicEvolution.network.registerMessage(SpeedRequestPacket.Handler.class, SpeedRequestPacket.class, 12, Side.SERVER); + DraconicEvolution.network.registerMessage(SpeedRequestPacket.Handler.class, SpeedRequestPacket.class, 13, Side.CLIENT); } public void registerTileEntities() { @@ -136,6 +142,7 @@ public class CommonProxy { GameRegistry.registerTileEntity(TileDraconiumChest.class, References.RESOURCESPREFIX + "TileDraconiumChest"); GameRegistry.registerTileEntity(TileEnergyRelay.class, References.RESOURCESPREFIX + "TileEnergyRelay"); GameRegistry.registerTileEntity(TileEnergyTransceiver.class, References.RESOURCESPREFIX + "TileEnergyTransceiver"); + GameRegistry.registerTileEntity(TileWirelessEnergyTransceiver.class, References.RESOURCESPREFIX + "TileWirelessEnergyTransceiver"); if (DraconicEvolution.debug) { GameRegistry.registerTileEntity(TileTestBlock.class, References.RESOURCESPREFIX + "TileTestBlock"); GameRegistry.registerTileEntity(TileContainerTemplate.class, References.RESOURCESPREFIX + "TileContainerTemplate"); @@ -180,4 +187,16 @@ public class CommonProxy { public ParticleEnergyField energyField(World worldObj, double x, double y, double z, int type, boolean advanced, ParticleEnergyField oldBeam, boolean render) { return null; } + + public boolean isOp(String paramString) + { + MinecraftServer localMinecraftServer = FMLCommonHandler.instance().getMinecraftServerInstance(); + paramString = paramString.trim(); + for (String str : localMinecraftServer.getConfigurationManager().func_152606_n()) { + if (paramString.equalsIgnoreCase(str)) { + return true; + } + } + return false; + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/ModBlocks.java b/src/main/java/com/brandon3055/draconicevolution/common/ModBlocks.java index cfb0fab6..a815ec2d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/ModBlocks.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/ModBlocks.java @@ -48,9 +48,9 @@ public class ModBlocks { public static void init() { - if(ConfigHandler.disableXrayBlock < 2) xRayBlock = new XRayBlock(); + xRayBlock = new XRayBlock(); weatherController = new WeatherController(); - if(ConfigHandler.disableSunDial < 2) sunDial = new SunDial(); + sunDial = new SunDial(); draconiumOre = new DraconiumOre(); grinder = new Grinder(); potentiometer = new Potentiometer(); @@ -74,7 +74,7 @@ public class ModBlocks { draconicBlock = new DraconicBlock(); energyCrystal = new EnergyCrystal(); - if(ConfigHandler.disable_LRD < 2) longRangeDislocator = new LongRangeDislocator(); + longRangeDislocator = new LongRangeDislocator(); if(DraconicEvolution.debug) { testBlock = new TestBlock(); @@ -87,19 +87,23 @@ public class ModBlocks { public static void register(BlockDE block) { String name = block.getUnwrappedUnlocalizedName(block.getUnlocalizedName()); - GameRegistry.registerBlock(block, name.substring(name.indexOf(":") + 1)); - //GameRegistry.registerBlock(block, block.getUnwrappedUnlocalizedName(block.getUnlocalizedName())); + if (isEnabled(block))GameRegistry.registerBlock(block, name.substring(name.indexOf(":") + 1)); } public static void register(BlockDE block, Class item) { String name = block.getUnwrappedUnlocalizedName(block.getUnlocalizedName()); - GameRegistry.registerBlock(block, item, name.substring(name.indexOf(":") + 1)); + if (isEnabled(block))GameRegistry.registerBlock(block, item, name.substring(name.indexOf(":") + 1)); } public static void registerOther(Block block) { String name = block.getUnlocalizedName().substring(block.getUnlocalizedName().indexOf(".") + 1); - GameRegistry.registerBlock(block, name.substring(name.indexOf(":") + 1)); + if (isEnabled(block)) GameRegistry.registerBlock(block, name.substring(name.indexOf(":") + 1)); + } + + public static boolean isEnabled(Block block) + { + return !ConfigHandler.disabledNamesList.contains(block.getUnlocalizedName()); } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/ModItems.java b/src/main/java/com/brandon3055/draconicevolution/common/ModItems.java index 3e03d9bf..b8e435f9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/ModItems.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/ModItems.java @@ -1,5 +1,6 @@ package com.brandon3055.draconicevolution.common; +import com.brandon3055.draconicevolution.common.handler.ConfigHandler; import com.brandon3055.draconicevolution.common.items.*; import com.brandon3055.draconicevolution.common.items.armor.DraconicArmor; import com.brandon3055.draconicevolution.common.items.armor.WyvernArmor; @@ -21,9 +22,9 @@ import net.minecraftforge.common.util.EnumHelper; public class ModItems { public static ArmorMaterial DRACONIUMARMOR_T1 = EnumHelper.addArmorMaterial("DRACONIUMARMOR_T1", -1, new int[] { 3, 8, 6, 3 }, 30); public static ArmorMaterial DRACONIUMARMOR_T2 = EnumHelper.addArmorMaterial("DRACONIUMARMOR_T2", -1, new int[] { 3, 8, 6, 3 }, 30); - public static ToolMaterial DRACONIUM_T1 = EnumHelper.addToolMaterial("DRACONIUM_T1", 10, -1, 12.0F, 11.0F, 35); - public static ToolMaterial DRACONIUM_T2 = EnumHelper.addToolMaterial("DRACONIUM_T2", 10, -1, 16.0F, 15.0F, 40); - public static ToolMaterial DRACONIUM_T3 = EnumHelper.addToolMaterial("DRACONIUM_T3", 10, -1, 400.0F, 20.0F, 45); + public static ToolMaterial DRACONIUM_T1 = EnumHelper.addToolMaterial("DRACONIUM_T1", 10, -1, 12.0F, 20.0F, 35); + public static ToolMaterial DRACONIUM_T2 = EnumHelper.addToolMaterial("DRACONIUM_T2", 10, -1, 16.0F, 40.0F, 40); + public static ToolMaterial DRACONIUM_T3 = EnumHelper.addToolMaterial("DRACONIUM_T3", 10, -1, 400.0F, 60.0F, 45); public static Item draconicPickaxe; public static Item draconicShovel; @@ -74,7 +75,6 @@ public class ModItems { public static ItemStack draconicFluxCapacitor; public static ItemStack wyvernEnergyCore; public static ItemStack draconicEnergyCore; - public static void init() { @@ -132,6 +132,11 @@ public class ModItems { public static void register(final ItemDE item) { String name = item.getUnwrappedUnlocalizedName(item.getUnlocalizedName()); - GameRegistry.registerItem(item, name.substring(name.indexOf(":") + 1)); + if (isEnabled(item)) GameRegistry.registerItem(item, name.substring(name.indexOf(":") + 1)); + } + + public static boolean isEnabled(Item item) + { + return !ConfigHandler.disabledNamesList.contains(item.getUnlocalizedName()); } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/achievements/Achievements.java b/src/main/java/com/brandon3055/draconicevolution/common/achievements/Achievements.java index 73793e63..600c098b 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/achievements/Achievements.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/achievements/Achievements.java @@ -2,7 +2,6 @@ package com.brandon3055.draconicevolution.common.achievements; import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.ModItems; -import com.brandon3055.draconicevolution.common.handler.ConfigHandler; import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; @@ -26,6 +25,7 @@ public class Achievements { public static void addAchievement (String name, Achievement achievement, ItemStack stack, String triggerCondition) { + if (stack == null || stack.getItem() == null) return; achievementsList.put(name, achievement.registerStat()); achievementItems.put(stack.getUnlocalizedName(), new AchievementCondition(name, triggerCondition)); } @@ -104,7 +104,7 @@ public class Achievements { ItemStack mobSoul = new ItemStack(ModItems.mobSoul); ItemNBTHelper.setString(mobSoul, "Name", "Any"); addAchievement("draconicevolution.soul", new Achievement("draconicevolution.soul", "draconicevolution.soul", 0+x, -2, mobSoul, null).initIndependentStat(), "null"); - if (ConfigHandler.disableSunDial == 0)addAchievement("draconicevolution.sundial", new Achievement("draconicevolution.sundial", "draconicevolution.sundial", 4+x, -4, ModBlocks.sunDial, getAchievement("draconicevolution.core3")).setSpecial(), "craft"); + //if (ConfigHandler.disableSunDial == 0)addAchievement("draconicevolution.sundial", new Achievement("draconicevolution.sundial", "draconicevolution.sundial", 4+x, -4, ModBlocks.sunDial, getAchievement("draconicevolution.core3")).setSpecial(), "craft"); addAchievement("draconicevolution.manual", new Achievement("draconicevolution.manual", "draconicevolution.manual", -8+x, -1, ModItems.infoTablet, getAchievement("draconicevolution.dust")), "craft"); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/CustomSpawner.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/CustomSpawner.java index f42c3fda..be0838db 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/CustomSpawner.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/CustomSpawner.java @@ -39,7 +39,7 @@ public class CustomSpawner extends BlockDE implements IHudDisplayBlock { this.setCreativeTab(DraconicEvolution.tabBlocksItems); this.setHardness(10F); this.setResistance(2000F); - this.setHarvestLevel("pickaxe", 3); + this.setHarvestLevel("pickaxe", 1); ModBlocks.register(this); } @@ -81,23 +81,23 @@ public class CustomSpawner extends BlockDE implements IHudDisplayBlock { return true; }else { -// if (world.isRemote && !player.isSneaking()) { -// player.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + "#################################")); -// player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo1.txt").appendText(": " + EnumChatFormatting.DARK_AQUA + spawner.getBaseLogic().entityName)); -// player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo2.txt").appendText(": " + EnumChatFormatting.DARK_AQUA + spawner.getBaseLogic().requiresPlayer)); -// player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo3.txt").appendText(": " + EnumChatFormatting.DARK_AQUA + spawner.getBaseLogic().ignoreSpawnRequirements)); -// player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo4.txt").appendText(": " + EnumChatFormatting.DARK_AQUA + spawner.getBaseLogic().spawnSpeed)); -// player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo5.txt")); -// player.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + "#################################")); -// }else if (world.isRemote && player.isSneaking()) -// { -// player.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + "#################################")); -// player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo6.txt")); -// player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo7.txt")); -// player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo8.txt")); -// player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo9.txt")); -// player.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + "#################################")); -// } + if (world.isRemote && !player.isSneaking()) { + player.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + "#################################")); + player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo1.txt").appendText(": " + EnumChatFormatting.DARK_AQUA + spawner.getBaseLogic().entityName)); + player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo2.txt").appendText(": " + EnumChatFormatting.DARK_AQUA + spawner.getBaseLogic().requiresPlayer)); + player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo3.txt").appendText(": " + EnumChatFormatting.DARK_AQUA + spawner.getBaseLogic().ignoreSpawnRequirements)); + player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo4.txt").appendText(": " + EnumChatFormatting.DARK_AQUA + spawner.getBaseLogic().spawnSpeed)); + player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo5.txt")); + player.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + "#################################")); + }else if (world.isRemote && player.isSneaking()) + { + player.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + "#################################")); + player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo6.txt")); + player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo7.txt")); + player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo8.txt")); + player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo9.txt")); + player.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + "#################################")); + } return true; } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/PlacedItem.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/PlacedItem.java index 374b6df9..0fce2e71 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/PlacedItem.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/PlacedItem.java @@ -164,7 +164,7 @@ public class PlacedItem extends BlockDE { if (tile == null) { world.setBlockToAir(x, y, z); } - tile.rotation += 5; + tile.rotation += 5.625F; }else { if (!world.isRemote) breakBlock(world, x, y, z, this, world.getBlockMetadata(x, y, z)); world.setBlockToAir(x, y, z); @@ -180,13 +180,13 @@ public class PlacedItem extends BlockDE { if (tile == null) { world.setBlockToAir(x, y, z); } - tile.rotation += 25; + tile.rotation += 22.5F; }else { TilePlacedItem tile = (world.getTileEntity(x, y, z) != null && world.getTileEntity(x, y, z) instanceof TilePlacedItem) ? (TilePlacedItem) world.getTileEntity(x, y, z) : null; if (tile == null) { world.setBlockToAir(x, y, z); } - tile.rotation -= 25; + tile.rotation -= 22.5F; } world.markBlockForUpdate(x, y, z); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/TeleporterStand.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/TeleporterStand.java index 07fe6658..be619a76 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/TeleporterStand.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/TeleporterStand.java @@ -3,7 +3,6 @@ package com.brandon3055.draconicevolution.common.blocks; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.items.tools.TeleporterMKI; -import com.brandon3055.draconicevolution.common.items.tools.TeleporterMKII; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.tileentities.TileTeleporterStand; @@ -19,6 +18,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import java.util.List; @@ -53,10 +53,11 @@ public class TeleporterStand extends BlockCustomDrop { public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float prx, float pry, float prz) { TileTeleporterStand tile = world.getTileEntity(x, y, z) instanceof TileTeleporterStand ? (TileTeleporterStand)world.getTileEntity(x, y, z) : null; if (tile == null) return false; - if (tile.getStackInSlot(0) == null && player.getHeldItem() != null && (player.getHeldItem().getItem() instanceof TeleporterMKI || player.getHeldItem().getItem() instanceof TeleporterMKII)) { + if (tile.getStackInSlot(0) == null && player.getHeldItem() != null && (player.getHeldItem().getItem() instanceof TeleporterMKI)) { ItemStack stack = player.getHeldItem(); tile.setInventorySlotContents(0, stack.copy()); - player.getHeldItem().stackSize--; + player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + world.markBlockForUpdate(x, y, z); return true; } @@ -124,4 +125,9 @@ public class TeleporterStand extends BlockCustomDrop { if (tile == null) return; tile.rotation = (int)entity.rotationYawHead; } + + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) { + return super.getPickBlock(target, world, x, y, z, player); + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/EnergyCrystal.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/EnergyCrystal.java index 69e0f727..f2d4e22c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/EnergyCrystal.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/EnergyCrystal.java @@ -33,10 +33,12 @@ import java.util.List; */ public class EnergyCrystal extends BlockDE implements IHudDisplayBlock { - public static final byte RELAY_TIER_1 = 0; - public static final byte RELAY_TIER_2 = 1; - public static final byte TRANSCEIVER_TIER_1 = 2; - public static final byte TRANSCEIVER_TIER_2 = 3; + public static final byte RELAY_TIER_1 = 0; + public static final byte RELAY_TIER_2 = 1; + public static final byte TRANSCEIVER_TIER_1 = 2; + public static final byte TRANSCEIVER_TIER_2 = 3; + public static final byte WIRELESS_TRANSCEIVER_TIER_1 = 3; + public static final byte WIRELESS_TRANSCEIVER_TIER_2 = 4; public EnergyCrystal() { @@ -55,12 +57,14 @@ public class EnergyCrystal extends BlockDE implements IHudDisplayBlock list.add(new ItemStack(item, 1, 1)); list.add(new ItemStack(item, 1, 2)); list.add(new ItemStack(item, 1, 3)); + list.add(new ItemStack(item, 1, 4)); + list.add(new ItemStack(item, 1, 5)); } @Override public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); - if (meta == 1 || meta == 0) setBlockBounds(0.37F, 0.135F, 0.37F, 0.63F, 0.865F, 0.63F); + if (meta == 1 || meta == 0 || meta == 4 || meta == 5) setBlockBounds(0.37F, 0.135F, 0.37F, 0.63F, 0.865F, 0.63F); else if (meta == 2 || meta == 3) { TileEnergyTransceiver tile = world.getTileEntity(x, y, z) instanceof TileEnergyTransceiver ? (TileEnergyTransceiver) world.getTileEntity(x, y, z) : null; @@ -94,7 +98,7 @@ public class EnergyCrystal extends BlockDE implements IHudDisplayBlock @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); - if (meta == 1 || meta == 0) return AxisAlignedBB.getBoundingBox(x + 0.37F, y + 0.135F, z + 0.37F, x + 0.63F, y + 0.865F, z + 0.63F); + if (meta == 1 || meta == 0 || meta == 4 || meta == 5) return AxisAlignedBB.getBoundingBox(x + 0.37F, y + 0.135F, z + 0.37F, x + 0.63F, y + 0.865F, z + 0.63F); else if (meta == 2 || meta == 3) { TileEnergyTransceiver tile = world.getTileEntity(x, y, z) instanceof TileEnergyTransceiver ? (TileEnergyTransceiver) world.getTileEntity(x, y, z) : null; @@ -158,7 +162,7 @@ public class EnergyCrystal extends BlockDE implements IHudDisplayBlock @Override public TileEntity createTileEntity(World world, int metadata) { - return metadata == 0 || metadata == 1 ? new TileEnergyRelay(metadata) : metadata == 2 || metadata == 3 ? new TileEnergyTransceiver(metadata - 2) : null; + return metadata == 0 || metadata == 1 ? new TileEnergyRelay(metadata) : metadata == 2 || metadata == 3 ? new TileEnergyTransceiver(metadata - 2) : metadata == 4 || metadata == 5 ? new TileWirelessEnergyTransceiver(metadata - 4) : null; } @Override @@ -198,7 +202,7 @@ public class EnergyCrystal extends BlockDE implements IHudDisplayBlock } @Override - public List getDisplayData(World world, int x, int y, int z) {//todo Localization + public List getDisplayData(World world, int x, int y, int z) { List list = new ArrayList(); IRemoteEnergyHandler tile = world.getTileEntity(x, y, z) instanceof IRemoteEnergyHandler ? (IRemoteEnergyHandler) world.getTileEntity(x, y, z) : null; if (tile != null) @@ -213,6 +217,9 @@ public class EnergyCrystal extends BlockDE implements IHudDisplayBlock if (tile instanceof TileRemoteEnergyBase) { list.add(StatCollector.translateToLocal("info.de.connections.txt") + ": " + ((TileRemoteEnergyBase) tile).linkedDevices.size() + "/" + tile.getMaxConnections()); } + if (tile instanceof TileWirelessEnergyTransceiver){ + list.add(StatCollector.translateToLocal("info.de.wirelessConnections.txt") + ": " + ((TileWirelessEnergyTransceiver) tile).receiverList.size() + "/" + ((TileWirelessEnergyTransceiver) tile).getmaxWirelessConnections()); + } if (tile instanceof TileRemoteEnergyBase) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/EnergyStorageCore.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/EnergyStorageCore.java index 36c03c57..8fbb27f5 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/EnergyStorageCore.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/EnergyStorageCore.java @@ -18,6 +18,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatComponentText; import net.minecraft.util.StatCollector; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -59,18 +60,18 @@ public class EnergyStorageCore extends BlockDE implements IHudDisplayBlock{ @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_) { -// TileEnergyStorageCore tile = (world.getTileEntity(x, y, z) != null && world.getTileEntity(x, y, z) instanceof TileEnergyStorageCore) ? (TileEnergyStorageCore) world.getTileEntity(x, y, z) : null; -// if (tile == null) -// { -// LogHelper.error("Missing Tile Entity (EnergyStorageCore)"); -// return false; -// } -// -// if (!world.isRemote) { -// player.addChatComponentMessage(new ChatComponentText("Tier:" + tile.getTier())); -// String BN = String.valueOf(tile.getEnergyStored()); -// if (BN.substring(BN.length() - 2).contentEquals(".0")) BN = BN.substring(0, BN.length() - 2); -// player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("info.de.charge.txt") + ": " + Utills.formatNumber(tile.getEnergyStored()) + " / " + Utills.formatNumber(tile.getMaxEnergyStored()) + " [" + BN + " RF]")); } + TileEnergyStorageCore tile = (world.getTileEntity(x, y, z) != null && world.getTileEntity(x, y, z) instanceof TileEnergyStorageCore) ? (TileEnergyStorageCore) world.getTileEntity(x, y, z) : null; + if (tile == null) + { + LogHelper.error("Missing Tile Entity (EnergyStorageCore)"); + return false; + } + + if (!world.isRemote) { + player.addChatComponentMessage(new ChatComponentText("Tier:" + (tile.getTier() + 1))); + String BN = String.valueOf(tile.getEnergyStored()); + if (BN.substring(BN.length() - 2).contentEquals(".0")) BN = BN.substring(0, BN.length() - 2); + player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("info.de.charge.txt") + ": " + Utills.formatNumber(tile.getEnergyStored()) + " / " + Utills.formatNumber(tile.getMaxEnergyStored()) + " [" + BN + " RF]")); } return true; } @@ -131,7 +132,7 @@ public class EnergyStorageCore extends BlockDE implements IHudDisplayBlock{ } list.add(InfoHelper.HITC()+getLocalizedName()); - list.add("Tier: " + InfoHelper.ITC() + tile.getTier()); + list.add("Tier: " + InfoHelper.ITC() + (tile.getTier() + 1)); String BN = String.valueOf(tile.getEnergyStored()); if (BN.substring(BN.length() - 2).contentEquals(".0")) BN = BN.substring(0, BN.length() - 2); list.add(StatCollector.translateToLocal("info.de.charge.txt") + ": " + InfoHelper.ITC() + Utills.formatNumber(tile.getEnergyStored()) + " / " + Utills.formatNumber(tile.getMaxEnergyStored()) + " [" + BN + " RF]"); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/InvisibleMultiblock.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/InvisibleMultiblock.java index f87d67d8..7d01cf6d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/InvisibleMultiblock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/InvisibleMultiblock.java @@ -22,6 +22,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatComponentText; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -92,23 +93,23 @@ public class InvisibleMultiblock extends BlockDE implements IHudDisplayBlock { public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_) { int meta = world.getBlockMetadata(x, y, z); if (meta == 0 || meta == 1) { -// TileInvisibleMultiblock thisTile = (world.getTileEntity(x, y, z) != null && world.getTileEntity(x, y, z) instanceof TileInvisibleMultiblock) ? (TileInvisibleMultiblock) world.getTileEntity(x, y, z) : null; -// if (thisTile == null) { -// LogHelper.error("Missing Tile Entity (TileInvisibleMultiblock)"); -// return false; -// } -// TileEnergyStorageCore master = thisTile.getMaster(); -// if (master == null) { -// onNeighborBlockChange(world, x, y, z, this); -// return false; -// } -// if (!world.isRemote) { -// world.markBlockForUpdate(master.xCoord, master.yCoord, master.zCoord); -// player.addChatComponentMessage(new ChatComponentText("Tier:" + master.getTier())); -// String BN = String.valueOf(master.getEnergyStored()); -// if (BN.substring(BN.length() - 2).contentEquals(".0")) BN = BN.substring(0, BN.length() - 2); -// player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("info.de.charge.txt") + ": " + Utills.formatNumber(master.getEnergyStored()) + " / " + Utills.formatNumber(master.getMaxEnergyStored()) + " [" + BN + " RF]")); -// } + TileInvisibleMultiblock thisTile = (world.getTileEntity(x, y, z) != null && world.getTileEntity(x, y, z) instanceof TileInvisibleMultiblock) ? (TileInvisibleMultiblock) world.getTileEntity(x, y, z) : null; + if (thisTile == null) { + LogHelper.error("Missing Tile Entity (TileInvisibleMultiblock)"); + return false; + } + TileEnergyStorageCore master = thisTile.getMaster(); + if (master == null) { + onNeighborBlockChange(world, x, y, z, this); + return false; + } + if (!world.isRemote) { + world.markBlockForUpdate(master.xCoord, master.yCoord, master.zCoord); + player.addChatComponentMessage(new ChatComponentText("Tier:" + (master.getTier() + 1))); + String BN = String.valueOf(master.getEnergyStored()); + if (BN.substring(BN.length() - 2).contentEquals(".0")) BN = BN.substring(0, BN.length() - 2); + player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("info.de.charge.txt") + ": " + Utills.formatNumber(master.getEnergyStored()) + " / " + Utills.formatNumber(master.getMaxEnergyStored()) + " [" + BN + " RF]")); + } return true; } else if (meta == 2) { TileEnergyPylon pylon = (world.getTileEntity(x, y+1, z) != null && world.getTileEntity(x, y+1, z) instanceof TileEnergyPylon) ? (TileEnergyPylon) world.getTileEntity(x, y+1, z) : (world.getTileEntity(x, y-1, z) != null && world.getTileEntity(x, y-1, z) instanceof TileEnergyPylon) ? (TileEnergyPylon) world.getTileEntity(x, y-1, z) : null; @@ -208,7 +209,7 @@ public class InvisibleMultiblock extends BlockDE implements IHudDisplayBlock { if (master == null) { return list; } list.add(InfoHelper.HITC() + ModBlocks.energyStorageCore.getLocalizedName()); - list.add("Tier: " + InfoHelper.ITC() + master.getTier()); + list.add("Tier: " + InfoHelper.ITC() + (master.getTier() + 1)); String BN = String.valueOf(master.getEnergyStored()); if (BN.substring(BN.length() - 2).contentEquals(".0")) BN = BN.substring(0, BN.length() - 2); list.add(StatCollector.translateToLocal("info.de.charge.txt") + ": " + InfoHelper.ITC() + Utills.formatNumber(master.getEnergyStored()) + " / " + Utills.formatNumber(master.getMaxEnergyStored()) + " [" + BN + " RF]"); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerAdvTool.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerAdvTool.java index db3c325c..93b5d557 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerAdvTool.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerAdvTool.java @@ -4,6 +4,7 @@ import com.brandon3055.draconicevolution.common.inventory.InventoryTool; import com.brandon3055.draconicevolution.common.utills.IInventoryTool; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.enchantment.EnumEnchantmentType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Items; @@ -185,7 +186,7 @@ public class ContainerAdvTool extends ContainerDataSync { NBTTagList list = stack.getTagCompound().getTagList("StoredEnchantments", 10); if (list.tagCount() != 1) return false; Enchantment enchant = Enchantment.enchantmentsList[list.getCompoundTagAt(0).getInteger("id")]; - if (inventoryTool.inventoryItem == null || !(inventoryTool.inventoryItem.getItem() instanceof IInventoryTool) || !((IInventoryTool) inventoryTool.inventoryItem.getItem()).isEnchantValid(enchant)) return false; + if (inventoryTool.inventoryItem == null || !(inventoryTool.inventoryItem.getItem() instanceof IInventoryTool) || (!((IInventoryTool) inventoryTool.inventoryItem.getItem()).isEnchantValid(enchant) && enchant.type != EnumEnchantmentType.all)) return false; if (EnchantmentHelper.getEnchantments(inventoryTool.inventoryItem).containsKey(list.getCompoundTagAt(0).getInteger("id"))) return false; return super.isItemValid(stack); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDraconiumChest.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDraconiumChest.java index 510e73f1..dbc34418 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDraconiumChest.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDraconiumChest.java @@ -33,6 +33,7 @@ public class ContainerDraconiumChest extends Container { private int lastEnergyStored; private int lastBurnSpeed; private int lastTickFeedMode; + private boolean lastTickOutputLock; public ContainerDraconiumChest(InventoryPlayer invPlayer, TileDraconiumChest tile) { this.tile = tile; @@ -116,15 +117,26 @@ public class ContainerDraconiumChest extends Container { { ItemStack itemstack1 = slot.getStack(); itemstack = itemstack1.copy(); - if (i < tile.getSizeInventory()+10)//Transferring from container + if (i < tile.getSizeInventory()+16 && i != 240)//Transferring from container { - if (!mergeItemStack(itemstack1, tile.getSizeInventory()+10, inventorySlots.size(), true)) + if (!mergeItemStack(itemstack1, tile.getSizeInventory()+16, inventorySlots.size(), true)) { return null; } slot.onSlotChange(itemstack1, itemstack); } - else if (!mergeItemStack(itemstack1, 0, tile.getSizeInventory(), false))//Transferring from player + else if (i == 240) + { + if (!mergeItemStack(itemstack1, tile.getSizeInventory()+16, inventorySlots.size(), true)) + { + if (!mergeItemStack(itemstack1, 0, tile.getSizeInventory(), false)) + { + return null; + } + } + slot.onSlotChange(itemstack1, itemstack); + } + else if (!DraconiumChest.isStackValid(itemstack1) || !mergeItemStack(itemstack1, 0, tile.getSizeInventory(), false))//Transferring from player { return null; } @@ -196,8 +208,14 @@ public class ContainerDraconiumChest extends Container { { icrafting.sendProgressBarUpdate(this, 3, tile.smeltingAutoFeed); } + if (lastTickOutputLock != tile.lockOutputSlots) + { + icrafting.sendProgressBarUpdate(this, 4, tile.lockOutputSlots ? 1 : 0); + } + } + lastTickOutputLock = tile.lockOutputSlots; lastTickFeedMode = tile.smeltingAutoFeed; lastBurnSpeed = tile.smeltingBurnSpeed; lastProgressTime = tile.smeltingProgressTime; @@ -211,6 +229,7 @@ public class ContainerDraconiumChest extends Container { else if (id == 1) tile.energy.setEnergyStored(value*32); else if (id == 2) tile.smeltingBurnSpeed = value; else if (id == 3) tile.smeltingAutoFeed = value; + else if (id == 4) tile.lockOutputSlots = value == 1; } public TileDraconiumChest getTile(){return tile;} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomDragon.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomDragon.java index ee7bd1b1..6c18e40a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomDragon.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomDragon.java @@ -74,7 +74,7 @@ public class EntityCustomDragon extends EntityDragon { float f; float f1; - if (!initialized){ + if (!initialized && !worldObj.isRemote){ this.addPotionEffect(new PotionEffect(10, 600, 10, false)); initialized = true; } @@ -389,7 +389,7 @@ public class EntityCustomDragon extends EntityDragon { double d2 = entity.posX - d0; double d3 = entity.posZ - d1; double d4 = d2 * d2 + d3 * d3; - entity.addVelocity(d2 / d4 * 8.0D, 5.20000000298023224D, d3 / d4 * 8.0D); + if (rand.nextInt(isUber ? 3 : 10) == 0) entity.addVelocity(d2 / d4 * 8.0D, 5.20000000298023224D, d3 / d4 * 8.0D); entity.velocityChanged = true; ((EntityLivingBase)entity).setLastAttacker(this); } @@ -620,8 +620,6 @@ public class EntityCustomDragon extends EntityDragon { compound.setInteger("PortalY", portalY); compound.setInteger("PortalZ", portalZ); } - LogHelper.info(portalY + " write"); - } @Override @@ -637,8 +635,6 @@ public class EntityCustomDragon extends EntityDragon { portalY = compound.getInteger("PortalY"); portalZ = compound.getInteger("PortalZ"); } - LogHelper.info(portalY + " read"); - } @Override diff --git a/src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java index cdeeee86..a2a4d3b9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java @@ -4,15 +4,15 @@ import com.brandon3055.draconicevolution.common.utills.LogHelper; import net.minecraftforge.common.config.Configuration; import java.io.File; +import java.util.ArrayList; +import java.util.List; public class ConfigHandler { public static Configuration config; //GENERAL - public static int disableSunDial; public static int teleporterUsesPerPearl; - public static int disableXrayBlock; public static int soulDropChance; public static int passiveSoulDropChance; public static int cometRarity; @@ -32,6 +32,13 @@ public class ConfigHandler { public static boolean enableVersionChecker; public static boolean dragonBreaksBlocks; public static int[] dragonEggSpawnLocation; + public static int[] oreGenDimentionBlacklist; + private static String[] disabledBlocksItems; + public static List disabledNamesList = new ArrayList(); + public static double maxPlayerSpeed; + private static int[] speedDimBlackList; +public static List speedLimitDimList = new ArrayList(); + public static boolean speedLimitops; //spawner public static String[] spawnerList; @@ -43,7 +50,6 @@ public class ConfigHandler { public static int admin_dislocator_Min_Range; public static int admin_dislocator_Max_Range; public static int admin_dislocator_Detect_Range; - public static int disable_LRD; //Potion IDs @@ -65,8 +71,8 @@ public class ConfigHandler { try { //General - disableSunDial = config.get(Configuration.CATEGORY_GENERAL, "Disable Sun Dial", 0, "Disable Sun Dial 0:Default, 1:Disable recipe, 2:Disable completely").getInt(0); - disableXrayBlock = config.get(Configuration.CATEGORY_GENERAL, "Disable Xray Block", 0, "Disable Distortion Flame 0:Default, 1:Disable recipe, 2:Disable completely").getInt(0); +// disableSunDial = config.get(Configuration.CATEGORY_GENERAL, "Disable Sun Dial", 0, "Disable Sun Dial 0:Default, 1:Disable recipe, 2:Disable completely").getInt(0); +// disableXrayBlock = config.get(Configuration.CATEGORY_GENERAL, "Disable Xray Block", 0, "Disable Distortion Flame 0:Default, 1:Disable recipe, 2:Disable completely").getInt(0); teleporterUsesPerPearl = config.get(Configuration.CATEGORY_GENERAL, "Teleporter Uses PerPearl", 1, "Charm of Dislocation uses per Ender pearl").getInt(1); bowBlockDamage = config.get(Configuration.CATEGORY_GENERAL, "Bow Block Damage", true, "Dose Draconic bow explosion damage blocks").getBoolean(true); showUnlocalizedNames = config.get(Configuration.CATEGORY_GENERAL, "Show Unlocalized Names", false, "If set to true the unlocalized name of every block and item will be displayed in its tool tip").getBoolean(false); @@ -87,6 +93,11 @@ public class ConfigHandler { enableVersionChecker = config.get(Configuration.CATEGORY_GENERAL, "Enable version checker", true, "Set to false to disable the version checker").getBoolean(true); dragonBreaksBlocks = config.get(Configuration.CATEGORY_GENERAL, "Can dragon break blocks", true, "Set to false to disable the DE dragons ability to break blocks (dose not effect vanilla dragon)").getBoolean(true); dragonEggSpawnLocation = config.get(Configuration.CATEGORY_GENERAL, "Dragon egg spawn location", new int[] {0, 0, 0}, "Sets the exact location to spawn the dragon egg and disables the portal spawn (dose not effect vanilla dragon)").getIntList(); + oreGenDimentionBlacklist = config.get(Configuration.CATEGORY_GENERAL, "Ore gen dimension blacklist", new int[0], "Add the id's of dimensions you do not want draconium ore to spawn in").getIntList(); + disabledBlocksItems = config.getStringList("Disabled Blocks & Items", Configuration.CATEGORY_GENERAL, new String[0], "add the unlocalized name of a block or item to this list to disable it"); + maxPlayerSpeed = config.get(Configuration.CATEGORY_GENERAL, "Player speed cap", 10D, "Limits the max speed of players. Recommend between 0.5 - 1.0 for servers").getDouble(10D); + speedDimBlackList = config.get(Configuration.CATEGORY_GENERAL, "Speed limit Dim black lack list", new int[] {1}, "A list of dimensions the speed limit will not effect (speed limit is not so really required in the end)").getIntList(); + speedLimitops = config.get(Configuration.CATEGORY_GENERAL, "Speed limit effects ops", false, "Dose the speed limit effect ops").getBoolean(false); //Spawner spawnerListType = config.get("spawner", "listType", false, "Sets weather the spawner list is a white list or a black list (true = white list false = black list)").getBoolean(false); @@ -96,13 +107,16 @@ public class ConfigHandler { admin_dislocator_Min_Range = config.get("long range dislocator", "Dislocator Min Range", 1000).getInt(1000); admin_dislocator_Max_Range = config.get("long range dislocator", "Dislocator Max Range", 10000).getInt(10000); admin_dislocator_Detect_Range = config.get("long range dislocator", "Admin Dislocator Detect Range", 5).getInt(5); - disable_LRD = config.get("long range dislocator", "Disable Dislocator", 0, "Disable Long Range Dislocator 0:Default, 1:Disable recipe, 2:Disable completely (Includes Admin Dislocator)").getInt(0); //Potions // potionFlightID = config.get("magic id's", "potionFlightID", 50).getInt(50); //Enchantments reaperEnchantID = config.get("magic id's", "Reaper Enchant id", 180).getInt(180); + + + for (String s : disabledBlocksItems) disabledNamesList.add(s); + for (int i : speedDimBlackList) speedLimitDimList.add(i); } catch (Exception e) { LogHelper.error("Unable to load Config"); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java index ad096db2..3bc0938e 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java @@ -12,7 +12,6 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; @@ -30,9 +29,9 @@ public class CraftingHandler { add(ModItems.draconicEnergyCore, "CSC", "SMS", "CSC", 'C', ModItems.draconicIngot, 'S', ModItems.wyvernEnergyCore, 'M', ModItems.wyvernCore); addOre(ModItems.draconiumBlend, " D ", "DID", " D ", 'I', "ingotIron", 'D', ModItems.draconiumDust); - CraftingManager.getInstance().addShapelessRecipe(new ItemStack(ModItems.draconicIngot, 9), Item.getItemFromBlock(ModBlocks.draconicBlock)); - CraftingManager.getInstance().addShapelessRecipe(new ItemStack(ModItems.draconiumIngot, 9), Item.getItemFromBlock(ModBlocks.draconiumBlock)); - GameRegistry.addSmelting(ModItems.draconiumBlend, new ItemStack(ModItems.draconiumIngot, 2), 1.0f); + addShaplessOre(getStack(ModItems.draconicIngot, 9, 0), Item.getItemFromBlock(ModBlocks.draconicBlock)); + addShaplessOre(getStack(ModItems.draconiumIngot, 9, 0), Item.getItemFromBlock(ModBlocks.draconiumBlock)); + if (ModItems.isEnabled(ModItems.draconiumIngot) && ModItems.isEnabled(ModItems.draconiumBlend)) GameRegistry.addSmelting(ModItems.draconiumBlend, getStack(ModItems.draconiumIngot, 2, 0), 1.0f); //Wyvern tools @@ -82,43 +81,46 @@ public class CraftingHandler { //machines adv - add(ModBlocks.resurrectionStone, "CSC", "SMS", "CSC", 'C', mobSoul, 'S', ModItems.wyvernCore, 'M', new ItemStack(ModBlocks.draconiumBlock, 1, 0)); + add(ModBlocks.resurrectionStone, "CSC", "SMS", "CSC", 'C', mobSoul, 'S', ModItems.wyvernCore, 'M', ModBlocks.draconiumBlock); add(ModBlocks.energyStorageCore, "CCC", "SMS", "CCC", 'C', ModItems.draconiumIngot, 'S', ModItems.wyvernEnergyCore, 'M', ModItems.wyvernCore); add(ModBlocks.weatherController, "RIR", "TPT", "IEI", 'R', Items.blaze_rod, 'T', Blocks.tnt, 'P', ModItems.draconicCore, 'I', ModItems.draconiumIngot, 'E', Blocks.enchanting_table); add(ModBlocks.playerDetectorAdvanced, "ISI", "EDE", "ICI", 'I', ModItems.draconiumIngot, 'E', Items.ender_eye, 'S', new ItemStack(Items.skull, 1, 1), 'C', Items.compass, 'D', ModBlocks.playerDetector); add(ModBlocks.energyInfuser, "IPI", "CEC", "ICI", 'I', ModItems.draconiumIngot, 'P', ModBlocks.particleGenerator, 'C', ModItems.draconicCore, 'E', Blocks.enchanting_table); add(ModBlocks.draconiumChest, "IFI", "SCS", "IWI", 'I', ModItems.draconiumIngot, 'C', ModItems.draconicCore, 'S', getChest(), 'W', Blocks.crafting_table, 'F', Blocks.furnace); - addOre(new ItemStack(ModBlocks.energyPylon, 2), "IEI", "MCM", "IDI", 'I', ModItems.draconiumIngot, 'E', Items.ender_eye, 'C', ModItems.draconicCore, 'D', "gemDiamond", 'M', "gemEmerald"); - addOre(new ItemStack(ModBlocks.grinder, 1, 3), "IXI", "DCD", "IFI", 'I', "ingotIron", 'X', ModItems.draconiumIngot, 'D', Items.diamond_sword, 'C', ModItems.draconicCore, 'F', Blocks.furnace); + addOre(getStack(ModBlocks.energyPylon, 2, 0), "IEI", "MCM", "IDI", 'I', ModItems.draconiumIngot, 'E', Items.ender_eye, 'C', ModItems.draconicCore, 'D', "gemDiamond", 'M', "gemEmerald"); + addOre(getStack(ModBlocks.grinder, 1, 3), "IXI", "DCD", "IFI", 'I', "ingotIron", 'X', ModItems.draconiumIngot, 'D', Items.diamond_sword, 'C', ModItems.draconicCore, 'F', Blocks.furnace); addOre(ModBlocks.playerDetector, "ITI", "CEC", "IDI", 'I', "ingotIron", 'E', Items.ender_eye, 'T', Blocks.redstone_torch, 'C', Items.comparator, 'D', ModItems.draconicCore); - addOre(new ItemStack(ModBlocks.generator, 1, 3), "NIN", "IFI", "NCN", 'N', Items.netherbrick, 'I', "ingotIron", 'F', Blocks.furnace, 'C', ModItems.draconicCore); + addOre(getStack(ModBlocks.generator, 1, 3), "NIN", "IFI", "NCN", 'N', Items.netherbrick, 'I', "ingotIron", 'F', Blocks.furnace, 'C', ModItems.draconicCore); addOre(ModBlocks.dissEnchanter, "PIP", "ETE", "CBC", 'P', Items.ender_eye, 'I', Items.enchanted_book, 'E', "gemEmerald", 'T', Blocks.enchanting_table, 'C', ModItems.draconicCore, 'B', Items.book); - addOre(new ItemStack(ModBlocks.energyCrystal, 4, 0), "IDI", "DCD", "IDI", 'I' , ModItems.draconiumIngot, 'D', "gemDiamond", 'C', ModItems.draconicCore); - addOre(new ItemStack(ModBlocks.energyCrystal, 4, 1), "CRC", "RWR", "CRC", 'R' , new ItemStack(ModBlocks.energyCrystal, 1), 'W', ModItems.wyvernCore, 'C', ModItems.draconicCore); - addShaplessOre(new ItemStack(ModBlocks.energyCrystal, 1, 0), new ItemStack(ModBlocks.energyCrystal, 1, 2), new ItemStack(ModBlocks.energyCrystal, 1, 2)); - addShaplessOre(new ItemStack(ModBlocks.energyCrystal, 2, 2), new ItemStack(ModBlocks.energyCrystal, 1, 0)); - addShaplessOre(new ItemStack(ModBlocks.energyCrystal, 1, 1), new ItemStack(ModBlocks.energyCrystal, 1, 3), new ItemStack(ModBlocks.energyCrystal, 1, 3)); - addShaplessOre(new ItemStack(ModBlocks.energyCrystal, 2, 3), new ItemStack(ModBlocks.energyCrystal, 1, 1)); + addOre(getStack(ModBlocks.energyCrystal, 4, 0), "IDI", "DCD", "IDI", 'I' , ModItems.draconiumIngot, 'D', "gemDiamond", 'C', ModItems.draconicCore); + addOre(getStack(ModBlocks.energyCrystal, 4, 1), "CRC", "RWR", "CRC", 'R' , ModBlocks.energyCrystal, 'W', ModItems.wyvernCore, 'C', ModItems.draconicCore); + addShaplessOre(getStack(ModBlocks.energyCrystal, 1, 0), getStack(ModBlocks.energyCrystal, 1, 2), getStack(ModBlocks.energyCrystal, 1, 2)); + addShaplessOre(getStack(ModBlocks.energyCrystal, 2, 2), getStack(ModBlocks.energyCrystal, 1, 0)); + addShaplessOre(getStack(ModBlocks.energyCrystal, 1, 1), getStack(ModBlocks.energyCrystal, 1, 3), getStack(ModBlocks.energyCrystal, 1, 3)); + addShaplessOre(getStack(ModBlocks.energyCrystal, 2, 3), getStack(ModBlocks.energyCrystal, 1, 1)); + addOre(getStack(ModBlocks.energyCrystal, 1, 4), "PGP", "ECE", "PGP", 'P', Items.ender_pearl, 'G', ModBlocks.particleGenerator, 'E', Items.ender_eye, 'C', getStack(ModBlocks.energyCrystal, 1, 0)); + addOre(getStack(ModBlocks.energyCrystal, 1, 5), "PGP", "ECE", "PGP", 'P', Items.ender_pearl, 'G', ModBlocks.particleGenerator, 'E', Items.ender_eye, 'C', getStack(ModBlocks.energyCrystal, 1, 1)); + //Tools add(ModItems.teleporterMKII, "IEI", "ETE", "IWI", 'I', ModItems.draconiumIngot, 'E', Items.ender_pearl, 'T', ModItems.teleporterMKI, 'W', ModItems.wyvernCore); add(ModItems.teleporterMKI, "CSC", "SMS", "CSC", 'C', Items.blaze_powder, 'S', ModItems.draconiumDust, 'M', Items.ender_eye); - addOre(new ItemStack(ModItems.safetyMatch, 1, 1000), " O ", " S ", " ", 'O', "dyeOrange", 'S', "stickWood"); - add(ModItems.safetyMatch, "MMM", "MMM", "MMM", 'M', new ItemStack(ModItems.safetyMatch, 1, 1000)); + addOre(getStack(ModItems.safetyMatch, 1, 1000), " O ", " S ", " ", 'O', "dyeOrange", 'S', "stickWood"); + add(ModItems.safetyMatch, "MMM", "MMM", "MMM", 'M', getStack(ModItems.safetyMatch, 1, 1000)); addOre(ModItems.wrench, " ID", " RI", "C ", 'I' , ModItems.draconiumIngot, 'D', "gemDiamond", 'R', Items.blaze_rod, 'C', ModItems.draconicCore); //Other addOre(ModItems.infoTablet, "SSS", "SDS", "SSS", 'S', "stone", 'D', ModItems.draconiumDust); - CraftingManager.getInstance().addShapelessRecipe(new ItemStack(ModItems.enderArrow), Items.arrow, Items.ender_pearl); + addShaplessOre(getStack(ModItems.enderArrow, 1, 0), Items.arrow, Items.ender_pearl); addShaplessOre(new ItemStack(Blocks.dirt), Item.getItemFromBlock(Blocks.sand), Items.rotten_flesh, "treeSapling", "treeSapling", "treeSapling"); addShaplessOre(new ItemStack(Blocks.dirt), Item.getItemFromBlock(Blocks.sand), Items.rotten_flesh, "treeLeaves", "treeLeaves", "treeLeaves"); //Disable able - if(ConfigHandler.disableSunDial == 0) - add(ModBlocks.sunDial, "IAI", "CDC", "IEI", 'I', ModItems.draconiumIngot, 'A', ModItems.awakenedCore, 'C', ModItems.draconicCore, 'E', Blocks.enchanting_table, 'D', Blocks.dragon_egg); - if(ConfigHandler.disableXrayBlock == 0) - addOre(new ItemStack(ModBlocks.xRayBlock, 4), "SGS", "GDG", "SGS", 'S', Items.nether_star, 'G', "blockGlassColorless", 'D', "gemDiamond"); + //if(ConfigHandler.disableSunDial == 0) + add(ModBlocks.sunDial, "IAI", "CDC", "IEI", 'I', ModItems.draconiumIngot, 'A', ModItems.awakenedCore, 'C', ModItems.draconicCore, 'E', Blocks.enchanting_table, 'D', Blocks.dragon_egg); + //if(ConfigHandler.disableXrayBlock == 0) + addOre(getStack(ModBlocks.xRayBlock, 4, 0), "SGS", "GDG", "SGS", 'S', Items.nether_star, 'G', "blockGlassColorless", 'D', "gemDiamond"); } @@ -135,23 +137,60 @@ public class CraftingHandler { private static void addOre(Block result, Object... recipe){ addOre(new ItemStack(result), recipe); } private static void addOre(Item result, Object... recipe){ addOre(new ItemStack(result), recipe); } private static void addOre(ItemStack result, Object... recipe){ + if (result == null) return; + for (Object o : recipe) { + if (o == null) return; + String s = o instanceof Item ? ((Item) o).getUnlocalizedName() : o instanceof Block ? ((Block) o).getUnlocalizedName() : null; + if (s != null && ConfigHandler.disabledNamesList.contains(s)) return; + } + GameRegistry.addRecipe(new ShapedOreRecipe(result, recipe)); } + private static void addShaplessOre(ItemStack result, Object... recipe){ + if (result == null) return; + for (Object o : recipe) { + if (o == null) return; + String s = o instanceof Item ? ((Item) o).getUnlocalizedName() : o instanceof Block ? ((Block) o).getUnlocalizedName() : null; + if (s != null && ConfigHandler.disabledNamesList.contains(s)) return; + } + GameRegistry.addRecipe(new ShapelessOreRecipe(result, recipe)); } - - private static void add(Block result, Object... recipe){ add(new ItemStack(result), recipe); } private static void add(Item result, Object... recipe){ add(new ItemStack(result), recipe); } private static void add(ItemStack result, Object... recipe){ + if (result == null) return; + for (Object o : recipe) { + if (o == null) return; + String s = o instanceof Item ? ((Item) o).getUnlocalizedName() : o instanceof Block ? ((Block) o).getUnlocalizedName() : null; + if (s != null && ConfigHandler.disabledNamesList.contains(s)) return; + } + GameRegistry.addRecipe(result, recipe); } private static void addEnergy(Block result, Object... recipe){ addEnergy(new ItemStack(result), recipe); } private static void addEnergy(Item result, Object... recipe){ addEnergy(new ItemStack(result), recipe); } private static void addEnergy(ItemStack result, Object... recipe){ + if (result == null) return; + for (Object o : recipe) { + if (o == null) return; + String s = o instanceof Item ? ((Item) o).getUnlocalizedName() : o instanceof Block ? ((Block) o).getUnlocalizedName() : null; + if (s != null && ConfigHandler.disabledNamesList.contains(s)) return; + } + GameRegistry.addRecipe(new ShapedOreEnergyRecipe(result, recipe)); } + + private static ItemStack getStack(Block block, int count, int meta) + { + return ModBlocks.isEnabled(block) ? new ItemStack(block, count, meta) : null; + } + + private static ItemStack getStack(Item item, int count, int meta) + { + return ModItems.isEnabled(item) ? new ItemStack(item, count, meta) : null; + } } \ No newline at end of file diff --git a/src/main/java/com/brandon3055/draconicevolution/common/handler/FMLEventHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/FMLEventHandler.java index ce337260..77ecad38 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/FMLEventHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/FMLEventHandler.java @@ -32,7 +32,6 @@ public class FMLEventHandler { public void onEntityUpdate(TickEvent.PlayerTickEvent event) { if (event.phase != TickEvent.Phase.START) return; EntityPlayer player = event.player; - //Reset Walk Speed---------------------------------------------------------------------------------------------- if (walkSpeed == null){ diff --git a/src/main/java/com/brandon3055/draconicevolution/common/handler/MinecraftForgeEventHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/MinecraftForgeEventHandler.java index e25cc498..a95ada91 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/MinecraftForgeEventHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/MinecraftForgeEventHandler.java @@ -10,6 +10,7 @@ import com.brandon3055.draconicevolution.common.entity.EntityDragonHeart; import com.brandon3055.draconicevolution.common.entity.ExtendedPlayer; import com.brandon3055.draconicevolution.common.items.armor.ArmorEffectHandler; import com.brandon3055.draconicevolution.common.network.MountUpdatePacket; +import com.brandon3055.draconicevolution.common.network.SpeedRequestPacket; import com.brandon3055.draconicevolution.common.tileentities.TileGrinder; import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.utills.LogHelper; @@ -63,6 +64,38 @@ public class MinecraftForgeEventHandler { Random random = new Random(); private static Method becomeAngryAt; + public static double maxSpeed = 10F; + public static int ticksSinceRequest = 0; + public static boolean speedNeedsUpdating = true; + + @SubscribeEvent + public void onLivingUpdate(LivingEvent.LivingUpdateEvent event) + { + if (!event.entityLiving.worldObj.isRemote || !(event.entityLiving instanceof EntityPlayerSP)) return; + EntityPlayerSP player = (EntityPlayerSP) event.entityLiving; + + double motionX = player.motionX; + double motionZ = player.motionZ; + double motion = Math.sqrt((motionX*motionX + motionZ*motionZ)); + double reduction = motion - maxSpeed; + + if (motion > maxSpeed && (player.onGround || player.capabilities.isFlying)) + { + player.motionX -= motionX * reduction; + player.motionZ -= motionZ * reduction; + } + + if (speedNeedsUpdating) + { + if (ticksSinceRequest == 0) { + DraconicEvolution.network.sendToServer(new SpeedRequestPacket()); + LogHelper.info("Requesting speed packet from server"); + } + ticksSinceRequest++; + if (ticksSinceRequest > 500) ticksSinceRequest = 0; + } + } + @SubscribeEvent public void onLivingJumpEvent(LivingEvent.LivingJumpEvent event) { if (!(event.entityLiving instanceof EntityPlayer)) return; @@ -303,6 +336,7 @@ public class MinecraftForgeEventHandler { public void joinWorld(EntityJoinWorldEvent event) { if (event.entity instanceof EntityPlayerSP) { + speedNeedsUpdating = true; DraconicEvolution.network.sendToServer(new MountUpdatePacket(0)); } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/InfoTablet.java b/src/main/java/com/brandon3055/draconicevolution/common/items/InfoTablet.java index 3c4d594e..273d7cb5 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/InfoTablet.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/InfoTablet.java @@ -21,6 +21,7 @@ public class InfoTablet extends ItemDE { this.setCreativeTab(DraconicEvolution.tabBlocksItems); this.setMaxStackSize(1); ModItems.register(this); + //GameRegistry.registerItem(this, Strings.infoTabletName); } @Override diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java index bec4d820..8afe74b0 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java @@ -51,7 +51,7 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IEnergyCo super(material, 0, armorType); this.setUnlocalizedName(name); this.setCreativeTab(DraconicEvolution.tabToolsWeapons); - GameRegistry.registerItem(this, name); + if (ModItems.isEnabled(this)) GameRegistry.registerItem(this, name); } @Override @@ -169,7 +169,10 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IEnergyCo if (world.isRemote) return; if (this.getEnergyStored(stack) >= 5000 && clearNegativeEffects(player)) this.extractEnergy(stack, 5000, false); if (player.worldObj.getBlockLightValue((int)Math.floor(player.posX), (int) player.posY, (int)Math.floor(player.posZ)) < 5 && ItemNBTHelper.getBoolean(stack, "ArmorNVActive", false)) + { player.addPotionEffect(new PotionEffect(16, 419, 0, true)); + } + else if ( ItemNBTHelper.getBoolean(stack, "ArmorNVActive", false) && ItemNBTHelper.getBoolean(stack, "ArmorNVLock", false)) player.addPotionEffect(new PotionEffect(16, 419, 0, true)); else if (player.isPotionActive(16)) player.removePotionEffect(16); } @@ -264,7 +267,10 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IEnergyCo public List getFields(ItemStack stack, int slot) { List list = new ArrayList(); if (armorType == 0) + { list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorNVActive").readFromItem(stack, false)); + list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorNVLock").readFromItem(stack, false)); + } else if (armorType == 1) { list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorFlightLock").readFromItem(stack, false)); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java index c97a9141..33832ded 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java @@ -47,7 +47,7 @@ public class WyvernArmor extends ItemArmor implements ISpecialArmor, IEnergyCont super(material, 0, armorType); this.setUnlocalizedName(name); this.setCreativeTab(DraconicEvolution.tabToolsWeapons); - GameRegistry.registerItem(this, name); + if (ModItems.isEnabled(this)) GameRegistry.registerItem(this, name); } @Override diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicDistructionStaff.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicDistructionStaff.java index 40f382d0..8937ec21 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicDistructionStaff.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicDistructionStaff.java @@ -8,13 +8,17 @@ import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.utills.IInventoryTool; import com.brandon3055.draconicevolution.common.utills.ItemConfigField; import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnumEnchantmentType; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; +import net.minecraft.world.World; import java.util.List; @@ -67,9 +71,24 @@ public class DraconicDistructionStaff extends MiningTool implements IInventoryTo @Override public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { - //todo Make this awesome - ToolHandler.AOEAttack(player, entity, stack, 25, ItemNBTHelper.getInteger(stack, References.ATTACK_AOE, 0)); - ToolHandler.damageEntityBasedOnHealth(entity, player, 0.5F); + ToolHandler.damageEntityBasedOnHealth(entity, player, 0.3F); + ToolHandler.AOEAttack(player, entity, stack, ItemNBTHelper.getInteger(stack, References.ATTACK_AOE, 0)); return true; } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + return super.onItemRightClick(stack, world, player); + } + + @SuppressWarnings("unchecked") + @SideOnly(Side.CLIENT) + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean extended) { + super.addInformation(stack, player, list, extended); + + list.add(""); + list.add(EnumChatFormatting.BLUE + "+" + ToolHandler.getBaseAttackDamage(stack) + " " + StatCollector.translateToLocal("info.de.attackDamage.txt")); + list.add(EnumChatFormatting.BLUE + "+30%" + " " + StatCollector.translateToLocal("info.de.bonusHealthDamage.txt")); + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java index 69da6f25..319f9f1f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java @@ -40,7 +40,7 @@ public class DraconicHoe extends ItemHoe implements IEnergyContainerItem{ super(ModItems.DRACONIUM_T1); this.setUnlocalizedName(Strings.draconicHoeName); this.setCreativeTab(DraconicEvolution.tabToolsWeapons); - GameRegistry.registerItem(this, Strings.draconicHoeName); + if (ModItems.isEnabled(this)) GameRegistry.registerItem(this, Strings.draconicHoeName); } @Override diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKI.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKI.java index d155b762..63c5539f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKI.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKI.java @@ -22,7 +22,6 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraft.world.WorldProvider; import java.util.List; @@ -88,6 +87,7 @@ public class TeleporterMKI extends ItemDE { ItemNBTHelper.setFloat(stack, "Pitch", player.rotationPitch); ItemNBTHelper.setInteger(stack, "Dimension", player.dimension); ItemNBTHelper.setBoolean(stack, "IsSet", true); + ItemNBTHelper.setString(stack, "DimentionName", DraconicEvolution.proxy.getMCServer().worldServerForDimension(player.dimension).provider.getDimensionName()); if (world.isRemote) player.addChatMessage(new ChatComponentText(new ChatComponentTranslation("msg.teleporterBound.txt").getFormattedText() + "{X:" + (int) player.posX + " Y:" + (int) player.posY + " Z:" + (int) player.posZ + " Dim:" + player.worldObj.provider.getDimensionName() + "}")); return stack; @@ -128,7 +128,7 @@ public class TeleporterMKI extends ItemDE { } else { list.add(EnumChatFormatting.GREEN + StatCollector.translateToLocal("info.teleporterInfSet1.txt")); - list.add(EnumChatFormatting.WHITE + "{x:" + (int) ItemNBTHelper.getDouble(stack, "X", 0) + " y:" + (int) ItemNBTHelper.getDouble(stack, "Y", 0) + " z:" + (int) ItemNBTHelper.getDouble(stack, "Z", 0) + " Dim:" + WorldProvider.getProviderForDimension(ItemNBTHelper.getInteger(stack, "Dimension", 0)).getDimensionName() + "}"); + list.add(EnumChatFormatting.WHITE + "{x:" + (int) ItemNBTHelper.getDouble(stack, "X", 0) + " y:" + (int) ItemNBTHelper.getDouble(stack, "Y", 0) + " z:" + (int) ItemNBTHelper.getDouble(stack, "Z", 0) + " Dim:" + getLocation(stack).getDimensionName() + "}"); list.add(EnumChatFormatting.BLUE + String.valueOf(stack.getMaxDamage() - stack.getItemDamage() + 1) + " " + StatCollector.translateToLocal("info.teleporterInfSet2.txt")); } } @@ -149,15 +149,11 @@ public class TeleporterMKI extends ItemDE { } public TeleportLocation getLocation(ItemStack stack) { - double x = ItemNBTHelper.getDouble(stack, "X", 0); - double y = ItemNBTHelper.getDouble(stack, "Y", 0); - double z = ItemNBTHelper.getDouble(stack, "Z", 0); - float yaw = ItemNBTHelper.getFloat(stack, "Yaw", 0); - float pitch = ItemNBTHelper.getFloat(stack, "Pitch", 0); - int dim = ItemNBTHelper.getInteger(stack, "Dimension", 0); - if (!ItemNBTHelper.getBoolean(stack, "IsSet", false)) return null; - return new TeleportLocation(x, y, z, dim, pitch, yaw); + TeleportLocation location = new TeleportLocation(); + location.readFromNBT(stack.getTagCompound()); + + return location; } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Wrench.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Wrench.java index 7c7dfe1d..664c8414 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Wrench.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Wrench.java @@ -1,16 +1,21 @@ package com.brandon3055.draconicevolution.common.items.tools; +import cofh.api.energy.IEnergyReceiver; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.items.ItemDE; import com.brandon3055.draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.common.tileentities.energynet.TileRemoteEnergyBase; +import com.brandon3055.draconicevolution.common.tileentities.energynet.TileWirelessEnergyTransceiver; import com.brandon3055.draconicevolution.common.utills.IHudDisplayItem; import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -21,15 +26,14 @@ import java.util.List; /** * Created by Brandon on 23/08/2014. */ -public class Wrench extends ItemDE implements IHudDisplayItem{ +public class Wrench extends ItemDE implements IHudDisplayItem { public static final String BIND_MODE = "bind"; public static final String UNBIND_MODE = "unBind"; public static final String CLEAR_BINDINGS = "unBindAll"; public static final String MODE_SWITCH = "modeSwitch"; - public Wrench() - { + public Wrench() { this.setUnlocalizedName(Strings.wrenchName); this.setCreativeTab(DraconicEvolution.tabToolsWeapons); this.setMaxStackSize(1); @@ -43,14 +47,14 @@ public class Wrench extends ItemDE implements IHudDisplayItem{ //player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.BLUE + "[Draconic Evolution]" + EnumChatFormatting.RESET + " New version available:")); if (player.isSneaking()) cycleMode(stack, world, player); - else if (ItemNBTHelper.getCompound(stack).hasKey("LinkData") && ItemNBTHelper.getCompound(stack).getCompoundTag("LinkData").getBoolean("Bound")) ItemNBTHelper.getCompound(stack).getCompoundTag("LinkData").setBoolean("Bound", false); + else if (ItemNBTHelper.getCompound(stack).hasKey("LinkData") && ItemNBTHelper.getCompound(stack).getCompoundTag("LinkData").getBoolean("Bound")) + ItemNBTHelper.getCompound(stack).getCompoundTag("LinkData").setBoolean("Bound", false); return super.onItemRightClick(stack, world, player); } - static final String[] modes = new String[] {BIND_MODE, UNBIND_MODE, CLEAR_BINDINGS, MODE_SWITCH}; + static final String[] modes = new String[]{BIND_MODE, UNBIND_MODE, CLEAR_BINDINGS, MODE_SWITCH}; - private static void cycleMode(ItemStack stack, World world, EntityPlayer player) - { + private static void cycleMode(ItemStack stack, World world, EntityPlayer player) { String currentMode = ItemNBTHelper.getString(stack, "Mode", "bind"); int mode = 0; for (String s : modes) @@ -95,8 +99,35 @@ public class Wrench extends ItemDE implements IHudDisplayItem{ return list; } - public static String getMode(ItemStack stack) - { + public static String getMode(ItemStack stack) { return ItemNBTHelper.getString(stack, "Mode", "bind"); } + + @Override + public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { + if (world.isRemote) return false; + DraconicEvolution.debug = true; + TileEntity tileClicked = world.getTileEntity(x, y, z); + if (tileClicked instanceof TileRemoteEnergyBase) return false; + else if (!(tileClicked instanceof IEnergyReceiver)) return false; + if (stack.hasTagCompound() && stack.getTagCompound().hasKey("LinkData")) + { + NBTTagCompound linkData = stack.getTagCompound().getCompoundTag("LinkData"); + if (!linkData.getBoolean("Bound")) return false; + int xCoord = linkData.getInteger("XCoord"); + int yCoord = linkData.getInteger("YCoord"); + int zCoord = linkData.getInteger("ZCoord"); + LogHelper.info("side"); + if (world.getTileEntity(xCoord, yCoord, zCoord) instanceof TileWirelessEnergyTransceiver) + { + ((TileWirelessEnergyTransceiver)world.getTileEntity(xCoord, yCoord, zCoord)).linkDevice(x, y, z, side, player, ItemNBTHelper.getString(stack, "Mode", "bind")); + + linkData.setBoolean("Bound", false); + return true; + } + else return false; + } + + return false; + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java index 6f560457..3845bb97 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java @@ -1,14 +1,15 @@ package com.brandon3055.draconicevolution.common.items.tools.baseclasses; import com.brandon3055.draconicevolution.common.lib.References; -import com.brandon3055.draconicevolution.common.utills.DataUtills; -import com.brandon3055.draconicevolution.common.utills.ItemConfigField; -import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.*; import net.minecraft.block.Block; +import net.minecraft.block.material.MaterialLiquid; import net.minecraft.client.Minecraft; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -16,6 +17,7 @@ import net.minecraft.network.play.client.C07PacketPlayerDigging; import net.minecraft.network.play.server.S18PacketEntityTeleport; import net.minecraft.network.play.server.S23PacketBlockChange; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; @@ -61,24 +63,43 @@ public abstract class MiningTool extends ToolBase {//todo add custom information public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) { int radius = ItemNBTHelper.getInteger(stack, References.DIG_AOE, 0); int depth = ItemNBTHelper.getInteger(stack, References.DIG_DEPTH, 1) - 1; - return getEnergyStored(stack) >= energyPerOperation && (radius > 0) ? breakAOEBlocks(stack, x, y, z, radius, depth, player) : super.onBlockStartBreak(stack, x, y, z, player); } + @Override + public boolean onBlockDestroyed(ItemStack stack, World p_150894_2_, Block p_150894_3_, int p_150894_4_, int p_150894_5_, int p_150894_6_, EntityLivingBase p_150894_7_) { + if (ItemNBTHelper.getInteger(stack, References.DIG_AOE, 0) == 0) extractEnergy(stack, References.ENERGYPERBLOCK, false); + return super.onBlockDestroyed(stack, p_150894_2_, p_150894_3_, p_150894_4_, p_150894_5_, p_150894_6_, p_150894_7_); + } + @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { ToolHandler.updateGhostBlocks(player, world); - if (player.isSneaking()) + if (InfoHelper.isShiftKeyDown() && !InfoHelper.isCtrlKeyDown()) { List fields = getFields(stack, player.inventory.currentItem); for (ItemConfigField field : fields) { - if (field.name.equals(References.DIG_AOE)) { + if (field.name.equals(References.DIG_AOE)) + { + int aoe = (Integer) field.value; + aoe++; + if (aoe > (Integer) field.max) aoe = (Integer) field.min; + field.value = aoe; + DataUtills.writeObjectToItem(stack, field.value, field.datatype, field.name); + } + } + } + else if (InfoHelper.isCtrlKeyDown() && !InfoHelper.isShiftKeyDown()) + { + List fields = getFields(stack, player.inventory.currentItem); + for (ItemConfigField field : fields) + { + if (field.name.equals(References.DIG_DEPTH)) { int aoe = (Integer) field.value; aoe++; if (aoe > (Integer) field.max) aoe = (Integer) field.min; field.value = aoe; - //field.sendChanges(); DataUtills.writeObjectToItem(stack, field.value, field.datatype, field.name); } } @@ -88,7 +109,6 @@ public abstract class MiningTool extends ToolBase {//todo add custom information } //todo attack, hoe, textures - //This method is basses on tinkerers construct public boolean breakAOEBlocks(ItemStack stack, int x, int y, int z, int breakRadius, int breakDepth, EntityPlayer player) { Map blockMap = ItemNBTHelper.getBoolean(stack, References.OBLITERATE, false) ? getObliterationList(stack) : new HashMap(); @@ -115,43 +135,84 @@ public abstract class MiningTool extends ToolBase {//todo add custom information } int sideHit = mop.sideHit; - int xRange = breakRadius; - int yRange = breakRadius; - int zRange = breakDepth; + int xMax = breakRadius; + int xMin = breakRadius; + int yMax = breakRadius; + int yMin = breakRadius; + int zMax = breakRadius; + int zMin = breakRadius; int yOffset = 0; + switch (sideHit) { case 0: + yMax = breakDepth; + yMin = 0; + zMax = breakRadius; + break; case 1: - yRange = breakDepth; - zRange = breakRadius; + yMin = breakDepth; + yMax = 0; + zMax = breakRadius; break; case 2: + xMax = breakRadius; + zMin = 0; + zMax = breakDepth; + yOffset = breakRadius - 1; + break; case 3: - xRange = breakRadius; - zRange = breakDepth; + xMax = breakRadius; + zMax = 0; + zMin = breakDepth; yOffset = breakRadius - 1; break; case 4: + xMax = breakDepth; + xMin = 0; + zMax = breakRadius; + yOffset = breakRadius - 1; + break; case 5: - xRange = breakDepth; - zRange = breakRadius; + xMin = breakDepth; + xMax = 0; + zMax = breakRadius; yOffset = breakRadius - 1; break; } - for (int xPos = x - xRange; xPos <= x + xRange; xPos++) + if (ItemNBTHelper.getBoolean(stack, References.BASE_SAFE_AOE, false)) { - for (int yPos = y + yOffset - yRange; yPos <= y + yOffset + yRange; yPos++) + for (int xPos = x - xMin; xPos <= x + xMax; xPos++) { - for (int zPos = z - zRange; zPos <= z + zRange; zPos++) + for (int yPos = y + yOffset - yMin; yPos <= y + yOffset + yMax; yPos++) { - breakExtraBlock(stack, player.worldObj, xPos, yPos, zPos, sideHit, player, refStrength, Math.abs(x - xPos) <= 1 && Math.abs(y - yPos) <= 1 && Math.abs(z - zPos) <= 1, blockMap); + for (int zPos = z - zMin; zPos <= z + zMax; zPos++) + { + if (player.worldObj.getTileEntity(xPos, yPos, zPos) != null) { + if (player.worldObj.isRemote) { + player.addChatComponentMessage(new ChatComponentTranslation("msg.de.baseSafeAOW.txt")); + } + else ((EntityPlayerMP)player).playerNetServerHandler.sendPacket(new S23PacketBlockChange(x, y, z, ((EntityPlayerMP)player).worldObj)); + return true; + } + } + } + } + } + + for (int xPos = x - xMin; xPos <= x + xMax; xPos++) + { + for (int yPos = y + yOffset - yMin; yPos <= y + yOffset + yMax; yPos++) + { + for (int zPos = z - zMin; zPos <= z + zMax; zPos++) + { + breakExtraBlock(stack, player.worldObj, xPos, yPos, zPos, breakRadius * ((breakDepth / 2) + 1) , player, refStrength, Math.abs(x - xPos) <= 1 && Math.abs(y - yPos) <= 1 && Math.abs(z - zPos) <= 1, blockMap); } } } @SuppressWarnings("unchecked") - List items = player.worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(x - xRange, y + yOffset - yRange, z - zRange, x + xRange + 1, y + yOffset + yRange + 1, z + zRange + 1)); + List items = player.worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(x - xMin, y + yOffset - yMin, z - zMin, x + xMax + 1, y + yOffset + yMax + 1, z + zMax + 1)); for (EntityItem item : items){ if (!player.worldObj.isRemote) { @@ -164,23 +225,22 @@ public abstract class MiningTool extends ToolBase {//todo add custom information return true; } - //This method is basses on tinkerers construct - protected void breakExtraBlock(ItemStack stack, World world, int x, int y, int z, int sidehit, EntityPlayer player, float refStrength, boolean breakSound, Map blockMap) + protected void breakExtraBlock(ItemStack stack, World world, int x, int y, int z, int totalSize, EntityPlayer player, float refStrength, boolean breakSound, Map blockMap) { - if (world.isAirBlock(x, y, z)) - return; + if (world.isAirBlock(x, y, z)) return; Block block = world.getBlock(x, y, z); + if (block == Blocks.bedrock || block.getMaterial() instanceof MaterialLiquid) return; + int meta = world.getBlockMetadata(x, y, z); boolean effective = false; - if(block != null) + + for (String s : getToolClasses(stack)) { - for (String s : getToolClasses(stack)) - { - if (block.isToolEffective(s, meta) || func_150893_a(stack, block) > 1F) effective = true; - } + if (block.isToolEffective(s, meta) || func_150893_a(stack, block) > 1F) effective = true; } + if (!effective) return; float strength = ForgeHooks.blockStrength(block, player, world, x,y,z); @@ -193,9 +253,12 @@ public abstract class MiningTool extends ToolBase {//todo add custom information return; } } + if (!player.canHarvestBlock(block) || !ForgeHooks.canHarvestBlock(block, player, meta) || refStrength/strength > 10f) return; + int scaledPower = energyPerOperation + (totalSize * (energyPerOperation / 10)); + if (player.capabilities.isCreativeMode || (blockMap.containsKey(block) && blockMap.get(block) == meta)) { block.onBlockHarvested(world, x, y, z, meta, player); if (block.removedByPlayer(world, player, x, y, z, false)) @@ -205,18 +268,18 @@ public abstract class MiningTool extends ToolBase {//todo add custom information ((EntityPlayerMP)player).playerNetServerHandler.sendPacket(new S23PacketBlockChange(x, y, z, world)); } - if ((blockMap.containsKey(block) && blockMap.get(block) == meta)) extractEnergy(stack, energyPerOperation, false); + if ((blockMap.containsKey(block) && blockMap.get(block) == meta)) extractEnergy(stack, scaledPower, false); if (breakSound) world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); return; } - extractEnergy(stack, energyPerOperation, false); + extractEnergy(stack, scaledPower, false); if (!world.isRemote) { block.onBlockHarvested(world, x, y, z, meta, player); - if(block.removedByPlayer(world, player, x,y,z, true)) // boolean is if block can be harvested, checked above + if(block.removedByPlayer(world, player, x,y,z, true)) { block.onBlockDestroyedByPlayer( world, x,y,z, meta); block.harvestBlock(world, player, x,y,z, meta); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/ToolBase.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/ToolBase.java index 7e7a7775..4f4e848f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/ToolBase.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/ToolBase.java @@ -3,9 +3,7 @@ package com.brandon3055.draconicevolution.common.items.tools.baseclasses; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.keybinding.KeyBindings; import com.brandon3055.draconicevolution.common.lib.References; -import com.brandon3055.draconicevolution.common.utills.InfoHelper; -import com.brandon3055.draconicevolution.common.utills.ItemConfigField; -import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.*; import com.google.common.collect.Sets; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -16,6 +14,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import org.lwjgl.input.Keyboard; @@ -125,6 +125,7 @@ public class ToolBase extends RFItemBase { public List getFields(ItemStack stack, int slot) { List list = super.getFields(stack, slot); if (!getToolClasses(stack).isEmpty()) list.add(new ItemConfigField(References.FLOAT_ID, slot, References.DIG_SPEED_MULTIPLIER).setMinMaxAndIncromente(0f, 1f, 0.01f).readFromItem(stack, 1f)); + if (!getToolClasses(stack).isEmpty()) list.add(new ItemConfigField(References.BOOLEAN_ID, slot, References.BASE_SAFE_AOE).readFromItem(stack, false)); return list; } @@ -135,15 +136,17 @@ public class ToolBase extends RFItemBase { if (show){ List l = getFields(stack, 0); for (ItemConfigField f : l) list.add(f.getTooltipInfo()); + if (getCapacity(stack) > 0) list.add(InfoHelper.ITC() + StatCollector.translateToLocal("info.de.charge.txt") + ": " + InfoHelper.HITC() + Utills.formatNumber(getEnergyStored(stack)) + " / " + Utills.formatNumber(getCapacity(stack))); } addAditionalInformation(stack, player, list, extended); if (show) InfoHelper.addLore(stack, list, true); + InfoHelper.addEnergyInfo(stack, list); } @SideOnly(Side.CLIENT) public void addAditionalInformation(ItemStack stack, EntityPlayer player, List list, boolean extended) { - list.add("Press " + Keyboard.getKeyName(KeyBindings.toolConfig.getKeyCode()) + " to open config gui"); + list.add(StatCollector.translateToLocal("info.de.press.txt") + " " + Keyboard.getKeyName(KeyBindings.toolConfig.getKeyCode()) + " " + StatCollector.translateToLocal("info.de.toOpenConfigGUI.txt")); } @Override @@ -152,4 +155,29 @@ public class ToolBase extends RFItemBase { if (stack.getUnlocalizedName().contains(":draconic")) return EnumRarity.epic; return EnumRarity.uncommon; } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World p_77659_2_, EntityPlayer player) { + + if (InfoHelper.isCtrlKeyDown() && InfoHelper.isShiftKeyDown()) + { + List fields = getFields(stack, player.inventory.currentItem); + for (ItemConfigField field : fields) + { + if (field.name.equals(References.ATTACK_AOE)) { + int aoe = (Integer) field.value; + aoe++; + if (aoe > (Integer) field.max) aoe = (Integer) field.min; + field.value = aoe; + DataUtills.writeObjectToItem(stack, field.value, field.datatype, field.name); + } + } + } + return super.onItemRightClick(stack, p_77659_2_, player); + } + + public ToolMaterial getToolMaterial() + { + return toolMaterial; + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/ToolHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/ToolHandler.java index cb7c7705..a5ea3436 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/ToolHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/ToolHandler.java @@ -1,29 +1,30 @@ package com.brandon3055.draconicevolution.common.items.tools.baseclasses; import cofh.api.energy.IEnergyContainerItem; -import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.boss.EntityDragonPart; import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.monster.EntitySpider; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; import net.minecraft.network.play.server.S23PacketBlockChange; import net.minecraft.util.*; import net.minecraft.world.World; import java.util.ArrayList; import java.util.List; -import java.util.Map; public class ToolHandler { public static Block[] destroyList = {Blocks.cobblestone, Blocks.stone, Blocks.dirt, Blocks.gravel, Blocks.sand, Blocks.grass, Blocks.netherrack}; @@ -137,64 +138,25 @@ public class ToolHandler { } } - public static ItemStack changeMode(ItemStack stack, EntityPlayer player, boolean hasOblit, int maxSize) { - if (player.isSneaking()) { - if (ItemNBTHelper.getShort(stack, "size", (short) 0) < maxSize) - ItemNBTHelper.setShort(stack, "size", (short) (ItemNBTHelper.getShort(stack, "size", (short) 0) + 1)); - else ItemNBTHelper.setShort(stack, "size", (short) 0); - if (!player.worldObj.isRemote) - player.addChatMessage(new ChatComponentTranslation("msg.size" + ItemNBTHelper.getShort(stack, "size", (short) 0) + ".txt")); - - } else { - updateGhostBlocks(player, player.worldObj); - if (hasOblit) { - ItemNBTHelper.setBoolean(stack, "obliterate", !ItemNBTHelper.getBoolean(stack, "obliterate", false)); - if (player.worldObj.isRemote) - player.addChatMessage(new ChatComponentTranslation("msg.oblit" + ItemNBTHelper.getBoolean(stack, "obliterate", false) + ".txt")); - } - } - return stack; - } - - public static void damageEntityBasedOnHealth(Entity entity, EntityPlayer player, float dmg) { - World world = player.worldObj; + public static void damageEntityBasedOnHealth(Entity entity, EntityPlayer player, float dmgMult) { ItemStack stack = player.getCurrentEquippedItem(); - if (entity instanceof EntityLivingBase) { + float baseAttack = getDamageAgainstEntity(stack, entity); + + if (entity instanceof EntityLivingBase) + { float entHealth = ((EntityLivingBase) entity).getHealth(); - if (!world.isRemote) { - if (entHealth > 20) { - if (stack == null || !(stack.getItem() instanceof IEnergyContainerItem) || ((IEnergyContainerItem) stack.getItem()).getEnergyStored(stack) < References.ENERGYPERBLOCK) { - if (!player.capabilities.isCreativeMode) return; - } else { - if (!player.capabilities.isCreativeMode) - ((IEnergyContainerItem) stack.getItem()).extractEnergy(stack, References.ENERGYPERATTACK + (int) ((entHealth) * 100), false); - } - entity.attackEntityFrom(DamageSource.causePlayerDamage(player), (entHealth) * dmg); - } - } - ((EntityLivingBase) entity).attackTime = 0; - } else if (entity instanceof EntityDragonPart) { - if (!world.isRemote) { - if (stack == null || !(stack.getItem() instanceof IEnergyContainerItem) || ((IEnergyContainerItem) stack.getItem()).getEnergyStored(stack) < References.ENERGYPERBLOCK) { - if (!player.capabilities.isCreativeMode) return; - } else { - if (!player.capabilities.isCreativeMode) - ((IEnergyContainerItem) stack.getItem()).extractEnergy(stack, References.ENERGYPERATTACK + (int) ((200F) * 100), false); - } - entity.attackEntityFrom(DamageSource.causePlayerDamage(player), 200F * dmg); - } - } else { - if (!world.isRemote) { - if (stack == null || !(stack.getItem() instanceof IEnergyContainerItem) || ((IEnergyContainerItem) stack.getItem()).getEnergyStored(stack) < References.ENERGYPERBLOCK) { - if (!player.capabilities.isCreativeMode) return; - } else { - if (!player.capabilities.isCreativeMode) - ((IEnergyContainerItem) stack.getItem()).extractEnergy(stack, References.ENERGYPERATTACK + (int) ((100F) * 100), false); - } - entity.attackEntityFrom(DamageSource.causePlayerDamage(player), 100F * dmg); - } + baseAttack += (entHealth * dmgMult); } + if (!player.capabilities.isCreativeMode && ((IEnergyContainerItem) stack.getItem()).getEnergyStored(stack) < (int)(baseAttack / 2) * References.ENERGYPERATTACK) return; + + entity.attackEntityFrom(DamageSource.causePlayerDamage(player), baseAttack); + if (EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, stack) > 0) entity.setFire(EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, stack) * 15); + + + if (!player.capabilities.isCreativeMode) ((IEnergyContainerItem) stack.getItem()).extractEnergy(stack, (int)(baseAttack / 2) * References.ENERGYPERATTACK, false); + + if (entity instanceof EntityLivingBase) { EntityLivingBase entityLivingBase = (EntityLivingBase)entity; double d1 = player.posX - entityLivingBase.posX; @@ -210,7 +172,7 @@ public class ToolHandler { { entityLivingBase.isAirBorne = true; float f1 = MathHelper.sqrt_double(d1 * d1 + d0 * d0); - float f2 = 0.4F + EnchantmentHelper.getKnockbackModifier(player, entityLivingBase) * 0.4F; + float f2 = 0.1F + EnchantmentHelper.getKnockbackModifier(player, entityLivingBase) * 0.4F; entityLivingBase.motionX /= 2.0D; entityLivingBase.motionY /= 2.0D; entityLivingBase.motionZ /= 2.0D; @@ -227,29 +189,21 @@ public class ToolHandler { } @SuppressWarnings({"rawtypes", "unused"}) - public static void AOEAttack(EntityPlayer player, Entity entity, ItemStack stack, int dmg, int range) { - Map enchants = EnchantmentHelper.getEnchantments(stack); - int sharp = 0; - if (enchants.get(16) != null) sharp = (Integer) enchants.get(16); + public static void AOEAttack(EntityPlayer player, Entity entity, ItemStack stack, int range) { World world = player.worldObj; AxisAlignedBB box = AxisAlignedBB.getBoundingBox(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range).expand(1.0D, 1.0D, 1.0D); List list = world.getEntitiesWithinAABBExcludingEntity(player, box); - if (range == 0){ - if (stack == null || !(stack.getItem() instanceof IEnergyContainerItem) || ((IEnergyContainerItem) stack.getItem()).getEnergyStored(stack) < References.ENERGYPERATTACK) { - if (!player.capabilities.isCreativeMode) return; - } else { - if (!player.capabilities.isCreativeMode) - ((IEnergyContainerItem) stack.getItem()).extractEnergy(stack, References.ENERGYPERATTACK, false); - } - entity.attackEntityFrom(DamageSource.causePlayerDamage(player), dmg + sharp); - return; - } + if (range == 0) return; for (Object entityObject : list) { if (entityObject instanceof EntityLivingBase) { - ((Entity) entityObject).attackEntityFrom(DamageSource.causePlayerDamage(player), dmg + sharp); - EntityLivingBase entityLivingBase = (EntityLivingBase) entityObject; + if (entityLivingBase.getEntityId() == entity.getEntityId()) continue; + + entityLivingBase.attackEntityFrom(DamageSource.causePlayerDamage(player), getDamageAgainstEntity(stack, entityLivingBase)); + if (EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, stack) > 0) entityLivingBase.setFire(EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, stack) * 15); + + double d1 = player.posX - entityLivingBase.posX; double d0; @@ -260,7 +214,7 @@ public class ToolHandler { if (entityLivingBase.worldObj.rand.nextDouble() >= entityLivingBase.getEntityAttribute(SharedMonsterAttributes.knockbackResistance).getAttributeValue()) { entityLivingBase.isAirBorne = true; float f1 = MathHelper.sqrt_double(d1 * d1 + d0 * d0); - float f2 = 0.4F + EnchantmentHelper.getKnockbackModifier(player, entityLivingBase) * 0.4F; + float f2 = 0.1F + (EnchantmentHelper.getKnockbackModifier(player, entityLivingBase) * 0.4F); entityLivingBase.motionX /= 2.0D; entityLivingBase.motionY /= 2.0D; entityLivingBase.motionZ /= 2.0D; @@ -316,4 +270,25 @@ public class ToolHandler { } } } + + public static float getBaseAttackDamage(ItemStack stack) + { + if (stack == null) return 0; + float sharpMod = (float)EnchantmentHelper.getEnchantmentLevel(Enchantment.sharpness.effectId, stack) * 4F; + if (stack.getItem() == ModItems.draconicDestructionStaff) return (ModItems.DRACONIUM_T3.getDamageVsEntity()) + sharpMod; + else if (stack.getItem() instanceof ItemSword) return (((ItemSword)stack.getItem()).func_150931_i()) + sharpMod; + return 0; + } + + public static float getDamageAgainstEntity(ItemStack stack, Entity entity) + { + float baseAttack = getBaseAttackDamage(stack); + float smiteMod = EnchantmentHelper.getEnchantmentLevel(Enchantment.smite.effectId ,stack) * 6F; + float athropodsMod = EnchantmentHelper.getEnchantmentLevel(Enchantment.baneOfArthropods.effectId ,stack) * 6F; + + if (entity instanceof EntityLivingBase && ((EntityLivingBase)entity).isEntityUndead()) baseAttack += smiteMod; + if (entity instanceof EntitySpider) baseAttack += athropodsMod; + + return baseAttack; + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java index f6442c7e..dc7deea7 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java @@ -14,6 +14,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnumEnchantmentType; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -41,7 +42,7 @@ public class DraconicBow extends ItemBow implements IInventoryTool this.setMaxDamage(-1); this.setCreativeTab(DraconicEvolution.tabToolsWeapons); this.setUnlocalizedName(Strings.draconicBowName); - GameRegistry.registerItem(this, Strings.draconicBowName); + if (ModItems.isEnabled(this)) GameRegistry.registerItem(this, Strings.draconicBowName); } @Override @@ -73,7 +74,7 @@ public class DraconicBow extends ItemBow implements IInventoryTool return event.result; } - if (player.capabilities.isCreativeMode || player.inventory.hasItem(Items.arrow) || player.inventory.hasItem(ModItems.enderArrow)) + if (player.capabilities.isCreativeMode || player.inventory.hasItem(Items.arrow) || player.inventory.hasItem(ModItems.enderArrow) || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0) { player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java index 41f19cde..541d0b15 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java @@ -11,6 +11,7 @@ import com.brandon3055.draconicevolution.common.utills.IInventoryTool; import com.brandon3055.draconicevolution.common.utills.InfoHelper; import com.brandon3055.draconicevolution.common.utills.ItemConfigField; import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; +import com.google.common.collect.Multimap; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -25,6 +26,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -40,7 +42,7 @@ public class DraconicSword extends ItemSword implements IEnergyContainerItem, II super(ModItems.DRACONIUM_T2); this.setUnlocalizedName(Strings.draconicSwordName); this.setCreativeTab(DraconicEvolution.tabToolsWeapons); - GameRegistry.registerItem(this, Strings.draconicSwordName); + if (ModItems.isEnabled(this)) GameRegistry.registerItem(this, Strings.draconicSwordName); } @Override @@ -76,8 +78,8 @@ public class DraconicSword extends ItemSword implements IEnergyContainerItem, II @Override public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { - ToolHandler.AOEAttack(player, entity, stack, 15, 3); - ToolHandler.damageEntityBasedOnHealth(entity, player, 0.3F); + ToolHandler.AOEAttack(player, entity, stack, 3); + ToolHandler.damageEntityBasedOnHealth(entity, player, 0.2F); return true; } @@ -90,6 +92,9 @@ public class DraconicSword extends ItemSword implements IEnergyContainerItem, II list.add(InfoHelper.ITC() + StatCollector.translateToLocal("info.de.sword.txt")); InfoHelper.addLore(stack, list); } + list.add(""); + list.add(EnumChatFormatting.BLUE + "+" + ToolHandler.getBaseAttackDamage(stack) + " " + StatCollector.translateToLocal("info.de.attackDamage.txt")); + list.add(EnumChatFormatting.BLUE + "+20%" + " " + StatCollector.translateToLocal("info.de.bonusHealthDamage.txt")); } @Override @@ -182,4 +187,11 @@ public class DraconicSword extends ItemSword implements IEnergyContainerItem, II public List getFields(ItemStack stack, int slot) { return new ArrayList(); } + + @Override + public Multimap getAttributeModifiers(ItemStack stack) { + Multimap map = super.getAttributeModifiers(stack); + map.clear(); + return map; + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java index 94ae37b4..6985383e 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java @@ -14,6 +14,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnumEnchantmentType; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -41,7 +42,7 @@ public class WyvernBow extends ItemBow implements IInventoryTool { this.setMaxDamage(-1); this.setCreativeTab(DraconicEvolution.tabToolsWeapons); this.setUnlocalizedName(Strings.wyvernBowName); - GameRegistry.registerItem(this, Strings.wyvernBowName); + if (ModItems.isEnabled(this)) GameRegistry.registerItem(this, Strings.wyvernBowName); } @Override @@ -60,7 +61,7 @@ public class WyvernBow extends ItemBow implements IInventoryTool { return getUnlocalizedName(); } - /* ======================================== CUSTOMEBOW START =====================================*/ + /* ======================================== CUSTOMEBOW START ===================================== */ @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { @@ -71,7 +72,7 @@ public class WyvernBow extends ItemBow implements IInventoryTool { return event.result; } - if (player.capabilities.isCreativeMode || player.inventory.hasItem(Items.arrow) || player.inventory.hasItem(ModItems.enderArrow)) { + if (player.capabilities.isCreativeMode || player.inventory.hasItem(Items.arrow) || player.inventory.hasItem(ModItems.enderArrow) || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0) { player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); } } else diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java index 032b46d7..aa675cc2 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java @@ -11,6 +11,7 @@ import com.brandon3055.draconicevolution.common.utills.IInventoryTool; import com.brandon3055.draconicevolution.common.utills.InfoHelper; import com.brandon3055.draconicevolution.common.utills.ItemConfigField; import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; +import com.google.common.collect.Multimap; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -26,6 +27,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -42,7 +44,7 @@ public class WyvernSword extends ItemSword implements IEnergyContainerItem, IInv super(ModItems.DRACONIUM_T1); this.setUnlocalizedName(Strings.wyvernSwordName); this.setCreativeTab(DraconicEvolution.tabToolsWeapons); - GameRegistry.registerItem(this, Strings.wyvernSwordName); + if (ModItems.isEnabled(this)) GameRegistry.registerItem(this, Strings.wyvernSwordName); } @Override @@ -81,8 +83,8 @@ public class WyvernSword extends ItemSword implements IEnergyContainerItem, IInv @Override public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { - ToolHandler.AOEAttack(player, entity, stack, 8, 1); - ToolHandler.damageEntityBasedOnHealth(entity, player, 0.2F); + ToolHandler.AOEAttack(player, entity, stack, 1); + ToolHandler.damageEntityBasedOnHealth(entity, player, 0.1F); return true; } @@ -95,6 +97,9 @@ public class WyvernSword extends ItemSword implements IEnergyContainerItem, IInv list.add(InfoHelper.ITC() + StatCollector.translateToLocal("info.de.sword.txt")); InfoHelper.addLore(stack, list); } + list.add(""); + list.add(EnumChatFormatting.BLUE + "+" + ToolHandler.getBaseAttackDamage(stack) + " " + StatCollector.translateToLocal("info.de.attackDamage.txt")); + list.add(EnumChatFormatting.BLUE + "+10%" + " " + StatCollector.translateToLocal("info.de.bonusHealthDamage.txt")); } @Override @@ -195,5 +200,12 @@ public class WyvernSword extends ItemSword implements IEnergyContainerItem, IInv public List getFields(ItemStack stack, int slot) { return new ArrayList(); } + + @Override + public Multimap getAttributeModifiers(ItemStack stack) { + Multimap map = super.getAttributeModifiers(stack); + map.clear(); + return map; + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java b/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java index 24cd8242..985fc2c6 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java @@ -44,4 +44,6 @@ public final class References { public static final String ATTACK_AOE = "WeaponAttackAOE"; public static final String OBLITERATE = "ToolVoidJunk"; public static final String TREE_MODE = "AxeTreeMode"; + public static final String BASE_SAFE_AOE = "BaseSafeAOE"; + } \ No newline at end of file diff --git a/src/main/java/com/brandon3055/draconicevolution/common/network/BlockUpdatePacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/BlockUpdatePacket.java new file mode 100644 index 00000000..dce9aa9b --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/BlockUpdatePacket.java @@ -0,0 +1,45 @@ +package com.brandon3055.draconicevolution.common.network; + +import com.brandon3055.draconicevolution.common.utills.LogHelper; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; +import net.minecraft.network.play.server.S23PacketBlockChange; + +public class BlockUpdatePacket implements IMessage +{ + int x, y, z; + + public BlockUpdatePacket() {} + + public BlockUpdatePacket(int x, int y, int z) { + this.x = x; + this.y = y; + this.z = z; + } + + @Override + public void fromBytes(ByteBuf bytes) { + this.x = bytes.readInt(); + this.y = bytes.readInt(); + this.z = bytes.readInt(); + } + + @Override + public void toBytes(ByteBuf bytes){ + bytes.writeInt(x); + bytes.writeInt(y); + bytes.writeInt(z); + } + + public static class Handler implements IMessageHandler { + + @Override + public IMessage onMessage(BlockUpdatePacket message, MessageContext ctx) { + LogHelper.info("update " + message.x + " " + message.y + " " + message.z); + ctx.getServerHandler().playerEntity.playerNetServerHandler.sendPacket(new S23PacketBlockChange(message.x, message.y, message.z, ctx.getServerHandler().playerEntity.worldObj)); + return null; + } + } +} \ No newline at end of file diff --git a/src/main/java/com/brandon3055/draconicevolution/common/network/ButtonPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/ButtonPacket.java index 1accda7a..92a3856c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/network/ButtonPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/ButtonPacket.java @@ -23,6 +23,7 @@ public class ButtonPacket implements IMessage public static final byte ID_DRACONIUMCHEST2 = 4; public static final byte ID_DRACONIUMCHEST3 = 5; public static final byte ID_TOOLCONFIG = 7; + public static final byte ID_DRACONIUMCHEST4 = 8; byte buttonId = 0; boolean state = false; @@ -104,6 +105,15 @@ public class ButtonPacket implements IMessage } break; } + case ID_DRACONIUMCHEST4: + { + Container container = ctx.getServerHandler().playerEntity.openContainer; + if (container != null && container instanceof ContainerDraconiumChest){ + TileDraconiumChest tile = ((ContainerDraconiumChest) container).getTile(); + tile.lockOutputSlots = ! tile.lockOutputSlots; + } + break; + } case ID_TOOLCONFIG: { ctx.getServerHandler().playerEntity.openGui(DraconicEvolution.instance, GuiHandler.GUIID_TOOL_CONFIG, ctx.getServerHandler().playerEntity.worldObj, (int)ctx.getServerHandler().playerEntity.posX, (int)ctx.getServerHandler().playerEntity.posY, (int)ctx.getServerHandler().playerEntity.posZ); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/network/SpeedRequestPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/SpeedRequestPacket.java new file mode 100644 index 00000000..4b094dbf --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/SpeedRequestPacket.java @@ -0,0 +1,54 @@ +package com.brandon3055.draconicevolution.common.network; + +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.handler.ConfigHandler; +import com.brandon3055.draconicevolution.common.handler.MinecraftForgeEventHandler; +import com.brandon3055.draconicevolution.common.utills.LogHelper; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import cpw.mods.fml.relauncher.Side; +import io.netty.buffer.ByteBuf; + +/** + * Created by Brandon on 26/03/2015. + */ +public class SpeedRequestPacket implements IMessage +{ + double speed = 0F; + + public SpeedRequestPacket() {} + + public SpeedRequestPacket(double speed) { + this.speed = speed; + } + + @Override + public void toBytes(ByteBuf bytes){ + bytes.writeDouble(speed); + } + + @Override + public void fromBytes(ByteBuf bytes){ + this.speed = bytes.readDouble(); + } + + public static class Handler implements IMessageHandler { + + @Override + public IMessage onMessage(SpeedRequestPacket message, MessageContext ctx) { + if (ctx.side == Side.SERVER) + { + if (ConfigHandler.speedLimitDimList.contains(ctx.getServerHandler().playerEntity.dimension) || (DraconicEvolution.proxy.isOp(ctx.getServerHandler().playerEntity.getCommandSenderName()) && !ConfigHandler.speedLimitops)) return new SpeedRequestPacket(20F); + return new SpeedRequestPacket(ConfigHandler.maxPlayerSpeed); + } + else { + MinecraftForgeEventHandler.maxSpeed = message.speed; + MinecraftForgeEventHandler.ticksSinceRequest = 0; + MinecraftForgeEventHandler.speedNeedsUpdating = false; + LogHelper.info("Server speed is set to " + message.speed); + } + return null; + } + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/network/TeleporterPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/TeleporterPacket.java index 97eab68e..b03a2f63 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/network/TeleporterPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/TeleporterPacket.java @@ -1,5 +1,6 @@ package com.brandon3055.draconicevolution.common.network; +import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.handler.ConfigHandler; import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; @@ -64,6 +65,7 @@ public class TeleporterPacket implements IMessage bytes.writeFloat(location.getPitch()); bytes.writeFloat(location.getYaw()); ByteBufUtils.writeUTF8String(bytes, location.getName()); + //ByteBufUtils.writeUTF8String(bytes, location.getDimensionName()); if (function == UPDATEDESTINATION) bytes.writeInt(data); } @@ -98,6 +100,7 @@ public class TeleporterPacket implements IMessage location.setPitch(bytes.readFloat()); location.setYaw(bytes.readFloat()); location.setName(ByteBufUtils.readUTF8String(bytes)); + //location.setDimentionName(ByteBufUtils.readUTF8String(bytes)); if (function == UPDATEDESTINATION) data = bytes.readInt(); } @@ -135,6 +138,7 @@ public class TeleporterPacket implements IMessage if (message.function == ADDDESTINATION){ NBTTagCompound tag = new NBTTagCompound(); + message.location.setDimentionName(DraconicEvolution.proxy.getMCServer().worldServerForDimension(message.location.getDimension()).provider.getDimensionName()); message.location.writeToNBT(tag); list.appendTag(tag); compound.setTag("Locations", list); @@ -168,6 +172,7 @@ public class TeleporterPacket implements IMessage if (message.function == UPDATEDESTINATION){ NBTTagCompound tag = list.getCompoundTagAt(message.data); + message.location.setDimentionName(DraconicEvolution.proxy.getMCServer().worldServerForDimension(message.location.getDimension()).provider.getDimensionName()); message.location.writeToNBT(tag); list.func_150304_a(message.data, tag); compound.setTag("Locations", list); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/CustomSpawnerBaseLogic.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/CustomSpawnerBaseLogic.java index bab84c3a..3d17911c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/CustomSpawnerBaseLogic.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/CustomSpawnerBaseLogic.java @@ -165,7 +165,7 @@ public abstract class CustomSpawnerBaseLogic { } } else ((EntityLiving) par1Entity).onSpawnWithEgg(null); - ((EntityLiving)par1Entity).func_110163_bv(); + if (!requiresPlayer)((EntityLiving)par1Entity).func_110163_bv(); this.getSpawnerWorld().spawnEntityInWorld(par1Entity); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java index dde21f4f..67562112 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java @@ -10,7 +10,7 @@ import com.brandon3055.draconicevolution.common.utills.EnergyStorage; import com.brandon3055.draconicevolution.common.utills.ICustomItemData; import com.brandon3055.draconicevolution.common.utills.InventoryUtils; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; @@ -28,7 +28,7 @@ import java.util.List; /** * Created by Brandon on 27/06/2014. */ -public class TileDraconiumChest extends TileEntity implements IInventory, IEnergyReceiver, ICustomItemData { +public class TileDraconiumChest extends TileEntity implements ISidedInventory, IEnergyReceiver, ICustomItemData { ItemStack[] items = new ItemStack[240]; ItemStack[] itemsCrafting = new ItemStack[10]; private int ticksSinceSync = -1; @@ -40,6 +40,7 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg public int green = 0; public int blue = 150; public boolean editMode = false; + public boolean lockOutputSlots = false; private String customName; public EnergyStorage energy = new EnergyStorage(1000000, 10000, 0); @@ -55,6 +56,7 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg public final int smeltingCompleateTime = 1600; public int smeltingAutoFeed = 0; public int tick; + private boolean inTick = false; @Override public void updateEntity() { @@ -108,7 +110,7 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg updateEnergy(); } - public void updateEnergy() { + public void updateEnergy() {//todo if no charging item wait a sec before checking again if (energy.getEnergyStored() < energy.getMaxEnergyStored() && getStackInSlot(239) != null && getStackInSlot(239).getItem() instanceof IEnergyContainerItem) { IEnergyContainerItem item = (IEnergyContainerItem) getStackInSlot(239).getItem(); item.extractEnergy(getStackInSlot(239), receiveEnergy(ForgeDirection.DOWN, item.extractEnergy(getStackInSlot(239), energy.getMaxReceive(), true), false), false); @@ -117,6 +119,7 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg public void updateFurnace() { if (worldObj.isRemote) return; + inTick = true; tick++; boolean canSmelt = false; boolean flag = true; @@ -196,7 +199,7 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg } while (itemsToProccess > 0 && proccessAttempts < 5); } - if ((flag && (getFill() || getLock() || getAll())) || (!canSmelt && (getLock() || getAll()) && tick % 60 == 0)) feedNextItem(); + if ((flag && (getFill() || getLock() || getAll())) || (!canSmelt && (getLock() || getAll()) && (tick + xCoord + yCoord + zCoord) % 60 == 0)) feedNextItem(); if (canSmelt) { smeltingBurnSpeed = Math.min(energy.getEnergyStored() / 1000, smeltingMaxBurnSpeed); @@ -206,7 +209,7 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg smeltingProgressTime += smeltingBurnSpeed; energy.modifyEnergyStored(-smeltingBurnSpeed * 5); } else smeltingProgressTime = 0; - + inTick = false; } public void feedNextItem() { @@ -445,6 +448,7 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg compound.setInteger("Green", green); compound.setInteger("Blue", blue); compound.setBoolean("Edit", editMode); + compound.setBoolean("LockOutputSlots", lockOutputSlots); compound.setByte("AutoFeed", (byte) smeltingAutoFeed); if (customName != null && customName.length() > 0)compound.setString("CustomName", customName); energy.writeToNBT(compound); @@ -470,6 +474,7 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg green = compound.getInteger("Green"); blue = compound.getInteger("Blue"); editMode = compound.getBoolean("Edit"); + lockOutputSlots = compound.getBoolean("LockOutputSlots"); smeltingAutoFeed = compound.getByte("AutoFeed"); customName = compound.getString("CustomName"); energy.readFromNBT(compound); @@ -539,61 +544,6 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg energy.readFromNBT(compound); } -// @Override -// public void writeDataToItem(NBTTagCompound compound, ItemStack stack) { -// NBTTagCompound[] tag = new NBTTagCompound[items.length]; -// -// for (int i = 0; i < items.length; i++) { -// tag[i] = new NBTTagCompound(); -// -// if (items[i] != null) { -// tag[i] = items[i].writeToNBT(tag[i]); -// } -// -// compound.setTag("Item" + i, tag[i]); -// } -// -// for (int i = 0; i < itemsCrafting.length; i++) { -// tag[i] = new NBTTagCompound(); -// -// if (itemsCrafting[i] != null) { -// tag[i] = itemsCrafting[i].writeToNBT(tag[i]); -// } -// -// compound.setTag("CraftingItem" + i, tag[i]); -// } -// -// compound.setInteger("Red", red); -// compound.setInteger("Green", green); -// compound.setInteger("Blue", blue); -// compound.setBoolean("Edit", editMode); -// compound.setByte("AutoFeed", (byte) smeltingAutoFeed); -// if (hasCustomInventoryName()) stack.setStackDisplayName(customName); -// energy.writeToNBT(compound); -// } - -// @Override -// public void readDataFromItem(NBTTagCompound compound, ItemStack stack) { -// NBTTagCompound[] tag = new NBTTagCompound[items.length]; -// -// for (int i = 0; i < items.length; i++) { -// tag[i] = compound.getCompoundTag("Item" + i); -// items[i] = ItemStack.loadItemStackFromNBT(tag[i]); -// } -// -// for (int i = 0; i < itemsCrafting.length; i++) { -// tag[i] = compound.getCompoundTag("CraftingItem" + i); -// itemsCrafting[i] = ItemStack.loadItemStackFromNBT(tag[i]); -// } -// -// red = compound.getInteger("Red"); -// green = compound.getInteger("Green"); -// blue = compound.getInteger("Blue"); -// editMode = compound.getBoolean("Edit"); -// smeltingAutoFeed = compound.getByte("AutoFeed"); -// energy.readFromNBT(compound); -// } - @Override public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { return this.energy.receiveEnergy(maxReceive, simulate); @@ -613,4 +563,21 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg public boolean canConnectEnergy(ForgeDirection from) { return true; } + + @Override + public int[] getAccessibleSlotsFromSide(int side) { + int[] i = new int[getSizeInventory()]; + for (int i1 = 0; i1 < i.length; i1++) i[i1] = i1; + return i; + } + + @Override + public boolean canInsertItem(int slot, ItemStack stack, int side) { + return !lockOutputSlots || inTick || slot < getSizeInventory() - 5; + } + + @Override + public boolean canExtractItem(int slot, ItemStack stack, int side) { + return true; + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/LinkedReceiver.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/LinkedReceiver.java new file mode 100644 index 00000000..20556f7a --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/LinkedReceiver.java @@ -0,0 +1,89 @@ +package com.brandon3055.draconicevolution.common.tileentities.energynet; + +import cofh.api.energy.IEnergyReceiver; +import net.minecraft.block.Block; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +/** + * Created by Brandon on 26/03/2015. + */ +public class LinkedReceiver { + + public int xCoord; + public int yCoord; + public int zCoord; + public int connectionSide; + public int particleEnergyCounter = 0; + public Block target = null; + private double tBBXMin = -1; + private double tBBXMax = -1; + private double tBBYMin = -1; + private double tBBYMax = -1; + private double tBBZMin = -1; + private double tBBZMax = -1; + + public LinkedReceiver(){} + + public LinkedReceiver(int xCoord, int yCoord, int zCoord, int connectionSide) + { + this.xCoord = xCoord; + this.yCoord = yCoord; + this.zCoord = zCoord; + this.connectionSide = connectionSide; + } + + public boolean isStillValid(World world) + { + TileEntity tile = world.getTileEntity(xCoord, yCoord, zCoord); + return tile instanceof IEnergyReceiver && ((IEnergyReceiver) tile).canConnectEnergy(ForgeDirection.getOrientation(connectionSide)); + } + + public IEnergyReceiver getReceiver(World world) + { + return isStillValid(world) ? (IEnergyReceiver) world.getTileEntity(xCoord, yCoord, zCoord) : null; + } + + public int receiveEnergy(World world, int maxReceive, boolean simulate) { + if (isStillValid(world)) return getReceiver(world).receiveEnergy(ForgeDirection.getOrientation(connectionSide), maxReceive, simulate); + else return 0; + } + + public int getEnergyStored(World world) { + if (isStillValid(world)) return getReceiver(world).getEnergyStored(ForgeDirection.getOrientation(connectionSide)); + else return 0; + } + + public int getMaxEnergyStored(World world) { + if (isStillValid(world)) return getReceiver(world).getMaxEnergyStored(ForgeDirection.getOrientation(connectionSide)); + else return 0; + } + + public void updateTarget(World world) { + target = world.getBlock(xCoord, yCoord, zCoord); + tBBXMin = target.getBlockBoundsMinX(); + tBBXMax = target.getBlockBoundsMinX(); + tBBYMin = target.getBlockBoundsMinX(); + tBBYMax = target.getBlockBoundsMinX(); + tBBZMin = target.getBlockBoundsMinX(); + tBBZMax = target.getBlockBoundsMinX(); + } + + public void writeToNBT(NBTTagCompound compound, String tag) + { + compound.setInteger(tag + "_XCoord", xCoord); + compound.setInteger(tag + "_YCoord", yCoord); + compound.setInteger(tag + "_ZCoord", zCoord); + compound.setInteger(tag + "_Side", connectionSide); + } + + public void readFromNBT(NBTTagCompound compound, String tag) + { + xCoord = compound.getInteger(tag + "_XCoord"); + yCoord = compound.getInteger(tag + "_YCoord"); + zCoord = compound.getInteger(tag + "_ZCoord"); + connectionSide = compound.getInteger(tag + "_Side"); + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileRemoteEnergyBase.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileRemoteEnergyBase.java index 004aaf25..6028d066 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileRemoteEnergyBase.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileRemoteEnergyBase.java @@ -94,14 +94,14 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe if (worldObj.isRemote) { int rType = 0; - if (this instanceof TileEnergyRelay) + if (this instanceof TileEnergyRelay || this instanceof TileWirelessEnergyTransceiver) { if (remoteTile instanceof TileEnergyTransceiver) rType = 2; else rType = 3; } else if (this instanceof TileEnergyTransceiver) { - if (remoteTile instanceof TileEnergyRelay) rType = 1; + if (remoteTile instanceof TileEnergyRelay || remoteTile instanceof TileWirelessEnergyTransceiver) rType = 1; else rType = 0; } if (inView) LogHelper.info(device.energyFlow); @@ -199,11 +199,13 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe { if (linkDat != null && linkDat.hasKey("Bound") && linkDat.getBoolean("Bound")) { + LogHelper.info("Bind"); handleBinding(player, linkDat.getInteger("XCoord"), linkDat.getInteger("YCoord"), linkDat.getInteger("ZCoord"), true); linkDat.setBoolean("Bound", false); } else { + LogHelper.info("Bind2"); linkDat = new NBTTagCompound(); linkDat.setInteger("XCoord", xCoord); linkDat.setInteger("YCoord", yCoord); @@ -257,6 +259,8 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe } else if (mode.equals(Wrench.CLEAR_BINDINGS)) { + if (this instanceof TileWirelessEnergyTransceiver) ((TileWirelessEnergyTransceiver)this).receiverList.clear(); + for (LinkedEnergyDevice ld : linkedDevices) { if (!(ld.getTile(worldObj) instanceof TileRemoteEnergyBase)) diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileWirelessEnergyTransceiver.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileWirelessEnergyTransceiver.java new file mode 100644 index 00000000..187e15cd --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileWirelessEnergyTransceiver.java @@ -0,0 +1,224 @@ +package com.brandon3055.draconicevolution.common.tileentities.energynet; + +import cofh.api.energy.IEnergyReceiver; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.client.handler.ParticleHandler; +import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyField; +import com.brandon3055.draconicevolution.client.render.particle.Particles; +import com.brandon3055.draconicevolution.common.items.tools.Wrench; +import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.utills.Utills; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraftforge.common.util.ForgeDirection; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by Brandon on 10/02/2015. + */ +public class TileWirelessEnergyTransceiver extends TileRemoteEnergyBase { + private ParticleEnergyField ring; + + public List receiverList = new ArrayList(); + + public TileWirelessEnergyTransceiver(){} + + public TileWirelessEnergyTransceiver(int powerTier){ + this.powerTier = powerTier; + this.updateStorage(); + } + + + @Override + public int getCap() { + return 50000 + (powerTier * 4500000); + } + + @Override + public int getRec() { + return 50000 + (powerTier * 4500000); + } + + @Override + public int getExt() { + return 50000 + (powerTier * 4500000); + } + + @Override + public void updateEntity() { + super.updateEntity(); + + if (worldObj.isRemote) + { + ring = DraconicEvolution.proxy.energyField(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 2, powerTier == 1, ring, inView > 0); + + for (LinkedReceiver receiver : receiverList) + { + int particleValue = 200; + if (receiver.particleEnergyCounter > particleValue) + { + receiver.particleEnergyCounter -= particleValue; + + //todo detect box size + ParticleHandler.spawnCustomParticle(new Particles.TransceiverParticle(worldObj, xCoord + 0.5, yCoord + 0.3 + (worldObj.rand.nextDouble() * 0.4), zCoord + 0.5, receiver.xCoord + worldObj.rand.nextDouble(), receiver.yCoord + worldObj.rand.nextDouble(), receiver.zCoord + worldObj.rand.nextDouble())); + } + } + } + else + { + for (LinkedReceiver receiver : receiverList) + { + if (!receiver.isStillValid(worldObj) && worldObj.getChunkFromBlockCoords(receiver.xCoord, receiver.zCoord).isChunkLoaded) + { + receiverList.remove(receiver); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + break; + } + + int sent = receiver.receiveEnergy(worldObj, storage.extractEnergy(receiver.receiveEnergy(worldObj, powerTier == 0 ? 5000 : 50000, true), false), false); + + sent = (sent / 20); + + if (sent > Short.MAX_VALUE) sent = Short.MAX_VALUE; + + if (sent > 0) sendObject(References.SHORT_ID, 10 + receiverList.indexOf(receiver), (short)sent); + } + } + } + + @SideOnly(Side.CLIENT) + @Override + public void receiveObject(int index, Object object) { + super.receiveObject(index, object); + if (index >= 10) + { + + if (receiverList.size() > index - 10 && receiverList.get(index - 10).particleEnergyCounter < 10000) receiverList.get(index - 10).particleEnergyCounter += (Short)object; + } + } + + public void linkDevice(int x, int y, int z, int side, EntityPlayer player, String mode) + { + TileEntity target = worldObj.getTileEntity(x, y, z); + if (!(target instanceof IEnergyReceiver)) + { + player.addChatComponentMessage(new ChatComponentText("Unknown Error occurred [Invalid Tile]")); + return; + } + + IEnergyReceiver receiver = (IEnergyReceiver) target; + + if (!receiver.canConnectEnergy(ForgeDirection.getOrientation(side))) + { + player.addChatComponentMessage(new ChatComponentTranslation("msg.de.wrongSide.txt")); + return; + } + + if (receiverList.size() >= getmaxWirelessConnections()) + { + player.addChatComponentMessage(new ChatComponentTranslation("msg.de.maxConnections.txt")); + return; + } + + if (Utills.getDistanceAtoB(xCoord, yCoord, zCoord, x, y, z) > (powerTier == 0 ? 15 : 30)) + { + player.addChatComponentMessage(new ChatComponentTranslation("msg.de.outOfRange.txt")); + return; + } + + + if (mode.equals(Wrench.BIND_MODE)) + { + LinkedReceiver r = new LinkedReceiver(x, y, z, side); + + for (LinkedReceiver r2 : receiverList) + { + if (r.xCoord == r2.xCoord && r.yCoord == r2.yCoord && r.zCoord == r2.zCoord && r.connectionSide == r2.connectionSide) + { + player.addChatComponentMessage(new ChatComponentTranslation("msg.de.linked.txt")); + return; + } + } + receiverList.add(r); + player.addChatComponentMessage(new ChatComponentTranslation("msg.de.linked.txt")); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + else if (mode.equals(Wrench.UNBIND_MODE)) + { + for (LinkedReceiver r2 : receiverList) + { + if (x == r2.xCoord && y == r2.yCoord && z == r2.zCoord && side == r2.connectionSide) + { + player.addChatComponentMessage(new ChatComponentTranslation("msg.de.unLinked.txt")); + receiverList.remove(r2); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + return; + } + } + } + } + + @Override + public void writeToNBT(NBTTagCompound compound) { + super.writeToNBT(compound); + compound.setInteger("Receiver_Count", receiverList.size()); + for (int i = 0; i < receiverList.size(); i++) receiverList.get(i).writeToNBT(compound, String.valueOf(i)); + } + + @Override + public void readFromNBT(NBTTagCompound compound) { + super.readFromNBT(compound); + int count = compound.getInteger("Receiver_Count"); + receiverList.clear(); + for (int i = 0; i < count; i++) + { + LinkedReceiver r = new LinkedReceiver(); + r.readFromNBT(compound, String.valueOf(i)); + receiverList.add(r); + } + } + +// @Override +// public double getCapacity() { +// return ((double) getEnergyStored(ForgeDirection.UNKNOWN) / (double) getMaxEnergyStored(ForgeDirection.UNKNOWN)) * 100D; +// } + + /**Calculates the energy flow based on the local buffer + * and the remote buffer + *return double between 0 to 100*/ + public double getFlow(double localCap, double remoteCap) + { + return Math.max(0, Math.min(100, (localCap - remoteCap) * 100D/*Flow Multiplier*/)); + } + + @Override + public double getBeamX() { + return xCoord + 0.5D; + } + + @Override + public double getBeamY() { + return yCoord + 0.5D; + } + + @Override + public double getBeamZ() { + return zCoord + 0.5D; + } + + @Override + public int getMaxConnections() { + return powerTier == 0 ? 3 : 6; + } + + public int getmaxWirelessConnections() { + return powerTier == 0 ? 8 : 16; + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyPylon.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyPylon.java index 17f818c3..eb36f11d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyPylon.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyPylon.java @@ -275,7 +275,7 @@ public class TileEnergyPylon extends TileObjectSync implements IEnergyHandler, I @Override public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { - if (getMaster() == null) return 0; + if (getMaster() == null || !getMaster().isOnline()) return 0; int extracted = reciveEnergy ? 0 : getMaster().extractEnergy(maxExtract, simulate); if (!simulate && extracted > 0) particleRate = (byte)Math.min(20, extracted < 500 && extracted > 0 ? 1 : extracted/500); return extracted; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/utills/InfoHelper.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/InfoHelper.java index acd62f8c..c1bf6f65 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/utills/InfoHelper.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/InfoHelper.java @@ -98,6 +98,10 @@ public class InfoHelper { return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT); } + public static boolean isCtrlKeyDown() { + return Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL); + } + @SuppressWarnings("unchecked") public static boolean holdShiftForDetails(List list, boolean inverted){ if (isShiftKeyDown() == inverted) list.add(StatCollector.translateToLocal("info.de.hold.txt")+" "+EnumChatFormatting.AQUA + "" + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("info.de.shift.txt") + EnumChatFormatting.RESET + " " + EnumChatFormatting.GRAY + StatCollector.translateToLocal("info.de.forDetails.txt")); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/utills/Teleporter.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/Teleporter.java index 134f8464..4d9e46b5 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/utills/Teleporter.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/Teleporter.java @@ -11,7 +11,6 @@ import net.minecraft.network.play.server.S07PacketRespawn; import net.minecraft.network.play.server.S1DPacketEntityEffect; import net.minecraft.network.play.server.S1FPacketSetExperience; import net.minecraft.potion.PotionEffect; -import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -26,6 +25,7 @@ public class Teleporter protected float pitch; protected float yaw; protected String name; + protected String dimentionName = ""; protected boolean writeProtected = false; public TeleportLocation(){ @@ -75,8 +75,7 @@ public class Teleporter public int getDimension() {return dimension;} public String getDimensionName() { - if (DraconicEvolution.proxy.getMCServer() == null) return String.valueOf(dimension); - return MinecraftServer.getServer().worldServerForDimension(dimension).provider.getDimensionName(); + return dimentionName; } public float getPitch() {return pitch;} @@ -117,6 +116,7 @@ public class Teleporter compound.setFloat("Pitch", pitch); compound.setFloat("Yaw", yaw); compound.setString("Name", name); + compound.setString("DimentionName", dimentionName); compound.setBoolean("WP", writeProtected); } @@ -128,6 +128,7 @@ public class Teleporter pitch = compound.getFloat("Pitch"); yaw = compound.getFloat("Yaw"); name = compound.getString("Name"); + dimentionName = compound.getString("DimentionName"); writeProtected = compound.getBoolean("WP"); } @@ -165,6 +166,10 @@ public class Teleporter // entity.fallDistance = 0; entity.worldObj.playSoundEffect(entity.posX, entity.posY, entity.posZ, "portal.travel", 0.1F, entity.worldObj.rand.nextFloat() * 0.1F + 0.9F); } + + public void setDimentionName(String dimentionName) { + this.dimentionName = dimentionName; + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/world/DraconicWorldGenerator.java b/src/main/java/com/brandon3055/draconicevolution/common/world/DraconicWorldGenerator.java index cc9f4890..68ed135b 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/world/DraconicWorldGenerator.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/world/DraconicWorldGenerator.java @@ -25,6 +25,11 @@ public class DraconicWorldGenerator implements IWorldGenerator { generateNether(random, chunkX * 16, chunkZ * 16, world); break; default: + for (Integer i : ConfigHandler.oreGenDimentionBlacklist) + { + if (i == world.provider.dimensionId) return; + } + addOreSpawn(ModBlocks.draconiumOre, world, random, chunkX * 16, chunkZ * 16, 3, 4, 2, 2, 8); break; } diff --git a/src/main/resources/assets/draconicevolution/lang/en_US.lang b/src/main/resources/assets/draconicevolution/lang/en_US.lang index 601fad72..3b683feb 100644 --- a/src/main/resources/assets/draconicevolution/lang/en_US.lang +++ b/src/main/resources/assets/draconicevolution/lang/en_US.lang @@ -1,40 +1,40 @@ //Description format \n=Force new line \% at start of line=add half line space above line //Tile Information ---------------------------------------------------------------------------------------------------------------------------------------- tile.draconicevolution:xRayBlock.name=Distortion Flame -tile.draconicevolution:xRayBlock.description=Many of you have probably seen a graphical glitch that sometimes occurs when chunks load that allows you to see through the world and see all of the cave caves and tunnels bellow. This block replicates that effect. When you place it next to another block the face of the block it is touching becomes transparent allowing you to see through the world. This can be very useful for finding cave systems and dungeons maby even things other players don’t want you to find. Such a block dose not come cheap. It will cost you several Nether Stars and it is so fragile that once placed it can not be collected without destroying it. (not even with silk touch) +-----tile.draconicevolution:xRayBlock.description=Many of you have probably seen a graphical glitch that sometimes occurs when chunks load that allows you to see through the world and see all of the cave caves and tunnels bellow. This block replicates that effect. When you place it next to another block the face of the block it is touching becomes transparent allowing you to see through the world. This can be very useful for finding cave systems and dungeons maby even things other players don’t want you to find. Such a block dose not come cheap. It will cost you several Nether Stars and it is so fragile that once placed it can not be collected without destroying it. (not even with silk touch) tile.draconicevolution:sunDial.name=Sun Dial -tile.draconicevolution:sunDial.description=This is an extremely powerful block that allows you to change the time. Simply place it in the world and and apply a constant redstone signal. Once the device charges it will fire a particle beam at the sun accelerating it to 30X its normal speed. Simply shut off the redstone signal when you have the sun where you want it. +-----tile.draconicevolution:sunDial.description=This is an extremely powerful block that allows you to change the time. Simply place it in the world and and apply a constant redstone signal. Once the device charges it will fire a particle beam at the sun accelerating it to 30X its normal speed. Simply shut off the redstone signal when you have the sun where you want it. tile.draconicevolution:weatherController.name=Weather Controller -tile.draconicevolution:weatherController.description=This is a block that allows you to control the weather. To use it place some emeralds in its inventory and select a mode. There are 3 available modes Rain off, Rain on and Thunder storm. To activate apply a redstone signal. +-----tile.draconicevolution:weatherController.description=This is a block that allows you to control the weather. To use it place some emeralds in its inventory and select a mode. There are 3 available modes Rain off, Rain on and Thunder storm. To activate apply a redstone signal. tile.draconicevolution:draconiumOre.name=Draconium Ore -tile.draconicevolution:draconiumOre.description=The very basis of Draconic Research +-----tile.draconicevolution:draconiumOre.description=The very basis of Draconic Research tile.draconicevolution:grinder.name=Mob Grinder -tile.draconicevolution:grinder.description=Everyone needs effective mob farms. For the cost of a bit of solid fuel (coal, charcoal, etc.) or RF power, you can kill to your hearts content knowing the forces of the Draconic have your back! The grinder will kill all mobs in a 7x7 area in front of it. It is much more efficient and can kill mobs faster if powered by RF. +-----tile.draconicevolution:grinder.description=Everyone needs effective mob farms. For the cost of a bit of solid fuel (coal, charcoal, etc.) or RF power, you can kill to your hearts content knowing the forces of the Draconic have your back! The grinder will kill all mobs in a 7x7 area in front of it. It is much more efficient and can kill mobs faster if powered by RF. tile.draconicevolution:potentiometer.name=Potentiometer -tile.draconicevolution:potentiometer.description=A simple redstone emitter that is capable of emitting a variable strength redstone signal between 0 and 15. +-----tile.draconicevolution:potentiometer.description=A simple redstone emitter that is capable of emitting a variable strength redstone signal between 0 and 15. tile.draconicevolution:rainSensor.name=Rain Sensor -tile.draconicevolution:rainSensor.description=A device that emits a redstine signal when it rains. This is perfect for controlling the weather controller. +-----tile.draconicevolution:rainSensor.description=A device that emits a redstine signal when it rains. This is perfect for controlling the weather controller. tile.draconicevolution:particleGenerator.name=Particle Generator -tile.draconicevolution:particleGenerator.description=Purely decorative, this blocks allows for fully customizable particle effects to be created. For more information check out the instruction manual built into its GUI. +-----tile.draconicevolution:particleGenerator.description=Purely decorative, this blocks allows for fully customizable particle effects to be created. For more information check out the instruction manual built into its GUI. tile.draconicevolution:playerDetector.name=Player Detector -tile.draconicevolution:playerDetector.description=Simple player detection, can be adjusted up to 10 blocks range to detect any players nearby. +-----tile.draconicevolution:playerDetector.description=Simple player detection, can be adjusted up to 10 blocks range to detect any players nearby. tile.draconicevolution:playerDetectorAdvanced.name=Advanced Player Detector -tile.draconicevolution:playerDetectorAdvanced.description=This is an advanced version of the player detector it has the following features. Max range of 20 blocks. Whitelist/Blacklist for fine tuning who you do or don’t want. Camouflage – Hide your detector so no one sees it. Inverted out put (less redstone needed!). +-----tile.draconicevolution:playerDetectorAdvanced.description=This is an advanced version of the player detector it has the following features. Max range of 20 blocks. Whitelist/Blacklist for fine tuning who you do or don’t want. Camouflage – Hide your detector so no one sees it. Inverted out put (less redstone needed!). tile.draconicevolution:energyInfuser.name=Energy Infuser -tile.draconicevolution:energyInfuser.description=Seeing the need for faster energy transfer you have found a way to bring the infuser to being. Has a faster transfer rate than most other mod’s RF recharge stations (and cool particle effects to boot!) +-----tile.draconicevolution:energyInfuser.description=Seeing the need for faster energy transfer you have found a way to bring the infuser to being. Has a faster transfer rate than most other mod’s RF recharge stations (and cool particle effects to boot!) tile.draconicevolution:customSpawner.name=Stabilized Mob Spawner -tile.draconicevolution:customSpawner.description=To get started, right click any vanilla spawner with a draconic core to stabilize it. You now have a empty transportable spawner (pick up with draconic tools) Use any mob soul on the spawner to change it to that type. There are several items you can use to upgrade the spawner:\n\%-Wyvern Core: Upgrades to tier 2 (increases spawn count and speed)\n\%-Awakened Core: Upgrades to tier 3 (further increases spawn count and speed)\n\%-Nether Star: Removes the requirement for a player to be within 16 blocks for the spawner to function.\n\%-Notch Apple: Makes the spawner ignore spawn requirements for the mob it is spawning e.g. Will make monsters spawn even if the light level is to high.\n\%When broken you get back everything except the mob soul (it is to fragile and is destroyed when the spawner is broken) +-----tile.draconicevolution:customSpawner.description=To get started, right click any vanilla spawner with a draconic core to stabilize it. You now have a empty transportable spawner (pick up with draconic tools) Use any mob soul on the spawner to change it to that type. There are several items you can use to upgrade the spawner:\n\%-Wyvern Core: Upgrades to tier 2 (increases spawn count and speed)\n\%-Awakened Core: Upgrades to tier 3 (further increases spawn count and speed)\n\%-Nether Star: Removes the requirement for a player to be within 16 blocks for the spawner to function.\n\%-Notch Apple: Makes the spawner ignore spawn requirements for the mob it is spawning e.g. Will make monsters spawn even if the light level is to high.\n\%When broken you get back everything except the mob soul (it is to fragile and is destroyed when the spawner is broken) tile.draconicevolution:longRangeDislocator1.name=Admin Dislocator tile.draconicevolution:longRangeDislocator1.description=If you are a server admin or map creator this block is for you! (creative or op only as there is no recipe on purpose) Created at the behest of GreatOrator, it allows for a configurable range for teleporting. What makes this different is it is purely random. Nearest player to the block when activated with redstone will be teleported to a random location (default is 1000 minimum and 10,000 maximum) from the block. If that spot would place the player in water or in the air, a block is generated below them. @@ -43,16 +43,16 @@ tile.draconicevolution:longRangeDislocator0.name=Long Range Dislocator tile.draconicevolution:longRangeDislocator0.description=Description tile.draconicevolution:generator.name=Generator -tile.draconicevolution:generator.description=This is a basic low power (around 80RF/t) generator that may come in handy if you have no other mods capable of generating RF power. +-----tile.draconicevolution:generator.description=This is a basic low power (around 80RF/t) generator that may come in handy if you have no other mods capable of generating RF power. tile.draconicevolution:energyStorageCore.name=Energy Core -tile.draconicevolution:energyStorageCore.description=Using Draconic knowledge you have discovered how to build a multi-block structure capable of storing more power then any other device ever invented with the highest tier able to store up to 2.14 trillion RF (you can find more info in the Energy core multiblock tutorial) +-----tile.draconicevolution:energyStorageCore.description=Using Draconic knowledge you have discovered how to build a multi-block structure capable of storing more power then any other device ever invented with the highest tier able to store up to 2.14 trillion RF (you can find more info in the Energy core multiblock tutorial) tile.draconicevolution:energyPylon.name=Energy Pylon -tile.draconicevolution:energyPylon.description=This device is used to extract or insert energy into the energy storage multiblock. Its maximum transfer rate is 2,147,483,647 RF/t +-----tile.draconicevolution:energyPylon.description=This device is used to extract or insert energy into the energy storage multiblock. Its maximum transfer rate is 2,147,483,647 RF/t tile.draconicevolution:draconium0.name=Draconium Block -tile.draconicevolution:draconium0.description=A storage block for draconium. +-----tile.draconicevolution:draconium0.description=A storage block for draconium. tile.draconicevolution:draconium1.name=Resurrection Stone tile.draconicevolution:draconium1.description=The key component in the Ritual of Draconic Resurrection. @@ -64,45 +64,40 @@ tile.draconicevolution:cKeyStone.name=Creative Key Stone tile.draconicevolution:cKeyStone.description=Description tile.draconicevolution:dissEnchanter.name=Disenchanter -tile.draconicevolution:dissEnchanter.description=With this device you are now able to transfer enchantments from your items to books at the cost of experience. The cost is determined by the repair cost of the item and the repair cost of the item is decreased slightly each time. To use it simply place the enchanted item in the first slot a regular book in the center slot and press the transfer button. One enchantment (the first one) will be stripped from the item and applied to the book. When you strip an enchant the item will loos a percentage of its total durability this percentage is shown in the gui. You can decrease the damage bu placing book shelves around it or other enchanting boosters (It takes a total of 20 book shelves to prevent all damage). WARNING Items that use energy instead of durability will also be damaged and destroyed but will not show their damage value. +-----tile.draconicevolution:dissEnchanter.description=With this device you are now able to transfer enchantments from your items to books at the cost of experience. The cost is determined by the repair cost of the item and the repair cost of the item is decreased slightly each time. To use it simply place the enchanted item in the first slot a regular book in the center slot and press the transfer button. One enchantment (the first one) will be stripped from the item and applied to the book. When you strip an enchant the item will loos a percentage of its total durability this percentage is shown in the gui. You can decrease the damage bu placing book shelves around it or other enchanting boosters (It takes a total of 20 book shelves to prevent all damage). WARNING Items that use energy instead of durability will also be damaged and destroyed but will not show their damage value. tile.draconicevolution:teleporterStand.name=Dislocator Pedestal -tile.draconicevolution:teleporterStand.description=You have figured out how to create a simple pedestal on which you can place you basic or advanced charms of dislocation. Simply right click with a charm in your hand to place it on the pedestal then right click the pedestal to teleport. The advantage of this is the charms wont take damage or use fuel. The disadvantage is you can bring them with you to your destination. To remove the charm from the pedestal simply shift right click with an empty hand\n\nWhen holding basic dislocator that has been renamed in an anvil or an enhanced dislocator with a destination set the name or destination will be displayed above the pedestal. If you hold shift all names will be hidden except the one you are looking at. (Shift behavior can be reversed in the config) +-----tile.draconicevolution:teleporterStand.description=You have figured out how to create a simple pedestal on which you can place you basic or advanced charms of dislocation. Simply right click with a charm in your hand to place it on the pedestal then right click the pedestal to teleport. The advantage of this is the charms wont take damage or use fuel. The disadvantage is you can bring them with you to your destination. To remove the charm from the pedestal simply shift right click with an empty hand\n\nWhen holding basic dislocator that has been renamed in an anvil or an enhanced dislocator with a destination set the name or destination will be displayed above the pedestal. If you hold shift all names will be hidden except the one you are looking at. (Shift behavior can be reversed in the config) tile.draconicevolution:draconiumChest.name=Draconic Chest -tile.draconicevolution:draconiumChest.description=Using your draconic knowledge you have learned how to create the ultimate chest. With a massive 234 slot storage capacity a built in crafting table and 5 slot RF furnace capable of doubling ore as well as the ability to keep its contents when harvested this chest is the most powerful most versatile storage device in existence! It also comes in a variety of every colour you can imagine gust shift right click it with empty hand for details. +-----tile.draconicevolution:draconiumChest.description=Using your draconic knowledge you have learned how to create the ultimate chest. With a massive 234 slot storage capacity a built in crafting table and 5 slot RF furnace capable of doubling ore as well as the ability to keep its contents when harvested this chest is the most powerful most versatile storage device in existence! It also comes in a variety of every colour you can imagine gust shift right click it with empty hand for details. tile.draconicevolution:draconicBlock.name=Awakened Draconium Block -tile.draconicevolution:draconicBlock.description=You have been studying the interactions of Draconium with various materials and have come to realize that this is only an inert state. You have discovered a method to bring out the true power of Draconium using a complex ritual involving a dragon heart. (See the dragon heart page for details) +-----tile.draconicevolution:draconicBlock.description=You have been studying the interactions of Draconium with various materials and have come to realize that this is only an inert state. You have discovered a method to bring out the true power of Draconium using a complex ritual involving a dragon heart. (See the dragon heart page for details) -tile.draconicevolution:energyCrystal0.name=Energy Relay [WIP] -tile.draconicevolution:energyCrystal0.description= - -tile.draconicevolution:energyCrystal1.name=Advanced Energy Relay [WIP] -tile.draconicevolution:energyCrystal1.description= - -tile.draconicevolution:energyCrystal2.name=Energy Transceiver [WIP] -tile.draconicevolution:energyCrystal2.description= - -tile.draconicevolution:energyCrystal3.name=Advanced Energy Transceiver [WIP] -tile.draconicevolution:energyCrystal3.description= +tile.draconicevolution:energyCrystal0.name=Energy Relay +tile.draconicevolution:energyCrystal1.name=Advanced Energy Relay +tile.draconicevolution:energyCrystal2.name=Energy Transceiver +tile.draconicevolution:energyCrystal3.name=Advanced Energy Transceiver +tile.draconicevolution:energyCrystal4.name=Wireless Energy Transceiver +tile.draconicevolution:energyCrystal5.name=Advanced Wireless Transceiver //Item Information ---------------------------------------------------------------------------------------------------------------------------------------- item.draconicevolution:awakenedCore.name=Awakened Core -item.draconicevolution:awakenedCore.description=This component is used to craft the most advanced draconic items +-----item.draconicevolution:awakenedCore.description=This component is used to craft the most advanced draconic items item.draconicevolution:draconiumIngot.name=Draconium Ingot -item.draconicevolution:draconiumIngot.description=The results of smelting draconium blend in a furnace. Used in most recipes. +-----item.draconicevolution:draconiumIngot.description=The results of smelting draconium blend in a furnace. Used in most recipes. item.draconicevolution:draconiumDust.name=Draconium Dust -item.draconicevolution:draconiumDust.description=This is the material from mining Draconium Ore +-----item.draconicevolution:draconiumDust.description=This is the material from mining Draconium Ore item.draconicevolution:draconiumBlend.name=Draconium Blend -item.draconicevolution:draconiumBlend.description=Mixture of Draconic dust and iron. Necessary to make Draconium +-----item.draconicevolution:draconiumBlend.description=Mixture of Draconic dust and iron. Necessary to make Draconium item.draconicevolution:dragonHeart.name=Dragon Heart -item.draconicevolution:dragonHeart.description=Dropped by the Ender Dragon and Draconic Dragon. It is your belief that this immensely powerful item may hold the key to unlocking the true power of draconium using an ancient ritual known as the ritual of awakening. \n\nThe Ritual:\n1.Drop a dragon heart on the ground and activate it with an explosion.\n\n2.Drop 4 to 16 draconic cores on the ground near the activated heart (4 per block of draconium). A few seconds after its initial activation it will draw all nearby items towards it anything that is not a core will be destroyed.\n\n3.Now quickly place 1 to 4 (depending on how many cores you dropped) Charged draconium blocks near the heart.\n\n4.You will know its working when you see the hearts energy targeting the charged draconium blocks. Now stand back and watch the magic happen.\n\nYou can only do this ritual once per heart so you best make the most of it. +-----item.draconicevolution:dragonHeart.description=Dropped by the Ender Dragon and Draconic Dragon. It is your belief that this immensely powerful item may hold the key to unlocking the true power of draconium using an ancient ritual known as the ritual of awakening. \n\nThe Ritual:\n1.Drop a dragon heart on the ground and activate it with an explosion.\n\n2.Drop 4 to 16 draconic cores on the ground near the activated heart (4 per block of draconium). A few seconds after its initial activation it will draw all nearby items towards it anything that is not a core will be destroyed.\n\n3.Now quickly place 1 to 4 (depending on how many cores you dropped) Charged draconium blocks near the heart.\n\n4.You will know its working when you see the hearts energy targeting the charged draconium blocks. Now stand back and watch the magic happen.\n\nYou can only do this ritual once per heart so you best make the most of it. item.draconicevolution:wyvernCore.name=Wyvern Core item.draconicevolution:wyvernCore.description=This component is used to craft all Wyvern tools @@ -116,100 +111,100 @@ item.draconicevolution:draconicCore.name=Draconic Core item.draconicevolution:draconicCore.description=Used to create all machines and advanced tools item.draconicevolution:teleporterMKI.name=Charm of Dislocation -item.draconicevolution:teleporterMKI.description=You have managed to infuse the powers of The End with your knowledge of the Draconic to create a basic teleporter, but at a cost. The energies binding them are unstable and only last for 10 uses and will take some of your life energy with each use and can only be linked to a single location but works across dimensions. Once used up, you must create a new one. +-----item.draconicevolution:teleporterMKI.description=You have managed to infuse the powers of The End with your knowledge of the Draconic to create a basic teleporter, but at a cost. The energies binding them are unstable and only last for 10 uses and will take some of your life energy with each use and can only be linked to a single location but works across dimensions. Once used up, you must create a new one. item.draconicevolution:teleporterMKII.name=Enhanced Charm of Dislocation -item.draconicevolution:teleporterMKII.description=Learning how draconic powers interact with the powers of the endermen, you have created the ultimate teleporter. You can now store up to 100 locations and using the endermen’s own pearls as fuel, created something that can teleport you extreme distances even across dimensions at will. Shift right click to open the GUI. Most functionality should be self explanatory. On the left is the destination list. Each destination has a lock button that prevents you from accidentally overwriting or deleting it. On the right starting from the top you have information about the selected destination, An option to rename the selected destination, An option to change the selected destination to your current coordinates and an option to delete the selected destination. Under that is the fuel, An option to teleport to the selected destination, an option to add a new destination (your current location), And an option to add fuel (Ender pearls from your inventory) Shift click to add a stack. You can also shift+Scroll with the item in your hand to cycle through the destinations without opening the gui and right click to teleport. You can also teleport players and mobs by left clicking them however players must be holding shift and mobs can not be teleported across dimensions. +-----item.draconicevolution:teleporterMKII.description=Learning how draconic powers interact with the powers of the endermen, you have created the ultimate teleporter. You can now store up to 100 locations and using the endermen’s own pearls as fuel, created something that can teleport you extreme distances even across dimensions at will. Shift right click to open the GUI. Most functionality should be self explanatory. On the left is the destination list. Each destination has a lock button that prevents you from accidentally overwriting or deleting it. On the right starting from the top you have information about the selected destination, An option to rename the selected destination, An option to change the selected destination to your current coordinates and an option to delete the selected destination. Under that is the fuel, An option to teleport to the selected destination, an option to add a new destination (your current location), And an option to add fuel (Ender pearls from your inventory) Shift click to add a stack. You can also shift+Scroll with the item in your hand to cycle through the destinations without opening the gui and right click to teleport. You can also teleport players and mobs by left clicking them however players must be holding shift and mobs can not be teleported across dimensions. info.teleporterInfGUI.txt=Shift + Right click to open gui info.teleporterInfScroll.txt=Shift + scroll to cycle destinations item.draconicevolution:wyvernPickaxe.name=Pickaxe of the Wyvern -item.draconicevolution:wyvernPickaxe.description=Weary of ordinary tools you begin to understand ways to use Draconic energy to upgrade. Modes: Shift-Right Click to switch modes: 1×1 or 3×3 +-----item.draconicevolution:wyvernPickaxe.description=Weary of ordinary tools you begin to understand ways to use Draconic energy to upgrade. Modes: Shift-Right Click to switch modes: 1×1 or 3×3 item.draconicevolution:wyvernShovel.name=Shovel of the Wyvern -item.draconicevolution:wyvernShovel.description=Weary of ordinary tools you begin to understand ways to use Draconic energy to upgrade. Modes: Shift-Right Click to switch modes: 1×1 or 3×3 +-----item.draconicevolution:wyvernShovel.description=Weary of ordinary tools you begin to understand ways to use Draconic energy to upgrade. Modes: Shift-Right Click to switch modes: 1×1 or 3×3 item.draconicevolution:wyvernSword.name=Sword of the Wyvern -item.draconicevolution:wyvernSword.description=Weary of ordinary tools you begin to understand ways to use Draconic energy to upgrade. +15 Attack – Bonus damage on mobs with health above 10 hearts (+20% of the mobs extra health) AOE – Hits all mobs in a 3×3 area (bonus damage does not apply to mobs other than the one you hit directly) +-----item.draconicevolution:wyvernSword.description=Weary of ordinary tools you begin to understand ways to use Draconic energy to upgrade. +15 Attack – Bonus damage on mobs with health above 10 hearts (+20% of the mobs extra health) AOE – Hits all mobs in a 3×3 area (bonus damage does not apply to mobs other than the one you hit directly) item.draconicevolution:wyvernBow.name=Bow of the Wyvern -item.draconicevolution:wyvernBow.description=Weary of ordinary tools you begin to understand ways to use Draconic energy to upgrade. Sharpshooter – Zoom in on your target and deal extreme damage with pin point accuracy. Rapid Fire – Barrage your enemies in a rain of arrows. +-----item.draconicevolution:wyvernBow.description=Weary of ordinary tools you begin to understand ways to use Draconic energy to upgrade. Sharpshooter – Zoom in on your target and deal extreme damage with pin point accuracy. Rapid Fire – Barrage your enemies in a rain of arrows. item.draconicevolution:wyvernHelm.name=Wyvern Helm -item.draconicevolution:wyvernHelm.description=Stronger than diamond you can now withstand even greater blows.\n\n\nFull set gives total fire immunity +-----item.draconicevolution:wyvernHelm.description=Stronger than diamond you can now withstand even greater blows.\n\n\nFull set gives total fire immunity item.draconicevolution:wyvernChest.name=Wyvern Chestplate -item.draconicevolution:wyvernChest.description=Infusing the armor with Dracomiun you vastly improve its resistance.\n\n\nFull set gives total fire immunity +-----item.draconicevolution:wyvernChest.description=Infusing the armor with Dracomiun you vastly improve its resistance.\n\n\nFull set gives total fire immunity item.draconicevolution:wyvernLeggs.name=Wyvern Leggings -item.draconicevolution:wyvernLeggs.description=You feel even stronger and faster now\nthat you have infused diamond legs with Draconium.\n\%Armor Effects:\n\%-Speed boost\n\n\nFull set gives total fire immunity +-----item.draconicevolution:wyvernLeggs.description=You feel even stronger and faster now\nthat you have infused diamond legs with Draconium.\n\%Armor Effects:\n\%-Speed boost\n\n\nFull set gives total fire immunity item.draconicevolution:wyvernBoots.name=Wyvern Boots -item.draconicevolution:wyvernBoots.description=You learn to improve the boots Draconium seems to have given you greater agility.\n\%Armor Effects:\n\%-Reduced fall damage\n\%-Jump boost\n\n\nFull set gives total fire immunity +-----item.draconicevolution:wyvernBoots.description=You learn to improve the boots Draconium seems to have given you greater agility.\n\%Armor Effects:\n\%-Reduced fall damage\n\%-Jump boost\n\n\nFull set gives total fire immunity item.draconicevolution:draconicPickaxe.name=Draconic Pickaxe -item.draconicevolution:draconicPickaxe.description=Further Draconic research has shown you ways to even greater power.. Modes: Shift-Right Click to switch modes: 1×1, 3×3, 5×5 and 7×7 Right Click to activate: Obliteration Mode – Destroys stone, cobblestone and netherrack. +-----item.draconicevolution:draconicPickaxe.description=Further Draconic research has shown you ways to even greater power.. Modes: Shift-Right Click to switch modes: 1×1, 3×3, 5×5 and 7×7 Right Click to activate: Obliteration Mode – Destroys stone, cobblestone and netherrack. item.draconicevolution:draconicAxe.name=Draconic Axe -item.draconicevolution:draconicAxe.description=Further Draconic research has shown you ways to even greater power.. Will harvest the entire tree and leaves above. +-----item.draconicevolution:draconicAxe.description=Further Draconic research has shown you ways to even greater power.. Will harvest the entire tree and leaves above. item.draconicevolution:draconicShovel.name=Draconic Shovel -item.draconicevolution:draconicShovel.description=Further Draconic research has shown you ways to even greater power.. Modes: Shift-Right Click to switch modes: 1×1, 3×3, 5×5 and 7×7 Right Click to activate: Obliteration Mode – Destroys dirt, sand and gravel. +-----item.draconicevolution:draconicShovel.description=Further Draconic research has shown you ways to even greater power.. Modes: Shift-Right Click to switch modes: 1×1, 3×3, 5×5 and 7×7 Right Click to activate: Obliteration Mode – Destroys dirt, sand and gravel. item.draconicevolution:draconicHoe.name=Draconic Hoe -item.draconicevolution:draconicHoe.description=Further Draconic research has shown you ways to even greater power.. Will till an entire 9×9 area, just perfect for a full-size farm with water source. Also will dig or replace dirt (if dirt in inventory) to make the full 9×9. +-----item.draconicevolution:draconicHoe.description=Further Draconic research has shown you ways to even greater power.. Will till an entire 9×9 area, just perfect for a full-size farm with water source. Also will dig or replace dirt (if dirt in inventory) to make the full 9×9. item.draconicevolution:draconicSword.name=Draconic Sword -item.draconicevolution:draconicSword.description=Further Draconic research has shown you ways to even greater power.. +19 Attack – Bonus damage on mobs with health above 10 hearts (+30% of the mobs extra health) AOE – Hits all mobs in a 7×7 area (bonus damage does not apply to mobs other than the one you hit directly) +-----item.draconicevolution:draconicSword.description=Further Draconic research has shown you ways to even greater power.. +19 Attack – Bonus damage on mobs with health above 10 hearts (+30% of the mobs extra health) AOE – Hits all mobs in a 7×7 area (bonus damage does not apply to mobs other than the one you hit directly) item.draconicevolution:draconicBow.name=Draconic Bow -item.draconicevolution:draconicBow.description=Further Draconic research has shown you ways to even greater power.. Sharpshooter – Zoom in on your target and deal extreme damage with pin point accuracy. Rapid Fire – Barrage your enemies in a rain of arrows. Explosive – With gunpowder in your inventory destroy an area slightly larger than TNT with your arrows. Devastation (Creative Mode only) – Explodes an extreme area in rapid fire mode. +-----item.draconicevolution:draconicBow.description=Further Draconic research has shown you ways to even greater power.. Sharpshooter – Zoom in on your target and deal extreme damage with pin point accuracy. Rapid Fire – Barrage your enemies in a rain of arrows. Explosive – With gunpowder in your inventory destroy an area slightly larger than TNT with your arrows. Devastation (Creative Mode only) – Explodes an extreme area in rapid fire mode. item.draconicevolution:draconicHelm.name=Draconic Helm -item.draconicevolution:draconicHelm.description=No longer do you fear the night you now can see all the time regardless of what is out there.\n\%Armor Effects:\n\%-Night Vision (Activates when in darkness)\n\%-Cures negative potion effects\n\%-Bypass suffocation and drowning damage\n\%-Removes mining slowdown under water +-----item.draconicevolution:draconicHelm.description=No longer do you fear the night you now can see all the time regardless of what is out there.\n\%Armor Effects:\n\%-Night Vision (Activates when in darkness)\n\%-Cures negative potion effects\n\%-Bypass suffocation and drowning damage\n\%-Removes mining slowdown under water item.draconicevolution:draconicChest.name=Draconic Chestplate -item.draconicevolution:draconicChest.description=Using the heart of a dragon you are stronger and have the gift of flight.\n\%Armor Effects:\n\%-Flight\n\%-Removes mining slowdown when in the air \n\%-Fire immunity +-----item.draconicevolution:draconicChest.description=Using the heart of a dragon you are stronger and have the gift of flight.\n\%Armor Effects:\n\%-Flight\n\%-Removes mining slowdown when in the air \n\%-Fire immunity item.draconicevolution:draconicLeggs.name=Draconic Leggings -item.draconicevolution:draconicLeggs.description=Even stronger armor the soul of a dragon protects you and moves you even faster Improved speed boost.\n\%Armor Effects:\n\%-Speed boost +-----item.draconicevolution:draconicLeggs.description=Even stronger armor the soul of a dragon protects you and moves you even faster Improved speed boost.\n\%Armor Effects:\n\%-Speed boost item.draconicevolution:draconicBoots.name=Draconic Boots -item.draconicevolution:draconicBoots.description=Stronger, faster, better than before the heart of a dragon grants you higher jumping. \n\%Armor Effects:\n\%-Fall protection\n\%-Jump boost\n\%-Up Hill Step +-----item.draconicevolution:draconicBoots.description=Stronger, faster, better than before the heart of a dragon grants you higher jumping. \n\%Armor Effects:\n\%-Fall protection\n\%-Jump boost\n\%-Up Hill Step item.draconicevolution:draconicDistructionStaff.name=Draconic Staff of Power item.draconicevolution:draconicDistructionStaff.description=After great pains you have mastered the powers of the Draconic! Mining – Shift-Right Click to switch modes: 1×1, 3×3, 5×5, 7×7 and 9×9 Mining – Right Click to activate: Obliteration Mode – Destroys all non-valuable blocks. Battle: +20 Attack – Bonus damage on mobs with health above 10 hearts (+50% of the mobs extra health) Battle: AOE – in 1×1 hits 1×1 area, 3×3 hits 5×5 area, 5×5 hits 9×9, 7×7 hits 13×13, and 9×9 hits 17×17 (bonus damage does not apply to mobs other than the one you hit directly) item.draconicevolution:mobSoul.name=Mob Soul -item.draconicevolution:mobSoul.description=You notice that with Draconic Weapons you can now occasionally steal the souls of those things you kill. +-----item.draconicevolution:mobSoul.description=You notice that with Draconic Weapons you can now occasionally steal the souls of those things you kill. item.draconicevolution:enderArrow.name=Ender Arrow -item.draconicevolution:enderArrow.description=Awesome arrow infused with the power of ender pearls. You will teleport to the location you hit. +-----item.draconicevolution:enderArrow.description=Awesome arrow infused with the power of ender pearls. You will teleport to the location you hit. item.draconicevolution:safetyMatch.name=Safety Match -item.draconicevolution:safetyMatch.description=Tired of everything burning to the ground when making a fireplace? +-----item.draconicevolution:safetyMatch.description=Tired of everything burning to the ground when making a fireplace? item.draconicevolution:safetyMatchBox.name=Box of Safety Matches -item.draconicevolution:safetyMatchBox.description=High-use safety matches. +-----item.draconicevolution:safetyMatchBox.description=High-use safety matches. item.draconicevolution:key.name=Key item.draconicevolution:key.description=Magical Key to access various locks. item.draconicevolution:draconiumEnergyCore0.name=Wyvern Energy Core -item.draconicevolution:draconiumEnergyCore0.description=This component is used in devices that need to be able to store energy +-----item.draconicevolution:draconiumEnergyCore0.description=This component is used in devices that need to be able to store energy item.draconicevolution:draconiumEnergyCore1.name=Draconic Energy Core item.draconicevolution:draconiumEnergyCore1.description=This is a more powerful version of the wyvern energy core item.draconicevolution:draconiumFluxCapacitor0.name=Wyvern Flux Capacitor -item.draconicevolution:draconiumFluxCapacitor0.description=Tired of your tools and armor running out of energy when you need them most you have figured out how to create an item capable of storing an immense amount of energy and transferring it to your items as they need it. +-----item.draconicevolution:draconiumFluxCapacitor0.description=Tired of your tools and armor running out of energy when you need them most you have figured out how to create an item capable of storing an immense amount of energy and transferring it to your items as they need it. item.draconicevolution:draconiumFluxCapacitor1.name=Draconic Flux Capacitor -item.draconicevolution:draconiumFluxCapacitor1.description=With this upgrade you will be able to go for days without needing to stop and recharge. +-----item.draconicevolution:draconiumFluxCapacitor1.description=With this upgrade you will be able to go for days without needing to stop and recharge. item.draconicevolution:draconicIngot.name=Awakened Draconium Ingot -item.draconicevolution:draconicIngot.description=You have been studying the interactions of Draconium with various materials and have come to realize that this is only an inert state. You have discovered a method to bring out the true power of Draconium using a complex ritual involving a dragon heart. (See the dragon heart page for details) +-----item.draconicevolution:draconicIngot.description=You have been studying the interactions of Draconium with various materials and have come to realize that this is only an inert state. You have discovered a method to bring out the true power of Draconium using a complex ritual involving a dragon heart. (See the dragon heart page for details) item.draconicevolution:creativeStructureSpawnerComet.name=Spawn Comet @@ -217,8 +212,7 @@ item.draconicevolution:creativeStructureSpawnerEnderIsland.name=Spawn Ender Isla item.draconicevolution:infoTablet.name=Draconic Evolution Information Tablet -item.draconicevolution:wrench.name=Crystal Wrench [WIP] -item.draconicevolution:wrench.description= +item.draconicevolution:wrench.name=Crystal Binder //Item Groups ---------------------------------------------------------------------------------------------------------------------------------------- @@ -277,6 +271,7 @@ msg.draconiumChestEditL3.txt=Or the bottom half of the chest to decrease the val msg.draconiumChestEditL4.txt=Right click with paper to copy the colour to other chests msg.draconiumChestEdit2.txt=Please use a single peace of paper msg.de.dragonDeath.txt=§5The heart is temporarily awakened by the dragons explosive §5death +msg.de.baseSafeAOW.txt=§9(§aAOE §aSafe §aMode §ais §aenabled§9) §cOperation §cCanceled §cbecause §ca §ctile §centity §cwas §cdetected //Energy Net msg.de.wrenchMode.bind.txt=Function: Bind @@ -290,6 +285,8 @@ msg.de.invalidTile.txt=Target Invalid msg.de.outOfRange.txt=Target out of range msg.de.maxConnections.txt=Connection limit reached msg.de.linked.txt=Devices Linked +msg.de.unLinked.txt=Devices Un-Linked +msg.de.wrongSide.txt=Can not connect to that side of the target device //Tool Tips/other localizations ---------------------------------------------------------------------------------------------------------------------------------------- @@ -302,6 +299,7 @@ info.teleporterInfDest.txt=Destination info.teleporterInfFuel.txt=Fuel: info.teleporterInfSet1.txt=Bound to info.teleporterInfSet2.txt=Uses remaining +info.de.rightClickToTeleport.txt=Right click to teleport info.draconicAxe1.txt=Timber!!!!!! info.draconicAxe2.txt=Will fall an entire tree @@ -325,6 +323,10 @@ info.de.miningMode.txt=Mining Mode info.de.changeMiningMode.txt=Shift Right click to change mining mode info.de.toggleOblit.txt=Right-click to toggle Obliteration mode info.de.oblitInfo.txt=Obliteration mode destroys low value blocks +info.de.attackDamage.txt=Attack Damage +info.de.bonusHealthDamage.txt=Mob Health +info.de.press.txt=Press +info.de.toOpenConfigGUI.txt=To open config GUI info.de.bowEnchants.txt=Enchants are twice as effective on this bow @@ -351,6 +353,7 @@ info.de.hudDisplayConfigTxt3.txt=################### info.de.hudDisplayConfigInfo1.txt=Click and drag HUD info.de.hudDisplayConfigInfo2.txt=to change location + info.de.manual.introTxt.txt=Everything you need to know. All in one place. info.de.manual.indexButton.txt=Index info.de.manual.indexButtonTip.txt=Go to index page @@ -360,6 +363,7 @@ info.de.modeIn.txt=Mode: Input info.de.modeOut.txt=Mode: Output info.de.5xTransfer.txt= (5x Transfer) info.de.connections.txt=Connections +info.de.wirelessConnections.txt=Wireless Connections enchantment.draconicevolution.reaperEnchant=Reaper @@ -442,7 +446,7 @@ achievement.draconicevolution.flux2.desc=Craft the Draconic Flux Capacitor achievement.draconicevolution.dhoe=Kick it up a Notch! -BAM- achievement.draconicevolution.dhoe.desc=Craft the Draconic Hoe -achievement.draconicevolution.dstaff=With your powers combined! +achievement.draconicevolution.dFlux Capacitor=With your powers combined! achievement.draconicevolution.dstaff.desc=Create the Draconic Staff achievement.draconicevolution.soul=Reaper!!!! @@ -498,14 +502,25 @@ button.de.chestAutoFeed0.txt=OFF.Auto Feed Disabled button.de.chestAutoFeed1.txt=FILL.Keep the current stacks full button.de.chestAutoFeed2.txt=LOCK.Only pull the currently smelting items from the inventory button.de.chestAutoFeed3.txt=ALL.Pull any smeltable items from the inventory +button.de.chestLockOutput.txt=Lock Output.Blocks items being inserted into the last 5 slots button.de.previous.txt=<== button.de.next.txt===> button.de.backToIndex.txt=Back to Index button.de.back.txt=Back button.de.goToIndex.txt=Index Page +button.de.addNew.txt=Add New +button.de.rename.txt=Rename +button.de.commit.txt=Commit +button.de.setHere.txt=Set Here +button.de.remove.txt=Remove +button.de.addFuel.txt=Add Fuel +button.de.cancel.txt=Cancel +button.de.UP.txt=UP +button.de.DOWN.txt=DOWN //Item Config Buttons button.de.ArmorNVActive.name=Night Vision +button.de.ArmorNVLock.name=Lock Night Vision button.de.ArmorFlightLock.name=Lock Flight button.de.ArmorSpeedMult.name=Speed Multiplier button.de.ArmorJumpMult.name=Jump Multiplier @@ -517,7 +532,7 @@ button.de.ToolDigDepth.name=Dig Depth button.de.WeaponAttackAOE.name=Attack A.O.E button.de.ToolVoidJunk.name=Void Junk button.de.AxeTreeMode.name=Tree Mode -button.de..name= +button.de.BaseSafeAOE.name=AOE Safe Mode button.de..name= button.de..name= diff --git a/src/main/resources/assets/draconicevolution/manual.json b/src/main/resources/assets/draconicevolution/manual.json index 5395197e..5e657929 100644 --- a/src/main/resources/assets/draconicevolution/manual.json +++ b/src/main/resources/assets/draconicevolution/manual.json @@ -1,161 +1,270 @@ [ - { - "name":"item.draconicevolution:tclogo", - "images":["http://i.imgur.com/zYLHSxW.png", "http://i.imgur.com/ss70hgS.jpg"], - "content": - [ - "line 1", - "line 2", - "", - "line 3", - "http://i.imgur.com/zYLHSxW.png", - "line 4", - "line 4", - "http://i.imgur.com/ss70hgS.jpg" - ] - }, - { - "name":"item.coal", - "images":["http://i.imgur.com/hZOyCf9.png", "http://i.imgur.com/IGDBOvC.png"], - "content": - [ - "http://i.imgur.com/IGDBOvC.png", - "line 1", - "Learning how draconic powers interact with the powers of the endermen, you have created the ultimate teleporter. You can now store up to 100 locations and using the endermen’s own pearls as fuel, created something that can teleport you extreme distances even across dimensions at will. Shift right click to open the GUI. Most functionality should be self explanatory. On the left is the destination list. Each destination has a lock button that prevents you from accidentally overwriting or deleting it. On the right starting from the top you have information about the selected destination, An option to rename the selected destination, An option to change the selected destination to your current coordinates and an option to delete the selected destination. Under that is the fuel, An option to teleport to the selected destination, an option to add a new destination (your current location), And an option to add fuel (Ender pearls from your inventory) Shift click to add a stack. You can also shift+Scroll with the item in your hand to cycle through the destinations without opening the gui and right click to teleport. You can also teleport players and mobs by left clicking them however players must be holding shift and mobs can not be teleported across dimensions.", - "line 3", - "http://i.imgur.com/hZOyCf9.png", - "Learning how draconic powers interact with the powers of the endermen, you have created the ultimate teleporter. You can now store up to 100 locations and using the endermen’s own pearls as fuel, created something that can teleport you extreme distances even across dimensions at will. Shift right click to open the GUI. Most functionality should be self explanatory. On the left is the destination list. Each destination has a lock button that prevents you from accidentally overwriting or deleting it. On the right starting from the top you have information about the selected destination, An option to rename the selected destination, An option to change the selected destination to your current coordinates and an option to delete the selected destination. Under that is the fuel, An option to teleport to the selected destination, an option to add a new destination (your current location), And an option to add fuel (Ender pearls from your inventory) Shift click to add a stack. You can also shift+Scroll with the item in your hand to cycle through the destinations without opening the gui and right click to teleport. You can also teleport players and mobs by left clicking them however players must be holding shift and mobs can not be teleported across dimensions.", - "Test Info" - ] - }, - { - "name":"info.Test Information!!!!", - "images":[], - "content": - [ - "Learning how draconic powers interact with the powers of the endermen, you have created the ultimate teleporter. You can now store up to 100 locations and using the endermen’s own pearls as fuel, created something that can teleport you extreme distances even across dimensions at will. Shift right click to open the GUI. Most functionality should be self explanatory. On the left is the destination list. Each destination has a lock button that prevents you from accidentally overwriting or deleting it. On the right starting from the top you have information about the selected destination, An option to rename the selected destination, An option to change the selected destination to your current coordinates and an option to delete the selected destination. Under that is the fuel, An option to teleport to the selected destination, an option to add a new destination (your current location), And an option to add fuel (Ender pearls from your inventory) Shift click to add a stack. You can also shift+Scroll with the item in your hand to cycle through the destinations without opening the gui and right click to teleport. You can also teleport players and mobs by left clicking them however players must be holding shift and mobs can not be teleported across dimensions.", - "line 1", - "[c]item.iron_ingot:0", - "line 3", - "Learning how draconic powers interact with the powers of the endermen, you have created the ultimate teleporter. You can now store up to 100 locations and using the endermen’s own pearls as fuel, created something that can teleport you extreme distances even across dimensions at will. Shift right click to open the GUI. Most functionality should be self explanatory. On the left is the destination list. Each destination has a lock button that prevents you from accidentally overwriting or deleting it. On the right starting from the top you have information about the selected destination, An option to rename the selected destination, An option to change the selected destination to your current coordinates and an option to delete the selected destination. Under that is the fuel, An option to teleport to the selected destination, an option to add a new destination (your current location), And an option to add fuel (Ender pearls from your inventory) Shift click to add a stack. You can also shift+Scroll with the item in your hand to cycle through the destinations without opening the gui and right click to teleport. You can also teleport players and mobs by left clicking them however players must be holding shift and mobs can not be teleported across dimensions.", - "line 4" - ] - }, - { - "name":"item.stick", - "images":[], - "content": - [ - "line 1", - "", - "line 3", - "www.image1", - "line 4", - "www.image2" - ] - }, { "name":"tile.draconicevolution:draconiumOre", "images":[], "content": [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" + "The very basis of Draconic Research" ] }, { - "name":"item.coal", + "name":"item.draconicevolution:draconiumDust", "images":[], "content": [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" + "This is the material from mining Draconium Ore" ] }, { - "name":"tile.draconicevolution:draconiumOre", + "name":"item.draconicevolution:draconiumBlend", "images":[], "content": [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" + "Mixture of Draconic dust and iron. Necessary to make Draconium", + "[c]item.draconicevolution:draconiumBlend:0" ] }, { - "name":"tile.draconicevolution:potentiometer", + "name":"item.draconicevolution:draconiumIngot", "images":[], "content": [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" + "The results of smelting draconium blend in a furnace. Used in most recipes", + "[c]item.draconicevolution:draconiumIngot:0" ] }, { - "name":"tile.draconicevolution:draconiumOre", + "name":"tile.draconicevolution:draconium", + "nameL":"Draconium Block", + "meta":0, "images":[], "content": [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" + "A storage block for draconium", + "[c]tile.draconicevolution:draconium:0" ] }, { - "name":"item.coal", + "name":"tile.draconicevolution:draconium", + "nameL":"Charged Draconium Block", + "meta":2, "images":[], "content": [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" + "Used in the Ritual of Draconic Resurrection. Place a draconium block in a charging device and 100 million RF later you have a charged draconium block!", + "[c]tile.draconicevolution:draconium:2" ] }, { - "name":"tile.draconicevolution:draconiumOre", + "name":"item.draconicevolution:draconicCore", "images":[], "content": [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" + "Used in most Draconic Evolution recipes", + "[c]item.draconicevolution:draconicCore:0" ] }, { - "name":"tile.draconicevolution:energyPylon", + "name":"item.draconicevolution:wyvernCore", "images":[], "content": [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" + "This component is used to craft all Wyvern tools", + "[c]item.draconicevolution:wyvernCore:0" + ] + }, + { + "name":"item.draconicevolution:wyvernPickaxe", + "images":[], + "content": + [ + "Weary of ordinary tools you begin to understand ways to use Draconic energy to upgrade. Modes: Shift-Right Click to switch modes: 1×1 or 3×3", + "[c]item.draconicevolution:wyvernPickaxe:0" + ] + }, + { + "name":"item.draconicevolution:wyvernShovel", + "images":[], + "content": + [ + "Weary of ordinary tools you begin to understand ways to use Draconic energy to upgrade. Modes: Shift-Right Click to switch modes: 1×1 or 3×3", + "[c]item.draconicevolution:wyvernShovel:0" + ] + }, + { + "name":"item.draconicevolution:wyvernSword", + "images":[], + "content": + [ + "Ordinary weaponry not good enough anymore? Using draconic knowledge you have found a way to imbue an ordinary diamond sword with the power of Draconium", + "+20 Attack damage", + "+10% Mob Health (Adds 10% of the mobs own health to the attack damage)", + "3x3 AOE Attack", + "[c]item.draconicevolution:wyvernSword:0" + ] + }, + { + "name":"item.draconicevolution:wyvernBow", + "images":[], + "content": + [ + "Weary of ordinary tools you begin to understand ways to use Draconic energy to upgrade. Sharpshooter – Zoom in on your target and deal extreme damage with pin point accuracy. Rapid Fire – Barrage your enemies in a rain of arrows.", + "[c]item.draconicevolution:wyvernBow:0" + ] + }, + { + "name":"item.draconicevolution:draconiumFluxCapacitor", + "nameL":"Wyvern Flux Capacitor", + "meta":0, + "images":[], + "content": + [ + "Tired of your tools and armor running out of energy when you need them most, you have figured out how to create an item capable of storing an immense amount of energy and transferring it to your items as they need it.", + "[c]item.draconicevolution:draconiumFluxCapacitor:0" + ] + }, + { + "name":"item.draconicevolution:draconiumEnergyCore", + "nameL":"Wyvern Energy Core", + "meta":0, + "images":[], + "content": + [ + "This component is used in devices that need to be able to store energy", + "[c]item.draconicevolution:draconiumFluxCapacitor:0" + ] + }, + { + "name":"item.draconicevolution:wyvernHelm", + "images":[], + "content": + [ + "Stronger than diamond you can now withstand even greater blows.", + "Full set gives total fire immunity", + "[c]item.draconicevolution:wyvernHelm:0" + ] + }, + { + "name":"item.draconicevolution:wyvernChest", + "images":[], + "content": + [ + "Infusing the armor with Dracomiun you vastly improve its resistance.", + "Full set gives total fire immunity", + "[c]item.draconicevolution:wyvernChest:0" + ] + }, + { + "name":"item.draconicevolution:wyvernLeggs", + "images":[], + "content": + [ + "You feel even stronger and faster now that you have infused diamond legs with Draconium.", + "Full set gives total fire immunity", + "+Speed boost", + "[c]item.draconicevolution:wyvernLeggs:0" + ] + }, + { + "name":"item.draconicevolution:wyvernBoots", + "images":[], + "content": + [ + "You learn to improve the boots Draconium seems to have given you greater agility.", + "Full set gives total fire immunity", + "+Reduced fall damage", + "+Jump boost", + "[c]item.draconicevolution:wyvernBoots:0" + ] + }, + { + "name":"item.draconicevolution:teleporterMKI", + "images":[], + "content": + [ + "You have managed to infuse the powers of The End with your knowledge of the Draconic to create a basic teleporter, but at a cost. The energies binding them are unstable and only last for 10 uses and will take some of your life energy with each use and can only be linked to a single location but works across dimensions. Once used up, you must create a new one.", + "[c]item.draconicevolution:teleporterMKI:0" + ] + }, + { + "name":"item.draconicevolution:teleporterMKII", + "images":[], + "content": + [ + "Learning how draconic powers interact with the powers of the endermen, you have created the ultimate teleporter. You can now store up to 100 locations and using the endermen’s own pearls as fuel, created something that can teleport you extreme distances even across dimensions at will. Shift right click to open the GUI. Most functionality should be self explanatory. On the left is the destination list. Each destination has a lock button that prevents you from accidentally overwriting or deleting it. On the right starting from the top you have information about the selected destination, An option to rename the selected destination, An option to change the selected destination to your current coordinates and an option to delete the selected destination. Under that is the fuel, An option to teleport to the selected destination, an option to add a new destination (your current location), And an option to add fuel (Ender pearls from your inventory) Shift click to add a stack. You can also shift+Scroll with the item in your hand to cycle through the destinations without opening the gui and right click to teleport. You can also teleport players and mobs by left clicking them however players must be holding shift and mobs can not be teleported across dimensions.", + "[c]item.draconicevolution:teleporterMKII:0" + ] + }, + { + "name":"tile.draconicevolution:teleporterStand", + "images":[], + "content": + [ + "You have figured out how to create a simple pedestal on which you can place you basic or advanced charms of dislocation. Simply right click with a charm in your hand to place it on the pedestal then right click the pedestal to teleport. The advantage of this is the charms wont take damage or use fuel. The disadvantage is you can bring them with you to your destination. To remove the charm from the pedestal simply shift right click with an empty hand\n\nWhen holding basic dislocator that has been renamed in an anvil or an enhanced dislocator with a destination set the name or destination will be displayed above the pedestal. If you hold shift all names will be hidden except the one you are looking at. (Shift behavior can be reversed in the config)", + "[c]tile.draconicevolution:teleporterStand:0" + ] + }, + { + "name":"tile.draconicevolution:draconium", + "nameL":"Resurrection Stone", + "meta":1, + "images":[], + "content": + [ + "The key component in the Ritual of Draconic Resurrection.", + "[c]tile.draconicevolution:draconium:1" + ] + }, + { + "name":"item.draconicevolution:enderArrow", + "images":[], + "content": + [ + "Perhaps not your brightest idea... You found a way to travel even longer distances using ender perls by strapping them to the end of a arrow.", + "This of course makes the arrow a lot heavier. Too heavy for a regular for a regular bow. Leaving you no choice but to use ether a wyvern or draconic bow.", + "So what could go wrong you ask? Well as im sure you are aware ender perls on their own are a rather painful way to travel. Now add the power of a wayvern or worse a draconic bow to that and you have a recipe for extreme pain.", + "Be sure to wear your best fall protection. And just hope its enough", + "[c]item.draconicevolution:enderArrow.name:0" + ] + }, + { + "name":"item.draconicevolution:mobSoul", + "images":[], + "content": + [ + "You notice that with Draconic Weapons you can now occasionally steal the souls of those things you kill." + ] + }, + { + "name":"item.draconicevolution:dragonHeart", + "images":[], + "content": + [ + "Dropped by the Ender Dragon and Draconic Dragon. It is your belief that this immensely powerful item may hold the key to unlocking the true power of draconium using an ancient ritual known as the ritual of awakening.", + "The Ritual:", + "1.Drop a dragon heart on the ground and activate it with an explosion.", + "2.Drop 4 to 16 draconic cores on the ground near the activated heart (4 per block of draconium). A few seconds after its initial activation it will draw all nearby items towards it anything that is not a core will be destroyed.", + "3.Now quickly place 1 to 4 (depending on how many cores you dropped) Charged draconium blocks near the heart.", + "4.You will know its working when you see the hearts energy targeting the charged draconium blocks. Now stand back and watch the magic happen.", + "You can only do this ritual once per heart so you best make the most of it." + ] + }, + { + "name":"item.draconicevolution:draconicIngot", + "images":[], + "content": + [ + "You have been studying the interactions of Draconium with various materials and have come to realize that this is only an inert state. You have discovered a method to bring out the true power of Draconium using a complex ritual involving a dragon heart. (See the dragon heart page for details)", + "[c]item.draconicevolution:draconicIngot:0" + ] + }, + { + "name":"tile.draconicevolution:draconicBlock", + "images":[], + "content": + [ + "You have been studying the interactions of Draconium with various materials and have come to realize that this is only an inert state. You have discovered a method to bring out the true power of Draconium using a complex ritual involving a dragon heart. (See the dragon heart page for details)", + "[c]tile.draconicevolution:draconicBlock:0" ] }, { @@ -163,38 +272,161 @@ "images":[], "content": [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" + "This component is used to craft the most advanced draconic items", + "[c]item.draconicevolution:awakenedCore:0" ] }, { - "name":"item.coal", + "name":"item.draconicevolution:draconiumEnergyCore", + "nameL":"Draconic Energy Core", + "meta":1, "images":[], "content": [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" + "This is a more powerful version of the wyvern energy core", + "[c]item.draconicevolution:draconiumEnergyCore:1" ] }, { - "name":"tile.draconicevolution:draconiumOre", + "name":"item.draconicevolution:draconicPickaxe", "images":[], "content": [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" + "Further Draconic research has shown you ways to even greater power.. Modes: Shift-Right Click to switch modes: 1×1, 3×3, 5×5 and 7×7 Right Click to activate: Obliteration Mode – Destroys blocks that you specify.", + "[c]item.draconicevolution:draconicPickaxe:0" + ] + }, + { + "name":"item.draconicevolution:draconicShovel", + "images":[], + "content": + [ + "Further Draconic research has shown you ways to even greater power.. Modes: Shift-Right Click to switch modes: 1×1, 3×3, 5×5 and 7×7 Right Click to activate: Obliteration Mode – Destroys blocks that you specify.", + "[c]item.draconicevolution:draconicShovel:0" + ] + }, + { + "name":"item.draconicevolution:draconicAxe", + "images":[], + "content": + [ + "Further Draconic research has shown you ways to even greater power.. Will harvest the entire tree and leaves above.", + "[c]item.draconicevolution:draconicAxe:0" + ] + }, + { + "name":"item.draconicevolution:draconicHoe", + "images":[], + "content": + [ + "Further Draconic research has shown you ways to even greater power.. Will till an entire 9×9 area, just perfect for a full-size farm with water source. Also will dig or replace dirt (if dirt in inventory) to make the full 9×9.", + "[c]item.draconicevolution:draconicHoe:0" + ] + }, + { + "name":"item.draconicevolution:draconicSword", + "images":[], + "content": + [ + "Seeking an even more powerful weapon you combine your Wyvern sword with Awakened Draconium to make the ultimate sword", + "+40 Attack damage", + "+20% Mob Health (Adds 20% of the mobs own health to the attack damage)", + "7x7 AOE Attack", + "[c]item.draconicevolution:draconicSword:0" + ] + }, + { + "name":"item.draconicevolution:draconicBow", + "images":[], + "content": + [ + "Further Draconic research has shown you ways to even greater power.. Sharpshooter – Zoom in on your target and deal extreme damage with pin point accuracy. Rapid Fire – Barrage your enemies in a rain of arrows. Explosive – With gunpowder in your inventory destroy an area slightly larger than TNT with your arrows. Devastation (Creative Mode only) – Explosive + Double rapid fire", + "[c]item.draconicevolution:draconicBow:0" + ] + }, + { + "name":"item.draconicevolution:draconicDistructionStaff", + "images":[], + "content": + [ + "After great pains you have mastered the powers of the Draconic and created the ultimate weapon and destructive tool!", + "Mining:", + " Extreme mining speed", + " 1x1x1 to 9x9x9 AOE with depth independently adjustable", + " Junk filter", + " AOE safe mode. To ensure you don't accidental mine your entire base", + "Attack:", + " +60 Attack damage", + " +30% Mob Health (Adds 30% of the mobs own health to the attack damage)", + " 1x1 to 25x25 AOE Attack", + "[c]item.draconicevolution:draconicDistructionStaff:0" + ] + }, + { + "name":"item.draconicevolution:draconiumFluxCapacitor", + "nameL":"Draconic Flux Capacitor", + "meta":1, + "images":[], + "content": + [ + "With this upgrade you will be able to go for days without needing to stop and recharge.", + "[c]item.draconicevolution:draconiumFluxCapacitor:1" + ] + }, + { + "name":"item.draconicevolution:draconicHelm", + "images":[], + "content": + [ + "No longer do you fear the night you now can see all the time regardless of what is out there.", + " -Night Vision", + " -Cures negative potion effects", + " -Bypass suffocation and drowning damage", + " -Removes mining slowdown under water (Aqua affinity)", + "[c]item.draconicevolution:draconicHelm:0" + ] + }, + { + "name":"item.draconicevolution:draconicChest", + "images":[], + "content": + [ + "Using the heart of a dragon you are stronger and have the gift of flight.", + " -Flight", + " -Removes mining slowdown when in the air", + " -Fire immunity", + "[c]item.draconicevolution:draconicChest:0" + ] + }, + { + "name":"item.draconicevolution:draconicLeggs", + "images":[], + "content": + [ + "Even stronger armor the soul of a dragon protects you and moves you even faster Improved speed boost.", + " -Speed boost", + "[c]item.draconicevolution:draconicLeggs:0" + ] + }, + { + "name":"item.draconicevolution:draconicBoots", + "images":[], + "content": + [ + "Stronger, faster, better than before the heart of a dragon grants you higher jumping.", + " -Fall protection", + " -Jump boost", + " -Up Hill Step", + "[c]item.draconicevolution:draconicBoots:0" + ] + }, + { + "name":"tile.draconicevolution:weatherController", + "images":[], + "content": + [ + "This is a block that allows you to control the weather. To use it place some emeralds in its inventory and select a mode. There are 3 available modes Rain off, Rain on and Thunder storm. To activate apply a redstone signal.", + "[c]tile.draconicevolution:weatherController:0" ] }, { @@ -203,105 +435,8 @@ "images":[], "content": [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" - ] - }, - { - "name":"item.coal", - "images":[], - "content": - [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" - ] - }, - { - "name":"tile.draconicevolution:draconiumOre", - "images":[], - "content": - [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" - ] - }, - { - "name":"tile.draconicevolution:draconiumChest", - "images":[], - "content": - [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" - ] - }, - { - "name":"tile.draconicevolution:draconiumOre", - "images":[], - "content": - [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" - ] - }, - { - "name":"item.coal", - "images":[], - "content": - [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" - ] - }, - { - "name":"tile.draconicevolution:energyCrystal", - "nameL":"Energy Relay", - "meta":1, - "images":[], - "content": - [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" - ] - }, - { - "name":"tile.draconicevolution:draconiumOre", - "images":[], - "content": - [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" + "This is a basic low power (around 80RF/t) generator that may come in handy if you have no other mods capable of generating RF power.", + "[c]tile.draconicevolution:generator:3" ] }, { @@ -310,16 +445,314 @@ "images":[], "content": [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" + "Everyone needs effective mob farms. For the cost of a bit of solid fuel (coal, charcoal, etc.) or RF power, you can kill to your hearts content knowing the forces of the Draconic have your back! The grinder will kill all mobs in a 7x7 area in front of it. It is much more efficient and can kill mobs faster if powered by RF.", + "[c]tile.draconicevolution:grinder:3" + ] + }, + { + "name":"tile.draconicevolution:energyInfuser", + "images":[], + "content": + [ + "Seeing the need for faster energy transfer you have found a way to bring the infuser to being. Has a faster transfer rate than most other mod’s RF recharge stations (and cool particle effects to boot!)", + "[c]tile.draconicevolution:energyInfuser:0" + ] + }, + { + "name":"tile.draconicevolution:sunDial", + "images":[], + "content": + [ + "This is an extremely powerful block that allows you to change the time. Simply place it in the world and and apply a constant redstone signal. Once the device charges it will fire a particle beam at the sun accelerating it to 30X its normal speed. Simply shut off the redstone signal when you have the sun where you want it.", + "[c]tile.draconicevolution:sunDial:0" + ] + }, + { + "name":"tile.draconicevolution:playerDetector", + "images":[], + "content": + [ + "Simple player detection, can be adjusted up to 10 blocks range to detect any players nearby.", + "[c]tile.draconicevolution:playerDetector:0" + ] + }, + { + "name":"tile.draconicevolution:playerDetectorAdvanced", + "images":[], + "content": + [ + "This is an advanced version of the player detector it has the following features. Max range of 20 blocks. Whitelist/Blacklist for fine tuning who you do or don’t want. Camouflage – Hide your detector so no one sees it. Inverted out put (less redstone needed!).", + "[c]tile.draconicevolution:playerDetectorAdvanced:0" + ] + }, + { + "name":"tile.draconicevolution:dissEnchanter", + "images":[], + "content": + [ + "With this device you are now able to transfer enchantments from your items to books at the cost of experience. The cost is determined by the repair cost of the item and the repair cost of the item is decreased slightly each time. To use it simply place the enchanted item in the first slot a regular book in the center slot and press the transfer button. One enchantment (the first one) will be stripped from the item and applied to the book. When you strip an enchant the item will loos a percentage of its total durability this percentage is shown in the gui. You can decrease the damage bu placing book shelves around it or other enchanting boosters (It takes a total of 20 book shelves to prevent all damage). WARNING Items that use energy instead of durability will also be damaged and destroyed but will not show their damage value.", + "[c]tile.draconicevolution:dissEnchanter:0" + ] + }, + { + "name":"tile.draconicevolution:draconiumChest", + "images":[], + "content": + [ + "Using your draconic knowledge you have learned how to create the ultimate chest. With a massive 234 slot storage capacity a built in crafting table and 5 slot RF furnace capable of doubling ore as well as the ability to keep its contents when harvested this chest is the most powerful most versatile storage device in existence! It also comes in a variety of every colour you can imagine gust shift right click it with empty hand for details.", + "[c]tile.draconicevolution:draconiumChest:0" + ] + }, + { + "name":"tile.draconicevolution:customSpawner", + "images":[], + "content": + [ + "To get started, right click any vanilla spawner with a draconic core to stabilize it. You now have a empty transportable spawner (pick up with draconic tools) Use any mob soul on the spawner to change it to that type.", + "There are several items you can use to upgrade the spawner:", + " -Wyvern Core: Upgrades to tier 2 (increases spawn count and speed)", + " -Awakened Core: Upgrades to tier 3 (further increases spawn count and speed)", + " -Nether Star: Removes the requirement for a player to be within 16 blocks for the spawner to function.", + " -Notch Apple: Makes the spawner ignore spawn requirements for the mob it is spawning e.g. Will make monsters spawn even if the light level is to high.", + "When broken you get back everything except the mob soul (it is to fragile and is destroyed when the spawner is broken)", + "[c]tile.draconicevolution:customSpawner:0" + ] + }, + { + "name":"tile.draconicevolution:energyStorageCore", + "images":[], + "content": + [ + "Using Draconic knowledge you have discovered how to build a multi-block structure capable of storing more power then any other device ever invented with the highest tier able to store up to 2.14 trillion RF (you can find more info in the Energy core multiblock tutorial)", + "[c]tile.draconicevolution:energyStorageCore:0" + ] + }, + { + "name":"tile.draconicevolution:energyPylon", + "images":[], + "content": + [ + "This device is used to extract or insert energy into the energy storage multiblock. Its maximum transfer rate is 2,147,483,647 RF/t", + "[c]tile.draconicevolution:energyPylon:0" + ] + }, + { + "name":"tile.draconicevolution:particleGenerator", + "images":[], + "content": + [ + "Purely decorative, this blocks allows for fully customizable particle effects to be created. For more information check out the instruction manual built into its GUI.", + "This block is also used as a part of the Energy Core multiblock structure", + "[c]tile.draconicevolution:particleGenerator:0" + ] + }, + { + "name":"tile.draconicevolution:energyCrystal", + "nameL":"Energy Relay", + "meta":0, + "images":[], + "content": + [ + "This is a the base component of the DE energy net. This device on its own can not send or receive energy from a block. Its purpose is to act as a hub to link devices that can.", + "See Crystal Binder info for more information on linking and energy distribution", + "Range:25", + "Max Connections: 10", + "[c]tile.draconicevolution:energyCrystal:0" + ] + }, + { + "name":"tile.draconicevolution:energyCrystal", + "nameL":"Advanced Energy Relay", + "meta":1, + "images":[], + "content": + [ + "This is a more powerful version of the Energy Relay. It is capable of transferring energy much faster and it has the ability to link to a larger number of devices", + "See Crystal Binder info for more information on linking and energy distribution", + "Range:50", + "Max Connections: 20", + "[c]tile.draconicevolution:energyCrystal:1" + ] + }, + { + "name":"tile.draconicevolution:energyCrystal", + "nameL":"Energy Transceiver", + "meta":2, + "images":[], + "content": + [ + "This is the block used to actually import and export energy from the energy net. Simply place it on the side of an energy acceptor or producer and link it to the network. You can change between input and output mode by right clicking it with a crystal binder in \"Mode Change\" mode", + "See Crystal Binder info for more information on linking and energy distribution", + "Range:25", + "Max Connections: 2", + "[c]tile.draconicevolution:energyCrystal:2" + ] + }, + { + "name":"tile.draconicevolution:energyCrystal", + "nameL":"Advanced Energy Transceiver", + "meta":3, + "images":[], + "content": + [ + "This is a more powerful version of the Energy Transceiver. Along with having a much higher energy transfer rate it also has the ability to extract or insert energy into a device 5 times faster then would normally be possible.", + "See Crystal Binder info for more information on linking and energy distribution", + "Range:50", + "Max Connections: 4", + "[c]tile.draconicevolution:energyCrystal:3" + ] + }, + { + "name":"tile.draconicevolution:energyCrystal", + "nameL":"Wireless Energy Transceiver", + "meta":4, + "images":[], + "content": + [ + "This device works similar to the Energy Relay except it is also able to wirelessly connect to RF accepting devices", + "See Crystal Binder info for more information on linking and energy distribution", + "Range:25", + "Max Connections: 3", + "Wireless Range: 15", + "Max Wireless Connections: 8", + "[c]tile.draconicevolution:energyCrystal:4" + ] + }, + { + "name":"tile.draconicevolution:energyCrystal", + "nameL":"Advanced Wireless Energy Transceiver", + "meta":5, + "images":[], + "content": + [ + "This is an advanced version of the Wireless Energy Transceiver that is able to connect to a larger number of devices as well as transfer energy at a much higher rate.", + "See Crystal Binder info for more information on linking and energy distribution", + "Range:50", + "Max Connections: 6", + "Wireless Range: 30", + "Max Wireless Connections: 16", + "[c]tile.draconicevolution:energyCrystal:5" + ] + }, + { + "name":"item.draconicevolution:wrench", + "images":[], + "content": + [ + "This is the tool used to link energy devices", + "Binding: To link two devices switch the tool to bind mode with shift+right click. Then just right click both devices (any order) to link them. Any energy net devices (Relay, Transceiver or Wireless Transceiver) and be linked to one another. The Wireless Transceiver can also be linked to any other RF accepting block by first clicking the transceiver then clicking the block.", + "Un-Binding: To un bind two linked devices switch the tool to un-bind mode then simply right click the two devices you with to un link. You can also clear all of a devices connections using \"un-bind all\" mode", + "Visual Indicator: While holding the Crystal Binder you are able to see the connections between all linked devices (Except the link between wireless transceivers and RF devices)", + "Connection Limits: All devices support a limited number of connections. This is the number of devices the block can be linked to. Relays have the highest number of available connections and therefor are useful for linking a network of Transceivers which have a very limited number of available connections.", + "Energy Transfer Mechanic: Each Energy device has its own internal energy buffer. If the buffer of a device it is linked to is lower then its own it will send some energy to that device to try to balance the two buffers. The energy difference between the two buffers is what determines the rate at which energy is sent.", + "[c]item.draconicevolution:wrench:0" + ] + }, + { + "name":"tile.draconicevolution:rainSensor", + "images":[], + "content": + [ + "A device that emits a redstine signal when it rains. This is perfect for controlling the weather controller.", + "[c]ile.draconicevolution:rainSensor:0" + ] + }, + { + "name":"tile.draconicevolution:potentiometer", + "images":[], + "content": + [ + "A simple redstone emitter that is capable of emitting a variable strength redstone signal between 0 and 15.", + "[c]tile.draconicevolution:potentiometer:0" + ] + }, + { + "name":"tile.draconicevolution:xRayBlock", + "images":[], + "content": + [ + "Many of you have probably seen a graphical glitch that sometimes occurs when chunks load that allows you to see through the world and see all of the cave caves and tunnels bellow. This block replicates that effect. When you place it next to another block the face of the block it is touching becomes transparent allowing you to see through the world. This can be very useful for finding cave systems and dungeons maby even things other players don’t want you to find. Such a block dose not come cheap. It will cost you several Nether Stars and it is so fragile that once placed it can not be collected without destroying it. (not even with silk touch)", + "[c]tile.draconicevolution:xRayBlock:0", + "TODO" + ] + }, + { + "name":"item.draconicevolution:safetyMatch", + "nameL":"Safety Match", + "meta":1000, + "images":[], + "content": + [ + "Tired of everything burning to the ground when making a fireplace? Use this match to light a fire that will never go out, Will never burn you and will never burn down your house", + "[c]item.draconicevolution:safetyMatch:1000", + "Sic of having so many loos matches in your pocket?", + "[c]item.draconicevolution:safetyMatch:0" + ] + }, + { + "name":"item.enchantedBook", + "nameL":"Reaper Enchant", + "images":[], + "content": + [ + "TODO" + ] + }, + { + "name":"info.Energy Storage Multiblock", + "images":[], + "content": + [ + "TODO" + ] + }, + { + "name":"info.Ritual of Draconic Resurrection", + "images":[], + "content": + [ + "TODO" + ] + }, + { + "name":"info.Pigman Blood Rage", + "images":[], + "content": + [ + "Don't let the pigmen see you eating pork you wont like what happens...", + "TODO" + ] + }, + { + "name":"info.Comets", + "images":[], + "content": + [ + "TODO" + ] + }, + { + "name":"info.Chaos Islands", + "images":[], + "content": + [ + "TODO" + ] + }, + { + "name":"info.Tool Config GUI", + "images":[], + "content": + [ + "TODO" + ] + }, + { + "name":"info.Placing items in world", + "images":[], + "content": + [ + "TODO" ] } -] - -//Test -//Test -//Test \ No newline at end of file +] \ No newline at end of file diff --git a/src/main/resources/assets/draconicevolution/textures/gui/Widgets.png b/src/main/resources/assets/draconicevolution/textures/gui/Widgets.png index 833c1133165d92c79fac2020b4bdc28c2e6b7d58..53d483de9476d32e8aee69da100c426e77cc3725 100644 GIT binary patch delta 2514 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 delta 2363 zcmV-B3B>lU7MT^0Q-2f-0W^c1lve-%3MNTJK~#9!?cL3997P((@n2O}PunKTyO3|$ z(`Ka{IhY&TLy&^Z1^KVY*_O;L-V2e;1+n6fK!^({kv0+w2$lm^R)QQ*5JKEg1o32M zy1Qx*Jyp{^GtQge$KTJ%?rC>=I#W+Q^*TmU5by|VYikF-#(&1fhCcrI<0HS>gerk{;5DL}N1Mk7kxDYm}8exSd$-E{SbyNHwF)7~TAN;rfnYiy0E-j^ zj^es88#v4+fUaKb-tX0m&GD(SwQRq$n%^G00e=P4gyy%O1e9n6?E?X zu4b}?*nbBQ?_;{1-|h#9or7&;05~s&Hueb|cKUwMK7pp7-;r(^NxPHU{?j|st=5UR zjCA#)-um+2+S)Gzh+kBv53fuGg}dX-pb=lc zbnSNMeRMhjt+n#rt1L^^b=_(I$Kk&$%TkBobbtQ=2xHPqDz~d7iR`vMl*zU||aDezknO-qRM={c8Dx z4+%DH|IN!=ozz~st508lZ}RWooIl~OlL5qzz1Y#0=lR?K;Jr`jKTQA-OirNYkE#7z zZ-1mrAO){hEuZdve5{=nqyP|W{1Af5vP=P?EK7OsQ@cMl5r)H|s;ZLrUcFwAPY5Xd zCs6n&sr@7qXxrTU*G#6+ZYrbzFz4n{M_=p=tm|4;RW|@SjZKmo%Q<`(9`d z0Zxw1KW}$eX+~ft09b2NZ+{E~@#l71f8JaHfWm*gh5upq`?$wkEYS0s0PRBGUJw+g z3&&wWfWm*gg@0{r?Z7qf#>Pey0NOQstnJ$!f$fn2Yi;TahUdg&$Qd7gs6z5$>;-hba->DMmw zag9J6`!~j@D2kZ{LjaCH{a;;O)#~c1LI@g-MyY~+@ZfBSdcoErq3q_o{vYznlS z0n<%^wzzKqfRj~Kl?H=>thKs#@1BOkp^Bo=a5$9rJ_Ulg0ieCxPuvB#J=Z_abLDxS zqDovKbVM^7vA~#5a5S8A8h;E1sX{J_B4zX;1T8NwYk7Hjra!>8Yx%g`cQ6>JEX$M` z#2JCkxz3J2)c$x2$}!yl*qwmbMj2&$?owf$po z7!HSgs(}+W8jVy{m5QS1RLuQ;KQ-a!E!|H$0=2b+LCg-?9Sg(ZP=9-Sd#RlP;N;x6 zaYMiV{(IV|V{dOy{eEBleqYvF6-6Oyt;({T84gTMfc8j0RaGj>va?LsIhQg6=bTnn zR?>w5oQ@#S@AqYl(S-{aG#Cuj@AviRpMUE9{rhw00=RYnh-pH5)!)4R0P4CA3&TD*#4FvngGD*3Ib1}vmr=()?Zu$5Zn3j z%R%Bf(;J2WI6j9poa!X$yYIf!Z@>MPf9NK(pY-tJjt(7cFYiMt{KiPVUZ&x&?u-Vo6Af?%1AzA$FY=kx^3Aqi zR#i2~ z;H+l=Wf@ll8dcS#84xS?x^9{R)9Z;xBlZLU&U^+CEAg_7-vwZm=T>$+0#Fp0mY4H% zPE7mR5eQg-3?QcY&RKaM^x(lzOH1870Efd$d2UlbKz~)$sfhsK3DodYUZ!!U~BM@-bn*iP`b?`m2lFPYF&RMOj8GE5QWFfk z>Z(${-;O|ofr_Oib_4UyI|4oP3_Ah=3&N;b_J3H{0<-Z6 hB>|EO2pHfA{U1=n?@z-uF(&{3002ovPDHLkV1jh?twR6+ diff --git a/src/main/resources/assets/draconicevolution/textures/particle/particles.png b/src/main/resources/assets/draconicevolution/textures/particle/particles.png index 8368455e4d1d915ac730c67738aed88691338d96..30c5542e0b7e69ecda11bb0ee75441bb8328445c 100644 GIT binary patch literal 12604 zcmeI3&38_p?*5#aNKJJ`0$gfb000P-mE^Sm0QBgB0358xlhMaw z8vtMgl;!2LeV2|_{1T04gV=5mt_Z=EX4Vp{CqxOrlP4_j5hY5eFOqSi`<^DWY&o)4Gmsfq1ilj{VaLAX(f`_|FJmh!YWK{z5>v7&;~oZXs0+SV`XEFblHP?9zn_`TezUMKE4H=E;$ww-Nq&p?~|T=)9A5`e?GlwKG=~ z^RuuY>eDk?DqS_)n_^F&8S!x@MVS|9mCSR_DvzJNiL@K1YjjSN-Wm5Fzw@i6$dt)s zm{;fG-n!)wM}+c7>J~lAPW^Ufx>R(AtYZiBMOA5OYA`F@a+AoKASvdNx{xWJv4>@Y zM2wbJU?o)MNBIdGu%QqM2lz8t+?ZHlt}->7>5MooS(W26`xlE#Mzw!LGSud;g6Qgk zxZ*66SR$F2Yn(Hj=Ob}LUukobhp3cD=~d`%-}w8-UtV6S6HR7GHabarKMn2lP>%w_ zK*($NDgdV?4w}kvAOZV~C_0yV_D~z8F|y~!dFL0%i53`zBttjC{sOzv;@Buk16mv& z)PEo#;(*f_N$@CJ0&Ju0nXKO>_7`tlurm#Z`*PcOzQ+7g9owE%YqhZem1YW!=j}Zuqh^g^((%1dl;-XoiyztVKoPHa0dlwzm5Pi;FD>w;gdkN`3AzEXoq|!j2WB6<&W^Dj6_> zmz_ku^W)dbe`VqCpZFJS?Q1u1c|OKt7@uwa#|M-MaF64`H6bQ;k*Aad>x?iEpa_Zq zrTz#I`+Gaymi?XL!6R;5o@r}S#`Ya@Tpa8xfpPImtc!z0_Db$h=$6hZbj>m+6?HD5 z%&39UGM$i9K1YaybC%st8Pi2_YDoG@2f;8dZqy zuDob)D;8d}Bd`g=H9RrsPt{E?d@9%~Z{=7~Z>@hQUTIo3I~RESm2P~^eK~o)l~QMQ z+@3PoucCZySL6_6gO8{O6^mC_kr6u=)s1v6*F+7&+Sn*PcX{Js&8sD~Eq znF`5<*6Q&{a@aq^dAo>MdV;R1gky%qZeGmV1Ae0!1q@Al6h%+m=i=>tD9_H!q${7d zO_|@Z;Y-gfsrsH-L5Sh}7$?g!4no8j-~<+P8&=DhN5jm@{8~ONZJI@yvp-ctP%qNX zf3Eb~X7gc-ixIo8T=fSh@wn;it9L1-_g;FVJ6l1f)&&bri%p{{?#9nPxZ(peL+q5m z5G7?kye>_quzz8JFsIW43{stvrfoAJG0T0i*;6CZQ{xh%)Am%yRa*6#tYMcg7VOiL zT5X{qUobevPc4uY*F^Nm$+_bO=?8nWT7us;pm`m$xgAW?H10p_W4K_OoPT@+{lG2A zfQUhgPKm_#o?N!b6~X9uoI+KIl?n##@y`XC(!HJxZXf!;1tqcPmwXcN6XY3vS%dYO z3XNn88}(1_RnU)_2Yq`18k!0lugb+;N0E%-f8C}dcrw?Jj42_7huk(ym^zxKiWfB| z7EfYCv5I`97H;JM)x6ie){hSki8Nae4-bF7y@1_Gc{;4T1hfQ13`CAkV58REEudF# z1wK$wK7+-k7~j7M0T~&Nw;FR|QibI8_q(lr#)4V;y{9jtVNh}YY`p@if(qW)(TNb& z5wVAH(%^Hwv4U-4o#0zaRw@K(Z=vGMM&40+B%kU~DJg?!oY$XHEEomrivqJ+02iDc zHchIg%$n+Wpcz#g6^@TA24yPWG2D{F1GyMoA5uWmguTxJKJ?;nxlpoX5l#BnDYbK{ zm0Txmj(t-pz)1)k%qkVBYgUcvP#;HCx-$_;=G z6g{g$^$V(-v#f3KaL3b~WSv-`h%d)~_6p{3|As)SA_<3EK)UXvSmzQ(;E6Y#3Lhjb z+$(zB$`7+e0@t@*6Cdwq_k|qW%n)ipva&-3@HPY|&l4OmYvekmz&gNKhm2bYrc-Hm zxgpkU13(>Cqr%uw(>=~aS=B91Ava1gvMoXOjy}6fkxGbx!6-Yq9<7KH<1eWt@B*uJ za7k?#znCwSlU1{qF$FFRe1Fx9QP#!Zf%)Z=GDsbVcAH9c(DbYpokEkstQm2uKI|GG zM?_{&VZ#(@K^Mjp3YoJw;=NN&AS%N0!vjWCM^p_Q0ZsW{cUmU=9xci+Y4!DUEN5uT ziVKBdMFS~DupT%0@ZffB>!RP${I~cbqe=^-Jg47Uan&v`P!;Cg9`0_2E)9ha@RX#^ z+}RHOc{my5LPwtKZE9$Lq4=kl9CcCE%L_Q5k!=J5-HzLx)`XNn#TdQ7Mb7V9!pH<; z&ToB~Z}vm$Qh^F4yTp@p=V(K)CI`&K_eJ+Ie>Aq9bN6p1OiQ7}B?3$J=iseV@pxBW zJ-9H&Z>=$086%)9=iGt45f>9%DG=@u^5@e}3j4a3Z_zSrYI%!U%|tirIyzO+dDAfm zZ(*f&W&v16B00fi+HV0h{)W(AOgL7Cu^+q1Wq|k zD*uB{;p=AOk~f(GXB2bPX6lAmu8^8}j9hx5{#!=nuZ=hoJOJE+UocTiX*w|i$DQ&W znSz9J!Yd+VA3uIOKYnxvBH*!7`sCEn(t0_64cEb4uL-ORc$-x1{(0iWU;=eSvOqIO zg^iAJ9&9GZgl10C)+HEv8`FJzfD=yX1?bJz{?W%=zn0QQgHK4Su2_QnjykOZwfR;f zB%=uM1JXrJY^HCxXt`;C(jW|Lj(p>*|N>a=&D!ujAkQ_8-mtc zvgC6Qzn^9Eq3=qdxt4S}(S|uR!A$V1tHQU=Lna6ns5J#rS0$f1@juSoDaIU2$N(-(ttUA`yLll$MaswUP&hb! zZCl9%J;cl>+tF%&OzWSa1}NXn2kg`eMzoIcsk4C-nb|Rg$o>>2kykVeaox2)PmCpe zB}bE^NZcJ!eY1h);wnJD28}!Az)Y148KlmM&M6oE`5iU3~ItQ1B z9}yne!n=>L&Tja^cM6#Rv?Kstv6xMOq--vrLNI8{sHr3sI)j#qgO4X55R=l)`%-Mk z#!gjLv!eWji(vOy7)0?{OsUvAuq%@!6>|7sA*Y23)OoVmKB>P2`YC(e@rQ?={?Nkx zPEBbI|6Y#;xTP1`@2vghV^dB*6QpQyK#iSxyIUk}-8F0C{$w`GCye2Q1-G3@o^^gB znCD@8mD!vFBz-#b*;8$2H5TN&3`*clbS`YFHNa zF?UZQglxU^c)80|6aq$c$_KIz6@3*3D0-9Hw)sA-XCY&he*DDGp<>DOn$DD5Ql~Q| zfgdoVk#Nnx^KUwn3r9JBO^lFB!lf* z8n^HO(ee~)bpB=~6lK*OU8#>|6{`R4q2ulSb2b@u*3NBZVw^=BsMo_MVKyqs@$up$ zoza5IwL_zm%z~BBK&k%koRGO#ETS~h)07(^)6&ck?iZC!0U27$Nmmm*ODJeKIC$=w zp4h|%4vvu1^)}W5<*c(P{u>z5qWJTvPr`E}uH!Q-0;UxF8Z!=%e^Sm8meK2$i{U+} z`E>}w$NGhNmtOX28(oUxFRtuxjm2_9qP6}{XGxu8^+c`6Ick-X>sM9vSj2K1p<}38 zZpQ~Ud&~muoi%>q>bZ31Wf6HRr{%D@be`dt*8-zYedj0;Myt$5%h zJg{TQ8;N@n2H6bw3rtc+&2D`tqw0@{AB$FJcdUjt8CbaXO6%Uq)*Pd{SYvBMi6(Z+ z@P?y?O))oP(FS9-8g8ySZmw$M@DO;B`X7yHvZ1L(0wOkC|I7Eb%0IqQCTjh3#%^$~ zolB=1U>b0b*=g#p&%{`a<@zwAar|3+kpsgDABS2A=k8tvxiSrK+fXv&1DbwkWlzi! zs6hNFu+hLgZbM>p>9s542`fpRK+13TCeO|5mPSUYCVsq*Nea`X20mCLl0<@kDR1** zq`@KbysN#$(KsSFJgYKDrm-)uJXm5?0W>MX^lU!xjL10cAKD3>0R#!Vj`n) zS&rB=`!{7z4kZ`5--mZ!`?BGps0Mb*G0h~@rUcx|zcdhN#=vP|zc8sVcd7VAyTo91 zUhEnEy2hi6(~&64Y@kK-ObI7K%+X1t2Aot%GDX64fir;Oop+RYS(#{r5VkM3(S;=L}=`o)*RrM7kz!jEs3Yjy%dxBW!YtwBD;iI4?A-hW+;ZQMU}&SKkX;^U{)MyuYO(y-w|LOO>8FZ zeD@gQ>4lC@+V`_uB*989P!*x)>v_TYdw+DJxeB{*;^SS_9rbGt|3{(1-Ivyiq4#BQCJPkC62FGx5l#fHB zeXQKT$#FPjq++batX*m7k z5`O%$cVx-`T5oV*&+3ArHj4$vJFU>%XemOqzDD;kQw+a&&#O13QjxA*rqiigR+yyn z0?W;}gb;r9UggT|ISSPSIP~|M_fBa3+}DrxKT`=!tNL&)1^sLR=2jZSg^tsjr$n6^ zTUr*GtFniZSg2CcOb_BNBv8l*6sguRf@8#E##+AIu%FP?QZ-(Utv6SXN!>;wMQYNa z#}mBlh*titF{d!~BtR9OIv-28|F&z|__Wyu9{wbsU?DyDQ}ALNiGvL{&1VxznW}3V z%~qikWAvrwe}nS=c3Wmo;Geq=pipIi?Ty7|pbFpNey70eTiAQ-CVb5#GZom@ws8ZX z2}w5B`Icjt=*6&&V>canl*`*hF6*NAL-WJ({PcnRJEOSV;&gfUq%=C_DHV=_`Z;q- z=BLkDl-tZ4CK~9(vhc>wYV@jMADf;0Z*QkoS66cyb@2imrNJ;(;@FO{9i=ZT1FJ)L zCVVh=KoYbojz%Z2kf<>x$Dzt(*h**#E9}0~i75i4Qt}tF?Z^OCIm@Su1WKnI4Y&a- z$W$7(KEosbkah6{Y7G=;Pay;cJReZ-|w=Lpt)L2 zj8rvax|?exeh%m&h(M|@XNTnE0i6pQ58r^u)B*L44K@Z-iwS%xVk-P~&8Ywl?k?^) z)fikStLZIL>YxC-q_W$>1T!*fE<$eyN#K~vXpgPl-1!f>Wd_925ziat!$Nxlt8MzJ zp^5{0Lk@+w%`b>s&X0N5q0*Ve&;fU|Wf7_Ikj-YJ5^XhCsOiGm+S)GSsEqLZVw@Z| zR0Nj!UjXM*Fs^AlS?L+Q`}6{6s1}HzBn3JMt@H%N3}4`&k7X<@<}!t_#rE?8x2m|I zP7-d+P|TtwwlArqtdD@8AAcM5a0}pEOdgV2Ibx9ahHGhb*ZF`JQush7M5x4D3@uZ% zEED8??N%2l5R?s11huPc;4f?v>vdBHaPkH z3~?e&)><9m*_rl8@yzTzE)v+2TBP^Fr~cYaY}JUCecGRM{cpWCj&Q)9F=~7Bzw5<+ z>+k!=-&jVR5q{jbMUTZ{>*)NA^mwFzNf=g!C)`h*05^|zlg@mwsN{^DkYlWF?cr?) zMc5CTM}EF3FZcB$Eq2`I&mBMe>JKrcTPp1a6(g5({!b}zL*1GE&mWifK!g)`bEK-K z-JNV!JSW-CR~eUuT9}XK?%yZUMqO-U%%7R_IRi*Y)c6)<8Xp8+NO)9i;gTDce^k)X zX+j#?bruCkVRRkzvu%4sp&%|xrmwX#(H%I}FWMzKAm<5xs?mxE*DDbkavf8ya)Fwr z+kQ1-Jgwf|G0ov|SZ6xF1C5gY9?o)4VR;zqaU*M}$cYF97E9?Ux>j1I^>n|24C) zgq7J^Uw3~g?o^8JpA;X!|5~08BzEGD4zW$c*}ifbi7(1zTO7lW`*X|Tn-@n#n)wne z&}n|!bs^Out{iABD;-RByqO;dj`LZG zcQlKh^D~c|7}vp4v~`ZRCu64r%~BYDxf8k^H>L^y8T}KouAQ|3cbs2@61~D<`uu;) z*isRL?|OJkCW)Y_=CXuf?fvVRqq`gnVaer?EpWpD=A!O_ntJA_OsliTs?d^8N-yE*70eA){%1D*epW>aGtlE>moE-mFMJnf<#X2n_MK z{^;L4d;D;GnQQqRqD>+j(kuqetvC6J`=wsD{34+O zMyS&2bV^H9t`?))09pH`UT4$`AXrfx!#v79aHEYC=KC%fwOs9faXtAC51@Avu3(pW zx|2Smq3CEw*(dC{gXfC~M!!LLAJ?62<^Xog2}cbOGE&*l;uW)FsnLG4b;wOH_U<&H zRL)oFSE@Uqow~nt`!YpM#UM^ywrVw7*?q1vwkrNEb2n4R(jowIIU zQ&6PxvSHcN%`QUd-I9j(ZmGR9a2%9pc{xvF*HObIn^p4b@Wdi^HI-_X#wjd6kztI56lV52W2ejcYC;W5=BIgpw zsu?PHVJl|zy^#ZAUaLKrIn*Ps{es1+Anw;@xNysDdf;ay8sM#8lH@@nLOw@GSQJ35 zc0y3HiAJG z&CXN0gVPmL6?C%tadS6Z_L;HW{8trL6KH#vFTUEA>C zua4{?@~C?tPD9tW2G3+G`}KJ5aWt*l{&ls00MH3cW&Hwar{*qyF&)uAuQ|p;$|nY;1yR6f6pO8 zr*g6Cz3eQ5Z6*%;+UT-!lZ95&QQ6&z3#%j=%{s!qEg*z^nb+fF75N^P6m^4~9zRE2 zl_=NBD070(8kkRTVKjI&B1Y$=h?`%lyT*u)K*KJct3};%SV>#`$2suF1DO$`d9L;(jHQAe9a%qh6h$38aA@QcWzY|y?G&% zLrEs%5A7wa8&D^aa%Ic0CYo3BPl)?~!(peQyUVgF6UbJn4n+lODkbb~IQXZKDgY2& z{r4?^3D2TO?Q2N-D%gHxa#G0H1Aa9x1U;H3^lvpuy&jAeMcxK7jHnXE#Fxd#F-T{i zDUBTRdtASbEyM(L3ichHTD_KUyynA1e>b&U{`RQzn=O^J++IymxtNV@_I4$!xYcbx zzC*;LuT&6dl$WY$0y&`j+RnzbmpZ@9e`Q%Q=N$72S$BwObXE4;K z!l13UAzosUSG)q5VpkUC$FSgwv(bc~oNExu=-tIdOr_KJ8_WJbZ(juENRuPy5kl5~&l6exL zjBVl~;`&n-6(f6JSzx5N=W3T5IheZidOQ$euCn3nXxBt{bs5IMK%M9U&kz7y*^5s5NZ%YvAL-j3o&EGLTN z$92AL6Hc{4(qHmDdEk!ktsGzt8e{kDdov&(0w{>np`n z7CAh=Q?BaQm#35_LtMVhJpCKMv|W$%6L3~VfY&;^HKt6fg(~V3_dS&L(~G^Na5}w_ z8V|_fQJu1FgA~(ub_9eBJ0&ICF3aj2o|^==-vhJ7ykj2pzVCMI*sq=nU6b}f?9Q}y-#wuh&@H_ccm)4 zNMZZ+qATZ)n9Bw_6aJdPb=ifn-rs2<+mQn@;ZA%Fbl0kK{)h(W$uvkYN?4-MM01D} zv4)VS_4=o%yF1kplD3p=ifDz5|B(^BdcpQ!cE-%VPc>*MWAc@K?k91Hmk%( zUbX_qsL8j0wRJ_Y+tap(AO0(q2@kOe1yv{9(tp{v@<#|Pk+Z4Sll;n!6wYO{mimf% z`g1I>{W@DywiFz7jcb}s%Y4Wag|%zWVFih{ z@QdD);c@7pCCcWGZEf~$u%eOnX0zIT0CN4Jy#4Us-|Id5yDlA?Sh7aE@q1;FWdw^aSOgnEIZt}AXy=tMGxI;D zpKeMKv(%1ky_VB_K5^o*W;$0i;|2KRzZML6Z$sHr9@&5Ed>d`8QBh2Mqz;IpIbj$7 z%?`Jlyb@0<)xu}IZ$FK++fH}P%@vS>>=nqZt+tPiP;?@VE_NW0jG~2?`X5>P@*|q+ z_MbEO4U`QOJ)BOP-tTYy`O{NNHgKdTOUq|y1A(GIH$Af{Lm%K7<(LzTma(Eer=nF75=1^h9EDs|qL#_~bT{R^!c4R$MLa|MP~ zz~W7J9@dD0srCkvdwU{t!;qAT2R7m zNKsG7Z?_+W4 zv07Uuc-QJ5_}Pz3>?CK*m)DlJa({8;(4l&}L9x%l&{m)Yt{ZcIiVf$2-u@n&yA^TX z_Mi$z`D~IVOG_94>*PhOM?Z_^ArH^DCZb`>{#? z&Vp2&v0**R{?%oJr~_As$4i9DcaKY38w%N@;KiGvqV05Pu7?e%D#JB&we#|*erPG< z?Un|;(l?)D=LXg+oV;I6V9D7|MACX(hHISY#bwr!RNI4YYiO&=)_Hu^ihd1@S&bf> z;_Z^8x0CbQTm^;ku|%ktT4#A;%T-r%zYLkF-*wV|<(weOS`CjOQEwnHl;V%mD=!>}idwC>Lo%sC~QRwUb^E{YPMs3YwS0?C& z&(@{QeH7k9*x7V*1*zJ(Q7PE6S`mVtS`KOqD4PCOOEQQZf>F;d(Iao>kwe)J6iEkM zvsnfrSrh*KR|smto{rPbyD~Ob$e*3Lw#G(LBkRQg=iHrEEUn>dMmK*j_Uk@EcF^B@ z)Jvdj%8N-jb^iWZ=Kj6w<8~CrIuH^p2ps`n`qnO%fZ_Q75MHG%N3RdzKc!O+t&Ci%$sK z7aY(RpMQ^M4luJi&?HkJ*#0wy(23Z8mfOFv)oW{!9P1!ph^y3}V0HX!9158VGN1oF zD4bEm%GY|A<8!_sKia?s&`SF5;#4)1=Pf%(hgU%dRysTmKM3X3pG5`|+%F;-6yNCN zkg>gf%~WN&hOBt@+{C>c^Lw&jX{Y6rI$DPV)PtWV^ z5Uw{H(EH2AP}Ilk8V`s2K;*8#1#-+5uVhXNEGFjR*Gxvejzc^fo(OSio)U~5t~x>8 zZ>0z$=L|`EBT{1y^K59SU8U6v+>C25%3I?rMIFc2Sv&lzvPww)Y zd=Os=T~}IM54K0giy7haBnKhSTiFkGHMxcu|hWp4k&NyUDkjzd{8 z-aQVr_a|HtB=0x6c2EDX2x;Psh|)i+zHd%35g~OAXicZl-|O`0i^`V(+Za4{81++D zB14yZ*u~PvdEsAERMnFVR!*~_i~A8S>gcW%gbrmgq*t5(wt5$`#@jc zFDYODd3Ch;5B=2Bh}Dqamw_C}xvCsA+0K@R>F{n2=UMJ-z4?xizN5o~Rh{W%j+CS4 z_%g-~*jBc1+SvGush2l>_*dom`xk~3h>>SFR@U_aT4}8 zjA6B97JwV~^kiQBY%XeSzLS=rdCD=HhN}?E-Xedn&0tjTjwLJPw?V$>@ef-u{?AS_ z!O5*&Og=-?#z(=NI!wm9G73``fKr>Rf-l9S-eA;ozh-#1$Qb*-p7*zW#2fB|z}S`y zg%IC9NbX`<`z>3*<&m09y=6EjTFKMbs4KR(rS^Q1p@h)ntu94HrRY|F9Q}DWI){1Vzbo! zR7f(hS*~dAVj6I%x0`-J;gR)ob@4#^|p-n z$mLQ|s|_N*b%5T2Dwnt-XnXe*`S1xe93LNBCOyjPg}X!3&bKx&&`_yPTl26p%GwrbEADuZPVyQaPr zG)47CI%VhQumru9*)0g|4*Yg$Mx?3w*=y_NPQBVr+Gp3)H99I2{-R2CDLi*b&H?T+ zY#fp~V?hpw1 z`2F#n?4GxI=Onu`d2{c~otG#bEoHnXlurNvz*ALG&;))V6w^stLR-7t> zXkRmN{B48xTGyI)c#XFPXs#k=nZf*5SOn51@96!;8vLmxssH}{p%*K|iK#;MX7A(bm?!?%OzB@e^Oj9ermKqbTG) z_RQAkrrXlJj*p!7vr?g5MDM!K=}{zu@=4&z$*U_natX3hzqeShd~ znnala0!$jM1?ioy9h=)zG1A`(K2!}`n4b13s4A-iZr69LC)c~jWfTB5QJ1syMbbWsn~`-wtKd&xSN`G+4sf1o z?O+EHdB#mhfoj%ZNj`1~uIUPJcW(*s_LLMA6QlUtzhUJm%)NcyYQjmH8(B8D@8LF) z=i=-RE}Ae6~vCC<_&-*kC^r2r{&2~fW#sjT`jfqv{d4`pv&WAJgo?eVWs4E*4K zlgf*3|3>ZX>i4i`+WuL)c`9?c3043wnK%e~aniW|NS)QVYH`fw~o^x+NZc^#)+ zShrjYxN7H)B%L_Ngl@{8=*xT*`)yI*cSG~(S2-GKXVL2=WxAjS zBunS*!NGy1w#@l&iE6X1;Jb&1hm>Aq*l2HWSht@f_ttcVlQ=MZ78O%qNTSF`g^RH< zXv6>b3m$2gPA|UVBt2P~u6*Mr_lo2h%St ztziRiK!MNTX`q8?`G7~GR`dQ~&-9^$Ea=8G*YhHt{h<12CwkqUEo*&marbD^qdmmy zXr5&GLBzuiUGa-I5xAc-k9&)W?WyHzIU!|QcdTd{S;y97{)1V=Hzp1;L?Ic+xf(31 zrz4Ga7N-YZytd%oHA|=zm>8nZE}6hNzGdSh6M=?LD)14aS(DSc?PRAhyaU zerT*=LHtzri)^bqTaTL$=xCSTBM}cA`1troE6^jv;oaR_bAPFwt0b-U;~}1FDV-OR zu@G>aneiFfAd`+K9A3I|H(gPI7?GqeFn>j&Xp|~>K+xCL)>h42u!;_UL>Qtq zF1Kg#9I)rG4iJc zeb~O*GAq3m$$zQFG^P6mlaa1>VH`vicJM?HiF$@J7~1=0CW@AH%e>mM{B}7N&!{py+TR zW&~N~fPk~3+Z%(Hu7mYT+fO2gfZGYJEWwzBA21f+rw{k(@-JDrKJnA5=044GI(n{g zv(9MH3LcA^Q#M+OuM6ZDn#`&Z2!!0@!vrv8E&%HLhNkcP7N%x&E39)7Uc}Sb_LE(l zS=B@}0t#M1a1n(UGKyY7f1cZ918-$oq2M-fOBZH)Bic#>9xA-=B&V7tcVqFSmS9fs z!$QEC2Q2iC^+4O)k#(Z8pJ8wd_?2>Fm(5)~?fkXScnb@C*fid-IhC;kJ#X4-SDB^r`>0BC`Ez^Q&trGw!g99h!pVj zS~9shStD$L#<-8a?kTsfIX`g)U-cp`Zo#-~CIp#v!>{R&PhYS0(r7-x0mcQ(+n*sr z_j_9dUZoOP`E3T9mISz?e(Pya_qu#oS|=AEklYXXY8Obo8XZ<@dVY+x0)4iUw~eTq zOl9V62b;32J$!@z1i9k0^nUdTTH65dbDzW_123Wb56h%FiIAg15CJ~yu6g~q^@;Bu z@E+z1yxG@J#eOg$Sfic`iI=?jMtjk?jKT{;#yl0sBF&-gCn>Fqq9pwyRd>6PP+mvMKLc4Dl9Pw6gtN%Qv9=>t$ z+QQmeT31@}+VA@}PTeJG+fMy7Hcl6wj6Cw4I_p|0b#wvSBMG=Z9E4D4k1f@(Mc1t! zZ~Xh`S63@0E-fapEctl0d+$!Adbt)lur?B+a%}fL6i3N=0jv6?H%)atK@#Xkt$Q8@ zW3tB!FF%Z91@3wVopefqg13PBHg)PB;A^^>+}4l1$2XJ-Kk9Fn_5AI(#iiQ2RAjp; zFVw5z>+XfW6yCWvwqRCw`G<2bulx9>wzm!LqycbmNsNb^L5dZRO~OZ{i4S8fyUm7T zu3$bc+d0K57zI)p{u}Ive7&ZI-F~EXa>SCkU)U;r62}3Lz=U@b`?KWRfbe$amSkKY zrZUjAKWb~8G&cdRArc&*ACRggG!G*x8SU;Hy_*G&b$slH2Z(6F)&s@;YmCY~8T{%l zZ_|**Q+ak!suBDtWZuRSGk+L&>91TGN6REQj$Dxbgd3<@!}xfXzTVF)i{At1hX*nBgrs|Wd!sO+}WZ9?na2tMS7g{}oKlR|)l zNh;nYj6!J6D}Cmz^QZF|nda_6y~9-@ZAR3x(>Xr`Gc*J07rx6#OYM)o6A;N7wU^GD z4wNpes95Vze*M~qrKW7c25lG@VB7xy+NQ3kU|{G86fazGHsB<9|1 zIk+1&BG%#rAG!%l|DnJHI(PHK?Py@DF5Hd4+Om8;K={3|%P;6)DTs%bnr0*JZTEGs zb^OYS9inCPMU7X+np%XTlDA(hAEoojQrN={L5bh+36R%*m*swfwie`xERkH(8bFOL z!^0TY;-25ExS@5dkLR~auc_r{hTvC&3PG9s5H|{NUOUz3Wxb&+G1BCEd=+aV3+vvj z?c{m|ol>F6)91nPxO%PrGK9<2uSNOz$3dQUE-%D%55p4D`(fx54;U%v{2RrLcOTFNos!3!$%*ksV} zvGS#5pN5?<2aRrf0rNRprJK&e99!ofYSTv@Y7HmqVz)b3kM|?TQ(Lm#>nv*ez`R(32~Y(fM_kxeZ!-IC zj?v!E*tiPeDyN4Wcl~j@pUK#O3if}$Y|A>r-KrcXGpi!l#u@|l$DJJdrd%w#mBm7j zwJJ{KL`i5{{$Wj1YzXD`s2TgFS56u-ESfH=tlL$I~ZVSGDHmY;Vu`aCDeJ^_d-Buq5 zW(VY;9^7>PS@5G~sRPrzL5o`Xqgd242PK~%WoP+(5aNhm6JK9|Siprpv&n-EzlvC$ zd_PLK5$n#G?K^&wZ|?x1es&W-mJ>=0Dt=re2wRn_YwK~nD$lBxC%duRw#?(;ygMG6xp0LAOn6o z@uGr5bO}5mO}bRntYLPHLjR1wbuEC1xD|~q`7U^@g)hVPx1Aa+Pd_wkcK|JDe!vOoZ=zxiLoAW*Z)1Uzj0|%M=jcRyz$yYNH)nZ^TI{QSOQFH1nV%HvNbd~6Tyhu-Gu`J)a$Hmfqvl(vPrF`%&9I`9Y)>jk_E4hr(? z2%6&v*@gxoug4Z;GCLm5gV3*6$z_DzES3LR;xu;IKP^;^6>jxGp)p{jG@4Cd$SxnP z`XPBP1TnX6+VZJ+5r%*lj&D4l9+bgDkO>KK=XeXusctblT zCJ3X;_TqR&_!u1HvFl#1NS5|5C5dj$t0Nv6oKt;O;UmIZ64$j3W*gAZEUBK`-3dsp z?`V(dbe^J7aj^NQ{)`K+A%mCm@VZ2D`m~zJoWIBJXhG6_i8LT@Yi4_@oc*vlw}Yk`}`=_?lk)<+)pMc-CO|)`JwP z`l8u@FOhg-GsVODS(n*`7q`kEd3g&|_yo4Xw#B2cqOe-$N(B*RJShpwBg;phyM#A{ zGAea<9-ZH1B1|-?E7(KE9eI>rkK+FPo`SI~sFgpr4}u$Yt@c~;re9+qjf_&K>p00e zM6qN*xslOAlC(?~j?j8n6HDR$x`>6>^u-Bl{n zB`$qTe~UQjeBkQG>D#3^AC%r1WTo)^(6jX#W)@Vuht~2w_JcV3E&ANM>Fn~wo230_ z#?+9hf>vpF|L{llG@~88-0!Ncj^9Gqo2~8uXo-5k52JUcKp@5z^2c(2=i3_+`gbs` z?iP%3JzmoF?CrCzM@av6x1CzsL?dT^zdOza?Fln(l)~nIlH-;j<=mnmoO%zoy3HEMv_6Z}%^?tpV)vt)?~t9xc!>7a zR-x7T`E-Ja-sE+6QQNJ;vi6h8?OqOuvsJ0xS`hkH;donp-dXTR3IP@c@}AzWa35YR z*lKW3&O;BbUW>S-AHH$>@U(z(ujMBGTm;=L#$_wdc=_?zO>D42J;lZ|;vUPLb<+^! z{^x1pHSJu{UyRyXZ{|#>pq@cTPcSR13HBsTsHE(LA?AD_j9&4cV+&=kptVF+33BLP zzoffuamdN=mz&|WR(YSTkV)JTVqQGi70@r~bZz(zxMG@hf414Fc)AZM(6cQYWv|S+ z@oRFtkr9f;nZWDWwguAp0&4grNs2boQZ*g7pV@avSfTk+h$-LlV#|m8uS4urTZQZ< z&Iku4R4rdVzXfCB4alDquIjZRVnzzAl~39Wt}ZT8ySci?H8(YBKk9=v;yL&jRJ{c( zNR6;eC^lBpa9ADZn@zYS@4whsJQ-?yq`T+^RaW6Id%?`dPi^(CyT4Sx?A{F^Uy=Iw z!D!w2RlXyC^*8|cA;65dbG4&>5a`ZvR1jP9>Dgs2awj*ES-FPjvkF>8pHhn8Me3op7Ae#xJV7MaBE zeboV*SgfU=M<=sQ*XQ5B>4G1=1YgFp>~LY_Wt;YN6UTSAu7+O!z5Ek#YjJAP7e9?M zNe(6@Qr<#rz*#Nyny+YYb%O>huGQB5k<3$vn1(!Jhy{`{zZsAgD>s3$U|PBaqF9mI z57j5*V*&65>f!BUX^5X`HFPkjxtAuGNYYN+CoUj^ZKd_z@fp<7g z((u=58P}Szik4(BUrE0YUq>+}PSn4*`C>!lAuRWe^DXi^335`2YxxpRp+gNq2Eo(- zjkS7keJ2C~Z~qSU;A5P~hI@rdJimyCou%tg6S=><49RTNt<35H3ECs`@FRM+o0^-I zvy_$Zvi_K)Jr-EnWc9Zb0jt(qxz|2!d65QYfa@+MHzU+2b>|wBJWlvAT6pKl&#tb< z0-cbk^o{_x2te%_GVQTYA zd-Nl3s+J*vh(QWXGTN{tohy+^FFV0&czTc|fc z`b6$%4SS8)7g%k?2}Gz)c!O}&@(&DHur+3`u`L-P( zUS(%8f81Le(S_1#3F8U1d)CggcQyMCl>Hj$#L69W+*p+ey_3QWtN;habz6YhT2R+h z<8QvcQcuh)mbQtoV(H7j z6snM*6+~Yus=6B{&X;7ms3LY(xYX1()?aIqoF6?y9E{Cg9Tn%~gbmu9Jqpmv8KWgx zqxy6pHdZ_9%yGM6>8>3BfdmN)D@#(w`ZYA}KE~X)!{wY`V`F1}zP_c4D=WE>n}YOR z>CZz_A2+s+kAa%~fE$J_wly8v8Hz)suh>CXmowsC;4`H{jt&*7n6by&HBS4ER(hX8 zTOvYp-bg?u;`0ylHs|;CWHtI+#Py?^{SrSHEWLHy|L5xJw3UbFZfSr2 zT1WYzkd-csDws0(Y~hFemM};X@A%D}a;PZ;l>`MJ7oe2;06=gKbEOG0@MxGn-oy4@ z9SpoDDiFlIxPoG zJ7B`@7%?^dJK1-+346^U{^C|Xa>%Jp%Wzmvw@C*maSwI-m=hGI24Jw_!;EDk3n>Rp zXL&~0`eaeS8W-$6RxmLerskj^XsPAO{ph1kwyv4b-i*1%0Z8NIi!w~4Ngg?6db#6|f89Fj z4OsiRe!WZ`58Nyj^lZd{seoMh5XKpZ$~nQq*>w!Y08LeVVKt$2_?>~$CdRk@UhRIdni6Cxn5*XmT1GzM?xW_%BUie5GQlzrjl9Uk8a4*YIAQ&n7UXwfD7U@QFGhQ#NB zfWo8lnrK<(kne^A4Z#Wj^_&{?&}kso^#h9Gj(dHFeu5Py-3-V)d}?$3W2xhgl37(i z&8JW6=YiY5Fy4n!-S7xHixIjg{5UA*R3^LATogX}NO#yc+C|M64_f?mjB4*Zmu{S)=bbtj3?79$(+>T>6vaN9+(_1_uP#b^30eJ*05F z>GZrjOOfe3Of`}2YHPb=f)Nl-rU7f+n6v=FR0nYM99M^9;sD%&yCy8s&j))0X(5CA zavO!pX}vkecwmI}1A)P>LV^fbHTP}>VX7|oU)Mc8l0s#Wj-ElHX{KEcG#HPn%(s2( zT1!7VQ&iA>+6z}2R|2wz8uE`_3SC9lx8vt1(wHK&o30zFklK%p9!L~43FYdI3e1Ag zK>UP4-dwMqp!IAM+$+Oqt=Ga^je{LWy{@2NPX_OuP|7g#hqu95;1Qq12> zt{`-L@bXIT1Yz9aiTdfLVW^9!J%hD6c>`(LAuLjvO`jjOz#t00JBVAKGHno=rcLlg zD#x1`r4eg=5_JC#S~`OGrpIncM2ETCe=gawVpK|?1Q{MZTlt~ z{Yrnsvx=syOntV|>g&CbXT|E;W(#firD@z|h^H`Z z@Xb#(+Q9PXh0Yj`k#b0uCtRP{nlld$UcZWK2@F=;aPC^X7R?n4#J*%Zxd`jJM`kz0 zO=(!(B6BVts&^4P*YSK=l~pL|V3FZDH3H_a6XJ{Ut|slKRm^ww2LDj1&(Y1H*RO)^ z=Wgu8m!W2|PellA@*a09gB*J`u*;nTtDpZXKm{*Wi{D2^%Kp}!kpf1DBHrp zRIXY*E?hl6cNhKs*dTPabGoy%v%7PD#4j=tVd2h~3VCQJD6Z*X_n6(31swMi+KZ#0 zClbo=qXM}5D^Lu$t(P*8Qfs#GcXBEySBU6<0>!%poKRhi%|>WzPVIt8nnpQIXp?*& zV*UhNh{)826_)zeic%SDoKih0;IS5^29aCw^Ho23NYTV`}Fj5Y;a+B=fGJqQ-h^^=7$=Gh(O+O$1f?6Uve$&dIx*gy$_96pdQuk20lcn2X;|?o z1Rk-I^W>?9nmW6rvy1}jXz9PiC4k$OjJlzKUV$4QzXfx>s|f0UL~xxaSSfAbXr+~l zX`n0~%ni*!U9}#|2nUlIe{jg;xjeUK9ZXOcQ=58V=APiD_>M~-&SdfZx21?C#>5z! zvBRMV;OFxCbs9_Zpyi|JT5@hwT~QGlX=;@EJAdx_G3yql#%BetqITkez>o|MpwbK= zdHQOsm3l_1Vb<9>*N$Ml6aAP@=_#p3juSum`T$~q; za&G|lndN-CzhVq8&*?5-@tI>7E zBr6H-QLT2}<9cJ}+djgf`mkKbsn0YQX7R2~2RTW5pARVT-=ucG`b!=mms&I6k3z#M zlv^&*q|x+|KfX_w@1_5VCIP*XO#3~d_;(C}Y`OdUNz&UJ!Vcoq;jY>HYXW$T5EJu= zfH0mFa+~feG{+QWao(2xnw6pSeu=0t4tmt})q+ItLEOoGNXQ41T;SZM*F+|(s~Z}# z=h|w4oR@L@jcC0vFSt@0*Q`cvLbKipJvFHT5ofp!RW9@7VjBKV7?m&XQ_0$%8bTwK z`Bv;@uNs3XV^WGF_^3q30`TnkpAbw+pl>AO7vK!A9+t_ek`$79?kBC(lb*IIm~n*4 zQFwRn1tl2|M_f<77j*p;zGL(%GNmS6i$}&HtyP&K!8)wl4jRlv7-f^tXolZVE#Km2 z*3NCtopab&CKkPSG7eWZ{c|$GiL|PW_aWhXcTZ>Nc$O~bgk+)$ zi*VO4Pl7RE*Bic$R`o?#!T#`f*GI)7;y&@dEyZY;6W()HG_JZT>_I7bz z1G+f{axN3ywB0;CTX$pL%PPP8l%7)Z?di1&z1{&eAw71j{ABR9@umU`oZi1$e3Dsc zCc%sVy$lDc9AKrxDo{Hh0!uHqFYI{gn@57F$&f$aiQky*eP`MrV}hX6yP4x5reBGn%38`C1@Z=0l6#LJHFmK{EF^)`j)(IVTtS*N^Lm5{|5 zAnf|Y0ogAcpfT%&KV-ac&6_0uvG;qlrMaH*nQt&v3XVN><1AB{!D|*vq|MNV10*f1f#J3U$U+WeXdP z3$>ZRHS^VuzCRo1*+0MX8ck7RZ;k%>85H`{7a_S}_w$9U`jeA^KF^7mxj7$-gpwQ5 zyljPDFDr!c<2v2(~3q&N9X!mm?#~wvzv%k zn2D|bEQJ;03o;A}wxH9hH3}x3p)s(~+ljnwNPWj*=o0i2#9#yh^nN|x`!Z-M3L`tc zeC6N27Zxl5-BARg8tf^Llj>89iVZ03G8}l-KT@0Up#5FkttA_RHO!{PvIgR74SxAM zOZU?i{qs8ALZr_oU5CCEaj6lc{=4Me%;45+m_@s}SI0)bnD)=L^Pgj^p%lC$n)y7H?fAM2E63e-^+ z+wBoT4deKAg!$ZE6To1D>k$imCau4Lv4ivHlSNU*9}V&>&l|T-FO6`pMFzOEjeIRU z^Qx=%{a%6F^ZQWSNi$;ao4e$W1Bu*Wf_Ps<>I`vScxRM*^YaR+J&ok^5G)$7Y)$z) z^vBhT^Le0!x#A%953ue?Vq}g=^s}0pcB+La`2Y#{TG z4HiA%e_d^flQLRe@_kgc`nF$p4j0a5b>~8UdBPOz5=$P~)98iyN!6$$gS^$;BWv(k zi&Ik>Y8!SVW5sE)@iIx2v#UU?DIkZmmrv=bd_mlgj%7Qmf9Y-nwcr16=I+oR8;Q{M z_AWTe{WLaQkp9$=d=7q?0b;cxq($(m-_TOikAZc-IwfJ+Hk^pa*aVV8Si)lay|4K% zu;BNIFU|>QFugG}dVA76`U*4*y{W$T0l+*V(<1q+ag0$z?1s`iFe)zCRQ9j@KdQdJ z__1N!ROz_(r5xZ%WvmmeFj)sZ^%^E(IjZs&s_aDs0UGPU41WJ{$tf*_gLt z@B4AtQp=jl@lRF60z@e@(*GjL8a(AAZ|c@U8$Ai z%h@-XRwe<5;ne!{&XNqJ&(;Yy0$=^g$cC~T-wxuuWRAdKj@4Etdje zSdW$Ymq<~e>}q?D`|*CS0)`_jZ+CJMqAQ_Ckc(am`8^(Dor?u;wU+x~+)w)W0ErwP ztEmY3ufK}{s)*B!NHQ5a;ToJ(hQp$Tm&UXnR@p9B`6fhBvtz_+*s`kcihmy_5uaO? zCotUa25h0pN7mxe*$R@mz^U#Lyg_b%%f$>I(=hKi^-s1okL0$q)K@)Pn_SRQI{ema z-%^YZJt7pZW=N5>`1P{~t?Dw;L6Z-QToUXi*dUdt-&lN^3~XO?No2T$igv#56VMBCmseOugAt+E z#Mg14j3R68ELDMhtqdynzt7`sE2bbcU?T*0Kj*C6U}2;AwA!mxhelvH8)t zdSTaWReM6b_MmrW?0}x^cJVA$HQAp)f4pO2Nv5DY-5;8AKMwgncX|^>DTcH8(`KkXVi?KM1>wkc28faK>L0V`zhCyAr+5uc$ z#a^3wHfE*O;Tc~<8qmBdHA5v+M-r1$rtJoA8phdYs8mwYpWmCCS(y?OZl(--M#+b} zFN;Fj+<|f8!?fwj1Q6@7WAe0!!B5VM2Ga_QVq0PucM$Vj7blhuLwQhfrbMiB(d-c6 zv|qXFQO|laVoRssIX`hU?5F6L@GO{Nt~$bKRQ4;Z*epCxu(Xksx-qx@@yoYG0uSXQ zEH8vjIMCvlO{OT2Q4A#(V%+&z3rJGse_fFPXwH zhIjM&=?3Q1x%GgvJluG6v_zL^hBJtE|On`=OlsKvI|-HibdMHt^$P6%WXeNlnJ= znncCc!1P>w6Q_Lh^XJ9hfm}kdtR@5xdU27dxNhmSR|v>Eurk6wdu?HJ;7jn@zDoJ; zcn8fN4{d}p6X;_3w9-!uO!t-O6$!8vo-lGLytZhS#8!Wf{cLXM+ZUKm6D^2dyKi&K z*-XBAxJtTA(1tuCs%o2#z~DnM=T5;c+glYfeAy33On>DXhmtl~Yl$3Xu<2k$3#Hok z(&_h^Pe9g|16~(mB)NEr1iG>vmLQeo`6snTt%8v$Jhp7x?>3uAk>Kux5wNug(si7eiXHhceapgAN_NKehA#i^ls z{ZDDOcenwfqYlJ6UTaTP%gy<`J7YRt|7#FQ6VvSbsS)% z7lOihh;+F3#8Vk8O4kVT>5fpVjAZi|FZRx!c{atQ)hhQY;S=HDygi4J8K$PWX-vr( zD0SM2XKbjKt?geo8L0}-Ql{aTm9{s>F=!=B^4mB4#+X02Kazctd3#`?z`^LgNAZ$B zxxku%=gtV$d>WCw{sh}^>gv0kLMM?TxzTb;@~nlVPzlHC$A}fhZ|&B2$Qg2q)IO;w z8P-9E;ukIAEq!Xsbn%lVebg4K84gk(x7nm5G{5ok*uPNE^!QRb_>yi{pE>3)^Ln1D zXdz!i1?bBZ^86FS1mcn&RYC|dYp~X=I=1?iX&9PiqUU+0gQuw4P(@wnw${iGt3jjZ zvwFoVlh=v5337p?fO-6kXk{r|w$aN@$Tu{_nXdg*<%3 zU}dMF3~2C%>kGfeAGiGLV_S_Ev^S3NoWpGZ+q|ZGB8aKF`P_}^@?HA-zRxnZ2_K## zWTmhS-$Hb7GX!2{zg64+nIvycnmBuX%2w04E~5DFazHiY&XO-Hp$_v_%3r`GHTzji zUlEsdh@5*;n)^UIhLfOip>+Vg1KDszFX`=zBaVR~r9eJBwyxmhPVJndx{H54Vmt0b zT67Z=;i9IPW>RHsh$;52^LzYga{JU=>5PsmZvSi2q{^mfq&Q~ACjj*e9) zVyVA^6BOSHRU;GLejDMS_)MK)$SGgc@TTjHuI}5&%NiE=;7ccdE;_>;qKPZ)p`GCD zXeTZ+T?YQ7Q+FO4Gj^>4Um0Cfh7s;Z;@acTk`pVK_N;4}d>P}iSoN@aCTMINBM<5a z9L{;7)Wpy50qh1eLKmD_C2Ou(`q0V89OjediApZLx7Gg03$p>gV1Ff9#~2|=8p`LY zJ+AZVR|+fv^6$CQm&Q8az|5S)4MbIKlSoate*W2n_m1jik4~Cf{_iu-7q1lF5rYRB z_JG*#bRO;5vQ`7e?F+=_(~xKSGE55zQ*jD46Uq8(gjN}h$0uRrL8@h?)2=vZ+p20M zicgdvh8NaY)RAA#LA8Y!b#~xf8O8~p`H8pvSyCEPak#pb<;NYEFB|^|Y7zuI{a(~K z<1x=n+EC+>wDi2`ON1ajmn(<(q->*b#mv)@Y7ha!*zK z?}E`rx};TP?7_xAl(Mor9h5d-!=sZj04}byQqsn{9*P$tl({f3`*8=Q>gEN*%JS!q zhw1`YwB^DKGjXAcX{pE79SH(Ixi5AHUANJ5^4uu(+cQr$(=tqL02=GAlC{6}xkd&v z#YHaZN@5fWNmazO;?WF0a-&o-z!~@Y0E8H%(Re?W!;D&hmfAsF|kRNem>ei>h`dF}}9xh4A_*$ZlKkDYzu|nfJr|Kxzi{BmuW%^!d zTF)?sc~ivZY7%fT-Q#d&!Ai7u$g zJLkQLvTWL+nzE&r^+0A=L#j1=Ud&#MQIk$?9N>KRPOQE`&IqsUQ^m_1@eUl!i9wJ~ zT`uKTwop`bg9loP{m{gsAF=W+`RBs2_oevqTn$s{)`?Y|U)N<_8-;&DwPDd&_C&ZZ zgSf?_zLenp607~IFLcp`_kGXPF;kK{19{hCGaa7F$x1H~J2Nl#T$KyDwf_X|-k$Lf z@}&>RMzzdu9l}l%O3r5Gk-_%um_Bxqq%qhk+?>i=!HI#Bxl?qf;Y~OTI|hX5i|!1G z$|xUm<0jpD^d)%+rp-{*o7pJ!aGGk4xt(t3RGPZ^m(Vf0VcuaXDeFM3$W%ZpE9cz5$EHmZ82lrFEz8Hz_;}B$ZvvDh8&OR2 z?M0qmMvW&@TooaquXY~8UzMeK=3%|*th za{Tz$k3V42KRt!zyzfR_3*oAb)4v-G(n479cqWDj(;MDKr|KjW#L#a%C5`*K@q#pQ zP?(mZvMH9`0)H@W_M5JQ&O!!^i@ZVtO0ItzBfQqi2N+Dwnihc%Qj$FChLlBf}GCrTo@UOt>u;a;b3Ym%Y^(`Gx^uP;fp@7ug#Wj zlu4;$Ds#*`P799(C4RNV*DfF@B#o9$HFyZKCJSvz_ORY**SvkuAlfE%-T^Crfg-fw zyS(@pCTF}^ekPkHOgXfXGjU96z+yQ)s_5b&adNI%v}e<>-zS-$%?RemD*KG%RUpNxm%1yxAs`G^s{WMyk&Vo;$mJ6sokafRWZ~;mllV zdjp-fIn`XhVbb#k$ug$SD!v}?i7R7-5%W}mMVcanr+89zj%+_{0Ci@Jysy~x4BxSz zk^EK{4T6S!(wmnp6vD4Ur(ny0(9pAZIL*}AJm%hg`^byJf=T-V!aAb1gLbLU#iZ=& zyjtCFi^_HO-H=GbsduI)-62V#3ef}f9@ z85T-q{#+evkc~QOrT#t-2mxgi0~)U^#H=Tp`n)q1)$Z^4&?jyO^Qs9#5&%eFJ80hYW&5r`Lge$ z`tPGS<+B+O)w0L%Zqq+~EFBst=9zco9E+8>8vXhMfZOGG@7P)q?p694kxq-d?Gc9uzOX<^}SCkW!h)c?1-jf&((NH zr5?O^oK&SbF`$oiMLeJvL1;2Ry!v4s_&CQi9shM%ZquHqu(8kNZ^t&K&SFoRO%2wi zaFVSJZ%B>%p7v_XA0N$D^p_=nQWo6bO;xxmx&9r)P+?a^arH6SKFj4S9odWa>|nIP zPI~F>Z-X0@D5~>YI`6SA5PA@TvAzY007-uS&m+P{0j?(Bu(5T1F49qPaR(#aTsJwjavKh+!QCI>r|$1cziRFD%x!bR zWBGzxOJe5CZpT!rFf5;!g^2Mn;6*aY?M3Ua58sEI<-}A$G?R8B!hWyL^{1X+n5CEb z+iT2Z$kS;JI{XQ`*wxA?AIKnbb)ua7>-G;MtIqjp#Pom747ssOL72>mrOn-9OLBMCT2V&#d=1t-r^@=-`k z4yB%OrjqrctgWKeauQanGF=7~+yfYRVyDKOLpJ4p=tL{bE~f2Uw5>GR(fs{Y;i9-a zU#sKYb;upgH3BY-d+%68ur1{IVvyGt0U9Ve_b7?Lm!K`Kih7V{9#QjW*&Lobfs!nS z8$Xroik}Kz_27|YM?Q#F)=vlAx)&iJV(@r08xxBzF2#cO^+6(K#ztA*vZW<7J3RHg zf(9R~3ze$tHFovY#)jvAJ1~v=68KS`n|W0@^AC4vIS@an&CL|(tOrwWNG=td@o;BW zm_@UYmgS8_VHkqRs^pkVNzJV|ZWfI?ioJa)I%ZI@u6}g<*B`)gkGyd_^%p<76>sEf z7uVifNV@U1ytx%6!F5uBxC;;2I{v);t*2n{7+9M6choH@aTa5Cs(aCL^Q^JgthgJ0 zVVUO3BnJB`-@{Lzs7b}J5+}--t;f`CB6RDXd%%(y+&eelDf&^+J%9Vp1aZKG+e6D9 zK7}Xesr@!wt-|_426pKE6XYk(vfjxuwqDvgjrqoKfNup`OH6TsLe@L)p5*gEbu)iX~!LT zr6y`Vs@lVu)_HUde!NL!-Q(Xa1XbsvlXcvgh6OG0cYn71^LDrKD5I?GjBCbMx<<8c100u^P$o#nNmb9x%}>j zJ3yCD=h|K^AV)-Q8M&0Hw%fr(E@9iSH4pTD=W6xD=~pUkbbjfHrMq}g7O4_Iq*lD{`-bSPkDHGA8&c>Bhuz1N zvpsZQ02R`yEJ!O{9=jV+G_J1Bp3GG@@FX9t{&x|DP)rV(6vkc|&f=w~A)Z(5_Di$y zVPpL z2RTX1#3X?NKX+2GKM#qGBms-p5jCqaF_j2jsg$NvIIQrmuG;=0_naDUdOHAPz>&2f z+jYX*jUz}4r{0fIX2u)?Yvo^;4)VSmyzTj1rYlygtjON>qLcLhdjYJOYON<;`%^2y zC)*UMiHd%tl9M9ejMLAdcjNg0bfwMT3UkY^)qIY<=seZZG}7MB{|`4n$iIp)aXJd6 z%@Q7FZtcjkv;hH|Fp~57Ilu?(zEEZxuaq(9wY03b%gQ28n*<{RsxX~? z8nrEv5xMnAqLf&>O{`PK0hrwx0A?RQ*M-P|#*}3s-Y^I7ae6!K<%9^tBMI{Sb$V!7 zV9ZIVtPX})TX0f-yHpc8b-rIRR*5jehQV7?U|RY{!hx_*>2{Agmc2rT>!4>+`8Fb= zel$AmzDo_;D^Z%2Y%I<$I8)PWhKV58T6Q%!3I-Z?LpS^`qNyyFD-gCv$9j#it|TdK z!y8Zne4HLMyjt2Pl~Z;$Qa1U)%IUHdMRY|T{V;_6T~Z@G2@E;8HI%CL*zG?p^YIzx z90y5tTArM5CqXw_t@P|;NiZ)QcoLnQCa;DJ`VX@<))|Oo>J6~q#6tXqGTM(awnZH_ z_jK)KQIJh@$I;^F=>R@K4~jQsv)S~`uDR9C=upQ)?UO@6)pMI^^o&CWnA+0aI)H{u z$3UvLQ=kuK+AnRJWkZYvoeV(&PHiJ1qaQ94WAZIBTTsLrz>;h5_A}5jJc3QOVk0Ze zsW7oA?H+%3Lcomw9cLxN+wZlL1NbDpO=;icymD^fA{M~Zr^&qN5W;zRtxw(s97Cd= zu5};m!4$6?a=G584Bn9&OrZ?wu0I#6J(QbP)Oy#kF>wbmQ=1j3?=Q3jFOlH`=-{Bv z570U=GJq{%C}hfv$u)fZ9zvI$3rbcwvixt=0sI!dP2ss)EeA~~k$_|#JAC8mfJtoJ z+CWXJF59&QqoemZp-GLWZMSUn_roe3RcmM3@?JS=Euv^)q53e5ICiRDqyuX+1;{$B zlwzB1U4jUFrOQ-v&N8=%6h>F$Jef;ATPE}0brC+zm$?lO;8XNg1>CXwp<3kEX_Ks` z=z2N`vzG}Ke4*sbzs-X6>uFw{oaVS>M$X?@D%F?6O+=SGne9sr-?p~fw;`0w=z zCmRLU2`}-aRVs*?_mo?t~Q+WM-i!%C>F78$kYYHgU6fGcezRo-_m-v=Yd zr|%Xa+Z1bS;HYaq9~qThJMGr$_FT4`o?n=&*^sq^E_?%7jD$J`i53$ur(6TWi==b$ zIwxHQ=QL6bE5M!v9BLj`avWV+W-w52nQCjd#;naUa+<6ux?+lD5K#rFG8<7IT}l1 z#VEV164Rr+=9sl@!0EWN42Z!@bGgIXG#E5xYZ+>YQ6K|gQ)U){vT|#7rjRS+H1M*^ zK$2Dl>KRk1M<#1XL*GD?dR#5qLm5udHP?~t>&rlq^^i!3;P$Szc!hL|5g;>jzzN7j z*_t#K&IBy&dKuM@)s4Loc`eyx|{90l&6tFU1hah?p+?tACvMWB|g zTGmMd2)cag%jd?5^Uu}&Bsl7}EposI&@dBe_)fwoN;bFFLOs+PN*cZi`NJgGtB|19 z^ibcQl)6hJoCJI6g03%5s$c|X*Gb9FqRlYW0UPeb6OcPJ5NpA7r<@I-S!Im2t%%Il z8g-QV(l8AjD+s|v#+r`Yp4_xbTbv`qp@^p3g;QYxl?dLa>|9-7TV1vWlR#Q(bpgl_ zdeD(w8)Se1faR1=v_*)P=!Bk9$<$6Oea=NUnUA3LZ^L^Ey*2@6|29@0lK26XM4(us zPeCF zf6b}pTAy)-kUlq=I$owVJef5!Omvq;gx)LZWNvk~?Dg8D8CH!--n47=jWs9Hj;sud zv;bw~o&|(k2A;YMfUv?82Qy0Ljn?si)dw!jme8?$K zsMSi1?lR$_B)0^du_6PTUb9wR?5%tq?D8u ztbkGzYf%qoDyyN-UVNjvhz1O-LSM)z&D4`2AgR}K40}{KPfW?By}1?Lq+l#$q@OZn zw3`zkBl_lnIw>olj&f*e%QqHk)!2HPIEGEnhEPJX_)VWH`RL)M8wz>coJ=4-tqbx8&nc9ksR!*0CO7`&S!6spBRW4uR2pm4#_`6ek z*}1ujF4~3pHB<41-EQ;!5JV)}>bU0tpK_&|&t#PC^ja5a)wKGcDh=UW`V_3ZKPUim zIsn85plWSU(lb{HqaYENvt~Bhd5UyyN{y-2b<&HJR+KgPp!Z<&n^|MQ(i(M39?d$>vTj2hKuawu%JmzWscufg4T7p~&Zy&urORSj(_4AT=JUvr z<)*nTVMflB8#d~nYT7gMOE5S?x@qGGX(n)9Y(wi(SV}~C*prkfzl~eiNa@gbU!c>DoaFWi4y%a;wI4uQV zTlTCA(^QVW(sK?+s9hwtsdstO(OnX_8!@NfsTv#Hp(`M%BEwXUZeal7FL#Mk(AHeV zGG6j*ylnh>#B$l1xP439;xFXu9x@}lEv{jGFkP?@jrc+43_FxonU$%@90yxg3Z~=B z1Hj!gIuacuOnr&?cQ|3thcX-lDV-06ZKU)W$$*b8LW2%1#Wwa5w zj0z#7C70F`No$w{9ng7hm~-jBXHi&Gi&k1!0#PqHMr?C>@cC&l{lo6EkTRE6=9~pb zTV=f&70E=nHL;W~n~HVTUHISLB!6|$!h?Xo+vBb|nJ^7#Yln}JqT6NgNJ{NF>I}(c zj?aLVA&XQBs9nKX>3li(meV1$6oG6{CAT4TwHHd3I^?GQxaH5S7FsMiA*JCt249YM zuVoB&q}N-hU8g5mZ5u&}&bjTx7LaFc_R*q^j$wqQBq&SaE|tWb6}AePmk zF%C9LN!PNn9(iG?&WDNT`0cC`Mn?y*#>MpoC!DMwqqGa4uj!&rJI+`gvLF-ip&;#d z8HYnc57|P^yQ>4+Mz4cmxxEI~!IwAMRF2alQA+P|oxYl<-LO;#%D)Iv-ln|mQ z69k~jQ6n)H8Al+MW8baR)G`^LX^mO5T2}W{Qit+RYa>%;9eIu{rnO8hE~!)_X&S znhY)h3loj3Z1C|$TUSb#tyYsHoC*QA(IzL`&)KUjQte#kwk|>KB6#tA=LWQFL74U# zB<1&|FDEJ+*%%T-rsl6jQ6%S3=IRHlhRQ`sX|<95bCmQ!Ijiy;->A!?vT{pBPp{iJ zhHhlC@Tk64E7ui(sdh{%S&K5!Lfei@Cci>j94gaewdJc_-e;;c8Fr8e+5k_kS5KMF zOK!Pmeu=HU=(Bw;C<`oF6P>xWXIfhws^ol$j0mCCGGftx*}!2=L_u4AA#=Y;zycs< zBWy6GpkN60?lz4(PAcah<>}`)%A}lsUA9{0I8d^ED7Wp{#w4r_LESdsv@<Iz3r;igb4`mq|N^+4yM{J8C;(#X!LlY>xl=nh6YGj=&_m7SWF0qHyd7^Dyj0J9NV z8&A*>&@|!ITT8jfppk&s1m|=hQo2`p%vj#oLy4vwnPMFh@7?ZX&Nsc@H#Ggdzu zW+ws041m4}#-0mdlj#>4v&%$KC-nRCT7Ic0Xr6D8tMQ@!t`zuWrR33{ci;fDlt`aB z*GM(C3J;m9ipf~*WF1D%kT7J`RLX1zwp50#3`yRuLrQ8#kQH!PrIp%y0NJR$*}NZy zrij#SL24JJVZBAkVo9Ja!)Qn5oPtuQH-Ts*mof}Rt89{SD^?YabbGRK1!;tyv+Y88 z79|k{B}3eRBW4}7Ms&6Mr`z-wCG=QQmNw|MvmB9f9BMrkmoplww@3fXAsbVCQA*1MhXYJ1#(=SJBCbjg@=&#DaEvd~N4mD?x zVhe0yMY+b(H^`~kkZ$eX}z3n2ciXb>C8h3&`ncq7BkVfEbLO}TCHI{ zLy7|o8%{k{{Y_P;q;gK~u5r*Zg?j!F(1uxE*9OD+mfC7$Esd8@Rh`c3RKv26R;lel zhF*ZZNW)&vVg0-%8)X=dr;6~21MeG-nOx$mb}52 zL^4bc=+Wo-ZE=ZoG?|hSRbJls3>LMIg`KIw8C|Gja#z7d?k`q=K zicl1i)6b4OE}J2fQJXu{UA7C$SQ;lzqwI#%B7>Og>8jOAjJMcy(P+yvzbH!g(DD7} z0Z1LdvOXv|qNfVXnsQ7|T0Bk>$&_&8B-24gsv1ct=CiF{5*Nr?{cxGd8Dar#O$jn2 z)#EJEcZk~g9gnPZmRJo+VJT}n&Ybv+^m*tj<+bieN_#Hli7*R2r|c#atsg9F4dynV z=tj$GpWCkWwH_=hJcBr8xA(MbT@Y(T7g=mWTbpI8AnR(vq;y46dap}HUDIb|JE=7D z%ke7YHSZ8G4~ZR$jDm5vcTpEJi2*hwr5ktH<=~8LEx&sa84QRGr{DgpNO2M+DJs1Z zX~r9#i#q~CIz3iuMOnaFZsTpLJ*ausyw;m67Qz`-+GvY-j4iRMZriy~ulr zYgP>;?$W9ZuSH5dPk{ORp#+VvRAku9)AsLjhFX-4PqDCACT_)%(S?HH5W3GIjHF}t4{guq%L!?kZUsAfH_7Yi3&6f zdpoa|21?h{!NItWXH`_v=3Rs>G8mHAh{^?tC%|f(O`BKIxn&GOvqO(`yRXJO(d;lCObSYX)L4Ad1xSHFJLRP;lMQM*Yqy#-rkaiJqmwc$jQ%!@ zy;^<892t_<5*a1ECmAi)_Viim!@2>G=vY|k1;J2-mP;}y6N56{m(W#KO#-Uzt-Ug7 zNAIw-_Y~M8y*Zo;W`;?yCl+PNacAt1$OZDysh8FV23QiydY@U=60}=ywkQcHi%GiI zNH*Fn4L8|ac`RH)Be#%9)Uik#Fw)SroSVjXt z)tUE-*V7*o37cu4=%q_hLhET;HM*|6n-frlk=Z~YhRDt|*YlTwEDHmHP+Lo)7(S!9 z&uV0rMJselt~H<*wgMs6`lRfp(7HIR(6w{Uz}i*0l)|%6d@0!43C!SSI&USq!^)Ao}};5QpzTkP^4j5fGs-* z^Z85Zy}h0sYfV68(rBFvuQB8#&nmGEtq)g|ha%Xkvh$(l)3esL|RSmOcz5TL+@W6(D4CkuP@io z`6#Sp2)3|`PDY9~1|@(p2EPe@C8XDWU(PI(+V@rr0@0?4bP(TR?!a~!BcX`}CPhsZDlv<*zG0$MOubweFZ<={^w%5ZCFI4eMJDpg90GPm$PWxrE*0;n~DA}G1 zkyMjkF>dW()KPcJqSHzF3EqU`6UwV!A0PZDqQsOJM<-+3mnx7Icy#fef{#)-=vDFK5qbBv+ywbz`E z#%&-qGl4-bj|Y3CjDaG6F3dROaa&46JlZHfM}O9(zM*6?P<9E(Q%8>wKEmot1fmL8?;2i(lU*1+l4Lp z`Iw$8%_xvUN7pk&Qadi~_g%6_4z`{j@c}6G@b~Xdj=o|V`-`uMvw>=gOI9Lk`q5*(HoN?jG%c= zop<0f#vrltWN9)hlBN=7;rj?9rml-1KO@QlV_j-ht9K5e^&{V>Z;?UTIJLdIj|7M2 z5b8wA%Trj4($8mePgugRB0Cml39{;McnzljyCiBB+H)=%R>GO~V6LlxM1G7C?T(yy zt^Axz&Uh$`i590Ja`e!r=xm^{YwJeVrC+yH*sPV)Z7_P5A^o=&6_}#-7}RAadfQYk zujJt;RyzafR+=^rVu_j92Z|MjAZ0Q*shc2;TU)eP5`aK0!V-|#+h{ZE^zn8pgOkpK z1X$~O5S(d&%a{wRj$6uX%3NJ8O+9&4$iWiYkdbw*YXJ2jS~a%}Sb9@uo(w=!cWPa* z42x_O>n)RLJobCZJtr-arfF(U>kjG^V%JVlPK(f<2_a*zqLenEq`&#K`GX`_Zx4inQnU<(3-6 zEx8tlUz=tmAp3Kgk*0$%x%~@dN=jR;KYfL`r4^`k2J|&;(!{7nKFK)+t5rz|S$w28 zMpm7y){)?B=EuqcQ?CRwFSe>l#oBCO*IGs2<=jH->Tt*dkXd`VsI7}+z)ZDRS^LBa zI7n(Fgqnf_l87m(sVEfVvImHA>8-92$O^eb6U2}*s+f9fPmxKOil(toYP!owCqa@y zW91AnG_62%>;h;GRKl=)lzwZDPj_CV?v9A>OX`&6WaDiSmz=V-c1}{jQxXMPVE|g1 zleQjoF^HV>l0_oXwDK(4s~m;(bz<5fB2{pc61JF(u1hlrP|5>_wfq7`7Xxaa-)87Z z#-!KQEU?iWtet#vaA4zoX`exEkAt0I&}wmpTw2O9Ui!>ITr*1@CQ_WZ-O47V%OpKl zHUMuaqhjb&gQU*-WJE!`33X~3cbXAu6jRQwPL}%kB(CJnMRaXo20$WbZVlh~PR>o| zij%kkiZcwZl%ykPV3PQSGyr6Qns&`Ew;a3kJtS10#jcM2IeO*1>a!I&j3)ell&Cn9 zIk$nVDm4pT2xLG+t=!X{YD!y9XH-h4#;0?f^E_-a&|g4jq}i#K21Jok>)XI0WfyJa zHQphto+go&$r)g&eKgoiPhqsUG#JVpf!39gq7Vz@C1)O5WY1QfLod$v9IK(ScxAgJGz9z$VZhe$FL}Eu2*7Fn$0UfWzj3Pg|=` zZdurokPT-6RZA^Qv)B;gv=)Bk)ORh>37B|`rJF#R4n-SSWu*HFVn^>xa86$%PD0y} z)rn6Q-J@jN)l8-?Wcdg;%(K)#d}zJg|VWquK*Eqs|%w9)3dbJJi@+JQDZ5DFQ> zUKF9Hkxm3UEggPqm2}w4&h_JAw1}h{P;O_E2#m?kjWeVabnN5na`A1TRo*vYDL>oz z48-TCFE+)h9LWt*adtGDATKuw<-O%V!6Mxmis+8kmeu$kDS;^rVx`3V^D64D9a3~i zi`PPg@vxAzvy79U$*JQ?837|VyrCaht?t(J1@atrDbi}#K(|94cP&T}bG4+ZNEq4H z#XaOGC(lyEBp9862n9nyc2Fr@v1YZVwWTO2fNC>EyJHbCV^K%MEVp#$0VK6&c z(I+gSdL|12Cg=<$GFooBj+>U6`>b#%)Ci{wf=EBB530!jh5>WPC%>sDmv+azgqWir zr-5ulzSx8eU^*%fU|ZsZ{3)Bpd;CJ#B8aY=wGPrI9)+_~*`sU$$~ z2LphZHT;cO#+%-?v8Rb4tk9!^p5Xrkf22hkS9McZ2V~aU{2daC;iL?IS z*f%NDWVu#C({X;jpAXkSJZuP6xC~`NIb$*%001BWNklmZ2>BR&X4ljomfa1kNkR$J@RyJJenmKFr(cw|KI!9MdAKU__rCq} z`huMr%XtJjqYcoJRIq%tj+ugNqxTiu4eZR@Wf~+>6mNeycAQ6rSDq4V$ToRXUNRJ` zvy&-V1So?%x#~0eGkR?zF~)7}WbQQ4++SeRN1p2}f;rau2(cW;)}L3)2IMem%wA$X z?WZK?3Ol>aTQQkp;DY;|?XACgYXQl;zkr^79Y6&m2Jz#NXIoTw3YVT9X*YoqJrD*Iq2=nqgf8LL6)}cMP zZk8>nuYS>$Nd=vJ;#_jQ1C2Av?6a{CO~~S>JuyfX!jjvFPTY|h4v)y|xv}CHa8uwM zn(w-y+ZAL@5pIX~`?DSi2=c*6J^piUnPH(4X%mS2tmrxW z3NBB3DlZoxYEpt_GVuQU*^f*TW|VRFZM$Cdc!0KV&>^TyL^mE}xw$gpoPjSo<=91l zYi&V^^=h4?p^R*uEP58dpE~Rg=qkAh27}xqQgKN(`S(lp-3Z&PwI${-IRAKle_KHD zH@iQ8k1R57i!jgn-Q&&c5!{XFau1xC1VLV17JuQ|9{afW^UpcJuZ)BkMjry4!5Umx z9))4N#z{#@cGaqSLh-o-ej=n@VPTrSW7f}Y*G(ss&HDO$$@7++TBvY&^KO-PUrFxR zd76>jcH9lB&VVxGGAq%|lQo_fmkh*zt-4ha^aZ;vatr5JrEf?IRC*@e^mper?Bum{ zA(!!n2TN7vKewEMI}eP+M(iCHfUr%e0PKpJm^%3M-^=5t#WZ?mD>GO4u*a<;@ABOf zMTZ<8`ahq)Pet<)hSlK{eWgKJ*(jMiXCntytZy;>4Zs$DG5-z*^!&`Xr&R-%O}(8ak$G2uSIS8&ng$qm z+((Wfx`10V)1u>QUMXvOpkMM=_~E-5Dp$~dUv8JaTV_E-X`^8dLF!D>m+K8V z{4EV@@{s{jg;A7f536z`g?f=-mywT9n-^_CMMxLMwDp)!OYY(;9pBRnCo{_5fX4RaJAN zR~+iY)6TcX!iVqGfoVmTPwTAkv;hO?{PZy(9pClP*p7~ zX|^L%pIlvhYlPzzbO0=ufE;~EK}4+iF@b>*LU=c**MZeR(=yZ7Y@GpEHS@HAk$Xr2 zkgdNm705vQ+@}zGdWb;CHP~dz$~LR}*=MJrIv_v}B)OJ0x>gepit($OxP*fZ$R3XB zJ1g<`X3c~a3(a`5vOGCMVCP-S?b>af4y`byUSvJi)pr$?-r)OvJdq{%X%OxiAF|9# zxQTkSNFmc9SlZ^3Pv@x4^B_LayaOiVE-S{SqKg3_Vq;Y{&}aU>TmVdOELy%ia2 z$-&8E1WG#BQuku%FV)TT9`$70Qbb%%@u=%#!6D6ge`l>sA!@4914Oqs(-xR|^Pd{a z$X%9y&NG6${y0HpJqH&$@_V!Ce99WdoT~~Faa>jI$IgYi{)Y<@rO(1VZ=2khAvVmh z6`dvcF+NB{ZEw?VYM3fFCR(}ia-mJk*#$xV8 zQRnrA*s|;ryq7mV#CwI$=d_C4KlvUPMtTKfAxX zr_gk(_V3FH*+uxJBCHO_8d#lw<`r_)^nKF=Rv^yrj|6*9r6G?_>yxN%_<`@A3a!F8dIdHSjBxK|v$vSJA>3Sn5V za5p`d8w%LWCQb@ZClDzQ1J9=_$6Yt3Bn6_=3gjF2|E%h2L)UkedC#Azii``qELmWC zhw>aQ`(;_6t&33tFK^Su5p;914hUL`&TzeUEP-550(OtZJ7D-!?m4E5qX=&uaQ%%2 zOQIjWETaEEO3ibb;6i<4GQ8v!W>)9uqyG0y4ep1%7Y7Pj?78r3ClJjfD$1>=W%QjX z%J=tlyuYR_VSqIZz%)mPci@%AW!M*Wr83o73eULlzgNmDI+Kl^npB&|I__-fw5`40 zBT&F(S#urOY!BMe{=et?^Y&Z5eNQ+1E3@gg#G3>R%@t>X{Dw)4r_+5o-5uO+|(eHbIt9CyqkM$==RL3#M*g!Op6Py zlyBDC?@1Sx!Zi3)yDGG!W4=7qDDv3`)U?+YHJyzNlbJzwZA}&Oyi>NeDN#HRl(t`| z24kV1uq+PgFPlLp;M%t&pVj!lbIiQXAK`7Yytf$BSV74h1bklFF33?G90g!l?f1v% zJ`pU&&n{DWK-P#xpM3gvX0HWbz#1T{1y9}U(X&7Ab)r!%^ke=V+ld%A&Ia+ zVHtXi;z2mtrothDEmG&d`|p?f#?B+{jn91t${lW(*n-GjAnwWg%8u0~Ip1VXmw(Uq zS7SI-jJgM>lrEpr&;L8(qz=h|&H9 zH0CHuq4o{{Q{7T`N821 zRZC1@LFp$@smBjo0l8&$EEMlU9i4<{Zg?mkY7p*vZC|M-`Sk>J)jg}*)I-(niaRI_ z9&}oo`5v!CYDcqn-u-heo83bp9H{sTeLF!h@OT!m8U7?x8OrB{e1py^PSgZNx62nKf9&uZWNW@&-2ws_>mKh;ymAt z=fE=dOvm90tXi-P2G%eWdF-4AU>veNkWq_Xh#Y(6iqjU8mBtb+Mw+)|K_?n}H=r`b z)gQ$9U8VhV4HEiijmzlv&DY+g7CDck6Duct1mxxH+B8S6TO<#77rkoq$w6`c5@wbW|6Ivf~e=$fw`A zH*UkHyw~Lk@IuDR2xz7v_7`v~z=&*|^;+5WRBs7)-n@tfsYa8}&&^k1Y(ij5-gR3s zar}QVBxl5W<_XlHZ~Xq=H*Ua;IvVYQl>lF!;h;An2nTNXg_+x5B8el)+*~zWW3!LI z9%bg$d5(hGJOcgm>!4ail=}Op-}TU|_VEEER^!{#+iW?1Xm}{(oZNgCIE?|gLf)jfg;zJM^BT;U2+jLk0n}3xZN~GG#`El4<&wC6h-mS~d6#u^)pkkSYHS5?1|b7Y z@yEHcmzBRdV5b5QB@idQss ztPW?F{dNJF&%>Yrh&R^c??O_ofu}HlZ0@wurPfVW3Xr;&vvB;B(g{hYADe-`DNuy{^X`7}T-wd^wy&75l(!-^+Dy20-_2hEa6y)kfG@%gSkN+QU(mR;%lHHEA>ti3 z-i_I$W{b9Whr4&sgp+31)n;v(Y>pJS{`~nHf3!4Ks*EsV31^Psct|2GFBEo@1-&Gq z7n%I_S#rsJ&=rFn-M>Zq=L^TtLG<7EZ`1aK6dr_|XUhyM3(Tf9=P!r_>x;1MmFPWu z59X#Kr-5fj%Xx4yYv+|<=E0^Z_b^tT@gH~pWF{kM& zoWncrX5w1KK8$h6niBLc%S6RX%uc5mX=}YVU;o|_@el)T+;6S6YI?p*Nl)qKr)l-w z__EuP{r#-@^H0gN#>@ed4N6WUfp6WuF?O?OsTn>PG3F{(77cIRN!gy@52{bS6^cnbD zj8eL9i6T*-Pdj%kl7_&y{@d(KV`k|n&+~gJp~dHLO`eX$Z_u^W7*o2Zr3-NV@A*x) z-I9wx3iz7`y`ZhjGfTiABNjl3)HdFWqnn($I%DEoYp6 z=60o$P%g2wTW47E4w4?gA1b29d+|_U&Qw_%i!j#?BaBg+eJIO2&vrlAeD!BUfeCmp za<1+sCm*Ljn5+-tNaWglHrucHe9j{B8ag?3Yp@jMzn|xoF=?k~;!i1#QspYq!n`Zr zJ6%sVzj`fp$nzzK-?|g0=)VuqW%ayyW^l;dR@|tYx0#J8t-J#q^+J;x)t)z3s+!GrB$?%sz^CxjW^@U>34p0TY#{XC88MU{LOiZRU}F-iGBP^EXPaW7G@mq z11bQDYU?kmW1Hfw{xb^Ny%~W; zncwZ1#G@R7=I41Xd={PEnR0MC;po3%G!@yp*Nh4Hy9?l?u)7JtjAw#uoq5!(GC!-} z4Mt$8oqKP=+sr=C`|g_X`ncbE)ZaO{d{;v!py?JpTsyzTM>!q4&QCb^*-8Mp88Do` z^V|yLm{lL!?a}H}XmuQn?-fMxDY;9Kt-UL*#&e95jAO_7L>@yk*8x2w4Bs|9jgRfTWK+K=(Dl@cIL%>)U5#y5P9v&e9v7&BF=t+3T9xubTuxJ(zYY__V7%O^1N(~@ug6D83L*z}^_**pOV zbcVGhNA)8dlm~`e=0G|%o1=cz4KU@p2wew^(+q{{u3IraU45~NKqhbNKCjC&sNqzs z3?4l->4ZzOllm4Vtv#pB0U)$HZb2{bXum^3F9DT#KQ^BMgrYu2Ex*iklYE45_@|Y3 z3S_CM-5($3hT_Fo&;c9$`#`mW})`X51^*=@MbqTdhU_r~|AZ&f%PuRm|%`Fz;u6+g><5C4mvo#*V) z80ObKn^FDw65~o2#U!l6b!1A6)v=RWKwqEu(-(|DZTA`)MYroT+--Ki&0B~O>(RS2j#2l*a)$X)T zx~#=g_lrBc)FpV(3xlnIMVn6)ye>jwd=xjAn|AYm^cjwY|C5-cR%DZBqzgfv#kef* zzvm7rO@{||Pgds*dKxw{6@-o52LmW$S^?`Xuia_f%b`AmYWHU59!y-+#`9xgCtxYK z3j6Sopxi5sCew_*dGk4p1$HLZhp-mrLu>3Of9_Fg{e6FXh)0f19P|3U7|XLlG>4eh z_!SG#eSV%Yd;b*RXEy`YV`0_-lMV>kJfmf8P$T%_m?_v zns+=f9p~hQJ1+ZAFI3D2m9ziUP4|5v-s3BI1~8RZlY58p$Pq{fmpJ;>XUcU#N=1d~ zU3y4B4`O_v@gnr?^BzCv+vmsLxVYGphiLN^&C3fNMarN|-P$?+bRphjnGX(DXdZU; z-+yz1&3V}O_Iv*D625D$T~%MsD_$aP;HcMP6UDY0fVgcwtO1{2lvxR#W|&7s|Nc`+ zrxsRf856QLo-!)>Tg2SoQ;R2qr-)y}=s3HyZ?SS4k}$kHmK^|I+{!ebf@g8=VxaBt zXA>8~t6<*-umUMUUXSIf2>g8IR9fqK1Gqy{L2>m07l&)(S6wDyS?@c*n_MuW$NpyG z;*(E7p=J{bHjqwx7ErAG=HF8#2c?inN0qrkLin8p?=7)g(3fRiavWD#UR-r!-#o+f z{iTU*Bm8FPi7REr=^pHf2Asa4&DWj$)3B<3$^Tgf+N_=lx2>mUxCv0C**kxD+TZ8= zFbcaUaS#)}0gDzVAqXUJs>MQj?yS!^1v_J(ZRp+MfyqxOle9}2#Hj@|o&~utzCNi* z&-^rc71;3(W|7Rrp)r7U8ilWm7;qQdNjb8fPwX+z%{wV!?2fqN_-7qhq1Cur+|j8v z+rGC)fz{8_H&RqHn?rm}hQ`lTtucDURB+)|sr_syYEx&_z%b=3V?=jPdpdyTs) zgntWQ!P|rPmoO*l)Og;rIJ`%wNM@QST#}s)S_M6XreM!8p}R7Bean}xf7-~S#!@w= zKBk~OQnWO4B|hPx6kg>8zrVaaR74X=uUm$BVUq|b`L@%(5AL#>`pn(C{^nsC_&8gJ?rd*bN7W{s~iSXz?yHMJ1#^Z zdF!0dBKMdJtPD${7M2h&0S%V_7}^70ft1sTYJcX#nod6(P+0$SZqHOn!L8tGi*FyY zNcrbsDJ?ARD#gu;Fp3a&IelGshXE9we*KVR2#g(CG7eFhcrc*h9KZVWq&3b=H@4ek zEkP+x`>`A(>wxJ_VJ8frgziFvlok9DD+Kzuk%l-NffyA=+M0PL+QNW66{*D(+=zvb zhM?*obqJbT$%oac)p(@MY9Q62<*G>Nj--Nfj?%GD8?4U5yWg(@!;vYtF391hMfam3 z&8<(79$gV2cJFTz5OIm1_o6ez5y$CY_MHp=IaI;3Fp$-jTY;u)p~tnQ~ZBV z5DLw4ug2JW=m64fUsm}yZJ849>;S_Go^fZ>?xK#8LE~mBLV?=zc!9oEcN$JIXtMYC zXLtB2aP0ldzoQ}%Bd7G?bUyw$f{Ws1&Npz$i{|WLG(hOtqyjEFS~bhljDs-aFac}z zUFK3NIo>68;M{7(0Bj1T1>`OCo&G)zgxZEOl=)W%zn_X3{X*1^x=w!WL zVC;cbxSi~Q+Z#|FlWY5?(1qa;I*MwFdEQo}fRsh&4yj+A#q#2E(WWy1wgsP@Gj;8- zMb}5GX@T3^Y1vYp70*wkT!^ni^fj7`>G==9E-;l~hI&zYWM}+6(?9h^&cmM3&P-Jx zq|*9u5iW_rI$VMhAk$_ePQ;Sjf_YG-$_a;y(+gyTblSnk`U3Rl`P!CzzWild_H!H0 zT@b#@sI@rf?8uJ(CmXpl@|$aCk~|w-)VNB8)+@xbbFIMk=x3?g|E{l@R`H3x)J6XX z@d9l*YGI0QLr%guo+-kz*v+AS?RL1SL3_qP?#u2F8t zyaa^A8H%ySbzC$nrTw#i+vV;z50lQU5BpZ!Cg7?&492WMjXSybR>jrz=azRHFcg9n zfnbCct|&l_bW%Pb=ox=0ZFGF6$+rYW>CS%|x;u2wHW&Cx$Xq(j4S z&9Q@0zj9iRGsvbf!ez=7Od#2&y|P>2Fe{;1pzEjfM?*nOpo50{oanFzeQ-R~&g=Hf zwvF%C964j=x*t#U!#oe=bIj~{k!Mm%Js=XuyATlVpenu{u$;iD|ID-$pcm(48!|Ve zx>nYEEM~R@=*~9`XgpiM>&d2Q%R0uQN;|4*=c$v5zOidlol{x7&0pSioD235Am{xh zxhhRIAFLGg{PNz2>bfKw084c9^kuKBmv!UqRU3FiNu4y8j(w&@pA}ZI?oAtq9EIJz{@}9 z*4fsfbjnpB%n1JcUx3IZHl=N}Y94<{v6%tB>CRl1vQ^!v>O>zQDpH%5^Zl(W15YJF z!_qOAF+_#Lg|_H=y#Vxx*}n!R0J(6~EWxs~i?c0ablB|=?+rXL>uWs5^6UQYWoMghMuly!%T(oE zq~aB7>B~bDmy~d0Rr4iBCd%qKd&k!hJ3Y`=>A+l&IrS7O zyd*2LQN9_px(WZg0k~qP z97X+8+gDkPlALi0X(7mkBJ9Evw~Fk4A7}blP_DSCawbb=k8LAY4diyo{GD=fe-GCaI5COpLz4^YkzyA*LJ7(5|lyffo0Ou^kV?c9$pBbw175Ma}sYs>Pj^50OCiqD%p2^d|c1WW@0-n z=P5K96u8SAEj1AO`#~x*0004LNklu#&gZ^hy*A)%COcDktqUE zti)z{c9SIt%j>_xwa1S>$*)fRvz|u)Ic_}I#ywg+09IaIXVXJci@tr$nvFWRZ4G(? zX#pq!*Z%jUE@(T4`ad{V$lRFLcN0oxF1l`4nW7~6wZzS?cM~)g@!L!(w7yfDsBWcGP(iOw={W)3XS@%EoZdvaW0Ud> zX)iyw=kfg+zigrHOfnc1bFZ*(a`YXIFhsi#r`YMub#@br)Isea?AAMH;gXTuInp@+ za&FP;TT~0)