diff --git a/Change Log.txt b/Change Log.txt index 36c47dd5..847ccd2b 100644 --- a/Change Log.txt +++ b/Change Log.txt @@ -6,7 +6,12 @@ -fixed rounding issue with energy core display so it will show decimals like 23.5M / 1.64B instead of just 23M / 1B. -fixed a dupe bug in the tool inventory gui -chaos guardian will nolonger attack creative players unless they do something to piss him off. - +-added a better config gui for the HUD (Still accessible via the tool config gui) +-completely re-wrote the armor and added a shield mechanic instead of the old "Just block ALL the damage" mechanic. +-added an upgrade system for the tools and armor. +-change: If you logout while flying you will be flying when you login again. +-added tool config profiles. +-fixed chaos guardian crystals in unloaded chunks showing as alive then they are not. ######## 1.0.2-Snapshot 9 ######## -added config option to adjust the distance between chaos islands. @@ -23,6 +28,12 @@ -added hover text to values in the reactor stats page. -fixed some bugs in the reactor code. -fixed a minor bug in the custom spwner blacklist. +-fixed flux gate allowing more then the specified RF/t to pass under certain conditions when used with Cryo-Ducts +-fixed rendering bug with the portal. +-fixed pickaxe AOE mode creating ghost blocks when blocks with a higher hardness then the block you are mining are within the AOE. +-made a change that will hopefully fix the issue with the energy core HUD display not updating properly. +-fixed dragging the scroll bare in the Info Tablet not working properly on some pages. +-added support for language localization to the information tablet. ######## 1.0.2-Snapshot 8-bugfix ######## -fixed crash in information tablet. diff --git a/build.properties b/build.properties index f174bbc9..50a1edac 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ minecraft_version=1.7.10 -mod_version=1.0.2-Snapshot_10-privateBuild1 +mod_version=1.0.2-Snapshot_10-beta_build2 forge_version=10.13.4.1492-1.7.10 CCLIB_version=1.1.3.140 NEI_version=1.0.3.74 diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHudConfig.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHudConfig.java index c3dc524d..4edfc1c4 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHudConfig.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHudConfig.java @@ -209,4 +209,12 @@ public class GuiHudConfig extends GuiScreen { public boolean doesGuiPauseGame() { return false; } + + @Override + protected void keyTyped(char keyChar, int keyInt) { + if (keyInt == 1) { + Minecraft.getMinecraft().displayGuiScreen(parent); + return; + } + } } 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 c07f84c3..c36faf78 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,17 +3,21 @@ package com.brandon3055.draconicevolution.client.gui.componentguis; import com.brandon3055.brandonscore.client.gui.guicomponents.*; import com.brandon3055.brandonscore.client.utills.ClientUtills; import com.brandon3055.brandonscore.common.utills.InfoHelper; -import com.brandon3055.draconicevolution.client.gui.guicomponents.*; +import com.brandon3055.draconicevolution.client.gui.guicomponents.ComponentContributorsPage; +import com.brandon3055.draconicevolution.client.gui.guicomponents.ComponentIndexButton; +import com.brandon3055.draconicevolution.client.gui.guicomponents.ComponentManualPage; 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.brandon3055.draconicevolution.common.utills.LogHelper; import com.google.gson.stream.JsonReader; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.GuiConfirmOpenLink; import net.minecraft.client.gui.GuiYesNoCallback; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.resources.IResource; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -35,6 +39,7 @@ public class GUIManual extends GUIScrollingBase implements GuiYesNoCallback { private static ManualPage currentPage = null; private int previousScale = -1; private int worldUpdateIn = -1; + private static String lang; public GUIManual() { @@ -54,6 +59,8 @@ public class GUIManual extends GUIScrollingBase implements GuiYesNoCallback { public void initGui() { super.initGui(); if (previousScale == -1) adjustGuiScale(); + + if (!Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode().equals(lang)) loadPages(); } private void adjustGuiScale(){ @@ -192,7 +199,7 @@ public class GUIManual extends GUIScrollingBase implements GuiYesNoCallback { ComponentContributorsPage page = (ComponentContributorsPage)collection.getComponent("CONTRIBUTORS"); barPosition = (int)(((double)page.scrollOffset/page.scrollLimit) * 247D); } - else if (collection.getComponent("OPEN_PAGE") != null && collection.getComponent("OPEN_PAGE").isEnabled()) { + else if (!scrollPressed && collection.getComponent("OPEN_PAGE") != null && collection.getComponent("OPEN_PAGE").isEnabled()) { ComponentManualPage page = (ComponentManualPage)collection.getComponent("OPEN_PAGE"); barPosition = (int)(((double)page.scrollOffset/page.scrollLimit) * 247D); } @@ -284,11 +291,43 @@ public class GUIManual extends GUIScrollingBase implements GuiYesNoCallback { public static void loadPages() { + lang = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode(); + + ResourceLocation rsLocation = new ResourceLocation(References.RESOURCESPREFIX + "manual-"+lang+".json"); + IResource resource = null; + + try { + resource = Minecraft.getMinecraft().getResourceManager().getResource(rsLocation); + } + catch (IOException e) { + LogHelper.warn("##################################################################################"); + LogHelper.warn(""); + LogHelper.warn("Info Tablet language localisation is not available for the selected language: "+lang); + LogHelper.warn("The default language (en_US) will be loaded instead"); + LogHelper.warn(""); + LogHelper.warn("##################################################################################"); + + rsLocation = new ResourceLocation(References.RESOURCESPREFIX + "manual-en_US.json"); + try { + resource = Minecraft.getMinecraft().getResourceManager().getResource(rsLocation); + } + catch (IOException e1) { + LogHelper.error("Well that didn't work... "); + e1.printStackTrace(); + } + } + + if (resource == null){ + LogHelper.error("Something went wrong while loading the Info Tablet json file"); + return; + } + + try { File manualJSON = new File(ResourceHandler.getConfigFolder(), "manual.json"); - InputStream is = Minecraft.getMinecraft().getResourceManager().getResource(new ResourceLocation(References.RESOURCESPREFIX + "manual.json")).getInputStream(); + InputStream is = resource.getInputStream(); OutputStream os = new FileOutputStream(manualJSON); IOUtils.copy(is, os); is.close(); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIToolConfig.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIToolConfig.java index d5a4c58e..4e451c80 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIToolConfig.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIToolConfig.java @@ -1,12 +1,15 @@ package com.brandon3055.draconicevolution.client.gui.componentguis; import com.brandon3055.brandonscore.client.gui.guicomponents.*; +import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.gui.GuiHudConfig; import com.brandon3055.draconicevolution.client.gui.guicomponents.ComponentConfigItemButton; import com.brandon3055.draconicevolution.client.gui.guicomponents.ComponentFieldAdjuster; import com.brandon3055.draconicevolution.client.gui.guicomponents.ComponentFieldButton; import com.brandon3055.draconicevolution.common.container.ContainerAdvTool; import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.network.ItemConfigPacket; import com.brandon3055.draconicevolution.common.utills.IConfigurableItem; import com.brandon3055.draconicevolution.common.utills.IInventoryTool; import com.brandon3055.draconicevolution.common.utills.ItemConfigField; @@ -16,6 +19,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; +import net.minecraft.util.StringUtils; /** * Created by Brandon on 26/12/2014. @@ -27,6 +31,7 @@ public class GUIToolConfig extends GUIBase { private int screenLevel = 0; private ItemStack editingItem; private ContainerAdvTool container; + private int slot; public GUIToolConfig(EntityPlayer player, ContainerAdvTool container) { super(container, 198, 89); @@ -49,12 +54,16 @@ public class GUIToolConfig extends GUIBase { @Override protected ComponentCollection assembleComponents() { - ComponentCollection c = new ComponentCollection(0, 0, xSize, ySize+14, this); + ComponentCollection c = new ComponentCollection(0, 0, xSize, ySize, this).setOpenBoarders(); + c.addComponent(new ComponentTexturedRect(0, -15, 198, 20, inventoryTexture)).setGroup("TEXT_TAB"); c.addComponent(new ComponentTexturedRect(0, 0, 198, 89, inventoryTexture)).setGroup("BACKGROUND"); c.addComponent(new ComponentButton(3, 26, 20, 12, 0, this, "<=", StatCollector.translateToLocal("gui.back"))).setGroup("BUTTONS").setName("BACK_BUTTON"); c.addComponent(new ComponentButton(3, 39, 20, 12, 1, this, "Inv", StatCollector.translateToLocal("gui.de.itemInventory.txt"))).setGroup("BUTTONS").setName("INVENTORY_BUTTON"); c.addComponent(new ComponentFieldAdjuster(4, 34, null, this)).setGroup("FIELD_BUTTONS").setName("FIELD_CONFIG_BUTTON_ARRAY"); c.addComponent(new ComponentButton(0, ySize, xSize, 14, 2, this, StatCollector.translateToLocal("gui.de.configureGuiElements.txt")).setGroup("INV_SCREEN")); + + ComponentTextField textField = (ComponentTextField) new ComponentTextField(this, 3, -12, 191, 12).setLabel(StatCollector.translateToLocal("gui.de.profile.txt")+":", 0xE0E0E0).setGroup("TEXT_TAB").setName("PROFILE_TEXT_FIELD"); + c.addComponent(textField); return c; } @@ -76,8 +85,7 @@ public class GUIToolConfig extends GUIBase { setLevel(0); } - public void updateItemButtons() - { + public void updateItemButtons() { for (ComponentBase component : collection.getComponents()) { if (component instanceof ComponentConfigItemButton) @@ -93,7 +101,6 @@ public class GUIToolConfig extends GUIBase { if (buttonPressed) return; - int fieldOffsetX = 24; int fieldOffsetY = 5; @@ -111,12 +118,21 @@ public class GUIToolConfig extends GUIBase { fieldOffsetY += 12; } + if (collection.getComponent("PROFILE_TEXT_FIELD") instanceof ComponentTextField) { + int preset = ItemNBTHelper.getInteger(stack, "ConfigProfile", 0); + String presetName = ItemNBTHelper.getString(stack, "ProfileName" + preset, "Profile " + preset); + ((ComponentTextField)collection.getComponent("PROFILE_TEXT_FIELD")).textField.setText(presetName); + } + collection.addComponent(new ComponentItemRenderer(3, 5, stack)).setGroup("LIST_SCREEN"); break; } } - } + if (collection.getComponent("PROFILE_TEXT_FIELD") instanceof ComponentTextField && !collection.getComponent("PROFILE_TEXT_FIELD").isMouseOver(x- guiLeft, y - guiTop)){ + ((ComponentTextField)collection.getComponent("PROFILE_TEXT_FIELD")).textField.setFocused(false); + } + } @Override public void buttonClicked(int id, int button) { @@ -144,10 +160,12 @@ public class GUIToolConfig extends GUIBase { collection.setOnlyGroupEnabled("INV_SCREEN"); collection.setGroupEnabled("BACKGROUND", true); collection.setComponentEnabled("BACK_BUTTON", false); + slot = -1; } else if (level == 1){//list screen collection.setOnlyGroupEnabled("LIST_SCREEN"); collection.setGroupEnabled("BACKGROUND", true); + if (editingItem != null && editingItem.getItem() instanceof IConfigurableItem && ((IConfigurableItem)editingItem.getItem()).hasProfiles()) collection.setGroupEnabled("TEXT_TAB", true); collection.setComponentEnabled("BACK_BUTTON", true); if (editingItem != null && editingItem.getItem() instanceof IInventoryTool) collection.setComponentEnabled("INVENTORY_BUTTON", true); if (collection.getComponent("BACK_BUTTON") != null) collection.getComponent("BACK_BUTTON").setY(26); @@ -157,6 +175,7 @@ public class GUIToolConfig extends GUIBase { collection.setGroupEnabled("BACKGROUND", true); collection.setComponentEnabled("BACK_BUTTON", true); if (collection.getComponent("BACK_BUTTON") != null) collection.getComponent("BACK_BUTTON").setY(3); + slot = -1; } else if (level == 3){//inventory screen @@ -171,10 +190,30 @@ public class GUIToolConfig extends GUIBase { public void setEditingItem(ItemStack stack, int slot) { this.editingItem = stack; container.updateInventoryStack(slot); + this.slot = slot; } @Override protected boolean checkHotbarKeys(int p_146983_1_) { return false; } + + @Override + protected void keyTyped(char par1, int par2) { + if (collection.getComponent("PROFILE_TEXT_FIELD") instanceof ComponentTextField && ((ComponentTextField)collection.getComponent("PROFILE_TEXT_FIELD")).isFocused() && par2 != 1) { + collection.keyTyped(par1, par2); + return; + } + super.keyTyped(par1, par2); + } + + @Override + public void componentCallBack(ComponentBase component) { + if (component instanceof ComponentTextField && editingItem != null && slot != -1){ + ComponentTextField textField = (ComponentTextField) component; + if (!StringUtils.isNullOrEmpty(textField.textField.getText())){ + DraconicEvolution.network.sendToServer(new ItemConfigPacket(slot, textField.textField.getText())); + } + } + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentFieldAdjuster.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentFieldAdjuster.java index 73b75213..7fdcb29f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentFieldAdjuster.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentFieldAdjuster.java @@ -49,13 +49,13 @@ public class ComponentFieldAdjuster extends ComponentBase { renderButton((getWidth() / 2) - 30, 0, 60, 20, GuiHelper.isInRect(x + (getWidth() / 2) - 30, y, 60, 20, mouseX - offsetX, mouseY - offsetY)); }else if (isDecimal() || isNonDecimal()) { - renderButton((getWidth() / 2) - 39, 3, 26, 14, GuiHelper.isInRect(x + (getWidth() / 2) - 39, y + 3, 26, 14, mouseX - offsetX, mouseY - offsetY)); - renderButton((getWidth() / 2) - 67, 3, 26, 14, GuiHelper.isInRect(x + (getWidth() / 2) - 67, y + 3, 26, 14, mouseX - offsetX, mouseY - offsetY)); - renderButton((getWidth() / 2) - 95, 3, 26, 14, GuiHelper.isInRect(x + (getWidth() / 2) - 95, y + 3, 26, 14, mouseX - offsetX, mouseY - offsetY)); + renderButton((getWidth() / 2) - 43, 3, 24, 14, GuiHelper.isInRect(x + (getWidth() / 2) - 43, y + 3, 24, 14, mouseX - offsetX, mouseY - offsetY)); + renderButton((getWidth() / 2) - 69, 3, 24, 14, GuiHelper.isInRect(x + (getWidth() / 2) - 69, y + 3, 24, 14, mouseX - offsetX, mouseY - offsetY)); + renderButton((getWidth() / 2) - 95, 3, 24, 14, GuiHelper.isInRect(x + (getWidth() / 2) - 95, y + 3, 24, 14, mouseX - offsetX, mouseY - offsetY)); - renderButton((getWidth() / 2) + 12, 3, 26, 14, GuiHelper.isInRect(x + (getWidth() / 2) + 12, y + 3, 26, 14, mouseX - offsetX, mouseY - offsetY)); - renderButton((getWidth() / 2) + 40, 3, 26, 14, GuiHelper.isInRect(x + (getWidth() / 2) + 40, y + 3, 26, 14, mouseX - offsetX, mouseY - offsetY)); - renderButton((getWidth() / 2) + 68, 3, 26, 14, GuiHelper.isInRect(x + (getWidth() / 2) + 68, y + 3, 26, 14, mouseX - offsetX, mouseY - offsetY)); + renderButton((getWidth() / 2) + 19, 3, 24, 14, GuiHelper.isInRect(x + (getWidth() / 2) + 19, y + 3, 24, 14, mouseX - offsetX, mouseY - offsetY)); + renderButton((getWidth() / 2) + 45, 3, 24, 14, GuiHelper.isInRect(x + (getWidth() / 2) + 45, y + 3, 24, 14, mouseX - offsetX, mouseY - offsetY)); + renderButton((getWidth() / 2) + 71, 3, 24, 14, GuiHelper.isInRect(x + (getWidth() / 2) + 71, y + 3, 24, 14, mouseX - offsetX, mouseY - offsetY)); } } @@ -80,12 +80,12 @@ public class ComponentFieldAdjuster extends ComponentBase { if (isDecimal() || isNonDecimal()) { - fontRendererObj.drawString("---", 8, y + 6, 0x000000); - fontRendererObj.drawString("--", 40, y + 6, 0x000000); - fontRendererObj.drawString("-", 70, y + 6, 0x000000); - fontRendererObj.drawString("+", 121, y + 6, 0x000000); - fontRendererObj.drawString("++", 147, y + 6, 0x000000); - fontRendererObj.drawString("+++", 172, y + 6, 0x000000); + fontRendererObj.drawString("---", 7, y + 6, 0x000000); + fontRendererObj.drawString("--", 37, y + 6, 0x000000); + fontRendererObj.drawString("-", 66, y + 6, 0x000000); + fontRendererObj.drawString("+", 127, y + 6, 0x000000); + fontRendererObj.drawString("++", 151, y + 6, 0x000000); + fontRendererObj.drawString("+++", 174, y + 6, 0x000000); } } @@ -101,22 +101,22 @@ public class ComponentFieldAdjuster extends ComponentBase { if (!isBoolean()) { - if (GuiHelper.isInRect(this.x + (getWidth() / 2) - 39, this.y + 3, 26, 14, x, y)) + if (GuiHelper.isInRect(this.x + (getWidth() / 2) - 43, this.y + 3, 26, 14, x, y)) {//- incroment(-1); - } else if (GuiHelper.isInRect(this.x + (getWidth() / 2) - 67, this.y + 3, 26, 14, x, y)) + } else if (GuiHelper.isInRect(this.x + (getWidth() / 2) - 69, this.y + 3, 26, 14, x, y)) {//-- incroment(-10); } else if (GuiHelper.isInRect(this.x + (getWidth() / 2) - 95, this.y + 3, 26, 14, x, y)) {//--- incroment(-100); - } else if (GuiHelper.isInRect(this.x + (getWidth() / 2) + 12, this.y + 3, 26, 14, x, y)) + } else if (GuiHelper.isInRect(this.x + (getWidth() / 2) + 19, this.y + 3, 26, 14, x, y)) {//+ incroment(1); - } else if (GuiHelper.isInRect(this.x + (getWidth() / 2) + 40, this.y + 3, 26, 14, x, y)) + } else if (GuiHelper.isInRect(this.x + (getWidth() / 2) + 45, this.y + 3, 26, 14, x, y)) {//++ incroment(10); - } else if (GuiHelper.isInRect(this.x + (getWidth() / 2) + 68, this.y + 3, 26, 14, x, y)) + } else if (GuiHelper.isInRect(this.x + (getWidth() / 2) + 71, this.y + 3, 26, 14, x, y)) {//+++ incroment(100); } @@ -180,7 +180,7 @@ public class ComponentFieldAdjuster extends ComponentBase { Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); ItemStack stack = gui.player.inventory.getStackInSlot(field.slot); if (stack != null && stack.getItem() instanceof IConfigurableItem){ - DataUtills.writeObjectToItem(stack, field.value, field.datatype, field.name); + DataUtills.writeObjectToCompound(IConfigurableItem.ProfileHelper.getProfileCompound(stack), field.value, field.datatype, field.name); } field.sendChanges(); } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentFieldButton.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentFieldButton.java index c1426ac6..a36fb916 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentFieldButton.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentFieldButton.java @@ -92,7 +92,7 @@ public class ComponentFieldButton extends ComponentBase { field.sendChanges(); ItemStack stack = gui.player.inventory.getStackInSlot(field.slot); if (stack != null && stack.getItem() instanceof IConfigurableItem){ - DataUtills.writeObjectToItem(stack, field.value, field.datatype, field.name); + DataUtills.writeObjectToCompound(IConfigurableItem.ProfileHelper.getProfileCompound(stack), field.value, field.datatype, field.name); } return; } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/handler/ClientEventHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/handler/ClientEventHandler.java index 68a8bef5..8b7d7b95 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/handler/ClientEventHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/handler/ClientEventHandler.java @@ -1,9 +1,11 @@ package com.brandon3055.draconicevolution.client.handler; +import com.brandon3055.brandonscore.common.utills.DataUtills.XZPair; import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.handler.ConfigHandler; +import com.brandon3055.draconicevolution.common.items.armor.CustomArmorHandler; import com.brandon3055.draconicevolution.common.items.armor.DraconicArmor; import com.brandon3055.draconicevolution.common.items.armor.WyvernArmor; import com.brandon3055.draconicevolution.common.items.weapons.DraconicBow; @@ -16,16 +18,26 @@ import cpw.mods.fml.relauncher.Side; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.Entity; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.IAttributeInstance; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; import net.minecraftforge.client.event.FOVUpdateEvent; import net.minecraftforge.client.event.RenderPlayerEvent; +import net.minecraftforge.client.model.AdvancedModelLoader; +import net.minecraftforge.client.model.IModelCustom; +import org.lwjgl.opengl.GL11; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; import java.util.Random; /** * Created by Brandon on 28/10/2014. */ public class ClientEventHandler { + public static Map> playerShieldStatus = new HashMap>(); public static int elapsedTicks; private static float previousFOB = 0f; @@ -40,16 +52,25 @@ public class ClientEventHandler { public static boolean playerHoldingWrench = false; public static Minecraft mc; private static Random rand = new Random(); + private static IModelCustom shieldSphere; + + public ClientEventHandler(){ + shieldSphere = AdvancedModelLoader.loadModel(ResourceHandler.getResource("models/shieldSphere.obj")); + } @SubscribeEvent public void tickEnd(TickEvent event) { if (event.phase != TickEvent.Phase.START || event.type != TickEvent.Type.CLIENT || event.side != Side.CLIENT) return; + for (Iterator>> i = playerShieldStatus.entrySet().iterator(); i.hasNext(); ){ + Map.Entry> entry = i.next(); + if (elapsedTicks - entry.getValue().getValue() > 5) i.remove(); + } + + if (mc == null) mc = Minecraft.getMinecraft(); else if (mc.theWorld != null) { - mc.theWorld.theProfiler.startSection("DE Client Tick Handler"); - elapsedTicks++; HudHandler.clientTick(); @@ -73,13 +94,13 @@ public class ClientEventHandler { playerHoldingWrench = mc.thePlayer.getHeldItem() != null && mc.thePlayer.getHeldItem().getItem() == ModItems.wrench; searchForPlayerMount(); - - mc.theWorld.theProfiler.endSection(); } } @SubscribeEvent public void fovUpdate(FOVUpdateEvent event){ + + //region Bow FOV Update if (event.entity.getItemInUse() != null && (event.entity.getItemInUse().getItem() instanceof WyvernBow || event.entity.getItemInUse().getItem() instanceof DraconicBow)){ float f = 1f; int i = event.entity.getItemInUseDuration(); @@ -106,6 +127,18 @@ public class ClientEventHandler { f *= 1.0F - f1 * 0.15F; event.newfov = f; } + //endregion + + //region Armor move speed FOV effect cancellation + CustomArmorHandler.ArmorSummery summery = new CustomArmorHandler.ArmorSummery().getSummery(event.entity); + + if (summery != null && summery.speedModifier > 0){ + IAttributeInstance iattributeinstance = event.entity.getEntityAttribute(SharedMonsterAttributes.movementSpeed); + float f = (float)((iattributeinstance.getAttributeValue() / (double)event.entity.capabilities.getWalkSpeed() + 1.0D) / 2.0D); + event.newfov /= f; + } + + //endregion } @@ -147,4 +180,51 @@ public class ClientEventHandler { event.result = 1; } } + + @SubscribeEvent + public void renderPlayerEvent(RenderPlayerEvent.Post event) { + if (playerShieldStatus.containsKey(event.entityPlayer)) { + GL11.glPushMatrix(); + GL11.glDepthMask(false); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_BLEND); + GL11.glDisable(GL11.GL_LIGHTING); + ResourceHandler.bindResource("textures/models/shieldSphere.png"); + + float p = playerShieldStatus.get(event.entityPlayer).getKey(); + + EntityPlayer viewingPlayer = Minecraft.getMinecraft().thePlayer; + + int i = 5 - (elapsedTicks - playerShieldStatus.get(event.entityPlayer).getValue()); + + GL11.glColor4f(1F - p, 0F, p, i / 5F); + + if (viewingPlayer != event.entityPlayer){ + double translationXLT = event.entityPlayer.prevPosX - viewingPlayer.prevPosX; + double translationYLT = event.entityPlayer.prevPosY - viewingPlayer.prevPosY; + double translationZLT = event.entityPlayer.prevPosZ - viewingPlayer.prevPosZ; + + double translationX = translationXLT + (((event.entityPlayer.posX - viewingPlayer.posX) - translationXLT) * event.partialRenderTick); + double translationY = translationYLT + (((event.entityPlayer.posY - viewingPlayer.posY) - translationYLT) * event.partialRenderTick); + double translationZ = translationZLT + (((event.entityPlayer.posZ - viewingPlayer.posZ) - translationZLT) * event.partialRenderTick); + + GL11.glTranslated(translationX, translationY + 1.1, translationZ); + } + else{ + GL11.glTranslated(0, -0.5, 0); + } + + GL11.glScaled(1, 1.5, 1); + + shieldSphere.renderAll(); + + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDepthMask(true); + GL11.glPopMatrix(); + } + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/handler/HudHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/handler/HudHandler.java index 447091ec..a9f58ef1 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/handler/HudHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/handler/HudHandler.java @@ -1,10 +1,10 @@ package com.brandon3055.draconicevolution.client.handler; import com.brandon3055.brandonscore.client.utills.GuiHelper; -import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; +import com.brandon3055.brandonscore.common.utills.Utills; import com.brandon3055.draconicevolution.client.gui.GuiHudConfig; import com.brandon3055.draconicevolution.common.handler.ConfigHandler; -import com.brandon3055.draconicevolution.common.items.armor.ICustomArmor; +import com.brandon3055.draconicevolution.common.items.armor.CustomArmorHandler; import com.brandon3055.draconicevolution.common.utills.IHudDisplayBlock; import com.brandon3055.draconicevolution.common.utills.IHudDisplayItem; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -13,7 +13,7 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.item.ItemStack; +import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; import net.minecraftforge.client.event.RenderGameOverlayEvent; @@ -36,8 +36,8 @@ public class HudHandler { private static float shieldPoints = 0F; private static float maxShieldPoints = 0F; private static float shieldEntropy = 0F; - private static float ltShieldPoints = 0F; - private static float ltEntropy = 0F; + private static int rfCharge = 0; + private static int rfTotal = 0; int width; int height; @@ -74,18 +74,18 @@ public class HudHandler { @SideOnly(Side.CLIENT) public static void clientTick() { if (ConfigHandler.hudSettings[6] > 0 && toolTipFadeOut > 1F - ((float)ConfigHandler.hudSettings[6] * 0.25F)) { - toolTipFadeOut-=0.1F; } if (hudList != null && (ltHudList == null || !hudList.equals(ltHudList))) toolTipFadeOut = 5F; - //if (armorStatsFadeOut > 0 && fadeArmorStats) armorStatsFadeOut-=0.1F; - //if (hudList != null && (ltHudList == null || !hudList.equals(ltHudList))) armorStatsFadeOut = 10F;todo armor refresh condition + if (ConfigHandler.hudSettings[7] > 0 && armorStatsFadeOut > 1F - ((float)ConfigHandler.hudSettings[7] * 0.25F)) { + armorStatsFadeOut-=0.1F; + if (armorStatsFadeOut < 0) armorStatsFadeOut = 0; + } ltHudList = hudList; Minecraft mc = Minecraft.getMinecraft(); if (mc == null || mc.thePlayer == null) return; - ItemStack[] armorSlots = mc.thePlayer.inventory.armorInventory; hudList = null; @@ -113,57 +113,69 @@ public class HudHandler { hudList = ((IHudDisplayBlock)mc.theWorld.getBlock(mop.blockX, mop.blockY, mop.blockZ)).getDisplayData(mc.theWorld, mop.blockX, mop.blockY, mop.blockZ); } - showShieldHud = false; - maxShieldPoints = 0; - shieldPoints = 0; - shieldEntropy = 0; - int peaces = 0; - for (ItemStack stack : armorSlots){ - if (stack == null || !(stack.getItem() instanceof ICustomArmor)) continue; - peaces++; - showShieldHud = true; - ICustomArmor armor = (ICustomArmor) stack.getItem(); - maxShieldPoints += armor.getProtectionPoints(stack); - shieldPoints += ItemNBTHelper.getFloat(stack, "ProtectionPoints", 0); - shieldEntropy += ItemNBTHelper.getFloat(stack, "ShieldEntropy", 0); - } - if (shieldPoints > 0 && maxShieldPoints > 0) shieldPercentCharge = Math.round((shieldPoints / maxShieldPoints) * 100F); - else shieldPercentCharge = 0; - if (shieldEntropy > 0 && peaces > 0) shieldEntropy /= peaces; + CustomArmorHandler.ArmorSummery summery = new CustomArmorHandler.ArmorSummery().getSummery(mc.thePlayer); + if (summery == null){ + showShieldHud = false; + return; + } + showShieldHud = armorStatsFadeOut > 0F; + + if (maxShieldPoints != summery.maxProtectionPoints || shieldPoints != summery.protectionPoints || shieldEntropy != summery.entropy || rfTotal != summery.totalEnergyStored) armorStatsFadeOut = 5F; + + maxShieldPoints = summery.maxProtectionPoints; + shieldPoints = summery.protectionPoints; + shieldPercentCharge = (int) (summery.protectionPoints / summery.maxProtectionPoints * 100D); + shieldEntropy = summery.entropy; + rfCharge = (int) ((double) summery.totalEnergyStored / Math.max((double) summery.maxTotalEnergyStorage, 1D) * 100D); + rfTotal = summery.totalEnergyStored; } private void drawArmorHUD(int x, int y, boolean rotated, double scale){ GL11.glPushMatrix(); GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_BLEND); + OpenGlHelper.glBlendFunc(770, 771, 1, 0); ResourceHandler.bindResource("textures/gui/HUD.png"); + GL11.glTranslated(x, y, 0); + GL11.glScaled(scale, scale, 1); + GL11.glTranslated(-x, -y, 0); + GL11.glColor4f(1F, 1F, 1F, Math.min(armorStatsFadeOut, 1F)); + if (rotated){ - GuiHelper.drawTexturedRect(x-(12*scale), y+scale, (int)(11*scale), (int)(13*scale), 2, 0, 11, 13, 0, GuiHelper.PXL128); - x+=(104*scale); + GuiHelper.drawTexturedRect(x-15, y+1, 14, 16, 2, 0, 13, 15, 0, GuiHelper.PXL128); + x+=104; GL11.glTranslated(x, y, 0); GL11.glRotated(-90, 0, 0, -1); GL11.glTranslated(-x, -y, 0); } - else GuiHelper.drawTexturedRect(x+(1*scale), y+(104*scale)+1, (int)(13*scale), (int)(15*scale), 2, 0, 11, 13, 0, GuiHelper.PXL128); + else GuiHelper.drawTexturedRect(x+1, y+105, 15, 17, 2, 0, 13, 15, 0, GuiHelper.PXL128); + + GuiHelper.drawTexturedRect(x, y, 17, 104, 0, 15, 17, 104, 0, GuiHelper.PXL128); + GuiHelper.drawTexturedRect(x+2, y+2+(100-shieldPercentCharge), 7, shieldPercentCharge, 17, 100-shieldPercentCharge, 7, shieldPercentCharge, 0, GuiHelper.PXL128); + GuiHelper.drawTexturedRect(x+10, y+2+100-(int)shieldEntropy, 2, (int)shieldEntropy, 25, 100-(int)shieldEntropy, 2, (int)shieldEntropy, 0, GuiHelper.PXL128); + GuiHelper.drawTexturedRect(x+13, y+2+100-rfCharge, 2, rfCharge, 28, 100-rfCharge, 2, rfCharge, 0, GuiHelper.PXL128); - GuiHelper.drawTexturedRect(x, y, (int)(15*scale), (int)(104*scale), 0, 14, 15, 104, 0, GuiHelper.PXL128); - GuiHelper.drawTexturedRect(x+2, y+2+(100- shieldPercentCharge), (int)(8*scale), shieldPercentCharge *scale, 15, 100-shieldPercentCharge, 8, shieldPercentCharge, 0, GuiHelper.PXL128); - GuiHelper.drawTexturedRect(x+11, y+2+(100-(int)shieldEntropy), (int)(2*scale), (int)shieldEntropy * scale, 24, 100-(int)shieldEntropy, 2, (int)shieldEntropy, 0, GuiHelper.PXL128); if (ConfigHandler.hudSettings[9] == 1) { FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; GL11.glTranslated(x, y, 0); - GL11.glScaled(scale, scale, 1); if (rotated) GL11.glRotated(90, 0, 0, -1); GL11.glTranslated(-x, -y, 0); + String shield = Math.round(shieldPoints) + "/" + (int)maxShieldPoints; + String entropy = "EN: "+(int)shieldEntropy + "%"; + String energy = "RF: "+ Utills.formatNumber(rfTotal); + float fade = Math.min(armorStatsFadeOut, 1F); if (!rotated) { - fontRenderer.drawStringWithShadow(Math.round(shieldPoints) + "/" + (int)maxShieldPoints, x + 16, y + 84, 0xFFFFFF); - fontRenderer.drawStringWithShadow((int)shieldEntropy + "%", x + 16, y + 94, 0xFFFFFF); + fontRenderer.drawStringWithShadow(shield, x + 18, y + 74, ((int)(fade*240F)+0x10 << 24) | 0x00FFFFFF); + fontRenderer.drawStringWithShadow(energy, x + 18, y + 84, ((int)(fade*240F)+0x10 << 24) | 0x00FFFFFF); + fontRenderer.drawStringWithShadow(entropy, x + 18, y + 94, ((int)(fade*240F)+0x10 << 24) | 0x00FFFFFF); }else { - fontRenderer.drawStringWithShadow(Math.round(shieldPoints) + "/" + (int)maxShieldPoints, x - 102, y + 16, 0xFFFFFF); - fontRenderer.drawStringWithShadow((int)shieldEntropy + "%", x - fontRenderer.getStringWidth((int)shieldEntropy + "%"), y + 16, 0xFFFFFF); + fontRenderer.drawString(shield, x - 52 - fontRenderer.getStringWidth(shield)/2, y + 2, ((int)(fade*240F)+0x10 << 24) | 0x000000FF); + fontRenderer.drawStringWithShadow(entropy, x - fontRenderer.getStringWidth(entropy), y + 18, ((int)(fade*240F)+0x10 << 24) | 0x00FFFFFF); + fontRenderer.drawStringWithShadow(energy, x - 102, y + 18, ((int)(fade*240F)+0x10 << 24) | 0x00FFFFFF); } } @@ -172,3 +184,40 @@ public class HudHandler { GL11.glPopMatrix(); } } + + +//GL11.glPushMatrix(); +// GL11.glEnable(GL11.GL_ALPHA_TEST); +// ResourceHandler.bindResource("textures/gui/HUD.png"); +// +// if (rotated){ +// GuiHelper.drawTexturedRect(x-(12*scale), y+scale, (int)(11*scale), (int)(13*scale), 2, 0, 11, 13, 0, GuiHelper.PXL128); +// x+=(104*scale); +// GL11.glTranslated(x, y, 0); +// GL11.glRotated(-90, 0, 0, -1); +// GL11.glTranslated(-x, -y, 0); +// } +// else GuiHelper.drawTexturedRect(x+(1*scale), y+(104*scale)+1, (int)(13*scale), (int)(15*scale), 2, 0, 11, 13, 0, GuiHelper.PXL128); +// +// GuiHelper.drawTexturedRect(x, y, (int)(17*scale), (int)(104*scale), 0, 15, 17, 104, 0, GuiHelper.PXL128); +// GuiHelper.drawTexturedRect(x+(2*scale), y+(2*scale)+(100-shieldPercentCharge), (int)(7*scale), shieldPercentCharge *scale, 17, 100-shieldPercentCharge, 7, shieldPercentCharge, 0, GuiHelper.PXL128); +// GuiHelper.drawTexturedRect(x+(10*scale), y+(2+(100-(int)shieldEntropy) * scale), (int)(2*scale), (int)shieldEntropy * scale, 25, 100-(int)shieldEntropy, 2, (int)shieldEntropy, 0, GuiHelper.PXL128); +// +// if (ConfigHandler.hudSettings[9] == 1) { +// FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; +// GL11.glTranslated(x, y, 0); +// GL11.glScaled(scale, scale, 1); +// if (rotated) GL11.glRotated(90, 0, 0, -1); +// GL11.glTranslated(-x, -y, 0); +// if (!rotated) { +// fontRenderer.drawStringWithShadow(Math.round(shieldPoints) + "/" + (int)maxShieldPoints, x + 16, y + 84, 0xFFFFFF); +// fontRenderer.drawStringWithShadow((int)shieldEntropy + "%", x + 16, y + 94, 0xFFFFFF); +// }else { +// fontRenderer.drawStringWithShadow(Math.round(shieldPoints) + "/" + (int)maxShieldPoints, x - 102, y + 16, 0xFFFFFF); +// fontRenderer.drawStringWithShadow((int)shieldEntropy + "%", x - fontRenderer.getStringWidth((int)shieldEntropy + "%"), y + 16, 0xFFFFFF); +// } +// } +// +// ResourceHandler.bindTexture(ResourceHandler.getResourceWOP("minecraft:textures/gui/icons.png")); +// GL11.glDisable(GL11.GL_ALPHA_TEST); +// GL11.glPopMatrix(); \ No newline at end of file diff --git a/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyBindings.java b/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyBindings.java index 374fa28d..7b3266b7 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyBindings.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyBindings.java @@ -14,11 +14,14 @@ import org.lwjgl.input.Keyboard; public class KeyBindings { public static KeyBinding placeItem; public static KeyBinding toolConfig; + public static KeyBinding toolProfileChange; public static void init() { placeItem = new KeyBinding("key.placeItem", Keyboard.KEY_P, References.MODNAME); toolConfig = new KeyBinding("key.toolConfig", Keyboard.KEY_C, References.MODNAME); + toolProfileChange = new KeyBinding("key.toolProfileChange", Keyboard.KEY_BACKSLASH, References.MODNAME); ClientRegistry.registerKeyBinding(placeItem); ClientRegistry.registerKeyBinding(toolConfig); + ClientRegistry.registerKeyBinding(toolProfileChange); } } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java index 99dc79e7..1fb4b522 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java @@ -1,11 +1,13 @@ package com.brandon3055.draconicevolution.client.keybinding; +import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.items.tools.baseclasses.ToolHandler; import com.brandon3055.draconicevolution.common.network.ButtonPacket; import com.brandon3055.draconicevolution.common.network.PlacedItemPacket; import com.brandon3055.draconicevolution.common.network.TeleporterPacket; +import com.brandon3055.draconicevolution.common.utills.IConfigurableItem; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent; import cpw.mods.fml.relauncher.Side; @@ -27,10 +29,18 @@ public class KeyInputHandler { @SubscribeEvent public void onKeyInput(InputEvent.KeyInputEvent event) { if(KeyBindings.placeItem.isPressed()) handlePlaceItemKey(); - if(KeyBindings.toolConfig.isPressed()) { + else if(KeyBindings.toolConfig.isPressed()) { DraconicEvolution.network.sendToServer(new ButtonPacket(ButtonPacket.ID_TOOLCONFIG, false)); - //EntityPlayer player = Minecraft.getMinecraft().thePlayer; - //player.openGui(DraconicEvolution.instance, GuiHandler.GUIID_TOOL_CONFIG, Minecraft.getMinecraft().theWorld, (int)player.posX, (int)player.posY, (int)player.posZ); + } + else if (KeyBindings.toolProfileChange.isPressed() && Minecraft.getMinecraft().thePlayer != null){ + DraconicEvolution.network.sendToServer(new ButtonPacket(ButtonPacket.ID_TOOL_PROFILE_CHANGE, false)); + + ItemStack stack = Minecraft.getMinecraft().thePlayer.getHeldItem(); + if (stack != null && stack.getItem() instanceof IConfigurableItem && ((IConfigurableItem)stack.getItem()).hasProfiles()){ + int preset = ItemNBTHelper.getInteger(stack, "ConfigProfile", 0); + if (++preset >= 5) preset = 0; + ItemNBTHelper.setInteger(stack, "ConfigProfile", preset); + } } } @@ -45,6 +55,21 @@ public class KeyInputHandler { @SideOnly(Side.CLIENT) @SubscribeEvent public void onMouseInput(InputEvent.MouseInputEvent event) { + if(KeyBindings.placeItem.isPressed()) handlePlaceItemKey(); + else if(KeyBindings.toolConfig.isPressed()) { + DraconicEvolution.network.sendToServer(new ButtonPacket(ButtonPacket.ID_TOOLCONFIG, false)); + } + else if (KeyBindings.toolProfileChange.isPressed() && Minecraft.getMinecraft().thePlayer != null){ + DraconicEvolution.network.sendToServer(new ButtonPacket(ButtonPacket.ID_TOOL_PROFILE_CHANGE, false)); + + ItemStack stack = Minecraft.getMinecraft().thePlayer.getHeldItem(); + if (stack != null && stack.getItem() instanceof IConfigurableItem && ((IConfigurableItem)stack.getItem()).hasProfiles()){ + int preset = ItemNBTHelper.getInteger(stack, "ConfigProfile", 0); + if (++preset >= 5) preset = 0; + ItemNBTHelper.setInteger(stack, "ConfigProfile", preset); + } + } + EntityPlayer player = Minecraft.getMinecraft().thePlayer; int change = Mouse.getEventDWheel(); if (change == 0 || !player.isSneaking()) return; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderPortal.java b/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderPortal.java index e72e7d43..1d4f26da 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderPortal.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderPortal.java @@ -6,8 +6,9 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.init.Blocks; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import org.lwjgl.opengl.GL11; /** * Created by Brandon on 25/5/2015. @@ -21,122 +22,127 @@ public class RenderPortal implements ISimpleBlockRenderingHandler { @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { Tessellator tess = Tessellator.instance; - GL11.glDisable(GL11.GL_ALPHA_TEST); + int meta = world.getBlockMetadata(x, y, z); + IIcon c = Blocks.obsidian.getIcon(0, 0); + float u = c.getMinU(); + float v = c.getMinV(); + float U = c.getMaxU(); + float V = c.getMaxV(); + tess.setColorRGBA(0, 0, 0, 256); switch (meta){ case 1: - tess.addVertex(x-0.01, y-0.01, z+0.75); - tess.addVertex(x-0.01, y+1.01, z+0.75); - tess.addVertex(x+1.01, y+1.01, z+0.75); - tess.addVertex(x+1.01, y-0.01, z+0.75); + tess.addVertexWithUV(x - 0.01, y - 0.01, z + 0.75, u, v); + tess.addVertexWithUV(x - 0.01, y + 1.01, z + 0.75, u, V); + tess.addVertexWithUV(x + 1.01, y + 1.01, z + 0.75, U, V); + tess.addVertexWithUV(x + 1.01, y - 0.01, z + 0.75, U, v); - tess.addVertex(x+1.01, y-0.01, z+0.25); - tess.addVertex(x+1.01, y+1.01, z+0.25); - tess.addVertex(x-0.01, y+1.01, z+0.25); - tess.addVertex(x-0.01, y-0.01, z+0.25); + tess.addVertexWithUV(x + 1.01, y - 0.01, z + 0.25, U, v); + tess.addVertexWithUV(x + 1.01, y + 1.01, z + 0.25, U, V); + tess.addVertexWithUV(x - 0.01, y + 1.01, z + 0.25, u, V); + tess.addVertexWithUV(x - 0.01, y - 0.01, z + 0.25, u, v); if (isFrame(world, x+1, y, z)){ - tess.addVertex(x+0.99, y-0.01, z+0.25); - tess.addVertex(x+0.99, y-0.01, z+0.75); - tess.addVertex(x+0.99, y+1.01, z+0.75); - tess.addVertex(x+0.99, y+1.01, z+0.25); + tess.addVertexWithUV(x + 0.99, y - 0.01, z + 0.25, u, v); + tess.addVertexWithUV(x + 0.99, y - 0.01, z + 0.75, u, V); + tess.addVertexWithUV(x + 0.99, y + 1.01, z + 0.75, U, V); + tess.addVertexWithUV(x + 0.99, y + 1.01, z + 0.25, U, v); } if (isFrame(world, x-1, y, z)){ - tess.addVertex(x+0.01, y+1.01, z+0.25); - tess.addVertex(x+0.01, y+1.01, z+0.75); - tess.addVertex(x+0.01, y-0.01, z+0.75); - tess.addVertex(x+0.01, y-0.01, z+0.25); + tess.addVertexWithUV(x + 0.01, y + 1.01, z + 0.25, U, v); + tess.addVertexWithUV(x + 0.01, y + 1.01, z + 0.75, U, V); + tess.addVertexWithUV(x + 0.01, y - 0.01, z + 0.75, u, V); + tess.addVertexWithUV(x + 0.01, y - 0.01, z + 0.25, u, v); } if (isFrame(world, x, y-1, z)){ - tess.addVertex(x-0.01, y+0.01,z+0.25); - tess.addVertex(x-0.01, y+0.01,z+0.75); - tess.addVertex(x+1.01, y+0.01,z+0.75); - tess.addVertex(x+1.01, y+0.01,z+0.25); + tess.addVertexWithUV(x - 0.01, y + 0.01, z + 0.25, u, v); + tess.addVertexWithUV(x - 0.01, y + 0.01, z + 0.75, u, V); + tess.addVertexWithUV(x + 1.01, y + 0.01, z + 0.75, U, V); + tess.addVertexWithUV(x + 1.01, y + 0.01, z + 0.25, U, v); } if (isFrame(world, x, y+1, z)){ - tess.addVertex(x+1.01, y+0.99,z+0.25); - tess.addVertex(x+1.01, y+0.99,z+0.75); - tess.addVertex(x-0.01, y+0.99,z+0.75); - tess.addVertex(x-0.01, y+0.99,z+0.25); + tess.addVertexWithUV(x + 1.01, y + 0.99, z + 0.25, U, v); + tess.addVertexWithUV(x + 1.01, y + 0.99, z + 0.75, U, V); + tess.addVertexWithUV(x - 0.01, y + 0.99, z + 0.75, u, V); + tess.addVertexWithUV(x - 0.01, y + 0.99, z + 0.25, u, v); } break; case 2: - tess.addVertex(x+0.75, y-0.01, z-0.01); - tess.addVertex(x+0.75, y-0.01, z+1.01); - tess.addVertex(x+0.75, y+1.01, z+1.01); - tess.addVertex(x+0.75, y+1.01, z-0.01); + tess.addVertexWithUV(x + 0.75, y - 0.01, z - 0.01, u, v); + tess.addVertexWithUV(x + 0.75, y - 0.01, z + 1.01, u, V); + tess.addVertexWithUV(x + 0.75, y + 1.01, z + 1.01, U, V); + tess.addVertexWithUV(x + 0.75, y + 1.01, z - 0.01, U, v); - tess.addVertex(x+0.25, y+1.01, z-0.01); - tess.addVertex(x+0.25, y+1.01, z+1.01); - tess.addVertex(x+0.25, y-0.01, z+1.01); - tess.addVertex(x+0.25, y-0.01, z-0.01); + tess.addVertexWithUV(x + 0.25, y + 1.01, z - 0.01, U, v); + tess.addVertexWithUV(x + 0.25, y + 1.01, z + 1.01, U, V); + tess.addVertexWithUV(x + 0.25, y - 0.01, z + 1.01, u, V); + tess.addVertexWithUV(x + 0.25, y - 0.01, z - 0.01, u, v); if (isFrame(world, x, y, z+1)){ - tess.addVertex(x+0.25, y-0.01, z+0.99); - tess.addVertex(x+0.25, y+1.01, z+0.99); - tess.addVertex(x+0.75, y+1.01, z+0.99); - tess.addVertex(x+0.75, y-0.01, z+0.99); + tess.addVertexWithUV(x + 0.25, y - 0.01, z + 0.99, u, v); + tess.addVertexWithUV(x + 0.25, y + 1.01, z + 0.99, U, V); + tess.addVertexWithUV(x + 0.75, y + 1.01, z + 0.99, U, V); + tess.addVertexWithUV(x + 0.75, y - 0.01, z + 0.99, u, v); } if (isFrame(world, x, y, z-1)){ - tess.addVertex(x+0.75, y-0.01, z+0.01); - tess.addVertex(x+0.75, y+1.01, z+0.01); - tess.addVertex(x+0.25, y+1.01, z+0.01); - tess.addVertex(x+0.25, y-0.01, z+0.01); + tess.addVertexWithUV(x + 0.75, y - 0.01, z + 0.01, u, v); + tess.addVertexWithUV(x + 0.75, y + 1.01, z + 0.01, U, V); + tess.addVertexWithUV(x + 0.25, y + 1.01, z + 0.01, U, V); + tess.addVertexWithUV(x + 0.25, y - 0.01, z + 0.01, u, v); } if (isFrame(world, x, y-1, z)){ - tess.addVertex(x+0.25, y+0.01, z-0.01); - tess.addVertex(x+0.25, y+0.01, z+1.01); - tess.addVertex(x+0.75, y+0.01, z+1.01); - tess.addVertex(x+0.75, y+0.01, z-0.01); + tess.addVertexWithUV(x + 0.25, y + 0.01, z - 0.01, u, v); + tess.addVertexWithUV(x + 0.25, y + 0.01, z + 1.01, u, V); + tess.addVertexWithUV(x + 0.75, y + 0.01, z + 1.01, U, V); + tess.addVertexWithUV(x + 0.75, y + 0.01, z - 0.01, U, v); } if (isFrame(world, x, y+1, z)){ - tess.addVertex(x+0.75, y+0.99, z-0.01); - tess.addVertex(x+0.75, y+0.99, z+1.01); - tess.addVertex(x+0.25, y+0.99, z+1.01); - tess.addVertex(x+0.25, y+0.99, z-0.01); + tess.addVertexWithUV(x + 0.75, y + 0.99, z - 0.01, U, v); + tess.addVertexWithUV(x + 0.75, y + 0.99, z + 1.01, U, V); + tess.addVertexWithUV(x + 0.25, y + 0.99, z + 1.01, u, V); + tess.addVertexWithUV(x + 0.25, y + 0.99, z - 0.01, u, v); } break; case 3: - tess.addVertex(x-0.01, y+0.25, z-0.01); - tess.addVertex(x-0.01, y+0.25, z+1.01); - tess.addVertex(x+1.01, y+0.25, z+1.01); - tess.addVertex(x+1.01, y+0.25, z-0.01); + tess.addVertexWithUV(x - 0.01, y + 0.25, z - 0.01, u, v); + tess.addVertexWithUV(x - 0.01, y + 0.25, z + 1.01, u, V); + tess.addVertexWithUV(x + 1.01, y + 0.25, z + 1.01, U, V); + tess.addVertexWithUV(x + 1.01, y + 0.25, z - 0.01, U, v); - tess.addVertex(x+1.01, y+0.75, z-0.01); - tess.addVertex(x+1.01, y+0.75, z+1.01); - tess.addVertex(x-0.01, y+0.75, z+1.01); - tess.addVertex(x-0.01, y+0.75, z-0.01); + tess.addVertexWithUV(x + 1.01, y + 0.75, z - 0.01, U, v); + tess.addVertexWithUV(x + 1.01, y + 0.75, z + 1.01, U, V); + tess.addVertexWithUV(x - 0.01, y + 0.75, z + 1.01, u, V); + tess.addVertexWithUV(x - 0.01, y + 0.75, z - 0.01, u, v); if (isFrame(world, x, y, z+1)){ - tess.addVertex(x-0.01, y+0.25, z+0.99); - tess.addVertex(x-0.01, y+0.75, z+0.99); - tess.addVertex(x+1.01, y+0.75, z+0.99); - tess.addVertex(x+1.01, y+0.25, z+0.99); + tess.addVertexWithUV(x - 0.01, y + 0.25, z + 0.99, u, v); + tess.addVertexWithUV(x - 0.01, y + 0.75, z + 0.99, u, V); + tess.addVertexWithUV(x + 1.01, y + 0.75, z + 0.99, U, V); + tess.addVertexWithUV(x + 1.01, y + 0.25, z + 0.99, U, v); } if (isFrame(world, x, y, z-1)){ - tess.addVertex(x+1.01, y+0.25, z+0.01); - tess.addVertex(x+1.01, y+0.75, z+0.01); - tess.addVertex(x-0.01, y+0.75, z+0.01); - tess.addVertex(x-0.01, y+0.25, z+0.01); + tess.addVertexWithUV(x + 1.01, y + 0.25, z + 0.01, U, v); + tess.addVertexWithUV(x + 1.01, y + 0.75, z + 0.01, U, V); + tess.addVertexWithUV(x - 0.01, y + 0.75, z + 0.01, u, V); + tess.addVertexWithUV(x - 0.01, y + 0.25, z + 0.01, u, v); } if (isFrame(world, x+1, y, z)){ - tess.addVertex(x+0.99, y+0.25, z-0.01); - tess.addVertex(x+0.99, y+0.25, z+1.01); - tess.addVertex(x+0.99, y+0.75, z+1.01); - tess.addVertex(x+0.99, y+0.75, z-0.01); + tess.addVertexWithUV(x + 0.99, y + 0.25, z - 0.01, u, v); + tess.addVertexWithUV(x + 0.99, y + 0.25, z + 1.01, u, V); + tess.addVertexWithUV(x + 0.99, y + 0.75, z + 1.01, U, V); + tess.addVertexWithUV(x + 0.99, y + 0.75, z - 0.01, U, v); } if (isFrame(world, x-1, y, z)){ - tess.addVertex(x+0.01, y+0.75, z-0.01); - tess.addVertex(x+0.01, y+0.75, z+1.01); - tess.addVertex(x+0.01, y+0.25, z+1.01); - tess.addVertex(x+0.01, y+0.25, z-0.01); + tess.addVertexWithUV(x + 0.01, y + 0.75, z - 0.01, U, v); + tess.addVertexWithUV(x + 0.01, y + 0.75, z + 1.01, U, V); + tess.addVertexWithUV(x + 0.01, y + 0.25, z + 1.01, u, V); + tess.addVertexWithUV(x + 0.01, y + 0.25, z - 0.01, u, v); } } - GL11.glEnable(GL11.GL_ALPHA_TEST); return true; } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java index ff5eb9d8..cd489eef 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java @@ -126,6 +126,7 @@ public class CommonProxy { DraconicEvolution.network.registerMessage(SpeedRequestPacket.Handler.class, SpeedRequestPacket.class, 13, Side.CLIENT); DraconicEvolution.network.registerMessage(ToolModePacket.Handler.class, ToolModePacket.class, 14, Side.SERVER); DraconicEvolution.network.registerMessage(GenericParticlePacket.Handler.class, GenericParticlePacket.class, 15, Side.CLIENT); + DraconicEvolution.network.registerMessage(ShieldHitPacket.Handler.class, ShieldHitPacket.class, 15, Side.CLIENT); } public void registerTileEntities() { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/ModItems.java b/src/main/java/com/brandon3055/draconicevolution/common/ModItems.java index 7a800147..cc6f53e3 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/ModItems.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/ModItems.java @@ -21,11 +21,11 @@ import net.minecraftforge.common.util.EnumHelper; @GameRegistry.ObjectHolder(References.MODID) 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, 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 ArmorMaterial WYVERN_ARMOR = EnumHelper.addArmorMaterial("WYVERN_ARMOR", -1, new int[] { 3, 8, 6, 3 }, 30); + public static ArmorMaterial DRACONIC_ARMOR = EnumHelper.addArmorMaterial("DRACONIC_ARMOR", -1, new int[] { 3, 8, 6, 3 }, 30); + public static ToolMaterial WYVERN = EnumHelper.addToolMaterial("WYVERN", 10, -1, 12.0F, 20.0F, 35); + public static ToolMaterial AWAKENED = EnumHelper.addToolMaterial("AWAKENED", 10, -1, 16.0F, 40.0F, 40); + public static ToolMaterial CHAOTIC = EnumHelper.addToolMaterial("CHAOTIC", 10, -1, 400.0F, 60.0F, 45); public static Item draconicPickaxe; public static Item draconicShovel; @@ -102,19 +102,19 @@ public class ModItems { draconicHoe = new DraconicHoe(); draconicSword = new DraconicSword(); draconicBow = new DraconicBow(); - draconicHelm = new DraconicArmor(DRACONIUMARMOR_T2, 0, Strings.draconicHelmName); - draconicChest = new DraconicArmor(DRACONIUMARMOR_T2, 1, Strings.draconicChestName); - draconicLeggs = new DraconicArmor(DRACONIUMARMOR_T2, 2, Strings.draconicLeggsName); - draconicBoots = new DraconicArmor(DRACONIUMARMOR_T2, 3, Strings.draconicBootsName); + draconicHelm = new DraconicArmor(DRACONIC_ARMOR, 0, Strings.draconicHelmName); + draconicChest = new DraconicArmor(DRACONIC_ARMOR, 1, Strings.draconicChestName); + draconicLeggs = new DraconicArmor(DRACONIC_ARMOR, 2, Strings.draconicLeggsName); + draconicBoots = new DraconicArmor(DRACONIC_ARMOR, 3, Strings.draconicBootsName); wyvernPickaxe = new WyvernPickaxe(); wyvernShovel = new WyvernShovel(); wyvernSword = new WyvernSword(); wyvernBow = new WyvernBow(); - wyvernHelm = new WyvernArmor(DRACONIUMARMOR_T1, 0, Strings.wyvernHelmName); - wyvernChest = new WyvernArmor(DRACONIUMARMOR_T1, 1, Strings.wyvernChestName); - wyvernLeggs = new WyvernArmor(DRACONIUMARMOR_T1, 2, Strings.wyvernLeggsName); - wyvernBoots = new WyvernArmor(DRACONIUMARMOR_T1, 3, Strings.wyvernBootsName); + wyvernHelm = new WyvernArmor(WYVERN_ARMOR, 0, Strings.wyvernHelmName); + wyvernChest = new WyvernArmor(WYVERN_ARMOR, 1, Strings.wyvernChestName); + wyvernLeggs = new WyvernArmor(WYVERN_ARMOR, 2, Strings.wyvernLeggsName); + wyvernBoots = new WyvernArmor(WYVERN_ARMOR, 3, Strings.wyvernBootsName); draconicCore = new DraconicCore(); wyvernCore = new WyvernCore(); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconicBlock.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconicBlock.java index cd31ce3a..a147b170 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconicBlock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconicBlock.java @@ -33,6 +33,11 @@ public class DraconicBlock extends BlockDE { @Override public void onBlockExploded(World world, int x, int y, int z, Explosion explosion) {} + @Override + public boolean canDropFromExplosion(Explosion p_149659_1_) { + return false; + } + @Override public void registerBlockIcons(IIconRegister iconRegister) { blockIcon = iconRegister.registerIcon(References.RESOURCESPREFIX + "draconic_block"); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumBlock.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumBlock.java index bc8cd8f9..6fa76836 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumBlock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumBlock.java @@ -47,6 +47,11 @@ public class DraconiumBlock extends BlockDE { @Override public void onBlockExploded(World world, int x, int y, int z, Explosion explosion) {} + @Override + public boolean canDropFromExplosion(Explosion p_149659_1_) { + return false; + } + @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/InfusedObsidian.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/InfusedObsidian.java index c288eab6..e2881eba 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/InfusedObsidian.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/InfusedObsidian.java @@ -55,6 +55,11 @@ public class InfusedObsidian extends BlockDE { return super.getExplosionResistance(par1Entity, world, x, y, z, explosionX, explosionY, explosionZ); } + @Override + public boolean canDropFromExplosion(Explosion p_149659_1_) { + return false; + } + public static class InfusedObsidianItemBlock extends ItemBlock { public InfusedObsidianItemBlock(Block p_i45328_1_) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosCrystal.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosCrystal.java index a914979e..39c1a3a7 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosCrystal.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosCrystal.java @@ -84,7 +84,7 @@ public class EntityChaosCrystal extends EntityLivingBase { int j = MathHelper.floor_double(this.posY); int k = MathHelper.floor_double(this.posZ); - if (this.worldObj.provider instanceof WorldProviderEnd && this.worldObj.getBlock(i, j, k) != Blocks.fire) this.worldObj.setBlock(i, j, k, Blocks.fire); + if (this.worldObj.provider instanceof WorldProviderEnd && this.worldObj.getBlock(i, j, k).isBlockSolid(this.worldObj, i, j, k, 0) && this.worldObj.getBlock(i, j, k) != Blocks.fire) this.worldObj.setBlock(i, j, k, Blocks.fire); }else if (deathAnimation > 0) deathAnimation -= 0.1F; @@ -189,7 +189,9 @@ public class EntityChaosCrystal extends EntityLivingBase { if (getGuardian() != null) getGuardian().updateCrystals(); } - public boolean isAlive() { return health > 0F; } + public boolean isAlive() { + return getHealth() > 0F; + } @Override public ItemStack getHeldItem() { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosGuardian.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosGuardian.java index fab150d0..a627e142 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosGuardian.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityChaosGuardian.java @@ -463,7 +463,7 @@ public class EntityChaosGuardian extends EntityDragon {//summon DraconicEvolutio if (ticksExisted % 1000 == 0 && rand.nextBoolean()) selectNewBehaviour(); - if (ignitionChargeTimer > 1 || (ignitionChargeTimer == 1 && ticksExisted % 20 == 0))ignitionChargeTimer--; + if (ignitionChargeTimer > 1 || (ignitionChargeTimer == 1 && ticksExisted % 20 == 0) && !ConfigHandler.disableGuardianCrystalRespawn)ignitionChargeTimer--; if (ignitionChargeTimer <= 0 && !worldObj.isRemote){ if ((ticksExisted - 19) % 20 == 0) ignitionChargeTimer = (behaviour == EnumBehaviour.LOW_HEALTH_STRATEGY ? 1000 : 2000) + rand.nextInt(600); @@ -478,7 +478,6 @@ public class EntityChaosGuardian extends EntityDragon {//summon DraconicEvolutio } } - updateAttack(); } @@ -560,7 +559,7 @@ public class EntityChaosGuardian extends EntityDragon {//summon DraconicEvolutio break; case ATTACK_FIREBALL_CHASER: if (attackTimer % 10 == 0) { - EntityDragonProjectile projectile = new EntityDragonProjectile(worldObj, EntityDragonProjectile.FIRE_CHASER, attackTarget instanceof EntityLivingBase ? (EntityLivingBase)attackTarget : null, 5F + (rand.nextFloat() * 8F), this); + EntityDragonProjectile projectile = new EntityDragonProjectile(worldObj, EntityDragonProjectile.FIRE_CHASER, attackTarget instanceof EntityLivingBase ? (EntityLivingBase)attackTarget : null, 5F + (rand.nextFloat() * 2F), this); projectile.setPosition(dragonPartHead.posX, dragonPartHead.posY, dragonPartHead.posZ); worldObj.spawnEntityInWorld(projectile); } @@ -574,7 +573,7 @@ public class EntityChaosGuardian extends EntityDragon {//summon DraconicEvolutio break; case ATTACK_CHAOS_CHASER: if (attackTimer % 10 == 0) { - EntityDragonProjectile projectile = new EntityDragonProjectile(worldObj, EntityDragonProjectile.CHAOS_CHASER, attackTarget instanceof EntityLivingBase ? (EntityLivingBase)attackTarget : null, 5F + (rand.nextFloat() * 12F), this); + EntityDragonProjectile projectile = new EntityDragonProjectile(worldObj, EntityDragonProjectile.CHAOS_CHASER, attackTarget instanceof EntityLivingBase ? (EntityLivingBase)attackTarget : null, 5F + (rand.nextFloat() * 10F), this); projectile.setPosition(dragonPartHead.posX, dragonPartHead.posY, dragonPartHead.posZ); worldObj.spawnEntityInWorld(projectile); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDragonProjectile.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDragonProjectile.java index 9f9cd010..dc5af6b8 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDragonProjectile.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDragonProjectile.java @@ -273,7 +273,7 @@ public class EntityDragonProjectile extends Entity { if (source == damageChaos && entityLivingBase instanceof EntityPlayer){ for (ItemStack stack : ((EntityPlayer) entityLivingBase).inventory.armorInventory) { if (stack != null && stack.getItem() instanceof IEnergyContainerItem){ - ((IEnergyContainerItem) stack.getItem()).extractEnergy(stack, ((IEnergyContainerItem) stack.getItem()).getMaxEnergyStored(stack) / (50 + rand.nextInt(50)), false); + ((IEnergyContainerItem) stack.getItem()).extractEnergy(stack, 30000 + rand.nextInt(10000), false); } } } 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 e8220941..2e9bef2c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java @@ -43,6 +43,7 @@ public class ConfigHandler { public static boolean useOldArmorModel; public static boolean useOriginal3DArmorModel; public static boolean useOldD2DToolTextures; + public static boolean disableGuardianCrystalRespawn; //spawner public static String[] spawnerList; @@ -113,6 +114,7 @@ public class ConfigHandler { useOldD2DToolTextures = config.get(Configuration.CATEGORY_GENERAL, "Use old 2D tool textures", false, "If true the 3D tool models will be replaced with standard 2D textures").getBoolean(false); chaosIslandSeparation = config.get(Configuration.CATEGORY_GENERAL, "Chaos Island Separation", 10000, "This sets how far apart the chaos islands will spawn. The islands spawn in a grid pattern.").getInt(10000); useOriginal3DArmorModel = config.get(Configuration.CATEGORY_GENERAL, "Use the original 3D armor models", false, "If true the original 3D armor models created by Skeletonpunk will be used instead of the current ones").getBoolean(false); + disableGuardianCrystalRespawn = config.get(Configuration.CATEGORY_GENERAL, "Disable Guardian Crystal Respawn", false, "(Wuss mode) Setting this to true will disable the chaos guardians ability to respawn healing crystals. Under certain circumstances such as on a Spigot server where entity render distance is significantly lower this may be required.").getBoolean(false); //Spawner 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 b27f68b2..aaeb3d08 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java @@ -102,7 +102,7 @@ public class CraftingHandler { addOre(ModBlocks.rainSensor, " ", "RBR", "SPS", 'R', "dustRedstone", 'B', Items.bucket, 'S', Blocks.stone_slab, 'P', Blocks.heavy_weighted_pressure_plate); addOre(ModBlocks.teleporterStand, " P ", " S ", "HBH", 'P', Blocks.stone_pressure_plate, 'S', "stone", 'H', new ItemStack(Blocks.stone_slab, 1, 0), 'B', Items.blaze_powder); addOre(ModBlocks.dislocatorReceptacle, "ICI", " O ", "ISI", 'I', "ingotIron", 'C', ModItems.draconicCore, 'O', ModBlocks.infusedObsidian, 'S', ModBlocks.teleporterStand); - + addOre(ModBlocks.upgradeModifier, " ", "DCD", "III", 'I', "ingotIron", 'D', "ingotDraconium", 'C', ModItems.draconicCore); //machines adv addOre(ModBlocks.resurrectionStone, "CSC", "SMS", "CSC", 'C', mobSoul, 'S', ModItems.wyvernCore, 'M', "blockDraconium"); 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 b1d1c68d..8bbf2c41 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/FMLEventHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/FMLEventHandler.java @@ -10,21 +10,11 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.common.gameevent.TickEvent; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.WeakHashMap; - public class FMLEventHandler { - public static Map playersWithFlight = new WeakHashMap(); - public static List playersWithUphillStep = new ArrayList(); - public static Field walkSpeed; private static boolean mmGiven = false; @SubscribeEvent @@ -40,109 +30,6 @@ public class FMLEventHandler { if (event.phase != TickEvent.Phase.START) return; CustomArmorHandler.onPlayerTick(event); - -// EntityPlayer player = event.player; -// //Reset Walk Speed---------------------------------------------------------------------------------------------- -// -// if (walkSpeed == null){ -// walkSpeed = ReflectionHelper.findField(PlayerCapabilities.class, "walkSpeed", "g", "field_75097_g"); -// walkSpeed.setAccessible(true); -// } -// if (walkSpeed != null) { -// try { -// walkSpeed.setFloat(player.capabilities, 0.1f); -// } -// catch (IllegalAccessException e) { -// e.printStackTrace(); -// } -// catch (ConcurrentModificationException e) { -// e.printStackTrace(); -// } -// } -// -// //Apply Hill Step----------------------------------------------------------------------------------------------- -// -// if (player.worldObj.isRemote) { -// boolean highStepListed = playersWithUphillStep.contains(player.getDisplayName()) && player.stepHeight >= 1f; -// boolean hasHighStep = CustomArmorHandler.getHasHighStep(player); -// -// if (hasHighStep && !highStepListed) { -// playersWithUphillStep.add(player.getDisplayName()); -// player.stepHeight = 1f; -// } -// -// if (!hasHighStep && highStepListed) { -// playersWithUphillStep.remove(player.getDisplayName()); -// player.stepHeight = 0.5F; -// } -// } -// -// //Apply Swiftness----------------------------------------------------------------------------------------------- -// -// if (CustomArmorHandler.getHasSwiftness(player)) { -// int i = CustomArmorHandler.getSwiftnessLevel(player); -// -// float percentIncrease = CustomArmorHandler.getSwiftnessMultiplier(player) * ((i + 1) * 0.05f); -// //LogHelper.info(player.capabilities.getWalkSpeed()+" "+percentIncrease); -// -// if (player.capabilities.isFlying && player.moveForward > 0F) -// { -// player.moveFlying(0F, 1F, percentIncrease / 2F); -// } -// -// if (!player.onGround && player.ridingEntity == null) player.jumpMovementFactor = 0.02F + (percentIncrease * 0.2F); -// -// if (walkSpeed != null) { -// try { -// walkSpeed.setFloat(player.capabilities, 0.1f + percentIncrease); -// } -// catch (IllegalAccessException e) { -// e.printStackTrace(); -// } -// catch (ConcurrentModificationException e) { -// e.printStackTrace(); -// } -// } -// } -// -// //Apply Flight-------------------------------------------------------------------------------------------------- -// -// if (CustomArmorHandler.getHasFlight(player)) { -// playersWithFlight.put(player, true); -// player.capabilities.allowFlying = true; -// if (CustomArmorHandler.getFlightLock(player)) player.capabilities.isFlying = true; -// -// if ((!player.onGround && player.capabilities.isFlying) && player.motionY != 0 && ((CustomArmorHandler.getVAccSprint(player) && BrandonsCore.proxy.isCtrlDown()) || (!CustomArmorHandler.getVAccSprint(player)))) -// { -// float percentIncrease = CustomArmorHandler.getVAccel(player); -// -// if (BrandonsCore.proxy.isSpaceDown() && !BrandonsCore.proxy.isShiftDown()) -// { -// player.motionY =(double)(percentIncrease * 2F); -// } -// -// if (BrandonsCore.proxy.isShiftDown() && !BrandonsCore.proxy.isSpaceDown()) -// { -// player.motionY = -(double)(percentIncrease * 2F); -// } -// } -// -// } else { -// -// if (!playersWithFlight.containsKey(player)) { -// playersWithFlight.put(player, false); -// } -// -// if (playersWithFlight.get(player) && !player.worldObj.isRemote) { -// playersWithFlight.put(player, false); -// -// if (!player.capabilities.isCreativeMode) { -// player.capabilities.allowFlying = false; -// player.capabilities.isFlying = false; -// player.sendPlayerAbilities(); -// } -// } -// } } @@ -150,6 +37,14 @@ public class FMLEventHandler { @SubscribeEvent public void playerLogin(PlayerEvent.PlayerLoggedInEvent event) { + if (!event.player.onGround){ + CustomArmorHandler.ArmorSummery summery = new CustomArmorHandler.ArmorSummery().getSummery(event.player); + if (summery != null && summery.flight[0]) { + event.player.capabilities.isFlying = true; + event.player.sendPlayerAbilities(); + } + } + if (!mmGiven && event.player.getCommandSenderName().toLowerCase().equals("dezil_nz")) { mmGiven = true; 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 d8057713..bdfeac07 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/MinecraftForgeEventHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/MinecraftForgeEventHandler.java @@ -148,11 +148,11 @@ public class MinecraftForgeEventHandler { public void onLivingJumpEvent(LivingEvent.LivingJumpEvent event) { if (!(event.entityLiving instanceof EntityPlayer)) return; EntityPlayer player = (EntityPlayer) event.entityLiving; + CustomArmorHandler.ArmorSummery summery = new CustomArmorHandler.ArmorSummery().getSummery(player); - if (CustomArmorHandler.getHasJumpBoost(player)) + if (summery != null && summery.jumpModifier > 0) { - int i = CustomArmorHandler.getJumpLevel(player); - event.entityLiving.motionY += CustomArmorHandler.getJumpMultiplier(player) * ((0.1f) * (2 + i)); + player.motionY += (double)(summery.jumpModifier * 0.1F); } } @@ -161,24 +161,6 @@ public class MinecraftForgeEventHandler { if (!(event.entityLiving instanceof EntityPlayer)) return; CustomArmorHandler.onPlayerAttacked(event); - - EntityPlayer player = (EntityPlayer) event.entityLiving; - - if (event.source.isFireDamage() && CustomArmorHandler.getFireImunity(player)) - { - event.setCanceled(true); - event.entityLiving.extinguish(); - } - - if (event.source.damageType.equals("fall") && CustomArmorHandler.getHasJumpBoost(player)) - { - if (event.ammount < (CustomArmorHandler.getJumpLevel(player) + 1) * 2) event.setCanceled(true); - } - - if ((event.source.damageType.equals("inWall") || event.source.damageType.equals("drown")) && (CustomArmorHandler.isWyvernArmor(player, 4) || CustomArmorHandler.isDraconicArmor(player, 4))) - { - if (event.ammount <= 2f) event.setCanceled(true); - } } @SubscribeEvent @@ -388,18 +370,22 @@ public class MinecraftForgeEventHandler { } } - @SubscribeEvent + @SubscribeEvent(priority = EventPriority.LOW) public void getBreakSpeed(PlayerEvent.BreakSpeed event) { if (event.entityPlayer != null) { float newDigSpeed = event.originalSpeed; + CustomArmorHandler.ArmorSummery summery = new CustomArmorHandler.ArmorSummery().getSummery(event.entityPlayer); + if (summery == null) return; + if (event.entityPlayer.isInsideOfMaterial(Material.water)) { - if (CustomArmorHandler.isDraconicArmor(event.entityPlayer, 4)) newDigSpeed *= 5f; + if (summery.flight[0]) newDigSpeed *= 5f; } + if (!event.entityPlayer.onGround) { - if (CustomArmorHandler.isDraconicArmor(event.entityPlayer, 3)) newDigSpeed *= 5f; + if (summery.flight[0]) newDigSpeed *= 5f; } event.newSpeed = newDigSpeed; } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java b/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java index 6c6bbddf..18155879 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java @@ -3,22 +3,24 @@ package com.brandon3055.draconicevolution.common.items; import com.brandon3055.draconicevolution.client.render.particle.Particles; import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.items.tools.baseclasses.ToolHandler; +import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.utills.LogHelper; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import java.io.File; -import java.io.FileWriter; +import java.io.IOException; import java.util.List; public class Tclogo extends ItemDE { @@ -113,7 +115,16 @@ public class Tclogo extends ItemDE { public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + LogHelper.info(Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode()); + ResourceLocation rs = new ResourceLocation(References.RESOURCESPREFIX + "manual-en_US.json"); + + try { + LogHelper.info(Minecraft.getMinecraft().getResourceManager().getResource(rs)); + } + catch (IOException e) { + e.printStackTrace(); + } // if ((int)System.currentTimeMillis() < lts + 10) return stack; @@ -137,35 +148,35 @@ public class Tclogo extends ItemDE { //projectile.setPosition(player.posX, player.posY, player.posZ); - - if (!world.isRemote) - { - int x = 45622; - LogHelper.info("45622".hashCode()); - - - File file = new File("C:/Users/Brandon/Desktop/0to"+String.valueOf(Integer.MAX_VALUE)+".txt"); - - try { - FileWriter writer = new FileWriter(file); - for (int i = 0; i < Integer.MAX_VALUE; i++) writer.write(i+","); - writer.close(); - LogHelper.info("Done"); - } - catch (Exception e) { - e.printStackTrace(); - } - - - int xCoord = 0; - int yCoord = 0; - int zCoord = 0; - - - - int locationHash = (String.valueOf(xCoord)+String.valueOf(yCoord)+String.valueOf(zCoord)).hashCode(); - - +// +// if (!world.isRemote) +// { +// int x = 45622; +// LogHelper.info("45622".hashCode()); +// +// +// File file = new File("C:/Users/Brandon/Desktop/0to"+String.valueOf(Integer.MAX_VALUE)+".txt"); +// +// try { +// FileWriter writer = new FileWriter(file); +// for (int i = 0; i < Integer.MAX_VALUE; i++) writer.write(i+","); +// writer.close(); +// LogHelper.info("Done"); +// } +// catch (Exception e) { +// e.printStackTrace(); +// } +// +// +// int xCoord = 0; +// int yCoord = 0; +// int zCoord = 0; +// +// +// +// int locationHash = (String.valueOf(xCoord)+String.valueOf(yCoord)+String.valueOf(zCoord)).hashCode(); +// +// @@ -337,12 +348,12 @@ public class Tclogo extends ItemDE { // - } + // } //List l = world.getEntitiesWithinAABB(Entity.class, AxisAlignedBB.getBoundingBox(player.posX, player.posY, player.posZ, player.posX, player.posY, player.posZ).expand(500, 500, 500)); //for (Entity e : l) if (!(e instanceof EntityPlayer)) e.setDead(); - if (1==1) return stack; + //if (1==1) return stack; /*if (player instanceof EntityPlayerMP) { for (int i = 0; i < 10; i++) ((EntityPlayerMP) player).playerNetServerHandler.setPlayerLocation(player.posX + 1, player.posY, player.posZ, player.rotationYaw, player.rotationPitch); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/CustomArmorHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/CustomArmorHandler.java index 637219a6..18431b2e 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/CustomArmorHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/CustomArmorHandler.java @@ -1,9 +1,17 @@ package com.brandon3055.draconicevolution.common.items.armor; import cofh.api.energy.IEnergyContainerItem; +import com.brandon3055.brandonscore.BrandonsCore; import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.network.ShieldHitPacket; import com.brandon3055.draconicevolution.common.utills.IUpgradableItem; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.common.network.NetworkRegistry; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.ai.attributes.IAttribute; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentTranslation; @@ -14,15 +22,22 @@ import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; +import java.lang.reflect.Field; +import java.util.*; + /** * Created by Brandon on 13/11/2014. */ public class CustomArmorHandler { + public static final UUID WALK_SPEED_UUID = UUID.fromString("0ea6ce8e-d2e8-11e5-ab30-625662870761"); private static final DamageSource ADMIN_KILL = new DamageSource("administrative.kill"); + public static Map playersWithFlight = new WeakHashMap(); + public static List playersWithUphillStep = new ArrayList(); + public static Field walkSpeed; public static void onPlayerHurt(LivingHurtEvent event) { // EntityPlayer player = (EntityPlayer) event.entityLiving; -// ShieldSummery summery = new ShieldSummery().getSummery(player); +// ArmorSummery summery = new ArmorSummery().getSummery(player); // if (summery == null || summery.protectionPoints <= 0) return; // float newEntropy = Math.min(summery.entropy + Math.min(3, event.ammount/5) + player.worldObj.rand.nextFloat(), 100F); // @@ -62,7 +77,9 @@ public class CustomArmorHandler { public static void onPlayerAttacked(LivingAttackEvent event){ EntityPlayer player = (EntityPlayer)event.entityLiving; - ShieldSummery summery = new ShieldSummery().getSummery(player); + ArmorSummery summery = new ArmorSummery().getSummery(player); + + if (applyArmorDamageBlocking(event, summery)) return; if (summery == null || summery.protectionPoints <= 0 || event.source == ADMIN_KILL) return; event.setCanceled(true); @@ -93,6 +110,11 @@ public class CustomArmorHandler { ItemNBTHelper.setFloat(armorPeace, "ShieldEntropy", newEntropy); } + if (summery.protectionPoints > 0){ + DraconicEvolution.network.sendToAllAround(new ShieldHitPacket(player, summery.protectionPoints / summery.maxProtectionPoints), new NetworkRegistry.TargetPoint(player.dimension, player.posX, player.posY, player.posZ, 64)); + player.worldObj.playSoundEffect(player.posX + 0.5D, player.posY + 0.5D, player.posZ + 0.5D, "draconicevolution:shieldStrike", 10.0F, player.worldObj.rand.nextFloat() * 0.1F + 1.055F); + } + if (remainingPoints > 0) { player.hurtResistantTime = 20; } @@ -103,10 +125,19 @@ public class CustomArmorHandler { public static void onPlayerDeath(LivingDeathEvent event) { EntityPlayer player = (EntityPlayer)event.entityLiving; - ShieldSummery summery = new ShieldSummery().getSummery(player); + ArmorSummery summery = new ArmorSummery().getSummery(player); if (summery == null || event.source == ADMIN_KILL) return; + if (summery.protectionPoints > 20){ + event.setCanceled(true); + event.entityLiving.setHealth(10); + LogHelper.warn("Something is trying to bypass the draconic shield. [Culprit: {Damage Type=" + event.source.damageType + ", Damage Class=" + event.source.toString() + "]"); + return; + } + + if (!summery.hasDraconic) return; + int[] charge = new int[summery.armorStacks.length]; int totalCharge = 0; for (int i = 0; i < summery.armorStacks.length; i++){ @@ -131,7 +162,13 @@ public class CustomArmorHandler { public static void onPlayerTick(TickEvent.PlayerTickEvent event) { EntityPlayer player = event.player; - ShieldSummery summery = new ShieldSummery().getSummery(player); + ArmorSummery summery = new ArmorSummery().getSummery(player); + + tickShield(summery, player); + tickArmorEffects(summery, player); + } + + public static void tickShield(ArmorSummery summery, EntityPlayer player){ if (summery == null || (summery.maxProtectionPoints - summery.protectionPoints < 0.01 && summery.entropy == 0) || player.worldObj.isRemote) return; float totalPointsToAdd = Math.min(summery.maxProtectionPoints - summery.protectionPoints, summery.maxProtectionPoints / 60F); @@ -155,172 +192,201 @@ public class CustomArmorHandler { } } + public static void tickArmorEffects(ArmorSummery summery, EntityPlayer player){ + //region/*----------------- Flight ------------------*/ + if (summery != null && summery.flight[0]) { + playersWithFlight.put(player, true); + player.capabilities.allowFlying = true; + if (summery.flight[1]) player.capabilities.isFlying = true; + player.capabilities.setFlySpeed(0.05F + (0.05F * summery.flightSpeedModifier)); + if ((!player.onGround && player.capabilities.isFlying) && player.motionY != 0 && summery.flightVModifier > 0) + { + float percentIncrease = summery.flightVModifier; + if (BrandonsCore.proxy.isSpaceDown() && !BrandonsCore.proxy.isShiftDown()) + { + //LogHelper.info(player.motionY); + player.motionY = 0.225F * summery.flightVModifier; + } + if (BrandonsCore.proxy.isShiftDown() && !BrandonsCore.proxy.isSpaceDown()) + { + player.motionY = -0.225F * summery.flightVModifier; + } + } + } else { + if (!playersWithFlight.containsKey(player)) { + playersWithFlight.put(player, false); + } + if (playersWithFlight.get(player) && !player.worldObj.isRemote) { + playersWithFlight.put(player, false); + if (!player.capabilities.isCreativeMode) { + player.capabilities.allowFlying = false; + player.capabilities.isFlying = false; + player.sendPlayerAbilities(); + } + player.capabilities.setFlySpeed(0.05F); + } + } + //endregion + //region/*---------------- Swiftness ----------------*/ + IAttribute speedAttr = SharedMonsterAttributes.movementSpeed; + if (summery != null && summery.speedModifier > 0) + { + double value = summery.speedModifier; + if (player.getEntityAttribute(speedAttr).getModifier(WALK_SPEED_UUID) == null) { + player.getEntityAttribute(speedAttr).applyModifier(new AttributeModifier(WALK_SPEED_UUID, speedAttr.getAttributeUnlocalizedName(), value, 1)); + } + else if (player.getEntityAttribute(speedAttr).getModifier(WALK_SPEED_UUID).getAmount() != value){ + player.getEntityAttribute(speedAttr).removeModifier(player.getEntityAttribute(speedAttr).getModifier(WALK_SPEED_UUID)); + player.getEntityAttribute(speedAttr).applyModifier(new AttributeModifier(WALK_SPEED_UUID, speedAttr.getAttributeUnlocalizedName(), value, 1)); + } + if (!player.onGround && player.ridingEntity == null) player.jumpMovementFactor = 0.02F + (0.02F * summery.speedModifier); + } + else if (player.getEntityAttribute(speedAttr).getModifier(WALK_SPEED_UUID) != null) + { + player.getEntityAttribute(speedAttr).removeModifier(player.getEntityAttribute(speedAttr).getModifier(WALK_SPEED_UUID)); + } + //endregion + //region/*---------------- HillStep -----------------*/ + if (summery != null && player.worldObj.isRemote) { + boolean highStepListed = playersWithUphillStep.contains(player.getDisplayName()) && player.stepHeight >= 1f; + boolean hasHighStep = summery.hasHillStep; + if (hasHighStep && !highStepListed) { + playersWithUphillStep.add(player.getDisplayName()); + player.stepHeight = 1f; + } - -//Re Add the armor effects! - - - - - - - - - - - - - - - - - -// slotHelm = 4; -// slotChest = 3; -// slotLeggs = 2; -// slotBoots = 1; - - //Flight------------------------------------------------------------------------------------------------------------ - public static boolean getHasFlight(EntityPlayer player){ - return isDraconicArmor(player, 3);// && ((IEnergyContainerItem)player.getEquipmentInSlot(3).getItem()).extractEnergy(player.getEquipmentInSlot(3), 80, !player.capabilities.isFlying) == 80; + if (!hasHighStep && highStepListed) { + playersWithUphillStep.remove(player.getDisplayName()); + player.stepHeight = 0.5F; + } + } + //endregion } - public static float getVAccel(EntityPlayer player){ - return ItemNBTHelper.getFloat(player.getEquipmentInSlot(3), "VerticalAcceleration", 0.3F); - } - public static boolean getVAccSprint(EntityPlayer player){ - return ItemNBTHelper.getBoolean(player.getEquipmentInSlot(3), "EffectiveOnSprint", false); - } - public static boolean getFlightLock(EntityPlayer player){ - return ItemNBTHelper.getBoolean(player.getEquipmentInSlot(3), "ArmorFlightLock", false); - } + private static boolean applyArmorDamageBlocking(LivingAttackEvent event, ArmorSummery summery){ + if (summery == null) return false; - //Swiftness--------------------------------------------------------------------------------------------------------- - public static boolean getHasSwiftness(EntityPlayer player){ - return isDraconicArmor(player, 2) || isWyvernArmor(player, 2); - } + if (event.source.isFireDamage() && summery.fireResistance >= 1) + { + event.setCanceled(true); + event.entityLiving.extinguish(); + return true; + } - public static int getSwiftnessLevel(EntityPlayer player){ - int i = isWyvernArmor(player, 2) ? 2 : isDraconicArmor(player, 2) ? 4 : 0; - return (player.isSprinting() || !ItemNBTHelper.getBoolean(player.getEquipmentInSlot(2), "ArmorSprintOnly", false)) ? i * 2 : i; - } + if (event.source.damageType.equals("fall") && summery.jumpModifier > 0) + { + if (event.ammount < summery.jumpModifier * 5F) event.setCanceled(true); + return true; + } - public static float getSwiftnessMultiplier(EntityPlayer player){ - return ItemNBTHelper.getFloat(player.getEquipmentInSlot(2), "ArmorSpeedMult", 1f); - } + if ((event.source.damageType.equals("inWall") || event.source.damageType.equals("drown")) && summery.armorStacks[3] != null) + { + if (event.ammount <= 2f) event.setCanceled(true); + return true; + } - //Jump Boost-------------------------------------------------------------------------------------------------------- - public static boolean getHasJumpBoost(EntityPlayer player){ - return (isDraconicArmor(player, 1) || isWyvernArmor(player, 1)) && extractEnergy(player, (getJumpLevel(player)+1)*80, 1); - } - - public static int getJumpLevel(EntityPlayer player){ - int i = isWyvernArmor(player, 1) ? 2 : isDraconicArmor(player, 1) ? 4 : 0; - return (player.isSprinting() || !ItemNBTHelper.getBoolean(player.getEquipmentInSlot(1), "ArmorSprintOnly", false)) ? i * 2 : i; - } - - public static float getJumpMultiplier(EntityPlayer player){ - return ItemNBTHelper.getFloat(player.getEquipmentInSlot(1), "ArmorJumpMult", 1f); - } - - //Fire Immunity----------------------------------------------------------------------------------------------------- - public static boolean getFireImunity(EntityPlayer player){ - if (isDraconicArmor(player, 3) && extractEnergy(player, 80, 3)) return true; - return (isWyvernArmor(player, 1) && isWyvernArmor(player, 2) && isWyvernArmor(player, 3) && isWyvernArmor(player, 4)); - } - - //Hill Step--------------------------------------------------------------------------------------------------------- - public static boolean getHasHighStep(EntityPlayer player){ - return isDraconicArmor(player, 1) && ItemNBTHelper.getBoolean(player.getEquipmentInSlot(1), "ArmorHillStep", true); - } - - //Armor & Energy---------------------------------------------------------------------------------------------------- - public static boolean isWyvernArmor(EntityPlayer player, int slot){ - int slotType = 4 - slot; - ItemStack armor = player.getEquipmentInSlot(slot); - return armor != null && armor.getItem() instanceof WyvernArmor && ((WyvernArmor)armor.getItem()).armorType == slotType; - } - - public static boolean isDraconicArmor(EntityPlayer player, int slot){ - int slotType = 4 - slot; - ItemStack armor = player.getEquipmentInSlot(slot); - return armor != null && armor.getItem() instanceof DraconicArmor && ((DraconicArmor)armor.getItem()).armorType == slotType; - } - - public static boolean extractEnergy(EntityPlayer player, int amount, int slot){ - if (player.getEquipmentInSlot(slot).getItem() instanceof IEnergyContainerItem) return ((IEnergyContainerItem)player.getEquipmentInSlot(slot).getItem()).extractEnergy(player.getEquipmentInSlot(slot), amount, false) == amount; return false; } - - public static class ShieldSummery { + public static class ArmorSummery { + /*---- Shield ----*/ /**Max protection points from all equipped armor peaces*/ - public float maxProtectionPoints; + public float maxProtectionPoints = 0F; /**Total protection points from all equipped armor peaces*/ - public float protectionPoints; + public float protectionPoints = 0F; /**Number of quipped armor peaces*/ - public int peaces; + public int peaces = 0; /**Point Allocation, The number of points on each peace*/ public float[] allocation; - /***/ + /**How many points have been drained from each armor peace*/ public float[] pointsDown; /**The armor peaces (Index will contain null if peace is not present)*/ public ItemStack[] armorStacks; /**Mean Fatigue*/ - public float entropy; + public float entropy = 0F; /**Mean Recovery Points*/ - public int meanRecoveryPoints; + public int meanRecoveryPoints = 0; /**Total RF stored in the armor*/ - public int totalEnergyStored; + public int totalEnergyStored = 0; + /**Total Max RF storage for the armor*/ + public int maxTotalEnergyStorage = 0; /**RF stored in each armor peace*/ public int[] energyAllocation; + /*---- Effects ----*/ + public boolean[] flight = new boolean[] {false, false}; + public float flightVModifier = 0F; + public float speedModifier = 0F; + public float jumpModifier = 0F; + public float fireResistance = 0F; + public float flightSpeedModifier = 0; + public boolean hasHillStep = false; + public boolean hasDraconic = false; - public ShieldSummery getSummery(EntityPlayer player){ + public ArmorSummery getSummery(EntityPlayer player){ ItemStack[] armorSlots = player.inventory.armorInventory; - protectionPoints = 0; - peaces = 0; float totalEntropy = 0; int totalRecoveryPoints = 0; - meanRecoveryPoints = 0; + allocation = new float[armorSlots.length]; armorStacks = new ItemStack[armorSlots.length]; pointsDown = new float[armorSlots.length]; energyAllocation = new int[armorSlots.length]; - totalEnergyStored = 0; for (int i = 0; i < armorSlots.length; i++){ ItemStack stack = armorSlots[i]; if (stack == null || !(stack.getItem() instanceof ICustomArmor)) continue; + ICustomArmor armor = (ICustomArmor)stack.getItem(); peaces++; allocation[i] = ItemNBTHelper.getFloat(stack, "ProtectionPoints", 0); protectionPoints += allocation[i]; totalEntropy += ItemNBTHelper.getFloat(stack, "ShieldEntropy", 0); armorStacks[i] = stack; totalRecoveryPoints += IUpgradableItem.EnumUpgrade.SHIELD_RECOVERY.getUpgradePoints(stack); - float maxPoints = ((ICustomArmor)stack.getItem()).getProtectionPoints(stack); + float maxPoints = armor.getProtectionPoints(stack); pointsDown[i] = maxPoints - allocation[i]; maxProtectionPoints += maxPoints; - energyAllocation[i] = ((IEnergyContainerItem)stack.getItem()).getEnergyStored(stack); + energyAllocation[i] = armor.getEnergyStored(stack); totalEnergyStored += energyAllocation[i]; + maxTotalEnergyStorage += armor.getMaxEnergyStored(stack); + if (stack.getItem() instanceof DraconicArmor) hasDraconic = true; + + fireResistance += armor.getFireResistance(stack); + + switch (i){ + case 2: + flight = armor.hasFlight(stack); + if (flight[0]) { + flightVModifier = armor.getFlightVModifier(stack, player); + flightSpeedModifier = armor.getFlightSpeedModifier(stack, player); + } + break; + case 1: + speedModifier = armor.getSpeedModifier(stack, player); + hasHillStep = armor.hasHillStep(stack, player); + break; + case 0: + jumpModifier = armor.getJumpModifier(stack, player); + break; + } } if (peaces == 0) return null; 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 2bce4d36..cbadc433 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 @@ -1,11 +1,12 @@ package com.brandon3055.draconicevolution.common.items.armor; -import cofh.api.energy.IEnergyContainerItem; +import com.brandon3055.brandonscore.BrandonsCore; import com.brandon3055.brandonscore.common.utills.InfoHelper; import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; +import com.brandon3055.brandonscore.common.utills.Utills; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.client.model.ModelDraconicArmorOld; import com.brandon3055.draconicevolution.client.model.ModelDraconicArmor; +import com.brandon3055.draconicevolution.client.model.ModelDraconicArmorOld; import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; import com.brandon3055.draconicevolution.common.handler.ConfigHandler; @@ -52,7 +53,7 @@ import java.util.List; @Optional.Interface(iface = "thaumcraft.api.IGoggles", modid = "Thaumcraft"), @Optional.Interface(iface = "thaumcraft.api.nodes.IRevealer", modid = "Thaumcraft") }) -public class DraconicArmor extends ItemArmor implements ISpecialArmor, IEnergyContainerItem, IConfigurableItem, IInventoryTool, IGoggles, IRevealer, IUpgradableItem, ICustomArmor {//TODO Wings +public class DraconicArmor extends ItemArmor implements ISpecialArmor, IConfigurableItem, IInventoryTool, IGoggles, IRevealer, IUpgradableItem, ICustomArmor {//TODO Wings @SideOnly(Side.CLIENT) private IIcon helmIcon; @SideOnly(Side.CLIENT) @@ -62,10 +63,8 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IEnergyCo @SideOnly(Side.CLIENT) private IIcon bootsIcon; - private double totalAbsorption = 2; // 1=100% private int maxTransfer = References.DRACONICTRANSFER; private int maxEnergy = References.DRACONICCAPACITY; - private int energyPerDamage = 80; public DraconicArmor(ArmorMaterial material, int armorType, String name) { super(material, 0, armorType); @@ -163,25 +162,22 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IEnergyCo return 0; } - /* ISpecialArmor */ - + //region ISpecialArmor @Override public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { - int maxAbsorption = 0;//25 * getEnergyStored(armor) / energyPerDamage; - if (source.damageType.equals(DamageSource.fall.damageType) && armor.getItem() == ModItems.draconicBoots) return new ArmorProperties(0, 1D, maxAbsorption); - if (source.isUnblockable()) return new ArmorProperties(0, (getProtectionShare()*totalAbsorption)/2, maxAbsorption); - return new ArmorProperties(0, getProtectionShare()*totalAbsorption, maxAbsorption); + if (source.isUnblockable() || source.isDamageAbsolute() || source.isMagicDamage()) return new ArmorProperties(0, damageReduceAmount / 100D, 15); + return new ArmorProperties(0, damageReduceAmount / 24.5D, 1000); } @Override public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { - return this.getEnergyStored(armor) > 10000 ? (int)(getProtectionShare() * 20D) : (int) ((float)this.getEnergyStored(armor) / 10000F * (float)(getProtectionShare() * 20D)); + return (int)(getProtectionShare() * 20D); } @Override public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { - //extractEnergy(stack, damage * energyPerDamage, false); } + //endregion @Override public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { @@ -189,17 +185,14 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IEnergyCo if (stack.getItem() == ModItems.draconicHelm) { 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 + 1, (int)Math.floor(player.posZ)) < 5 && ItemNBTHelper.getBoolean(stack, "ArmorNVActive", false)) + if (player.worldObj.getBlockLightValue((int)Math.floor(player.posX), (int) player.posY + 1, (int)Math.floor(player.posZ)) < 5 && IConfigurableItem.ProfileHelper.getBoolean(stack, "ArmorNVActive", false)) { player.addPotionEffect(new PotionEffect(16, 419, 0, true)); } - else if ( ItemNBTHelper.getBoolean(stack, "ArmorNVActive", false) && ItemNBTHelper.getBoolean(stack, "ArmorNVLock", true)) player.addPotionEffect(new PotionEffect(16, 419, 0, true)); + else if ( IConfigurableItem.ProfileHelper.getBoolean(stack, "ArmorNVActive", false) && IConfigurableItem.ProfileHelper.getBoolean(stack, "ArmorNVLock", true)) player.addPotionEffect(new PotionEffect(16, 419, 0, true)); else if (player.isPotionActive(16)) player.removePotionEffect(16); } - if (stack.getItem() == ModItems.draconicLeggs && player.isSprinting() && !player.capabilities.isCreativeMode) { - this.extractEnergy(stack, player.capabilities.isFlying ? 160 : 80, false); - } } @SuppressWarnings("unchecked") @@ -297,18 +290,19 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IEnergyCo } else if (armorType == 1) { - list.add(new ItemConfigField(References.FLOAT_ID, slot, "VerticalAcceleration").setMinMaxAndIncromente(0f, 1f, 0.01f).readFromItem(stack, 0.3F).setModifier("PERCENT")); + list.add(new ItemConfigField(References.FLOAT_ID, slot, "VerticalAcceleration").setMinMaxAndIncromente(0f, 8f, 0.1f).readFromItem(stack, 0F).setModifier("PLUSPERCENT")); + list.add(new ItemConfigField(References.FLOAT_ID, slot, "ArmorFlightSpeedMult").setMinMaxAndIncromente(0f, 6f, 0.1f).readFromItem(stack, 0F).setModifier("PLUSPERCENT")); list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "EffectiveOnSprint").readFromItem(stack, false)); list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorFlightLock").readFromItem(stack, false)); } else if (armorType == 2) { - list.add(new ItemConfigField(References.FLOAT_ID, slot, "ArmorSpeedMult").setMinMaxAndIncromente(0f, 1f, 0.01f).readFromItem(stack, 1F).setModifier("PERCENT")); + list.add(new ItemConfigField(References.FLOAT_ID, slot, "ArmorSpeedMult").setMinMaxAndIncromente(0f, 8f, 0.1f).readFromItem(stack, 0F).setModifier("PLUSPERCENT")); list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorSprintOnly").readFromItem(stack, false)); } else if (armorType == 3) { - list.add(new ItemConfigField(References.FLOAT_ID, slot, "ArmorJumpMult").setMinMaxAndIncromente(0f, 1f, 0.01f).readFromItem(stack, 1f).setModifier("PERCENT")); + list.add(new ItemConfigField(References.FLOAT_ID, slot, "ArmorJumpMult").setMinMaxAndIncromente(0f, 15f, 0.1f).readFromItem(stack, 0f).setModifier("PLUSPERCENT")); list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorSprintOnly").readFromItem(stack, false)); list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorHillStep").readFromItem(stack, true)); } @@ -333,13 +327,13 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IEnergyCo @Optional.Method(modid = "Thaumcraft") @Override public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player) { - return ItemNBTHelper.getBoolean(itemstack, "GogglesOfRevealing", true); + return IConfigurableItem.ProfileHelper.getBoolean(itemstack, "GogglesOfRevealing", true); } @Optional.Method(modid = "Thaumcraft") @Override public boolean showNodes(ItemStack itemstack, EntityLivingBase player) { - return ItemNBTHelper.getBoolean(itemstack, "GogglesOfRevealing", true); + return IConfigurableItem.ProfileHelper.getBoolean(itemstack, "GogglesOfRevealing", true); } @SideOnly(Side.CLIENT) @@ -432,8 +426,14 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IEnergyCo } @Override - public List getUpgradeStats(ItemStack itemstack) {//todo List Upgrades - return new ArrayList(); + public List getUpgradeStats(ItemStack stack) { + List strings = new ArrayList(); + + strings.add(InfoHelper.ITC()+StatCollector.translateToLocal("gui.de.RFCapacity.txt")+": "+InfoHelper.HITC()+ Utills.formatNumber(getMaxEnergyStored(stack))); + strings.add(InfoHelper.ITC()+StatCollector.translateToLocal("gui.de.ShieldCapacity.txt")+": "+InfoHelper.HITC()+ (int)getProtectionPoints(stack)); + strings.add(InfoHelper.ITC()+StatCollector.translateToLocal("gui.de.ShieldRecovery.txt") + ": " + InfoHelper.HITC() + Utills.round(getRecoveryPoints(stack) * 0.2D, 10)+" EPS"); + + return strings; } @Override @@ -449,6 +449,8 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IEnergyCo return 0; } + //region//----------------- ICustomArmor Start -----------------// + @Override public float getProtectionPoints(ItemStack stack) { return EnumUpgrade.SHIELD_CAPACITY.getUpgradePoints(stack) * 20; @@ -458,4 +460,61 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IEnergyCo public int getRecoveryPoints(ItemStack stack) { return EnumUpgrade.SHIELD_RECOVERY.getUpgradePoints(stack); } + + @Override + public float getSpeedModifier(ItemStack stack, EntityPlayer player) { + if (IConfigurableItem.ProfileHelper.getBoolean(stack, "ArmorSprintOnly", false)){ + return player.isSprinting() ? IConfigurableItem.ProfileHelper.getFloat(stack, "ArmorSpeedMult", 0f) : IConfigurableItem.ProfileHelper.getFloat(stack, "ArmorSpeedMult", 0f) / 5F; + } + else return IConfigurableItem.ProfileHelper.getFloat(stack, "ArmorSpeedMult", 0f); + } + + @Override + public float getJumpModifier(ItemStack stack, EntityPlayer player) { + if (IConfigurableItem.ProfileHelper.getBoolean(stack, "ArmorSprintOnly", false)){ + return player.isSprinting() || BrandonsCore.proxy.isCtrlDown() ? IConfigurableItem.ProfileHelper.getFloat(stack, "ArmorJumpMult", 0f) : IConfigurableItem.ProfileHelper.getFloat(stack, "ArmorJumpMult", 0f) / 5F; + } + else return IConfigurableItem.ProfileHelper.getFloat(stack, "ArmorJumpMult", 0f); + } + + @Override + public boolean hasHillStep(ItemStack stack, EntityPlayer player) { + if (IConfigurableItem.ProfileHelper.getBoolean(stack, "ArmorSprintOnly", false)){ + return (player.isSprinting() || BrandonsCore.proxy.isCtrlDown()) && IConfigurableItem.ProfileHelper.getBoolean(stack, "ArmorHillStep", true); + } + else return IConfigurableItem.ProfileHelper.getBoolean(stack, "ArmorHillStep", true); + } + + @Override + public float getFireResistance(ItemStack stack) { + return 1F; + } + + @Override + public boolean[] hasFlight(ItemStack stack) { + return new boolean[] {true, IConfigurableItem.ProfileHelper.getBoolean(stack, "ArmorFlightLock", false)}; + } + + @Override + public float getFlightSpeedModifier(ItemStack stack, EntityPlayer player) { + if (IConfigurableItem.ProfileHelper.getBoolean(stack, "EffectiveOnSprint", false)){ + return player.isSprinting() ? IConfigurableItem.ProfileHelper.getFloat(stack, "ArmorFlightSpeedMult", 0f) : 0F; + } + else return IConfigurableItem.ProfileHelper.getFloat(stack, "ArmorFlightSpeedMult", 0f); + } + + @Override + public float getFlightVModifier(ItemStack stack, EntityPlayer player) { + if (IConfigurableItem.ProfileHelper.getBoolean(stack, "EffectiveOnSprint", false)){ + return BrandonsCore.proxy.isCtrlDown() ? IConfigurableItem.ProfileHelper.getFloat(stack, "VerticalAcceleration", 0F) : 0F; + } + else return IConfigurableItem.ProfileHelper.getFloat(stack, "VerticalAcceleration", 0F); + } + + //endregion + + @Override + public boolean hasProfiles() { + return false; + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/ICustomArmor.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/ICustomArmor.java index 494d3af4..19f2b2b1 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/ICustomArmor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/ICustomArmor.java @@ -1,11 +1,13 @@ package com.brandon3055.draconicevolution.common.items.armor; +import cofh.api.energy.IEnergyContainerItem; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; /** * Created by brandon3055 on 5/2/2016. */ -public interface ICustomArmor { +public interface ICustomArmor extends IEnergyContainerItem { /**Returns the max number of protection points this armor piece can provide * 1 protection point equals 1 half heart of protection. @@ -15,16 +17,27 @@ public interface ICustomArmor { /**Reruns the number of Upgrade points applied to shield recovery*/ public int getRecoveryPoints(ItemStack stack); - /* - TODO -\ - Create a damage event handler - Handle all the damage calculations and save the current remaining protection points directly to the item from the damage handler - When player is hit save the ticks till regen can start and the new entropy value directly to the armor - Work out overall recovery by averaging the recovery points - use a player tick handler to regen the armor and save tick down the entropy + /**Returns the movement speed modifier for this armor*/ + public float getSpeedModifier(ItemStack stack, EntityPlayer player); - */ + /**Returns the jump height modifier for this armor*/ + public float getJumpModifier(ItemStack stack, EntityPlayer player); + /**Returns true if this armor has up-hill step enabled*/ + public boolean hasHillStep(ItemStack stack, EntityPlayer player); + /**Returns the fire resistance modifier for this armor + * This is the percentage of fire damage this armor should absorb + * If the total resistance for all armor peaces the player is wearing is >= 1 the player will not be damaged by fire. + * Should return a number between 0 and 1*/ + public float getFireResistance(ItemStack stack); + + /**Returns {true, false} if this armor gives the player flight + * Returns {true, true} if flight lock is also enables on this armor*/ + public boolean[] hasFlight(ItemStack stack); + + public float getFlightSpeedModifier(ItemStack stack, EntityPlayer player); + + /**Returns the vertical acceleration speed*/ + public float getFlightVModifier(ItemStack stack, EntityPlayer player); } 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 68b398aa..0ea48c09 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 @@ -1,8 +1,9 @@ package com.brandon3055.draconicevolution.common.items.armor; -import cofh.api.energy.IEnergyContainerItem; +import com.brandon3055.brandonscore.BrandonsCore; import com.brandon3055.brandonscore.common.utills.InfoHelper; import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; +import com.brandon3055.brandonscore.common.utills.Utills; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.model.ModelDraconicArmorOld; import com.brandon3055.draconicevolution.client.model.ModelWyvernArmor; @@ -11,10 +12,7 @@ import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; import com.brandon3055.draconicevolution.common.handler.ConfigHandler; import com.brandon3055.draconicevolution.common.items.tools.baseclasses.ToolBase; import com.brandon3055.draconicevolution.common.lib.References; -import com.brandon3055.draconicevolution.common.utills.IConfigurableItem; -import com.brandon3055.draconicevolution.common.utills.IInventoryTool; -import com.brandon3055.draconicevolution.common.utills.IUpgradableItem; -import com.brandon3055.draconicevolution.common.utills.ItemConfigField; +import com.brandon3055.draconicevolution.common.utills.*; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -39,16 +37,14 @@ import java.util.List; /** * Created by Brandon on 3/07/2014. */ -public class WyvernArmor extends ItemArmor implements ISpecialArmor, IEnergyContainerItem, IConfigurableItem, IInventoryTool, IUpgradableItem, ICustomArmor { +public class WyvernArmor extends ItemArmor implements ISpecialArmor, IConfigurableItem, IInventoryTool, IUpgradableItem, ICustomArmor { private IIcon helmIcon; private IIcon chestIcon; private IIcon leggsIcon; private IIcon bootsIcon; - private double totalAbsorption = 1; // 1=100% private int maxTransfer = References.WYVERNTRANSFER; private int maxEnergy = References.WYVERNCAPACITY; - private int energyPerDamage = 80; public WyvernArmor(ArmorMaterial material, int armorType, String name) { super(material, 0, armorType); @@ -146,27 +142,22 @@ public class WyvernArmor extends ItemArmor implements ISpecialArmor, IEnergyCont return 0; } - /* ISpecialArmor */ - + //region ISpecialArmor @Override public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { - int maxAbsorption = 0;//25 * getEnergyStored(armor) / energyPerDamage; - if (source.damageType.equals(DamageSource.fall.damageType) && armor.getItem() == ModItems.wyvernBoots) return new ArmorProperties(0, 0.8D, maxAbsorption); - if (source.isUnblockable()) return new ArmorProperties(0, (getProtectionShare()*totalAbsorption)/4, maxAbsorption); - return new ArmorProperties(0, getProtectionShare()*totalAbsorption, maxAbsorption); + if (source.isUnblockable() || source.isDamageAbsolute() || source.isMagicDamage()) return new ArmorProperties(0, damageReduceAmount / 100D, 15); + return new ArmorProperties(0, damageReduceAmount / 25D, 1000); } @Override public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { - return this.getEnergyStored(armor) > 10000 ? (int)(getProtectionShare() * 20D) : (int) ((float)this.getEnergyStored(armor) / 10000F * (float)(getProtectionShare() * 20D)); - - // return (int)(getProtectionShare() * 20D); + return (int)(getProtectionShare() * 20D); } @Override public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { - //extractEnergy(stack, damage * energyPerDamage, false); } + //endregion @Override public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { @@ -243,12 +234,12 @@ public class WyvernArmor extends ItemArmor implements ISpecialArmor, IEnergyCont List list = new ArrayList(); if (armorType == 2) { - list.add(new ItemConfigField(References.FLOAT_ID, slot, "ArmorSpeedMult").setMinMaxAndIncromente(0f, 1f, 0.01f).readFromItem(stack, 1F).setModifier("PERCENT")); + list.add(new ItemConfigField(References.FLOAT_ID, slot, "ArmorSpeedMult").setMinMaxAndIncromente(0f, 5f, 0.1f).readFromItem(stack, 0F).setModifier("PLUSPERCENT")); list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorSprintOnly").readFromItem(stack, false)); } else if (armorType == 3) { - list.add(new ItemConfigField(References.FLOAT_ID, slot, "ArmorJumpMult").setMinMaxAndIncromente(0f, 1f, 0.01f).readFromItem(stack, 1f).setModifier("PERCENT")); + list.add(new ItemConfigField(References.FLOAT_ID, slot, "ArmorJumpMult").setMinMaxAndIncromente(0f, 5f, 0.1f).readFromItem(stack, 0f).setModifier("PLUSPERCENT")); list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorSprintOnly").readFromItem(stack, false)); } return list; @@ -358,8 +349,14 @@ public class WyvernArmor extends ItemArmor implements ISpecialArmor, IEnergyCont } @Override - public List getUpgradeStats(ItemStack itemstack) {//todo List Upgrades - return new ArrayList(); + public List getUpgradeStats(ItemStack stack) { + List strings = new ArrayList(); + + strings.add(InfoHelper.ITC()+StatCollector.translateToLocal("gui.de.RFCapacity.txt")+": "+InfoHelper.HITC()+ Utills.formatNumber(getMaxEnergyStored(stack))); + strings.add(InfoHelper.ITC()+StatCollector.translateToLocal("gui.de.ShieldCapacity.txt")+": "+InfoHelper.HITC()+ (int)getProtectionPoints(stack)); + strings.add(InfoHelper.ITC() + StatCollector.translateToLocal("gui.de.ShieldRecovery.txt") + ": " + InfoHelper.HITC() + Utills.round(getRecoveryPoints(stack) * 0.2D, 10)+" EPS"); + + return strings; } @Override @@ -375,6 +372,7 @@ public class WyvernArmor extends ItemArmor implements ISpecialArmor, IEnergyCont return 0; } + //region//----------------- ICustomArmor Start -----------------// @Override public float getProtectionPoints(ItemStack stack) { return EnumUpgrade.SHIELD_CAPACITY.getUpgradePoints(stack) * 20F; @@ -384,4 +382,52 @@ public class WyvernArmor extends ItemArmor implements ISpecialArmor, IEnergyCont public int getRecoveryPoints(ItemStack stack) { return EnumUpgrade.SHIELD_RECOVERY.getUpgradePoints(stack); } + + @Override + public float getSpeedModifier(ItemStack stack, EntityPlayer player) { + if (IConfigurableItem.ProfileHelper.getBoolean(stack, "ArmorSprintOnly", false)){ + return player.isSprinting() ? IConfigurableItem.ProfileHelper.getFloat(stack, "ArmorSpeedMult", 0f) : IConfigurableItem.ProfileHelper.getFloat(stack, "ArmorSpeedMult", 0f) / 5F; + } + else return IConfigurableItem.ProfileHelper.getFloat(stack, "ArmorSpeedMult", 0f); + } + + @Override + public float getJumpModifier(ItemStack stack, EntityPlayer player) { + if (IConfigurableItem.ProfileHelper.getBoolean(stack, "ArmorSprintOnly", false)){ + return player.isSprinting() || BrandonsCore.proxy.isCtrlDown() ? IConfigurableItem.ProfileHelper.getFloat(stack, "ArmorJumpMult", 0f) : IConfigurableItem.ProfileHelper.getFloat(stack, "ArmorJumpMult", 0f) / 5F; + } + else return IConfigurableItem.ProfileHelper.getFloat(stack, "ArmorJumpMult", 0f); + } + + @Override + public boolean hasHillStep(ItemStack stack, EntityPlayer player) { + return false; + } + + @Override + public float getFireResistance(ItemStack stack) { + return getProtectionShare(); + } + + @Override + public boolean[] hasFlight(ItemStack stack) { + return new boolean[] {false, false}; + } + + @Override + public float getFlightSpeedModifier(ItemStack stack, EntityPlayer player) { + return 0; + } + + @Override + public float getFlightVModifier(ItemStack stack, EntityPlayer player) { + return 0; + } + + //endregion + + @Override + public boolean hasProfiles() { + return false; + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicAxe.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicAxe.java index 1152bfc0..0b7a3a81 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicAxe.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicAxe.java @@ -1,11 +1,11 @@ package com.brandon3055.draconicevolution.common.items.tools; -import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.client.render.IRenderTweak; import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.items.tools.baseclasses.MiningTool; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.common.utills.IConfigurableItem; import com.brandon3055.draconicevolution.common.utills.IInventoryTool; import com.brandon3055.draconicevolution.common.utills.IUpgradableItem; import com.brandon3055.draconicevolution.common.utills.ItemConfigField; @@ -24,7 +24,7 @@ import java.util.List; public class DraconicAxe extends MiningTool implements IInventoryTool, IRenderTweak {//todo axe & fields public DraconicAxe() { - super(ModItems.DRACONIUM_T1); + super(ModItems.WYVERN); this.setHarvestLevel("axe", 10); this.setUnlocalizedName(Strings.draconicAxeName); this.setCapacity(References.DRACONICCAPACITY); @@ -62,7 +62,7 @@ public class DraconicAxe extends MiningTool implements IInventoryTool, IRenderTw @Override public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) { - if (ItemNBTHelper.getBoolean(stack, References.TREE_MODE, false) && isTree(player.worldObj, x, y, z)) { + if (IConfigurableItem.ProfileHelper.getBoolean(stack, References.TREE_MODE, false) && isTree(player.worldObj, x, y, z)) { trimLeavs(x, y, z, player, player.worldObj, stack); for (int i = 0; i < 9; i++) player.worldObj.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(player.worldObj.getBlock(x, y, z)) + (player.worldObj.getBlockMetadata(x, y, z) << 12)); chopTree(x, y, z, player, player.worldObj, stack); 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 2bd6a86e..e8020eb4 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 @@ -1,13 +1,13 @@ package com.brandon3055.draconicevolution.common.items.tools; import com.brandon3055.brandonscore.common.utills.InfoHelper; -import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.client.render.IRenderTweak; import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.items.tools.baseclasses.MiningTool; import com.brandon3055.draconicevolution.common.items.tools.baseclasses.ToolHandler; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.common.utills.IConfigurableItem; import com.brandon3055.draconicevolution.common.utills.IInventoryTool; import com.brandon3055.draconicevolution.common.utills.ItemConfigField; import cpw.mods.fml.relauncher.Side; @@ -30,7 +30,7 @@ public class DraconicDistructionStaff extends MiningTool implements IInventoryTo public DraconicDistructionStaff() { - super(ModItems.DRACONIUM_T3); + super(ModItems.CHAOTIC); this.setUnlocalizedName(Strings.draconicDStaffName); this.setHarvestLevel("pickaxe", 10); this.setHarvestLevel("shovel", 10); @@ -76,7 +76,7 @@ public class DraconicDistructionStaff extends MiningTool implements IInventoryTo @Override public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { ToolHandler.damageEntityBasedOnHealth(entity, player, 0.3F); - ToolHandler.AOEAttack(player, entity, stack, ItemNBTHelper.getInteger(stack, References.ATTACK_AOE, 0)); + ToolHandler.AOEAttack(player, entity, stack, IConfigurableItem.ProfileHelper.getInteger(stack, References.ATTACK_AOE, 0)); return true; } 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 823dc42c..cbfdfbc5 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 @@ -11,9 +11,7 @@ import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; import com.brandon3055.draconicevolution.common.items.tools.baseclasses.ToolBase; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; -import com.brandon3055.draconicevolution.common.utills.IConfigurableItem; -import com.brandon3055.draconicevolution.common.utills.IUpgradableItem; -import com.brandon3055.draconicevolution.common.utills.ItemConfigField; +import com.brandon3055.draconicevolution.common.utills.*; import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -40,14 +38,14 @@ import org.lwjgl.opengl.GL11; import java.util.ArrayList; import java.util.List; -public class DraconicHoe extends ItemHoe implements IEnergyContainerItem, IRenderTweak, IUpgradableItem, IConfigurableItem { +public class DraconicHoe extends ItemHoe implements IEnergyContainerItem, IRenderTweak, IUpgradableItem, IConfigurableItem, IHudDisplayItem { protected int capacity = References.DRACONICCAPACITY; protected int maxReceive = References.DRACONICTRANSFER; protected int maxExtract = References.DRACONICTRANSFER; public DraconicHoe() { - super(ModItems.DRACONIUM_T1); + super(ModItems.WYVERN); this.setUnlocalizedName(Strings.draconicHoeName); this.setCreativeTab(DraconicEvolution.tabToolsWeapons); if (ModItems.isEnabled(this)) GameRegistry.registerItem(this, Strings.draconicHoeName); @@ -95,7 +93,8 @@ public class DraconicHoe extends ItemHoe implements IEnergyContainerItem, IRende boolean successfull = false; Block clicked = world.getBlock(x, y, z); if (!player.isSneaking() && player.canPlayerEdit(x, y, z, par7, stack) && (clicked == Blocks.dirt || clicked == Blocks.grass || clicked == Blocks.farmland) && par7 == 1) { - int size = 4; + int size = IConfigurableItem.ProfileHelper.getInteger(stack, References.DIG_AOE, 0); + LogHelper.info(size); for (int x1 = -size; x1 <= size; x1++) { for (int z1 = -size; z1 <= size; z1++) { if (!(stack.getItem() instanceof IEnergyContainerItem) || ((IEnergyContainerItem)stack.getItem()).getEnergyStored(stack) < References.ENERGYPERBLOCK) { @@ -319,4 +318,19 @@ public class DraconicHoe extends ItemHoe implements IEnergyContainerItem, IRende return strings; } + + @Override + public boolean hasProfiles() { + return false; + } + + @Override + public List getDisplayData(ItemStack stack) { + List list = new ArrayList(); + + for (ItemConfigField field : getFields(stack, 0)) list.add(field.getTooltipInfo());//list.add(field.getLocalizedName() + ": " + field.getFormattedValue()); + if (capacity > 0) list.add(InfoHelper.ITC() + StatCollector.translateToLocal("info.de.charge.txt") + ": " + InfoHelper.HITC() + Utills.formatNumber(getEnergyStored(stack)) + " / " + Utills.formatNumber(capacity)); + + return list; + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicPickaxe.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicPickaxe.java index 1b65af9d..ae94f3e5 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicPickaxe.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicPickaxe.java @@ -20,7 +20,7 @@ public class DraconicPickaxe extends MiningTool implements IInventoryTool, IRend public DraconicPickaxe() { - super(ModItems.DRACONIUM_T2); + super(ModItems.AWAKENED); this.setHarvestLevel("pickaxe", 10); this.setUnlocalizedName(Strings.draconicPickaxeName); this.setCapacity(References.DRACONICCAPACITY); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicShovel.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicShovel.java index 38a6c9a8..62fdaab1 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicShovel.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicShovel.java @@ -25,7 +25,7 @@ public class DraconicShovel extends MiningTool implements IInventoryTool, IRende protected int maxExtract = References.DRACONICTRANSFER; public DraconicShovel() { - super(ModItems.DRACONIUM_T2); + super(ModItems.AWAKENED); this.setHarvestLevel("shovel", 10); this.setUnlocalizedName(Strings.draconicShovelName); this.setCapacity(References.DRACONICCAPACITY); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconiumFluxCapacitor.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconiumFluxCapacitor.java index 544ae4ba..37aeacb7 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconiumFluxCapacitor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconiumFluxCapacitor.java @@ -72,12 +72,12 @@ public class DraconiumFluxCapacitor extends RFItemBase { @Override public int getMaxExtract(ItemStack stack){ - return stack.getItemDamage() == 0 ? 100000 : stack.getItemDamage() == 1 ? 1000000 : 0; + return stack.getItemDamage() == 0 ? 100000 : stack.getItemDamage() == 1 ? 100000000 : 0; } @Override public int getMaxReceive(ItemStack stack){ - return stack.getItemDamage() == 0 ? 100000 : stack.getItemDamage() == 1 ? 1000000 : 0; + return stack.getItemDamage() == 0 ? 100000 : stack.getItemDamage() == 1 ? 10000000 : 0; } @Override @@ -204,4 +204,10 @@ public class DraconiumFluxCapacitor extends RFItemBase { // public Entity createEntity(World world, Entity location, ItemStack itemstack) { // return new EntityPersistentItem(world, location, itemstack); // } + + + @Override + public boolean hasProfiles() { + return false; + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/WyvernPickaxe.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/WyvernPickaxe.java index b900812e..9bef6ac9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/WyvernPickaxe.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/WyvernPickaxe.java @@ -20,7 +20,7 @@ import java.util.List; public class WyvernPickaxe extends MiningTool implements IInventoryTool, IRenderTweak { public WyvernPickaxe() { - super(ModItems.DRACONIUM_T1); + super(ModItems.WYVERN); this.setUnlocalizedName(Strings.wyvernPickaxeName); this.setHarvestLevel("pickaxe", 10); this.setCapacity(References.WYVERNCAPACITY); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/WyvernShovel.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/WyvernShovel.java index 98b1bcb2..f4afe316 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/WyvernShovel.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/WyvernShovel.java @@ -21,7 +21,7 @@ public class WyvernShovel extends MiningTool implements IInventoryTool, IRenderT public WyvernShovel() { - super(ModItems.DRACONIUM_T1); + super(ModItems.WYVERN); this.setHarvestLevel("shovel", 10); this.setUnlocalizedName(Strings.wyvernShovelName); this.setCapacity(References.WYVERNCAPACITY); 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 ab2a3b31..bf1568a4 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 @@ -5,6 +5,7 @@ import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; import com.brandon3055.brandonscore.common.utills.Utills; import com.brandon3055.draconicevolution.common.handler.ConfigHandler; import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.utills.IConfigurableItem; import com.brandon3055.draconicevolution.common.utills.IUpgradableItem; import com.brandon3055.draconicevolution.common.utills.ItemConfigField; import net.minecraft.block.Block; @@ -67,15 +68,15 @@ public abstract class MiningTool extends ToolBase implements IUpgradableItem {// @Override 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; + int radius = IConfigurableItem.ProfileHelper.getInteger(stack, References.DIG_AOE, 0); + int depth = IConfigurableItem.ProfileHelper.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); + if (IConfigurableItem.ProfileHelper.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_); } @@ -85,10 +86,9 @@ public abstract class MiningTool extends ToolBase implements IUpgradableItem {// return super.onItemRightClick(stack, world, player); } - //todo attack, hoe, textures 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(); + Map blockMap = IConfigurableItem.ProfileHelper.getBoolean(stack, References.OBLITERATE, false) ? getObliterationList(stack) : new HashMap(); Block block = player.worldObj.getBlock(x,y,z); int meta = player.worldObj.getBlockMetadata(x,y,z); boolean effective = false; @@ -159,7 +159,7 @@ public abstract class MiningTool extends ToolBase implements IUpgradableItem {// break; } - if (ItemNBTHelper.getBoolean(stack, References.BASE_SAFE_AOE, false)) + if (IConfigurableItem.ProfileHelper.getBoolean(stack, References.BASE_SAFE_AOE, false)) { for (int xPos = x - xMin; xPos <= x + xMax; xPos++) { @@ -225,6 +225,9 @@ public abstract class MiningTool extends ToolBase implements IUpgradableItem {// float strength = ForgeHooks.blockStrength(block, player, world, x,y,z); + if (!player.canHarvestBlock(block) || !ForgeHooks.canHarvestBlock(block, player, meta) || refStrength/strength > 10f && !player.capabilities.isCreativeMode) + return; + if (!world.isRemote) { BlockEvent.BreakEvent event = ForgeHooks.onBlockBreakEvent(world, world.getWorldInfo().getGameType(), (EntityPlayerMP) player, x, y, z); @@ -234,9 +237,6 @@ public abstract class MiningTool extends ToolBase implements IUpgradableItem {// } } - if (!player.canHarvestBlock(block) || !ForgeHooks.canHarvestBlock(block, player, meta) || refStrength/strength > 10f && !player.capabilities.isCreativeMode) - return; - int scaledPower = energyPerOperation + (totalSize * (energyPerOperation / 10)); if (player.capabilities.isCreativeMode || (blockMap.containsKey(block) && blockMap.get(block) == meta)) { @@ -307,7 +307,6 @@ public abstract class MiningTool extends ToolBase implements IUpgradableItem {// @Override public List getUpgradeStats(ItemStack stack) { - List fields = getFields(stack, 0); List strings = new ArrayList(); int digaoe = 0; int depth = 0; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/RFItemBase.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/RFItemBase.java index e053e618..baf1217b 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/RFItemBase.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/RFItemBase.java @@ -14,6 +14,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -132,10 +133,18 @@ public class RFItemBase extends ItemDE implements IEnergyContainerItem, IConfigu @Override public List getDisplayData(ItemStack stack) { List list = new ArrayList(); + if (hasProfiles()) { + int preset = ItemNBTHelper.getInteger(stack, "ConfigProfile", 0); + list.add(EnumChatFormatting.DARK_PURPLE+StatCollector.translateToLocal("info.de.capacitorMode.txt")+": "+ItemNBTHelper.getString(stack, "ProfileName"+preset, "Profile "+preset)); + } for (ItemConfigField field : getFields(stack, 0)) list.add(field.getTooltipInfo());//list.add(field.getLocalizedName() + ": " + field.getFormattedValue()); if (capacity > 0) list.add(InfoHelper.ITC() + StatCollector.translateToLocal("info.de.charge.txt") + ": " + InfoHelper.HITC() + Utills.formatNumber(getEnergyStored(stack)) + " / " + Utills.formatNumber(capacity)); return list; } + @Override + public boolean hasProfiles() { + return true; + } } 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 b3d8759f..607e95e1 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 @@ -10,7 +10,9 @@ import com.brandon3055.draconicevolution.client.keybinding.KeyBindings; import com.brandon3055.draconicevolution.common.handler.ConfigHandler; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.network.ToolModePacket; -import com.brandon3055.draconicevolution.common.utills.*; +import com.brandon3055.draconicevolution.common.utills.IConfigurableItem; +import com.brandon3055.draconicevolution.common.utills.IUpgradableItem; +import com.brandon3055.draconicevolution.common.utills.ItemConfigField; import com.google.common.collect.Sets; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -26,6 +28,7 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import org.lwjgl.input.Keyboard; +import org.lwjgl.input.Mouse; import java.util.HashSet; import java.util.List; @@ -123,7 +126,7 @@ public class ToolBase extends RFItemBase { if (getEnergyStored(stack) >= energyPerOperation) { - float f = ItemNBTHelper.getFloat(stack, References.DIG_SPEED_MULTIPLIER, 1f); + float f = IConfigurableItem.ProfileHelper.getFloat(stack, References.DIG_SPEED_MULTIPLIER, 1f); if (speed > 50f) f *= f; return f * speed; } @@ -146,6 +149,10 @@ public class ToolBase extends RFItemBase { public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean extended) { boolean show = InfoHelper.holdShiftForDetails(list); if (show){ + if (hasProfiles()) { + int preset = ItemNBTHelper.getInteger(stack, "ConfigProfile", 0); + list.add(EnumChatFormatting.DARK_PURPLE+StatCollector.translateToLocal("info.de.capacitorMode.txt")+": "+ItemNBTHelper.getString(stack, "ProfileName"+preset, "Profile "+preset)); + } 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))); @@ -159,7 +166,11 @@ public class ToolBase extends RFItemBase { @SideOnly(Side.CLIENT) public void addAditionalInformation(ItemStack stack, EntityPlayer player, List list, boolean extended) { - list.add(StatCollector.translateToLocal("info.de.press.txt") + " " + Keyboard.getKeyName(KeyBindings.toolConfig.getKeyCode()) + " " + StatCollector.translateToLocal("info.de.toOpenConfigGUI.txt")); + String key; + if (KeyBindings.toolConfig.getKeyCode() >= 0 && KeyBindings.toolConfig.getKeyCode() < Keyboard.KEYBOARD_SIZE) key = Keyboard.getKeyName(KeyBindings.toolConfig.getKeyCode()); + else key = Mouse.getButtonName(KeyBindings.toolConfig.getKeyCode()+101); + + list.add(StatCollector.translateToLocal("info.de.press.txt") + " " + key + " " + StatCollector.translateToLocal("info.de.toOpenConfigGUI.txt")); } @Override @@ -200,7 +211,7 @@ public class ToolBase extends RFItemBase { aoe++; if (aoe > (Integer) field.max) aoe = (Integer) field.min; field.value = aoe; - DataUtills.writeObjectToItem(stack, field.value, field.datatype, field.name); + DataUtills.writeObjectToCompound(IConfigurableItem.ProfileHelper.getProfileCompound(stack), field.value, field.datatype, field.name); } } } @@ -214,7 +225,7 @@ public class ToolBase extends RFItemBase { aoe++; if (aoe > (Integer) field.max) aoe = (Integer) field.min; field.value = aoe; - DataUtills.writeObjectToItem(stack, field.value, field.datatype, field.name); + DataUtills.writeObjectToCompound(IConfigurableItem.ProfileHelper.getProfileCompound(stack), field.value, field.datatype, field.name); } } } @@ -228,7 +239,7 @@ public class ToolBase extends RFItemBase { aoe++; if (aoe > (Integer) field.max) aoe = (Integer) field.min; field.value = aoe; - DataUtills.writeObjectToItem(stack, field.value, field.datatype, field.name); + DataUtills.writeObjectToCompound(IConfigurableItem.ProfileHelper.getProfileCompound(stack), field.value, field.datatype, field.name); } } } 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 6572cfdf..bdcd5470 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,13 +1,11 @@ package com.brandon3055.draconicevolution.common.items.tools.baseclasses; import cofh.api.energy.IEnergyContainerItem; -import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.ModItems; +import com.brandon3055.draconicevolution.common.entity.EntityDragonProjectile; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.utills.IUpgradableItem; import com.brandon3055.draconicevolution.common.utills.LogHelper; -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; @@ -15,132 +13,128 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.boss.EntityDragon; 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; public class ToolHandler { - public static Block[] destroyList = {Blocks.cobblestone, Blocks.stone, Blocks.dirt, Blocks.gravel, Blocks.sand, Blocks.grass, Blocks.netherrack}; - - public static boolean isRightMaterial(final Material material, final Material[] materialsListing) { - for (final Material mat : materialsListing) { - if (material == mat) { - return true; - } - } - return false; - } - - public static boolean checkDestroyList(Block curBlock) { - for (Block block : destroyList) { - if (curBlock == block) { - return true; - } - } - return false; - } - - public static boolean disSquare(int x, int y, int z, final EntityPlayer player, final World world, final boolean silk, final int fortune, Material[] materialsListing, ItemStack stack) { - int size = stack.getItem().equals(ModItems.draconicAxe) ? 2 : ItemNBTHelper.getShort(stack, "size", (short) 0); - MovingObjectPosition mop = raytraceFromEntity(world, player, 4.5D); - if (mop == null) { - updateGhostBlocks(player, world); - return false; - } - - int sizeX = size; - int sizeY = size; - int sizeZ = size; - int yOff = (size * -1); - Block targetBlock = world.getBlock(x, y, z); - if (size > 0) yOff++; - //if (size == 0) return false; - int side = (stack.getItem().equals(ModItems.draconicAxe)) ? 6 : mop.sideHit; - switch (side) { - case 0: - case 1: - sizeY = 0; - yOff = 0; - break; - case 2: - case 3: - sizeZ = 0; - break; - case 4: - case 5: - sizeX = 0; - break; - } - - for (int x1 = x - sizeX; x1 <= x + sizeX; x1++) { - for (int y1 = y - (sizeY + yOff); y1 <= y + (sizeY - yOff); y1++) { - for (int z1 = z - sizeZ; z1 <= z + sizeZ; z1++) { - mineBlock(x1, y1, z1, player, world, silk, fortune, materialsListing, stack); - //player.worldObj.scheduleBlockUpdate(x1, y1, z1, Blocks.stone, 100); - } - } - } - world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, targetBlock.stepSound.getStepResourcePath(), (targetBlock.stepSound.getVolume() + 1.0F) / 2.0F, targetBlock.stepSound.getPitch() * 0.8F); - return true; - } - - @SuppressWarnings({"rawtypes", "unchecked"}) - public static void mineBlock(final int x, final int y, final int z, final EntityPlayer player, final World world, final boolean silk, final int fortune, Material[] materialsListing, ItemStack stack) { - Block block = world.getBlock(x, y, z); - int meta = world.getBlockMetadata(x, y, z); - Material mat = block.getMaterial(); - if ((block != null) && (!block.isAir(world, x, y, z)) && (block.getPlayerRelativeBlockHardness(player, world, x, y, z) != 0.0F)) { - List items = new ArrayList(); - - if ((!block.canHarvestBlock(player, meta)) || (!isRightMaterial(mat, materialsListing))) { - return; - } - - if (!(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.ENERGYPERBLOCK, false); - } - - if (checkDestroyList(block) && (ItemNBTHelper.getBoolean(stack, "obliterate", false))) { - world.setBlockToAir(x, y, z); - return; - } - - if ((stack.getItem().equals(ModItems.draconicAxe) ? 2 : ItemNBTHelper.getShort(stack, "size", (short) 0)) == 0) return; - - if ((silk) && (block.canSilkHarvest(world, player, x, y, z, meta))) { - if (block == Blocks.lit_redstone_ore) - items.add(new ItemStack(Item.getItemFromBlock(Blocks.redstone_ore))); - else items.add(new ItemStack(block, 1, meta)); - } else { - items.addAll(block.getDrops(world, x, y, z, meta, fortune)); - //block.dropXpOnBlockBreak(world, (int)player.posX, (int)player.posY, (int)player.posZ, block.getExpDrop(world, meta, fortune)); - int xp = block.getExpDrop(world, meta, fortune); - player.addExperience(xp); - } - - world.setBlockToAir(x, y, z); - - if (!world.isRemote && !player.capabilities.isCreativeMode && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { - for (ItemStack item : items) { - world.spawnEntityInWorld(new EntityItem(world, player.posX, player.posY, player.posZ, item)); - } - } - } - } +// public static Block[] destroyList = {Blocks.cobblestone, Blocks.stone, Blocks.dirt, Blocks.gravel, Blocks.sand, Blocks.grass, Blocks.netherrack}; +// +// public static boolean isRightMaterial(final Material material, final Material[] materialsListing) { +// for (final Material mat : materialsListing) { +// if (material == mat) { +// return true; +// } +// } +// return false; +// } +// +// public static boolean checkDestroyList(Block curBlock) { +// for (Block block : destroyList) { +// if (curBlock == block) { +// return true; +// } +// } +// return false; +// } +// +// public static boolean disSquare(int x, int y, int z, final EntityPlayer player, final World world, final boolean silk, final int fortune, Material[] materialsListing, ItemStack stack) { +// int size = stack.getItem().equals(ModItems.draconicAxe) ? 2 : ItemNBTHelper.getShort(stack, "size", (short) 0); +// MovingObjectPosition mop = raytraceFromEntity(world, player, 4.5D); +// if (mop == null) { +// updateGhostBlocks(player, world); +// return false; +// } +// +// int sizeX = size; +// int sizeY = size; +// int sizeZ = size; +// int yOff = (size * -1); +// Block targetBlock = world.getBlock(x, y, z); +// if (size > 0) yOff++; +// //if (size == 0) return false; +// int side = (stack.getItem().equals(ModItems.draconicAxe)) ? 6 : mop.sideHit; +// switch (side) { +// case 0: +// case 1: +// sizeY = 0; +// yOff = 0; +// break; +// case 2: +// case 3: +// sizeZ = 0; +// break; +// case 4: +// case 5: +// sizeX = 0; +// break; +// } +// +// for (int x1 = x - sizeX; x1 <= x + sizeX; x1++) { +// for (int y1 = y - (sizeY + yOff); y1 <= y + (sizeY - yOff); y1++) { +// for (int z1 = z - sizeZ; z1 <= z + sizeZ; z1++) { +// mineBlock(x1, y1, z1, player, world, silk, fortune, materialsListing, stack); +// //player.worldObj.scheduleBlockUpdate(x1, y1, z1, Blocks.stone, 100); +// } +// } +// } +// world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, targetBlock.stepSound.getStepResourcePath(), (targetBlock.stepSound.getVolume() + 1.0F) / 2.0F, targetBlock.stepSound.getPitch() * 0.8F); +// return true; +// } +// +// @SuppressWarnings({"rawtypes", "unchecked"}) +// public static void mineBlock(final int x, final int y, final int z, final EntityPlayer player, final World world, final boolean silk, final int fortune, Material[] materialsListing, ItemStack stack) { +// Block block = world.getBlock(x, y, z); +// int meta = world.getBlockMetadata(x, y, z); +// Material mat = block.getMaterial(); +// if ((block != null) && (!block.isAir(world, x, y, z)) && (block.getPlayerRelativeBlockHardness(player, world, x, y, z) != 0.0F)) { +// List items = new ArrayList(); +// +// if ((!block.canHarvestBlock(player, meta)) || (!isRightMaterial(mat, materialsListing))) { +// return; +// } +// +// if (!(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.ENERGYPERBLOCK, false); +// } +// +// if (checkDestroyList(block) && (IConfigurableItem.ProfileHelper.getBoolean(stack, "obliterate", false))) { +// world.setBlockToAir(x, y, z); +// return; +// } +// +// if ((stack.getItem().equals(ModItems.draconicAxe) ? 2 : ItemNBTHelper.getShort(stack, "size", (short) 0)) == 0) return; +// +// if ((silk) && (block.canSilkHarvest(world, player, x, y, z, meta))) { +// if (block == Blocks.lit_redstone_ore) +// items.add(new ItemStack(Item.getItemFromBlock(Blocks.redstone_ore))); +// else items.add(new ItemStack(block, 1, meta)); +// } else { +// items.addAll(block.getDrops(world, x, y, z, meta, fortune)); +// //block.dropXpOnBlockBreak(world, (int)player.posX, (int)player.posY, (int)player.posZ, block.getExpDrop(world, meta, fortune)); +// int xp = block.getExpDrop(world, meta, fortune); +// player.addExperience(xp); +// } +// +// world.setBlockToAir(x, y, z); +// +// if (!world.isRemote && !player.capabilities.isCreativeMode && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { +// for (ItemStack item : items) { +// world.spawnEntityInWorld(new EntityItem(world, player.posX, player.posY, player.posZ, item)); +// } +// } +// } +// } public static void damageEntityBasedOnHealth(Entity entity, EntityPlayer player, float dmgMult) { ItemStack stack = player.getCurrentEquippedItem(); @@ -256,6 +250,13 @@ public class ToolHandler { } entityLivingBase.attackTime = 0; } + else if (entityObject instanceof EntityDragonProjectile) { + float dmg = getDamageAgainstEntity(stack, ((Entity)entityObject)); + int rf = (int)dmg * References.ENERGYPERATTACK; + if (rf > item.getEnergyStored(stack)) dmg = item.getEnergyStored(stack) / References.ENERGYPERATTACK; + + ((Entity)entityObject).attackEntityFrom(DamageSource.causePlayerDamage(player), dmg); + } } } @@ -306,7 +307,7 @@ public class ToolHandler { float sharpMod = (float)EnchantmentHelper.getEnchantmentLevel(Enchantment.sharpness.effectId, stack) * 4F; - if (stack.getItem() == ModItems.draconicDestructionStaff) dmg = (ModItems.DRACONIUM_T3.getDamageVsEntity()) + sharpMod; + if (stack.getItem() == ModItems.draconicDestructionStaff) dmg = (ModItems.CHAOTIC.getDamageVsEntity()) + sharpMod; else if (stack.getItem() instanceof ItemSword) dmg = (((ItemSword)stack.getItem()).func_150931_i()) + sharpMod; dmg += (IUpgradableItem.EnumUpgrade.ATTACK_DAMAGE.getUpgradePoints(stack) * 5); 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 0508c363..b500e018 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 @@ -285,4 +285,9 @@ public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableI return strings; } + + @Override + public boolean hasProfiles() { + return true; + } } 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 e9434c90..ae245982 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 @@ -14,10 +14,7 @@ import com.brandon3055.draconicevolution.common.items.tools.baseclasses.ToolHand import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.network.ToolModePacket; -import com.brandon3055.draconicevolution.common.utills.IHudDisplayItem; -import com.brandon3055.draconicevolution.common.utills.IInventoryTool; -import com.brandon3055.draconicevolution.common.utills.IUpgradableItem; -import com.brandon3055.draconicevolution.common.utills.ItemConfigField; +import com.brandon3055.draconicevolution.common.utills.*; import com.google.common.collect.Multimap; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -48,7 +45,7 @@ public class DraconicSword extends ItemSword implements IEnergyContainerItem, II protected int maxExtract = References.DRACONICTRANSFER * 50; public DraconicSword() { - super(ModItems.DRACONIUM_T2); + super(ModItems.AWAKENED); this.setUnlocalizedName(Strings.draconicSwordName); this.setCreativeTab(DraconicEvolution.tabToolsWeapons); if (ModItems.isEnabled(this)) GameRegistry.registerItem(this, Strings.draconicSwordName); @@ -87,7 +84,7 @@ public class DraconicSword extends ItemSword implements IEnergyContainerItem, II @Override public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { - ToolHandler.AOEAttack(player, entity, stack, ItemNBTHelper.getInteger(stack, References.ATTACK_AOE, 0)); + ToolHandler.AOEAttack(player, entity, stack, IConfigurableItem.ProfileHelper.getInteger(stack, References.ATTACK_AOE, 0)); ToolHandler.damageEntityBasedOnHealth(entity, player, 0.2F); return true; } @@ -301,4 +298,9 @@ public class DraconicSword extends ItemSword implements IEnergyContainerItem, II } return super.onItemRightClick(stack, world, player); } + + @Override + public boolean hasProfiles() { + return true; + } } 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 0425ec86..1433cd4d 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 @@ -212,6 +212,11 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte return new ArrayList(); } + @Override + public boolean hasProfiles() { + return true; + } + @Override public List getUpgrades(ItemStack itemstack) { return new ArrayList(){{ 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 ee8e0823..e9ca08ec 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 @@ -14,10 +14,7 @@ import com.brandon3055.draconicevolution.common.items.tools.baseclasses.ToolHand import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.network.ToolModePacket; -import com.brandon3055.draconicevolution.common.utills.IHudDisplayItem; -import com.brandon3055.draconicevolution.common.utills.IInventoryTool; -import com.brandon3055.draconicevolution.common.utills.IUpgradableItem; -import com.brandon3055.draconicevolution.common.utills.ItemConfigField; +import com.brandon3055.draconicevolution.common.utills.*; import com.google.common.collect.Multimap; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -50,7 +47,7 @@ public class WyvernSword extends ItemSword implements IEnergyContainerItem, IInv protected int maxExtract = References.WYVERNTRANSFER; public WyvernSword() { - super(ModItems.DRACONIUM_T1); + super(ModItems.WYVERN); this.setUnlocalizedName(Strings.wyvernSwordName); this.setCreativeTab(DraconicEvolution.tabToolsWeapons); if (ModItems.isEnabled(this)) GameRegistry.registerItem(this, Strings.wyvernSwordName); @@ -91,7 +88,7 @@ public class WyvernSword extends ItemSword implements IEnergyContainerItem, IInv @Override public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { - ToolHandler.AOEAttack(player, entity, stack, ItemNBTHelper.getInteger(stack, References.ATTACK_AOE, 0)); + ToolHandler.AOEAttack(player, entity, stack, IConfigurableItem.ProfileHelper.getInteger(stack, References.ATTACK_AOE, 0)); ToolHandler.damageEntityBasedOnHealth(entity, player, 0.1F); return true; } @@ -308,5 +305,10 @@ public class WyvernSword extends ItemSword implements IEnergyContainerItem, IInv } return super.onItemRightClick(stack, world, player); } + + @Override + public boolean hasProfiles() { + return true; + } } 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 92a3856c..9a3ab13a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/network/ButtonPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/ButtonPacket.java @@ -1,5 +1,6 @@ package com.brandon3055.draconicevolution.common.network; +import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.gui.GuiHandler; import com.brandon3055.draconicevolution.common.container.ContainerDissEnchanter; @@ -8,11 +9,13 @@ import com.brandon3055.draconicevolution.common.container.ContainerWeatherContro import com.brandon3055.draconicevolution.common.tileentities.TileDissEnchanter; import com.brandon3055.draconicevolution.common.tileentities.TileDraconiumChest; import com.brandon3055.draconicevolution.common.tileentities.TileWeatherController; +import com.brandon3055.draconicevolution.common.utills.IConfigurableItem; 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.inventory.Container; +import net.minecraft.item.ItemStack; public class ButtonPacket implements IMessage { @@ -24,6 +27,7 @@ public class ButtonPacket implements IMessage public static final byte ID_DRACONIUMCHEST3 = 5; public static final byte ID_TOOLCONFIG = 7; public static final byte ID_DRACONIUMCHEST4 = 8; + public static final byte ID_TOOL_PROFILE_CHANGE = 9; byte buttonId = 0; boolean state = false; @@ -117,6 +121,17 @@ public class ButtonPacket implements IMessage 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); + break; + } + case ID_TOOL_PROFILE_CHANGE: + { + ItemStack stack = ctx.getServerHandler().playerEntity.getHeldItem(); + if (stack != null && stack.getItem() instanceof IConfigurableItem && ((IConfigurableItem)stack.getItem()).hasProfiles()){ + int preset = ItemNBTHelper.getInteger(stack, "ConfigProfile", 0); + if (++preset >= 5) preset = 0; + ItemNBTHelper.setInteger(stack, "ConfigProfile", preset); + } + break; } default: diff --git a/src/main/java/com/brandon3055/draconicevolution/common/network/ItemConfigPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/ItemConfigPacket.java index 6ff27b64..98f1a1ca 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/network/ItemConfigPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/ItemConfigPacket.java @@ -1,6 +1,8 @@ package com.brandon3055.draconicevolution.common.network; +import com.brandon3055.brandonscore.common.lib.References; import com.brandon3055.brandonscore.common.utills.DataUtills; +import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.common.utills.IConfigurableItem; import com.brandon3055.draconicevolution.common.utills.ItemConfigField; import cpw.mods.fml.common.network.ByteBufUtils; @@ -19,6 +21,7 @@ public class ItemConfigPacket implements IMessage public int slot; public Object value; public String name; + public boolean renameProfile = false; public ItemConfigPacket() {} @@ -29,12 +32,21 @@ public class ItemConfigPacket implements IMessage this.name = field.name; } + public ItemConfigPacket(int slot, String name) { + this.datatype = References.BOOLEAN_ID; + this.slot = slot; + this.value = false; + this.name = name; + this.renameProfile = true; + } + @Override public void fromBytes(ByteBuf bytes){ this.datatype = bytes.readByte(); this.slot = bytes.readInt(); this.name = ByteBufUtils.readUTF8String(bytes); this.value = DataUtills.instance.readObjectFromBytes(bytes, datatype); + this.renameProfile = bytes.readBoolean(); } @Override @@ -43,6 +55,7 @@ public class ItemConfigPacket implements IMessage bytes.writeInt(slot); ByteBufUtils.writeUTF8String(bytes, name); DataUtills.instance.writeObjectToBytes(bytes, datatype, value); + bytes.writeBoolean(renameProfile); } public static class Handler implements IMessageHandler { @@ -50,9 +63,18 @@ public class ItemConfigPacket implements IMessage @Override public IMessage onMessage(ItemConfigPacket message, MessageContext ctx) { EntityPlayer player = ctx.getServerHandler().playerEntity; + if (message.slot >= player.inventory.getSizeInventory() || message.slot < 0) return null; + ItemStack stack = player.inventory.getStackInSlot(message.slot); + if (stack != null && stack.getItem() instanceof IConfigurableItem) { + + if (message.renameProfile){ + ItemNBTHelper.setString(stack, "ProfileName" + ItemNBTHelper.getInteger(stack, "ConfigProfile", 0), message.name); + return null; + } + IConfigurableItem item = (IConfigurableItem) stack.getItem(); List fields = item.getFields(stack, message.slot); @@ -61,7 +83,7 @@ public class ItemConfigPacket implements IMessage ItemConfigField newValue = new ItemConfigField(message.datatype, message.value, message.slot, message.name); if (newValue.castToDouble() <= field.castMaxToDouble() && newValue.castToDouble() >= field.castMinToDouble()){ - DataUtills.writeObjectToItem(stack, message.value, message.datatype, message.name); + DataUtills.writeObjectToCompound(IConfigurableItem.ProfileHelper.getProfileCompound(stack), message.value, message.datatype, message.name); } } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/network/ShieldHitPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/ShieldHitPacket.java new file mode 100644 index 00000000..4be1b01f --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/ShieldHitPacket.java @@ -0,0 +1,51 @@ +package com.brandon3055.draconicevolution.common.network; + +import com.brandon3055.brandonscore.common.utills.DataUtills; +import com.brandon3055.draconicevolution.client.handler.ClientEventHandler; +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.client.Minecraft; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; + +/** + * Created by brandon3055 on 15/2/2016. + */ +public class ShieldHitPacket implements IMessage +{ + public int playerID; + public byte shieldPowerB; + public float shieldPowerF; + + public ShieldHitPacket() {} + + public ShieldHitPacket(EntityPlayer playerHit, float shieldPower) { + this.playerID = playerHit.getEntityId(); + this.shieldPowerB = (byte)(shieldPower * (float)Byte.MAX_VALUE); + } + + @Override + public void fromBytes(ByteBuf bytes){ + playerID = bytes.readInt(); + shieldPowerB = bytes.readByte(); + shieldPowerF = (float)shieldPowerB / (float)Byte.MAX_VALUE; + } + + @Override + public void toBytes(ByteBuf bytes){ + bytes.writeInt(playerID); + bytes.writeByte(shieldPowerB); + } + + public static class Handler implements IMessageHandler { + + @Override + public IMessage onMessage(ShieldHitPacket message, MessageContext ctx) { + Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(message.playerID); + if (entity instanceof EntityPlayer) ClientEventHandler.playerShieldStatus.put((EntityPlayer)entity, new DataUtills.XZPair(message.shieldPowerF, ClientEventHandler.elapsedTicks)); + return null; + } + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/network/SpeedRequestPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/SpeedRequestPacket.java index 779940fe..9acad073 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/network/SpeedRequestPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/SpeedRequestPacket.java @@ -40,7 +40,6 @@ public class SpeedRequestPacket implements IMessage if (ctx.side == Side.SERVER) { if (ConfigHandler.speedLimitDimList.contains(ctx.getServerHandler().playerEntity.dimension) || (BrandonsCore.proxy.isOp(ctx.getServerHandler().playerEntity.getCommandSenderName()) && !ConfigHandler.speedLimitops)) return new SpeedRequestPacket(20F); - LogHelper.info(ConfigHandler.speedLimitops); return new SpeedRequestPacket(ConfigHandler.maxPlayerSpeed); } else { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/gates/TileFluxGate.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/gates/TileFluxGate.java index 82ccbe9d..c4f8eb59 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/gates/TileFluxGate.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/gates/TileFluxGate.java @@ -11,12 +11,45 @@ import net.minecraftforge.common.util.ForgeDirection; */ public class TileFluxGate extends TileGate implements IEnergyReceiver { + private int transferredThisTick = 0; + + @Override + public void updateEntity() { + super.updateEntity(); + + transferredThisTick = 0; + } + @Override public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { IEnergyReceiver target = getOutputTarget(); - return target == null ? 0 : target.receiveEnergy(from, Math.min(getActualFlow(), target.receiveEnergy(from, maxReceive, true)), simulate); +// int i = buffer.receiveEnergy(Math.max(0, Math.min(maxReceive, Math.min(getActualFlow(), getActualFlow() - buffer.getEnergyStored()))), simulate); +// return i; + int transfer = target == null ? 0 : target.receiveEnergy(from, Math.min(Math.max(0, getActualFlow()-transferredThisTick), target.receiveEnergy(from, maxReceive, true)), simulate); + transferredThisTick += transfer; + return transfer; } +// private EnergyStorage buffer = new EnergyStorage(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE); +// +// @Override +// public void updateEntity() { +// super.updateEntity(); +// +// IEnergyReceiver receiver = getOutputTarget(); +// if (receiver != null && !worldObj.isRemote){ +// buffer.extractEnergy(receiver.receiveEnergy(output.getOpposite(), getActualFlow(), false), false); +// } +// } +// +// @Override +// public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { +// if (buffer.getEnergyStored() > 0) return 0; +// int i = buffer.receiveEnergy(Math.max(0, Math.min(maxReceive, Math.min(getActualFlow(), getActualFlow() - buffer.getEnergyStored()))), simulate); +// return i; +// } + + @Override public int getEnergyStored(ForgeDirection from) { IEnergyReceiver target = getOutputTarget(); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java index c7ad5859..0b14869b 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java @@ -789,8 +789,7 @@ public class TileEnergyStorageCore extends TileObjectSync { } private void detectAndRendChanges(){ - int diff = (int)Math.abs(lastTickCapacity - energy); - if (diff > 1000) lastTickCapacity = (Long) sendObjectToClient(References.LONG_ID, 0, energy, new NetworkRegistry.TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 20)); + if (lastTickCapacity != energy) lastTickCapacity = (Long) sendObjectToClient(References.LONG_ID, 0, energy, new NetworkRegistry.TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 20)); } @Override diff --git a/src/main/java/com/brandon3055/draconicevolution/common/utills/IConfigurableItem.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/IConfigurableItem.java index 713434be..06ed2b51 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/utills/IConfigurableItem.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/IConfigurableItem.java @@ -1,6 +1,9 @@ package com.brandon3055.draconicevolution.common.utills; +import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; import java.util.List; @@ -9,4 +12,62 @@ import java.util.List; */ public interface IConfigurableItem { List getFields(ItemStack stack, int slot); + + public boolean hasProfiles(); + + public static class ProfileHelper { + + public static NBTTagCompound getProfileCompound(ItemStack stack){ + int profile = ItemNBTHelper.getInteger(stack, "ConfigProfile", 0); + NBTTagCompound stackCompound = ItemNBTHelper.getCompound(stack); + if (!stackCompound.hasKey("ConfigProfiles") && stackCompound.getTagList("ConfigProfiles", 10).tagCount() < 5){ + NBTTagList profileList = new NBTTagList(); + for (int i = 0; i < 5; i++) profileList.appendTag(new NBTTagCompound()); + stackCompound.setTag("ConfigProfiles", profileList); + } + + return stackCompound.getTagList("ConfigProfiles", 10).getCompoundTagAt(profile); + } + + public static void setBoolean(ItemStack stack, String tag, boolean b) { + getProfileCompound(stack).setBoolean(tag, b); + } + + public static void setInteger(ItemStack stack, String tag, int i) { + getProfileCompound(stack).setInteger(tag, i); + } + + public static void setFloat(ItemStack stack, String tag, float f) { + getProfileCompound(stack).setFloat(tag, f); + } + + public static void setDouble(ItemStack stack, String tag, double d) { + getProfileCompound(stack).setDouble(tag, d); + } + + public static void setString(ItemStack stack, String tag, String s) { + getProfileCompound(stack).setString(tag, s); + } + + + public static boolean getBoolean(ItemStack stack, String tag, boolean defaultExpected){ + return getProfileCompound(stack).hasKey(tag) ? getProfileCompound(stack).getBoolean(tag) : defaultExpected; + } + + public static int getInteger(ItemStack stack, String tag, int defaultExpected){ + return getProfileCompound(stack).hasKey(tag) ? getProfileCompound(stack).getInteger(tag) : defaultExpected; + } + + public static float getFloat(ItemStack stack, String tag, float defaultExpected){ + return getProfileCompound(stack).hasKey(tag) ? getProfileCompound(stack).getFloat(tag) : defaultExpected; + } + + public static double getDouble(ItemStack stack, String tag, double defaultExpected) { + return getProfileCompound(stack).hasKey(tag) ? getProfileCompound(stack).getDouble(tag) : defaultExpected; + } + + public static String getString(ItemStack stack, String tag, String defaultExpected){ + return getProfileCompound(stack).hasKey(tag) ? getProfileCompound(stack).getString(tag) : defaultExpected; + } + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/utills/IUpgradableItem.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/IUpgradableItem.java index 88b3157b..a0c22a9e 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/utills/IUpgradableItem.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/IUpgradableItem.java @@ -49,20 +49,41 @@ public interface IUpgradableItem { DIG_AOE (2, 4, "DigAOE"){ @Override public void onRemovedFromItem(ItemStack itemStack) { - if (ItemNBTHelper.getInteger(itemStack, References.DIG_AOE, 0) > getUpgradePoints(itemStack)) ItemNBTHelper.setInteger(itemStack, References.DIG_AOE, getUpgradePoints(itemStack)); + int profile = ItemNBTHelper.getInteger(itemStack, "ConfigProfile", 0); + + for (int i = 0; i < 5; i++){ + ItemNBTHelper.setInteger(itemStack, "ConfigProfile", i); + if (IConfigurableItem.ProfileHelper.getInteger(itemStack, References.DIG_AOE, 0) > getUpgradePoints(itemStack)) IConfigurableItem.ProfileHelper.setInteger(itemStack, References.DIG_AOE, getUpgradePoints(itemStack)); + } + + ItemNBTHelper.setInteger(itemStack, "ConfigProfile", profile); } }, DIG_DEPTH (3, 2, "DigDepth"){ @Override public void onRemovedFromItem(ItemStack itemStack) { - if (ItemNBTHelper.getInteger(itemStack, References.DIG_DEPTH, 0) > getUpgradePoints(itemStack)) ItemNBTHelper.setInteger(itemStack, References.DIG_DEPTH, getUpgradePoints(itemStack)); + int profile = ItemNBTHelper.getInteger(itemStack, "ConfigProfile", 0); + + for (int i = 0; i < 5; i++){ + ItemNBTHelper.setInteger(itemStack, "ConfigProfile", i); + if (IConfigurableItem.ProfileHelper.getInteger(itemStack, References.DIG_DEPTH, 0) > getUpgradePoints(itemStack)) IConfigurableItem.ProfileHelper.setInteger(itemStack, References.DIG_DEPTH, getUpgradePoints(itemStack)); + } + + ItemNBTHelper.setInteger(itemStack, "ConfigProfile", profile); } }, ATTACK_DAMAGE (4, 1, "AttackDamage"), ATTACK_AOE (5, 2, "AttackAOE"){ @Override public void onRemovedFromItem(ItemStack itemStack) { - if (ItemNBTHelper.getInteger(itemStack, References.ATTACK_AOE, 0) > getUpgradePoints(itemStack)) ItemNBTHelper.setInteger(itemStack, References.ATTACK_AOE, getUpgradePoints(itemStack)); + int profile = ItemNBTHelper.getInteger(itemStack, "ConfigProfile", 0); + + for (int i = 0; i < 5; i++){ + ItemNBTHelper.setInteger(itemStack, "ConfigProfile", i); + if (IConfigurableItem.ProfileHelper.getInteger(itemStack, References.ATTACK_AOE, 0) > getUpgradePoints(itemStack)) IConfigurableItem.ProfileHelper.setInteger(itemStack, References.ATTACK_AOE, getUpgradePoints(itemStack)); + } + + ItemNBTHelper.setInteger(itemStack, "ConfigProfile", profile); } }, ARROW_DAMAGE (6, 1, "ArrowDamage"), diff --git a/src/main/java/com/brandon3055/draconicevolution/common/utills/ItemConfigField.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/ItemConfigField.java index 78c34274..5d649704 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/utills/ItemConfigField.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/ItemConfigField.java @@ -52,7 +52,7 @@ public class ItemConfigField { // } public ItemConfigField readFromItem(ItemStack stack, Object defaultExpected){ - value = DataUtills.readObjectFromItem(stack, datatype, name, defaultExpected); + value = DataUtills.readObjectFromCompound(IConfigurableItem.ProfileHelper.getProfileCompound(stack), datatype, name, defaultExpected); return this; } @@ -73,6 +73,9 @@ public class ItemConfigField { else if (datatype == References.FLOAT_ID && !StringUtils.isNullOrEmpty(modifier) && modifier.equals("PERCENT")){ return Math.round((Float)value * 100D) + "%"; } + else if (datatype == References.FLOAT_ID && !StringUtils.isNullOrEmpty(modifier) && modifier.equals("PLUSPERCENT")) { + return "+"+Math.round((Float)value * 100D) + "%"; + } else { return String.valueOf(value); diff --git a/src/main/resources/assets/draconicevolution/lang/en_US.lang b/src/main/resources/assets/draconicevolution/lang/en_US.lang index a5a60099..28b47569 100644 --- a/src/main/resources/assets/draconicevolution/lang/en_US.lang +++ b/src/main/resources/assets/draconicevolution/lang/en_US.lang @@ -416,6 +416,7 @@ entity.DraconicEvolution.ChaosGuardian.name=Chaos Guardian //KeyBinding ---------------------------------------------------------------------------------------------------------------------------------------- key.placeItem=Place Item in world key.toolConfig=Tool & Armor Config GUI +key.toolProfileChange=Change Tool Config Profile //Damage ---------------------------------------------------------------------------------------------------------------------------------------- death.attack.chaos=%1$s was torn apart by a Chaos Guardian @@ -457,10 +458,11 @@ button.de.toggleHidden.txt=Toggle Hidden button.de.ArmorNVActive.name=Night Vision button.de.ArmorNVLock.name=Lock Night Vision button.de.ArmorFlightLock.name=Lock Flight -button.de.ArmorSpeedMult.name=Move Speed -button.de.ArmorJumpMult.name=Jump Height +button.de.ArmorSpeedMult.name=Move Speed Modifier +button.de.ArmorJumpMult.name=Jump Height Modifier button.de.ArmorHillStep.name=Hill Step button.de.ArmorSprintOnly.name=Reduce When Walking +button.de.ArmorFlightSpeedMult.name=Flight Speed Modifier button.de.ToolDigMultiplier.name=Dig Speed button.de.ToolDigAOE.name=Size button.de.ToolDigDepth.name=Dig Depth @@ -550,6 +552,7 @@ gui.de.configureGuiElements.txt=Configure HUD Elements gui.de.hudDisplaySettings.txt=HUD Display Settings gui.de.shieldDisplaySettings.txt=Shield Display Settings gui.de.clickAndDragPurpleBoxes.txt=Click and drag the purple boxes to move the displays +gui.de.profile.txt=Profile gui.de.RFCapacity.txt=RF Capacity gui.de.DigSpeed.txt=Dig Speed diff --git a/src/main/resources/assets/draconicevolution/manual.json b/src/main/resources/assets/draconicevolution/manual-en_US.json similarity index 100% rename from src/main/resources/assets/draconicevolution/manual.json rename to src/main/resources/assets/draconicevolution/manual-en_US.json diff --git a/src/main/resources/assets/draconicevolution/models/shieldSphere.obj b/src/main/resources/assets/draconicevolution/models/shieldSphere.obj new file mode 100644 index 00000000..70eafd67 --- /dev/null +++ b/src/main/resources/assets/draconicevolution/models/shieldSphere.obj @@ -0,0 +1,3746 @@ +# Blender v2.70 (sub 0) OBJ File: 'Shield.blend' +# www.blender.org +mtllib shieldSphere.mtl +o Sphere +v -0.478027 0.800558 0.030968 +v -0.620815 0.700577 0.030968 +v -0.917720 0.276552 0.030968 +v -0.962835 0.108180 0.030968 +v -0.978027 -0.065468 0.030968 +v -0.962835 -0.239116 0.030968 +v -0.917720 -0.407488 0.030968 +v -0.744072 -0.708255 0.030968 +v -0.620815 -0.831512 0.030968 +v -0.151676 -1.050276 0.030968 +v -0.148719 0.919340 -0.000940 +v -0.314224 0.874225 -0.031878 +v -0.469514 0.800558 -0.060907 +v -0.609870 0.700577 -0.087144 +v -0.731028 0.577320 -0.109793 +v -0.829307 0.434532 -0.128164 +v -0.901720 0.276552 -0.141700 +v -0.946067 0.108180 -0.149990 +v -0.961000 -0.065468 -0.152782 +v -0.946067 -0.239116 -0.149990 +v -0.901720 -0.407488 -0.141700 +v -0.829307 -0.565468 -0.128164 +v -0.731029 -0.708255 -0.109793 +v -0.609870 -0.831512 -0.087144 +v -0.469514 -0.931493 -0.060907 +v -0.314224 -1.005160 -0.031878 +v -0.148719 -1.050276 -0.000940 +v 0.021972 -1.065468 0.030968 +v -0.139949 0.919340 -0.031761 +v -0.296952 0.874225 -0.092584 +v -0.444263 0.800558 -0.149653 +v -0.577409 0.700577 -0.201234 +v -0.692343 0.577320 -0.245759 +v -0.785572 0.434532 -0.281877 +v -0.854265 0.276552 -0.308488 +v -0.896333 0.108180 -0.324786 +v -0.910500 -0.065468 -0.330274 +v -0.896333 -0.239116 -0.324786 +v -0.854265 -0.407488 -0.308488 +v -0.785572 -0.565468 -0.281877 +v -0.692343 -0.708255 -0.245759 +v -0.577409 -0.831512 -0.201234 +v -0.444264 -0.931493 -0.149653 +v -0.296952 -1.005160 -0.092584 +v -0.139950 -1.050276 -0.031761 +v -0.125666 0.919340 -0.060446 +v -0.268819 0.874225 -0.149082 +v -0.403136 0.800558 -0.232248 +v -0.524536 0.700577 -0.307416 +v -0.629332 0.577320 -0.372303 +v -0.714337 0.434532 -0.424936 +v -0.776970 0.276552 -0.463716 +v -0.815328 0.108180 -0.487467 +v -0.828245 -0.065468 -0.495464 +v -0.815328 -0.239116 -0.487467 +v -0.776970 -0.407488 -0.463717 +v -0.714337 -0.565468 -0.424936 +v -0.629332 -0.708255 -0.372303 +v -0.524537 -0.831512 -0.307416 +v -0.403136 -0.931493 -0.232248 +v -0.268819 -1.005160 -0.149083 +v -0.125666 -1.050276 -0.060446 +v -0.106355 0.919340 -0.086018 +v -0.230783 0.874225 -0.199449 +v -0.347532 0.800558 -0.305880 +v -0.453053 0.700577 -0.402075 +v -0.544141 0.577320 -0.485113 +v -0.618028 0.434532 -0.552470 +v -0.672469 0.276552 -0.602099 +v -0.705809 0.108180 -0.632493 +v -0.717036 -0.065468 -0.642728 +v -0.705809 -0.239116 -0.632493 +v -0.672469 -0.407488 -0.602099 +v -0.618028 -0.565468 -0.552470 +v -0.544141 -0.708255 -0.485113 +v -0.453053 -0.831512 -0.402075 +v -0.347532 -0.931493 -0.305880 +v -0.230784 -1.005160 -0.199450 +v -0.106355 -1.050276 -0.086018 +v -0.082674 0.919340 -0.107606 +v -0.184141 0.874225 -0.241970 +v -0.279345 0.800558 -0.368041 +v -0.365394 0.700577 -0.481988 +v -0.439672 0.577320 -0.580349 +v -0.499924 0.434532 -0.660135 +v -0.544319 0.276552 -0.718923 +v -0.571507 0.108180 -0.754925 +v -0.580662 -0.065468 -0.767049 +v -0.571507 -0.239116 -0.754926 +v -0.544319 -0.407488 -0.718923 +v -0.499924 -0.565468 -0.660135 +v -0.439673 -0.708255 -0.580349 +v -0.365394 -0.831512 -0.481988 +v -0.279345 -0.931493 -0.368041 +v -0.184141 -1.005160 -0.241970 +v -0.082674 -1.050276 -0.107606 +v -0.055429 0.919340 -0.124475 +v -0.130479 0.874225 -0.275196 +v -0.200897 0.800558 -0.416614 +v -0.264543 0.700577 -0.544432 +v -0.319483 0.577320 -0.654767 +v -0.364048 0.434532 -0.744266 +v -0.396885 0.276552 -0.810210 +v -0.416994 0.108180 -0.850596 +v -0.423766 -0.065468 -0.864195 +v -0.416994 -0.239116 -0.850596 +v -0.396885 -0.407488 -0.810210 +v -0.364048 -0.565468 -0.744266 +v -0.319483 -0.708255 -0.654767 +v -0.264543 -0.831512 -0.544432 +v -0.200897 -0.931493 -0.416614 +v -0.130479 -1.005160 -0.275196 +v -0.055429 -1.050276 -0.124476 +v -0.025549 0.919340 -0.136051 +v -0.071626 0.874225 -0.297996 +v -0.114859 0.800558 -0.449945 +v -0.153935 0.700577 -0.587282 +v -0.187666 0.577320 -0.705833 +v -0.215027 0.434532 -0.801997 +v -0.235187 0.276552 -0.872852 +v -0.247533 0.108180 -0.916245 +v -0.251691 -0.065468 -0.930858 +v -0.247533 -0.239116 -0.916245 +v -0.235187 -0.407488 -0.872852 +v -0.215027 -0.565468 -0.801998 +v -0.187666 -0.708255 -0.705833 +v -0.153935 -0.831512 -0.587282 +v -0.114859 -0.931493 -0.449945 +v -0.071626 -1.005160 -0.297996 +v -0.025549 -1.050276 -0.136051 +v 0.005950 0.919340 -0.141939 +v -0.009585 0.874225 -0.309593 +v -0.024162 0.800558 -0.466899 +v -0.037337 0.700577 -0.609078 +v -0.048709 0.577320 -0.731809 +v -0.057934 0.434532 -0.831363 +v -0.064732 0.276552 -0.904716 +v -0.068894 0.108180 -0.949638 +v -0.070296 -0.065468 -0.964766 +v -0.068894 -0.239116 -0.949639 +v -0.064732 -0.407488 -0.904716 +v -0.057934 -0.565468 -0.831363 +v -0.048709 -0.708255 -0.731809 +v -0.037337 -0.831512 -0.609078 +v -0.024162 -0.931493 -0.466899 +v -0.009585 -1.005160 -0.309593 +v 0.005950 -1.050276 -0.141940 +v 0.037994 0.919340 -0.141939 +v 0.053530 0.874225 -0.309593 +v 0.068106 0.800558 -0.466899 +v 0.081281 0.700577 -0.609078 +v 0.092654 0.577320 -0.731809 +v 0.101879 0.434532 -0.831363 +v 0.108676 0.276552 -0.904716 +v 0.112839 0.108180 -0.949638 +v 0.114241 -0.065468 -0.964766 +v 0.112839 -0.239116 -0.949639 +v 0.108676 -0.407488 -0.904716 +v 0.101879 -0.565468 -0.831363 +v 0.092654 -0.708255 -0.731809 +v 0.081281 -0.831512 -0.609078 +v 0.068106 -0.931493 -0.466899 +v 0.053530 -1.005160 -0.309593 +v 0.037994 -1.050276 -0.141940 +v 0.069493 0.919340 -0.136051 +v 0.115570 0.874225 -0.297996 +v 0.158804 0.800558 -0.449945 +v 0.197879 0.700577 -0.587282 +v 0.231610 0.577320 -0.705833 +v 0.258971 0.434532 -0.801997 +v 0.279131 0.276552 -0.872852 +v 0.291478 0.108180 -0.916245 +v 0.295635 -0.065468 -0.930858 +v 0.291478 -0.239116 -0.916245 +v 0.279131 -0.407488 -0.872852 +v 0.258971 -0.565468 -0.801998 +v 0.231610 -0.708255 -0.705833 +v 0.197879 -0.831512 -0.587282 +v 0.158804 -0.931493 -0.449945 +v 0.115571 -1.005160 -0.297996 +v 0.069493 -1.050276 -0.136051 +v 0.099374 0.919340 -0.124475 +v 0.174424 0.874225 -0.275196 +v 0.244841 0.800558 -0.416614 +v 0.308487 0.700577 -0.544432 +v 0.363428 0.577320 -0.654767 +v 0.407993 0.434532 -0.744266 +v 0.440829 0.276552 -0.810210 +v 0.460939 0.108180 -0.850596 +v 0.467710 -0.065468 -0.864195 +v 0.460939 -0.239116 -0.850596 +v 0.440829 -0.407488 -0.810210 +v 0.407993 -0.565468 -0.744266 +v 0.363428 -0.708255 -0.654767 +v 0.308487 -0.831512 -0.544432 +v 0.244841 -0.931493 -0.416614 +v 0.174424 -1.005160 -0.275196 +v 0.099374 -1.050276 -0.124476 +v 0.126618 0.919340 -0.107606 +v 0.228085 0.874225 -0.241970 +v 0.323289 0.800558 -0.368041 +v 0.409338 0.700577 -0.481988 +v 0.483617 0.577320 -0.580349 +v 0.543869 0.434532 -0.660135 +v 0.588263 0.276552 -0.718923 +v 0.615451 0.108180 -0.754925 +v 0.624607 -0.065468 -0.767049 +v 0.615451 -0.239116 -0.754926 +v 0.588263 -0.407488 -0.718923 +v 0.543869 -0.565468 -0.660135 +v 0.483617 -0.708255 -0.580349 +v 0.409338 -0.831512 -0.481988 +v 0.323290 -0.931493 -0.368041 +v 0.228085 -1.005160 -0.241970 +v 0.126619 -1.050276 -0.107606 +v 0.150300 0.919340 -0.086018 +v 0.274728 0.874225 -0.199450 +v 0.391476 0.800558 -0.305880 +v 0.496998 0.700577 -0.402075 +v 0.588086 0.577320 -0.485113 +v 0.661973 0.434532 -0.552470 +v 0.716413 0.276552 -0.602099 +v 0.749754 0.108180 -0.632493 +v 0.760981 -0.065468 -0.642728 +v 0.749754 -0.239116 -0.632493 +v 0.716413 -0.407488 -0.602099 +v 0.661973 -0.565468 -0.552470 +v 0.588086 -0.708255 -0.485113 +v 0.496998 -0.831512 -0.402075 +v 0.391477 -0.931493 -0.305880 +v 0.274728 -1.005160 -0.199450 +v 0.150300 -1.050276 -0.086018 +v 0.021972 0.934532 0.030968 +v 0.169611 0.919340 -0.060446 +v 0.312763 0.874225 -0.149083 +v 0.447081 0.800558 -0.232248 +v 0.568481 0.700577 -0.307416 +v 0.673276 0.577320 -0.372303 +v 0.758282 0.434532 -0.424936 +v 0.820915 0.276552 -0.463716 +v 0.859272 0.108180 -0.487466 +v 0.872189 -0.065468 -0.495464 +v 0.859272 -0.239116 -0.487467 +v 0.820915 -0.407488 -0.463717 +v 0.758282 -0.565468 -0.424936 +v 0.673276 -0.708255 -0.372303 +v 0.568481 -0.831512 -0.307416 +v 0.447081 -0.931493 -0.232248 +v 0.312764 -1.005160 -0.149083 +v 0.169611 -1.050276 -0.060446 +v 0.183894 0.919340 -0.031761 +v 0.340896 0.874225 -0.092584 +v 0.488208 0.800558 -0.149653 +v 0.621353 0.700577 -0.201234 +v 0.736287 0.577320 -0.245759 +v 0.829517 0.434532 -0.281877 +v 0.898209 0.276552 -0.308488 +v 0.940278 0.108180 -0.324786 +v 0.954444 -0.065468 -0.330274 +v 0.940278 -0.239116 -0.324786 +v 0.898209 -0.407488 -0.308488 +v 0.829517 -0.565468 -0.281877 +v 0.736287 -0.708255 -0.245759 +v 0.621354 -0.831512 -0.201234 +v 0.488208 -0.931493 -0.149653 +v 0.340897 -1.005160 -0.092584 +v 0.183894 -1.050276 -0.031761 +v 0.192663 0.919340 -0.000940 +v 0.358169 0.874225 -0.031878 +v 0.513458 0.800558 -0.060907 +v 0.653815 0.700577 -0.087144 +v 0.774973 0.577320 -0.109793 +v 0.873252 0.434532 -0.128164 +v 0.945664 0.276552 -0.141700 +v 0.990011 0.108180 -0.149990 +v 1.004945 -0.065468 -0.152782 +v 0.990011 -0.239116 -0.149990 +v 0.945664 -0.407488 -0.141700 +v 0.873252 -0.565468 -0.128164 +v 0.774973 -0.708255 -0.109793 +v 0.653815 -0.831512 -0.087144 +v 0.513459 -0.931493 -0.060907 +v 0.358169 -1.005160 -0.031878 +v 0.192664 -1.050276 -0.000940 +v 0.195620 0.919340 0.030968 +v 0.363992 0.874225 0.030968 +v 0.521972 0.800558 0.030968 +v 0.664759 0.700577 0.030968 +v 0.788016 0.577320 0.030968 +v 0.887998 0.434532 0.030968 +v 0.961664 0.276552 0.030968 +v 1.006779 0.108180 0.030968 +v 1.021972 -0.065468 0.030968 +v 1.006780 -0.239116 0.030968 +v 0.961665 -0.407488 0.030968 +v 0.887998 -0.565468 0.030968 +v 0.788016 -0.708255 0.030968 +v 0.664760 -0.831512 0.030968 +v 0.521972 -0.931493 0.030968 +v 0.363992 -1.005160 0.030968 +v 0.195620 -1.050276 0.030968 +v 0.192663 0.919340 0.062875 +v 0.358169 0.874225 0.093814 +v 0.513458 0.800558 0.122842 +v 0.653815 0.700577 0.149080 +v 0.774973 0.577320 0.171728 +v 0.873252 0.434532 0.190099 +v 0.945664 0.276552 0.203636 +v 0.990011 0.108180 0.211926 +v 1.004945 -0.065468 0.214717 +v 0.990011 -0.239116 0.211926 +v 0.945665 -0.407488 0.203636 +v 0.873252 -0.565468 0.190099 +v 0.774973 -0.708255 0.171728 +v 0.653815 -0.831512 0.149080 +v 0.513459 -0.931493 0.122843 +v 0.358169 -1.005160 0.093814 +v 0.192664 -1.050276 0.062875 +v 0.183894 0.919340 0.093697 +v 0.340896 0.874225 0.154520 +v 0.488208 0.800558 0.211588 +v 0.621353 0.700577 0.263169 +v 0.736287 0.577320 0.307695 +v 0.829517 0.434532 0.343812 +v 0.898209 0.276552 0.370424 +v 0.940278 0.108180 0.386721 +v 0.954444 -0.065468 0.392209 +v 0.940278 -0.239116 0.386721 +v 0.898209 -0.407488 0.370424 +v 0.829517 -0.565468 0.343812 +v 0.736287 -0.708255 0.307695 +v 0.621354 -0.831512 0.263169 +v 0.488208 -0.931493 0.211589 +v 0.340897 -1.005160 0.154520 +v 0.183894 -1.050276 0.093697 +v 0.169611 0.919340 0.122382 +v 0.312763 0.874225 0.211018 +v 0.447081 0.800558 0.294184 +v 0.568481 0.700577 0.369352 +v 0.673276 0.577320 0.434238 +v 0.758282 0.434532 0.486871 +v 0.820915 0.276552 0.525652 +v 0.859272 0.108180 0.549402 +v 0.872189 -0.065468 0.557400 +v 0.859272 -0.239116 0.549402 +v 0.820915 -0.407488 0.525652 +v 0.758282 -0.565468 0.486871 +v 0.673276 -0.708255 0.434238 +v 0.568481 -0.831512 0.369352 +v 0.447081 -0.931493 0.294184 +v 0.312764 -1.005160 0.211018 +v 0.169611 -1.050276 0.122382 +v 0.150300 0.919340 0.147954 +v 0.274728 0.874225 0.261385 +v 0.391476 0.800558 0.367815 +v 0.496998 0.700577 0.464011 +v 0.588086 0.577320 0.547048 +v 0.661973 0.434532 0.614405 +v 0.716413 0.276552 0.664034 +v 0.749754 0.108180 0.694428 +v 0.760981 -0.065468 0.704663 +v 0.749754 -0.239116 0.694428 +v 0.716413 -0.407488 0.664034 +v 0.661973 -0.565468 0.614405 +v 0.588086 -0.708255 0.547048 +v 0.496998 -0.831512 0.464011 +v 0.391477 -0.931493 0.367815 +v 0.274728 -1.005160 0.261385 +v 0.150300 -1.050276 0.147954 +v 0.126618 0.919340 0.169542 +v 0.228085 0.874225 0.303905 +v 0.323289 0.800558 0.429976 +v 0.409338 0.700577 0.543923 +v 0.483617 0.577320 0.642284 +v 0.543869 0.434532 0.722071 +v 0.588263 0.276552 0.780858 +v 0.615451 0.108180 0.816861 +v 0.624607 -0.065468 0.828985 +v 0.615451 -0.239116 0.816861 +v 0.588263 -0.407488 0.780858 +v 0.543869 -0.565468 0.722071 +v 0.483617 -0.708255 0.642284 +v 0.409338 -0.831512 0.543923 +v 0.323290 -0.931493 0.429976 +v 0.228086 -1.005160 0.303906 +v 0.126619 -1.050276 0.169542 +v 0.099374 0.919340 0.186411 +v 0.174424 0.874225 0.337131 +v 0.244841 0.800558 0.478549 +v 0.308487 0.700577 0.606367 +v 0.363428 0.577320 0.716702 +v 0.407993 0.434532 0.806202 +v 0.440829 0.276552 0.872146 +v 0.460939 0.108180 0.912531 +v 0.467710 -0.065468 0.926131 +v 0.460939 -0.239116 0.912531 +v 0.440829 -0.407488 0.872146 +v 0.407993 -0.565468 0.806202 +v 0.363428 -0.708255 0.716702 +v 0.308487 -0.831512 0.606367 +v 0.244841 -0.931493 0.478549 +v 0.174424 -1.005160 0.337132 +v 0.099374 -1.050276 0.186411 +v 0.069493 0.919340 0.197987 +v 0.115570 0.874225 0.359931 +v 0.158804 0.800558 0.511880 +v 0.197879 0.700577 0.649217 +v 0.231610 0.577320 0.767769 +v 0.258972 0.434532 0.863933 +v 0.279131 0.276552 0.934788 +v 0.291478 0.108180 0.978181 +v 0.295635 -0.065468 0.992793 +v 0.291478 -0.239116 0.978181 +v 0.279131 -0.407488 0.934788 +v 0.258971 -0.565468 0.863933 +v 0.231610 -0.708255 0.767769 +v 0.197879 -0.831512 0.649217 +v 0.158804 -0.931493 0.511880 +v 0.115571 -1.005160 0.359932 +v 0.069493 -1.050276 0.197987 +v 0.037994 0.919340 0.203875 +v 0.053530 0.874225 0.371529 +v 0.068106 0.800558 0.528834 +v 0.081281 0.700577 0.671013 +v 0.092654 0.577320 0.793744 +v 0.101879 0.434532 0.893299 +v 0.108676 0.276552 0.966651 +v 0.112839 0.108180 1.011574 +v 0.114241 -0.065468 1.026701 +v 0.112839 -0.239116 1.011574 +v 0.108676 -0.407488 0.966651 +v 0.101879 -0.565468 0.893299 +v 0.092654 -0.708255 0.793744 +v 0.081281 -0.831512 0.671013 +v 0.068107 -0.931493 0.528835 +v 0.053530 -1.005160 0.371529 +v 0.037994 -1.050276 0.203875 +v 0.005950 0.919340 0.203875 +v -0.009585 0.874225 0.371529 +v -0.024162 0.800558 0.528834 +v -0.037337 0.700577 0.671013 +v -0.048709 0.577320 0.793744 +v -0.057934 0.434532 0.893299 +v -0.064731 0.276552 0.966651 +v -0.068894 0.108180 1.011574 +v -0.070296 -0.065468 1.026701 +v -0.068894 -0.239116 1.011574 +v -0.064731 -0.407488 0.966651 +v -0.057934 -0.565468 0.893299 +v -0.048709 -0.708255 0.793744 +v -0.037337 -0.831512 0.671013 +v -0.024162 -0.931493 0.528835 +v -0.009585 -1.005160 0.371529 +v 0.005950 -1.050276 0.203875 +v -0.025549 0.919340 0.197987 +v -0.071626 0.874225 0.359931 +v -0.114859 0.800558 0.511880 +v -0.153935 0.700577 0.649217 +v -0.187666 0.577320 0.767769 +v -0.215027 0.434532 0.863933 +v -0.235187 0.276552 0.934788 +v -0.247533 0.108180 0.978180 +v -0.251690 -0.065468 0.992793 +v -0.247533 -0.239116 0.978181 +v -0.235186 -0.407488 0.934788 +v -0.215027 -0.565468 0.863933 +v -0.187666 -0.708255 0.767769 +v -0.153935 -0.831512 0.649217 +v -0.114859 -0.931493 0.511880 +v -0.071626 -1.005160 0.359932 +v -0.025549 -1.050276 0.197987 +v -0.055429 0.919340 0.186411 +v -0.130479 0.874225 0.337131 +v -0.200897 0.800558 0.478549 +v -0.264543 0.700577 0.606367 +v -0.319483 0.577320 0.716702 +v -0.364048 0.434532 0.806202 +v -0.396884 0.276552 0.872146 +v -0.416994 0.108180 0.912531 +v -0.423766 -0.065468 0.926131 +v -0.416994 -0.239116 0.912531 +v -0.396884 -0.407488 0.872146 +v -0.364048 -0.565468 0.806202 +v -0.319483 -0.708255 0.716702 +v -0.264543 -0.831512 0.606367 +v -0.200897 -0.931493 0.478549 +v -0.130479 -1.005160 0.337132 +v -0.055429 -1.050276 0.186411 +v -0.082674 0.919340 0.169542 +v -0.184141 0.874225 0.303905 +v -0.279345 0.800558 0.429976 +v -0.365393 0.700577 0.543923 +v -0.439672 0.577320 0.642284 +v -0.499924 0.434532 0.722071 +v -0.544319 0.276552 0.780858 +v -0.571507 0.108180 0.816861 +v -0.580662 -0.065468 0.828984 +v -0.571507 -0.239116 0.816861 +v -0.544319 -0.407488 0.780858 +v -0.499925 -0.565468 0.722071 +v -0.439672 -0.708255 0.642284 +v -0.365393 -0.831512 0.543923 +v -0.279345 -0.931493 0.429976 +v -0.184141 -1.005160 0.303906 +v -0.082674 -1.050276 0.169542 +v -0.106355 0.919340 0.147954 +v -0.230783 0.874225 0.261385 +v -0.347532 0.800558 0.367815 +v -0.453053 0.700577 0.464011 +v -0.544141 0.577320 0.547048 +v -0.618028 0.434532 0.614405 +v -0.672468 0.276552 0.664034 +v -0.705809 0.108180 0.694428 +v -0.717036 -0.065468 0.704663 +v -0.705809 -0.239116 0.694428 +v -0.672468 -0.407488 0.664034 +v -0.618028 -0.565468 0.614405 +v -0.544141 -0.708255 0.547048 +v -0.453053 -0.831512 0.464011 +v -0.347532 -0.931493 0.367815 +v -0.230784 -1.005160 0.261385 +v -0.106355 -1.050276 0.147954 +v -0.125666 0.919340 0.122382 +v -0.268819 0.874225 0.211018 +v -0.403136 0.800558 0.294184 +v -0.524536 0.700577 0.369352 +v -0.629332 0.577320 0.434238 +v -0.714337 0.434532 0.486871 +v -0.776970 0.276552 0.525652 +v -0.815327 0.108180 0.549402 +v -0.828244 -0.065468 0.557400 +v -0.815328 -0.239116 0.549402 +v -0.776970 -0.407488 0.525652 +v -0.714337 -0.565468 0.486871 +v -0.629332 -0.708255 0.434238 +v -0.524536 -0.831512 0.369352 +v -0.403136 -0.931493 0.294184 +v -0.268819 -1.005160 0.211018 +v -0.125666 -1.050276 0.122382 +v -0.139950 0.919340 0.093697 +v -0.296952 0.874225 0.154520 +v -0.444263 0.800558 0.211588 +v -0.577409 0.700577 0.263169 +v -0.692343 0.577320 0.307695 +v -0.785572 0.434532 0.343812 +v -0.854264 0.276552 0.370424 +v -0.896333 0.108180 0.386721 +v -0.910499 -0.065468 0.392209 +v -0.896333 -0.239116 0.386721 +v -0.854264 -0.407488 0.370424 +v -0.785572 -0.565468 0.343812 +v -0.692343 -0.708255 0.307695 +v -0.577409 -0.831512 0.263169 +v -0.444264 -0.931493 0.211589 +v -0.296952 -1.005160 0.154520 +v -0.139950 -1.050276 0.093697 +v -0.148719 0.919340 0.062875 +v -0.314224 0.874225 0.093814 +v -0.469514 0.800558 0.122842 +v -0.609870 0.700577 0.149080 +v -0.731029 0.577320 0.171728 +v -0.829307 0.434532 0.190100 +v -0.901720 0.276552 0.203636 +v -0.946066 0.108180 0.211926 +v -0.961000 -0.065468 0.214717 +v -0.946067 -0.239116 0.211926 +v -0.901720 -0.407488 0.203636 +v -0.829307 -0.565468 0.190100 +v -0.731029 -0.708255 0.171728 +v -0.609870 -0.831512 0.149080 +v -0.469514 -0.931493 0.122843 +v -0.314224 -1.005160 0.093814 +v -0.148719 -1.050276 0.062876 +v -0.151676 0.919340 0.030968 +v -0.320047 0.874225 0.030968 +v -0.744072 0.577320 0.030968 +v -0.844053 0.434532 0.030968 +v -0.844053 -0.565468 0.030968 +v -0.478028 -0.931493 0.030968 +v -0.320048 -1.005160 0.030968 +v -0.547890 0.748213 -0.021838 +v -0.932350 -0.322306 -0.057463 +v -0.962012 0.021016 -0.060212 +v -0.678730 -0.767580 -0.033962 +v -0.962012 -0.151951 -0.060212 +v -0.932350 0.191370 -0.057463 +v -0.928504 -0.151951 -0.239466 +v -0.899852 0.191370 -0.231314 +v -0.230606 -1.026139 -0.040897 +v -0.760922 0.503899 -0.191785 +v -0.528484 0.748213 -0.125651 +v -0.528484 -0.879148 -0.125651 +v -0.230606 0.895203 -0.040897 +v -0.760922 -0.634834 -0.191785 +v -0.899852 -0.322306 -0.231314 +v -0.928504 0.021016 -0.239466 +v -0.843419 0.353967 -0.215257 +v -0.654868 0.636645 -0.161610 +v -0.385614 -0.966196 -0.085001 +v -0.385614 0.835261 -0.085001 +v -0.654869 -0.767580 -0.161610 +v -0.843419 -0.484903 -0.215257 +v -0.213100 -1.026139 -0.086085 +v -0.706661 0.503899 -0.331849 +v -0.490333 0.748213 -0.224130 +v -0.490333 -0.879148 -0.224130 +v -0.213100 0.895203 -0.086084 +v -0.706661 -0.634834 -0.331849 +v -0.835962 -0.322306 -0.396233 +v -0.862628 0.021016 -0.409511 +v -0.783441 0.353967 -0.370080 +v -0.607958 0.636645 -0.282700 +v -0.357365 -0.966196 -0.157920 +v -0.357365 0.835261 -0.157920 +v -0.607958 -0.767580 -0.282700 +v -0.783440 -0.484903 -0.370080 +v -0.862628 -0.151951 -0.409511 +v -0.835962 0.191370 -0.396233 +v -0.187589 0.895203 -0.127286 +v -0.627587 -0.634834 -0.459557 +v -0.742856 -0.322306 -0.546604 +v -0.766628 0.021016 -0.564556 +v -0.696035 0.353967 -0.511246 +v -0.539596 0.636645 -0.393109 +v -0.316198 -0.966196 -0.224407 +v -0.316198 0.835261 -0.224407 +v -0.539596 -0.767580 -0.393109 +v -0.696035 -0.484903 -0.511246 +v -0.766628 -0.151951 -0.564556 +v -0.742856 0.191370 -0.546604 +v -0.187590 -1.026139 -0.127286 +v -0.627587 0.503899 -0.459557 +v -0.434736 0.748213 -0.313922 +v -0.434736 -0.879148 -0.313923 +v -0.643774 0.021016 -0.699321 +v -0.584178 0.353967 -0.633947 +v -0.452110 0.636645 -0.489076 +v -0.263515 -0.966196 -0.282197 +v -0.263515 0.835261 -0.282197 +v -0.452110 -0.767580 -0.489076 +v -0.584178 -0.484903 -0.633947 +v -0.643774 -0.151951 -0.699321 +v -0.623705 0.191370 -0.677306 +v -0.154942 -1.026139 -0.163098 +v -0.526394 0.503899 -0.570561 +v -0.363586 0.748213 -0.391970 +v -0.363586 -0.879148 -0.391970 +v -0.154942 0.895203 -0.163098 +v -0.526394 -0.634834 -0.570561 +v -0.623705 -0.322306 -0.677306 +v -0.348480 0.636645 -0.567334 +v -0.201110 -0.966196 -0.329323 +v -0.201110 0.835261 -0.329323 +v -0.348480 -0.767580 -0.567334 +v -0.451679 -0.484903 -0.734005 +v -0.498248 -0.151951 -0.809217 +v -0.482566 0.191370 -0.783889 +v -0.116270 -1.026139 -0.192302 +v -0.406526 0.503899 -0.661081 +v -0.279307 0.748213 -0.455615 +v -0.279307 -0.879148 -0.455615 +v -0.116270 0.895203 -0.192302 +v -0.406526 -0.634834 -0.661081 +v -0.482566 -0.322306 -0.783890 +v -0.498248 0.021016 -0.809216 +v -0.451679 0.353967 -0.734005 +v -0.303051 -0.484903 -0.808013 +v -0.335007 -0.151951 -0.890501 +v -0.324246 0.191370 -0.862724 +v -0.072891 -1.026139 -0.213902 +v -0.272067 0.503899 -0.728034 +v -0.184768 0.748213 -0.502690 +v -0.184768 -0.879148 -0.502690 +v -0.072891 0.895203 -0.213902 +v -0.272067 -0.634834 -0.728034 +v -0.324246 -0.322306 -0.862724 +v -0.335007 0.021016 -0.890501 +v -0.303051 0.353967 -0.808013 +v -0.232235 0.636645 -0.625217 +v -0.131109 -0.966196 -0.364180 +v -0.131109 0.835261 -0.364180 +v -0.232235 -0.767580 -0.625217 +v -0.154135 0.191370 -0.911124 +v -0.026281 -1.026139 -0.227164 +v -0.127594 0.503899 -0.769140 +v -0.083188 0.748213 -0.531592 +v -0.083188 -0.879148 -0.531592 +v -0.026281 0.895203 -0.227164 +v -0.127594 -0.634834 -0.769140 +v -0.154135 -0.322306 -0.911124 +v -0.159609 0.021016 -0.940406 +v -0.143354 0.353967 -0.853451 +v -0.107333 0.636645 -0.660755 +v -0.055894 -0.966196 -0.385580 +v -0.055894 0.835261 -0.385580 +v -0.107333 -0.767581 -0.660755 +v -0.143354 -0.484903 -0.853451 +v -0.159609 -0.151951 -0.940406 +v 0.021972 0.748213 -0.541336 +v 0.021972 -0.879148 -0.541336 +v 0.021972 0.895203 -0.231635 +v 0.021972 -0.634834 -0.782999 +v 0.021972 -0.322306 -0.927443 +v 0.021972 0.021016 -0.957232 +v 0.021972 0.353967 -0.868771 +v 0.021972 0.636645 -0.672736 +v 0.021972 -0.966196 -0.392796 +v 0.021972 0.835261 -0.392796 +v 0.021972 -0.767581 -0.672737 +v 0.021972 -0.484903 -0.868771 +v 0.021972 -0.151951 -0.957232 +v 0.021972 0.191370 -0.927443 +v 0.021972 -1.026139 -0.231636 +v 0.021972 0.503899 -0.782999 +v 0.198080 -0.322306 -0.911124 +v 0.203553 0.021016 -0.940406 +v 0.187299 0.353967 -0.853451 +v 0.151278 0.636645 -0.660755 +v 0.099839 -0.966196 -0.385580 +v 0.099839 0.835261 -0.385580 +v 0.151278 -0.767580 -0.660755 +v 0.187299 -0.484903 -0.853451 +v 0.203553 -0.151951 -0.940406 +v 0.198080 0.191370 -0.911124 +v 0.070225 -1.026139 -0.227164 +v 0.171538 0.503899 -0.769140 +v 0.127133 0.748213 -0.531592 +v 0.127133 -0.879148 -0.531592 +v 0.070225 0.895203 -0.227164 +v 0.171538 -0.634834 -0.769140 +v 0.346995 0.353967 -0.808013 +v 0.276180 0.636645 -0.625217 +v 0.175053 -0.966196 -0.364180 +v 0.175053 0.835261 -0.364180 +v 0.276180 -0.767580 -0.625217 +v 0.346995 -0.484903 -0.808013 +v 0.378951 -0.151951 -0.890501 +v 0.368190 0.191370 -0.862724 +v 0.116835 -1.026139 -0.213903 +v 0.316011 0.503899 -0.728034 +v 0.228712 0.748213 -0.502690 +v 0.228712 -0.879148 -0.502690 +v 0.116835 0.895203 -0.213902 +v 0.316011 -0.634834 -0.728034 +v 0.368190 -0.322306 -0.862724 +v 0.378951 0.021016 -0.890501 +v 0.245055 0.835261 -0.329323 +v 0.392425 -0.767580 -0.567334 +v 0.495624 -0.484903 -0.734005 +v 0.542192 -0.151951 -0.809217 +v 0.526510 0.191370 -0.783889 +v 0.160215 -1.026139 -0.192302 +v 0.450471 0.503899 -0.661081 +v 0.323251 0.748213 -0.455615 +v 0.323252 -0.879148 -0.455615 +v 0.160215 0.895203 -0.192302 +v 0.450471 -0.634834 -0.661081 +v 0.526510 -0.322306 -0.783890 +v 0.542192 0.021016 -0.809217 +v 0.495623 0.353967 -0.734005 +v 0.392425 0.636645 -0.567334 +v 0.245055 -0.966196 -0.329323 +v 0.687718 -0.151951 -0.699321 +v 0.667649 0.191370 -0.677306 +v 0.198887 -1.026139 -0.163098 +v 0.570338 0.503899 -0.570561 +v 0.407531 0.748213 -0.391970 +v 0.407531 -0.879148 -0.391970 +v 0.198887 0.895203 -0.163098 +v 0.570338 -0.634834 -0.570561 +v 0.667650 -0.322306 -0.677306 +v 0.687718 0.021016 -0.699321 +v 0.628122 0.353967 -0.633947 +v 0.496055 0.636645 -0.489076 +v 0.307460 -0.966196 -0.282197 +v 0.307460 0.835261 -0.282197 +v 0.496055 -0.767580 -0.489076 +v 0.628122 -0.484903 -0.633947 +v 0.231534 -1.026139 -0.127286 +v 0.671532 0.503899 -0.459557 +v 0.478681 0.748213 -0.313922 +v 0.478681 -0.879148 -0.313923 +v 0.231534 0.895203 -0.127286 +v 0.671532 -0.634834 -0.459557 +v 0.786801 -0.322306 -0.546604 +v 0.810573 0.021016 -0.564556 +v 0.739979 0.353967 -0.511246 +v 0.583540 0.636645 -0.393109 +v 0.360143 -0.966196 -0.224407 +v 0.360143 0.835261 -0.224407 +v 0.583540 -0.767580 -0.393109 +v 0.739979 -0.484903 -0.511246 +v 0.810573 -0.151951 -0.564556 +v 0.786800 0.191370 -0.546604 +v 0.257045 0.895203 -0.086085 +v 0.750606 -0.634834 -0.331849 +v 0.879906 -0.322306 -0.396233 +v 0.906572 0.021016 -0.409511 +v 0.827385 0.353967 -0.370080 +v 0.651902 0.636645 -0.282700 +v 0.401310 -0.966196 -0.157920 +v 0.401310 0.835261 -0.157920 +v 0.651903 -0.767580 -0.282700 +v 0.827385 -0.484903 -0.370080 +v 0.906572 -0.151951 -0.409511 +v 0.879906 0.191370 -0.396233 +v 0.257045 -1.026139 -0.086085 +v 0.750606 0.503899 -0.331849 +v 0.534278 0.748213 -0.224130 +v 0.534278 -0.879148 -0.224130 +v 0.972448 0.021016 -0.239466 +v 0.887364 0.353967 -0.215257 +v 0.698813 0.636645 -0.161610 +v 0.429559 -0.966196 -0.085001 +v 0.429559 0.835261 -0.085001 +v 0.698813 -0.767580 -0.161610 +v 0.887364 -0.484903 -0.215258 +v 0.972448 -0.151951 -0.239466 +v 0.943796 0.191370 -0.231314 +v 0.274551 -1.026139 -0.040897 +v 0.804867 0.503899 -0.191785 +v 0.572429 0.748213 -0.125651 +v 0.572429 -0.879148 -0.125651 +v 0.274550 0.895203 -0.040897 +v 0.804867 -0.634834 -0.191785 +v 0.943796 -0.322306 -0.231314 +v 0.722674 0.636645 -0.033962 +v 0.443928 -0.966196 -0.008132 +v 0.443928 0.835261 -0.008132 +v 0.722675 -0.767580 -0.033962 +v 0.917873 -0.484903 -0.052050 +v 1.005957 -0.151951 -0.060212 +v 0.976295 0.191370 -0.057463 +v 0.283455 -1.026139 0.006738 +v 0.832467 0.503899 -0.044136 +v 0.591835 0.748213 -0.021838 +v 0.591835 -0.879148 -0.021838 +v 0.283455 0.895203 0.006738 +v 0.832467 -0.634834 -0.044136 +v 0.976295 -0.322306 -0.057463 +v 1.005956 0.021016 -0.060212 +v 0.917873 0.353967 -0.052050 +v 0.917873 -0.484903 0.113985 +v 1.005957 -0.151951 0.122147 +v 0.976295 0.191370 0.119399 +v 0.283455 -1.026139 0.055198 +v 0.832467 0.503899 0.106071 +v 0.591835 0.748213 0.083773 +v 0.591835 -0.879148 0.083773 +v 0.283455 0.895203 0.055198 +v 0.832467 -0.634834 0.106071 +v 0.976295 -0.322306 0.119399 +v 1.005956 0.021016 0.122147 +v 0.917873 0.353967 0.113985 +v 0.722675 0.636645 0.095897 +v 0.443928 -0.966196 0.070068 +v 0.443928 0.835261 0.070068 +v 0.722675 -0.767580 0.095897 +v 0.943796 0.191370 0.293249 +v 0.274551 -1.026139 0.102833 +v 0.804867 0.503899 0.253720 +v 0.572429 0.748213 0.187586 +v 0.572429 -0.879148 0.187586 +v 0.274551 0.895203 0.102832 +v 0.804867 -0.634834 0.253720 +v 0.943796 -0.322306 0.293249 +v 0.972448 0.021016 0.301401 +v 0.887364 0.353967 0.277193 +v 0.698813 0.636645 0.223546 +v 0.429559 -0.966196 0.146936 +v 0.429559 0.835261 0.146936 +v 0.698813 -0.767580 0.223546 +v 0.887364 -0.484903 0.277193 +v 0.972448 -0.151951 0.301401 +v 0.534278 0.748213 0.286066 +v 0.534278 -0.879148 0.286066 +v 0.257045 0.895203 0.148020 +v 0.750606 -0.634834 0.393784 +v 0.879906 -0.322306 0.458168 +v 0.906572 0.021016 0.471446 +v 0.827385 0.353967 0.432016 +v 0.651902 0.636645 0.344636 +v 0.401310 -0.966196 0.219855 +v 0.401310 0.835261 0.219855 +v 0.651902 -0.767580 0.344636 +v 0.827385 -0.484903 0.432016 +v 0.906572 -0.151951 0.471446 +v 0.879906 0.191370 0.458168 +v 0.257045 -1.026139 0.148020 +v 0.750606 0.503899 0.393784 +v 0.786801 -0.322306 0.608539 +v 0.810573 0.021016 0.626491 +v 0.739979 0.353967 0.573181 +v 0.583540 0.636645 0.455044 +v 0.360143 -0.966196 0.286342 +v 0.360143 0.835261 0.286342 +v 0.583540 -0.767580 0.455044 +v 0.739979 -0.484903 0.573181 +v 0.810573 -0.151951 0.626491 +v 0.786801 0.191370 0.608539 +v 0.231534 -1.026139 0.189222 +v 0.671532 0.503899 0.521492 +v 0.478681 0.748213 0.375858 +v 0.478681 -0.879148 0.375858 +v 0.231534 0.895203 0.189221 +v 0.671532 -0.634834 0.521492 +v 0.628122 0.353967 0.695882 +v 0.496055 0.636645 0.551011 +v 0.307460 -0.966196 0.344133 +v 0.307460 0.835261 0.344133 +v 0.496055 -0.767580 0.551011 +v 0.628122 -0.484903 0.695882 +v 0.687718 -0.151951 0.761256 +v 0.667649 0.191370 0.739242 +v 0.198887 -1.026139 0.225034 +v 0.570338 0.503899 0.632497 +v 0.407531 0.748213 0.453905 +v 0.407531 -0.879148 0.453905 +v 0.198887 0.895203 0.225034 +v 0.570338 -0.634834 0.632497 +v 0.667650 -0.322306 0.739242 +v 0.687718 0.021016 0.761256 +v 0.245055 0.835261 0.391259 +v 0.392425 -0.767581 0.629269 +v 0.495624 -0.484903 0.795941 +v 0.542192 -0.151951 0.871152 +v 0.526510 0.191370 0.845825 +v 0.160215 -1.026139 0.254238 +v 0.450471 0.503899 0.723016 +v 0.323251 0.748213 0.517550 +v 0.323252 -0.879148 0.517550 +v 0.160215 0.895203 0.254237 +v 0.450471 -0.634834 0.723017 +v 0.526511 -0.322306 0.845825 +v 0.542192 0.021016 0.871152 +v 0.495624 0.353967 0.795941 +v 0.392425 0.636645 0.629269 +v 0.245055 -0.966196 0.391259 +v 0.378951 -0.151951 0.952436 +v 0.368190 0.191370 0.924659 +v 0.116836 -1.026139 0.275838 +v 0.316011 0.503899 0.789969 +v 0.228712 0.748213 0.564625 +v 0.228712 -0.879148 0.564625 +v 0.116835 0.895203 0.275838 +v 0.316011 -0.634834 0.789969 +v 0.368190 -0.322306 0.924659 +v 0.378951 0.021016 0.952436 +v 0.346995 0.353967 0.869949 +v 0.276180 0.636645 0.687152 +v 0.175053 -0.966196 0.426116 +v 0.175053 0.835261 0.426115 +v 0.276180 -0.767581 0.687152 +v 0.346995 -0.484903 0.869949 +v 0.070226 -1.026139 0.289100 +v 0.171538 0.503899 0.831075 +v 0.127133 0.748213 0.593527 +v 0.127133 -0.879148 0.593527 +v 0.070225 0.895203 0.289099 +v 0.171538 -0.634834 0.831076 +v 0.198080 -0.322306 0.973059 +v 0.203553 0.021016 1.002341 +v 0.187299 0.353967 0.915386 +v 0.151278 0.636645 0.722690 +v 0.099839 -0.966196 0.447516 +v 0.099839 0.835261 0.447516 +v 0.151278 -0.767580 0.722690 +v 0.187299 -0.484903 0.915387 +v 0.203554 -0.151951 1.002341 +v 0.198080 0.191370 0.973060 +v 0.021972 0.895203 0.293571 +v 0.021972 -0.634834 0.844935 +v 0.021972 -0.322306 0.989378 +v 0.021972 0.021016 1.019167 +v 0.021972 0.353967 0.930706 +v 0.021972 0.636645 0.734672 +v 0.021972 -0.966196 0.454731 +v 0.021972 0.835261 0.454731 +v 0.021972 -0.767581 0.734672 +v 0.021972 -0.484903 0.930706 +v 0.021972 -0.151951 1.019167 +v 0.021972 0.191370 0.989378 +v 0.021972 -1.026139 0.293571 +v 0.021972 0.503899 0.844935 +v 0.021972 0.748213 0.603271 +v 0.021972 -0.879148 0.603272 +v -0.159609 0.021016 1.002341 +v -0.143354 0.353967 0.915386 +v -0.107333 0.636645 0.722690 +v -0.055894 -0.966196 0.447516 +v -0.055894 0.835261 0.447516 +v -0.107333 -0.767580 0.722690 +v -0.143354 -0.484903 0.915387 +v -0.159609 -0.151951 1.002341 +v -0.154135 0.191370 0.973060 +v -0.026281 -1.026139 0.289100 +v -0.127594 0.503899 0.831075 +v -0.083188 0.748213 0.593527 +v -0.083188 -0.879148 0.593527 +v -0.026281 0.895203 0.289099 +v -0.127594 -0.634834 0.831076 +v -0.154135 -0.322306 0.973060 +v -0.232235 0.636645 0.687152 +v -0.131109 -0.966196 0.426116 +v -0.131109 0.835261 0.426115 +v -0.232235 -0.767581 0.687152 +v -0.303051 -0.484903 0.869949 +v -0.335006 -0.151951 0.952436 +v -0.324245 0.191370 0.924659 +v -0.072891 -1.026139 0.275838 +v -0.272066 0.503899 0.789969 +v -0.184768 0.748213 0.564625 +v -0.184768 -0.879148 0.564625 +v -0.072891 0.895203 0.275838 +v -0.272067 -0.634834 0.789969 +v -0.324245 -0.322306 0.924659 +v -0.335006 0.021016 0.952436 +v -0.303051 0.353967 0.869949 +v -0.348480 -0.767580 0.629269 +v -0.451679 -0.484903 0.795941 +v -0.498248 -0.151951 0.871152 +v -0.482566 0.191370 0.845825 +v -0.406526 0.503899 0.723016 +v -0.116271 -1.026139 0.254238 +v -0.279307 0.748213 0.517550 +v -0.279307 -0.879148 0.517550 +v -0.116270 0.895203 0.254237 +v -0.406526 -0.634834 0.723017 +v -0.482566 -0.322306 0.845825 +v -0.498248 0.021016 0.871152 +v -0.451679 0.353967 0.795941 +v -0.348480 0.636645 0.629269 +v -0.201110 -0.966196 0.391259 +v -0.201110 0.835261 0.391259 +v -0.643773 -0.151951 0.761256 +v -0.623705 0.191370 0.739242 +v -0.154942 -1.026139 0.225034 +v -0.526394 0.503899 0.632497 +v -0.363586 0.748213 0.453905 +v -0.363586 -0.879148 0.453905 +v -0.154942 0.895203 0.225034 +v -0.526394 -0.634834 0.632497 +v -0.623705 -0.322306 0.739242 +v -0.643773 0.021016 0.761256 +v -0.584177 0.353967 0.695882 +v -0.452110 0.636645 0.551011 +v -0.263515 -0.966196 0.344133 +v -0.263515 0.835261 0.344133 +v -0.452110 -0.767580 0.551011 +v -0.584178 -0.484903 0.695882 +v -0.187590 -1.026139 0.189222 +v -0.627587 0.503899 0.521493 +v -0.434736 0.748213 0.375858 +v -0.434736 -0.879148 0.375858 +v -0.187589 0.895203 0.189221 +v -0.627587 -0.634834 0.521493 +v -0.742856 -0.322306 0.608539 +v -0.766628 0.021016 0.626491 +v -0.696034 0.353967 0.573181 +v -0.539596 0.636645 0.455044 +v -0.316198 -0.966196 0.286342 +v -0.316198 0.835261 0.286342 +v -0.539596 -0.767580 0.455044 +v -0.696034 -0.484903 0.573181 +v -0.766628 -0.151951 0.626491 +v -0.742856 0.191370 0.608539 +v -0.213100 0.895203 0.148020 +v -0.706661 -0.634834 0.393784 +v -0.835962 -0.322306 0.458168 +v -0.862628 0.021016 0.471446 +v -0.783440 0.353967 0.432016 +v -0.607958 0.636645 0.344636 +v -0.357365 -0.966196 0.219855 +v -0.357365 0.835261 0.219855 +v -0.607958 -0.767581 0.344636 +v -0.783441 -0.484903 0.432016 +v -0.862628 -0.151951 0.471446 +v -0.835961 0.191370 0.458168 +v -0.213101 -1.026139 0.148020 +v -0.706661 0.503899 0.393784 +v -0.490333 0.748213 0.286065 +v -0.490333 -0.879148 0.286066 +v -0.928503 0.021016 0.301401 +v -0.843419 0.353967 0.277193 +v -0.654868 0.636645 0.223545 +v -0.385614 -0.966196 0.146936 +v -0.385614 0.835261 0.146936 +v -0.654868 -0.767581 0.223546 +v -0.843419 -0.484903 0.277193 +v -0.928503 -0.151951 0.301401 +v -0.899851 0.191370 0.293249 +v -0.230606 -1.026139 0.102833 +v -0.760922 0.503899 0.253720 +v -0.528484 0.748213 0.187586 +v -0.528484 -0.879148 0.187586 +v -0.230606 0.895203 0.102832 +v -0.760922 -0.634834 0.253720 +v -0.899851 -0.322306 0.293249 +v -0.399984 -0.966196 0.070068 +v -0.788522 0.503899 0.106071 +v -0.239510 0.895203 0.055198 +v -0.239511 -1.026139 0.006738 +v -0.788522 0.503899 -0.044136 +v -0.547890 -0.879148 -0.021838 +v -0.239510 0.895203 0.006738 +v -0.788522 -0.634834 -0.044136 +v -0.873928 0.353967 -0.052050 +v -0.678730 0.636645 -0.033962 +v -0.399984 -0.966196 -0.008132 +v -0.399983 0.835261 -0.008132 +v -0.873928 -0.484903 -0.052050 +v -0.678730 0.636645 0.095897 +v -0.399983 0.835261 0.070068 +v -0.678730 -0.767581 0.095897 +v -0.873928 -0.484903 0.113985 +v -0.962012 -0.151951 0.122147 +v -0.932350 0.191370 0.119399 +v -0.239511 -1.026139 0.055198 +v -0.547890 0.748213 0.083773 +v -0.547890 -0.879148 0.083773 +v -0.788523 -0.634834 0.106071 +v -0.932350 -0.322306 0.119399 +v -0.962012 0.021016 0.122147 +v -0.873928 0.353967 0.113985 +vt 0.500000 0.000000 +vt 1.000000 0.000000 +vt 0.752957 0.500000 +vt 0.749020 0.500000 +vt 0.759343 0.500000 +vt 0.750980 0.500000 +vt 0.747043 0.500000 +vt 0.304651 0.382553 +vt 0.362991 0.255733 +vt 0.344087 0.332663 +vt 0.742902 0.500000 +vt 0.738227 0.500000 +vt 0.761773 0.500000 +vt 0.188149 0.183248 +vt 0.218721 0.339833 +vt 0.191416 0.266877 +vt 0.757099 0.500000 +vt 0.745016 0.500000 +vt 0.740657 0.500000 +vt 0.418729 0.134130 +vt 0.405742 0.220395 +vt 0.159463 0.036328 +vt 0.155308 0.122996 +vt 0.754984 0.500000 +vt 0.315480 0.406203 +vt 0.384321 0.302314 +vt 0.358736 0.371251 +vt 0.738226 0.500000 +vt 0.761774 0.500000 +vt 0.159750 0.211306 +vt 0.204303 0.354078 +vt 0.170706 0.292320 +vt 0.757098 0.500000 +vt 0.449911 0.202226 +vt 0.429382 0.282665 +vt 0.117947 0.077347 +vt 0.121888 0.164053 +vt 0.134433 0.249241 +vt 0.191449 0.373338 +vt 0.152705 0.324880 +vt 0.400988 0.355821 +vt 0.474277 0.280448 +vt 0.446868 0.352420 +vt 0.080936 0.132803 +vt 0.092840 0.216596 +vt 0.759344 0.500000 +vt 0.747042 0.500000 +vt 0.323942 0.433369 +vt 0.369572 0.414478 +vt 0.745016 0.499999 +vt 0.412425 0.414432 +vt 0.490997 0.366132 +vt 0.457603 0.427285 +vt 0.049691 0.200808 +vt 0.113060 0.295759 +vt 0.069152 0.278835 +vt 0.329749 0.463127 +vt 0.376224 0.460871 +vt 0.180598 0.396956 +vt 0.138026 0.363449 +vt 0.418243 0.476152 +vt 0.499502 0.456361 +vt 0.461222 0.504710 +vt 0.025276 0.279048 +vt 0.096359 0.349278 +vt 0.051632 0.348650 +vt 0.754984 0.499999 +vt 0.332703 0.494463 +vt 0.378467 0.508850 +vt 0.742901 0.500000 +vt 0.172119 0.424128 +vt 0.127168 0.406713 +vt 0.332703 0.526310 +vt 0.418243 0.538879 +vt 0.376224 0.556783 +vt 0.084899 0.407975 +vt 0.166300 0.453929 +vt 0.120503 0.453199 +vt 0.499502 0.548061 +vt 0.457603 0.582058 +vt 0.008522 0.364857 +vt 0.040875 0.423665 +vt 0.329749 0.557584 +vt 0.412425 0.600476 +vt 0.369572 0.603035 +vt 0.079070 0.469850 +vt 0.163341 0.485344 +vt 0.118255 0.501324 +vt 0.752958 0.500000 +vt 0.490997 0.638109 +vt 0.446868 0.656696 +vt 0.000000 0.455312 +vt 0.037248 0.501324 +vt 0.079070 0.532798 +vt 0.163341 0.517303 +vt 0.120503 0.549449 +vt 0.400988 0.658846 +vt 0.474277 0.723441 +vt 0.429382 0.726082 +vt 0.000000 0.547335 +vt 0.040875 0.578983 +vt 0.323942 0.587219 +vt 0.358736 0.646033 +vt 0.740656 0.500000 +vt 0.384321 0.712001 +vt 0.449911 0.801148 +vt 0.405742 0.787853 +vt 0.008522 0.637791 +vt 0.084899 0.594673 +vt 0.051632 0.653998 +vt 0.315480 0.614206 +vt 0.344087 0.684312 +vt 0.166300 0.548719 +vt 0.127168 0.595935 +vt 0.362991 0.758131 +vt 0.418729 0.868586 +vt 0.376753 0.839905 +vt 0.025276 0.723600 +vt 0.096359 0.653370 +vt 0.069152 0.723813 +vt 0.304651 0.637627 +vt 0.326122 0.716569 +vt 0.172119 0.578520 +vt 0.138026 0.639199 +vt 0.049691 0.801839 +vt 0.113060 0.706889 +vt 0.092840 0.786052 +vt 0.291823 0.656684 +vt 0.337725 0.795665 +vt 0.305454 0.741704 +vt 0.180598 0.605692 +vt 0.152705 0.677768 +vt 0.381793 0.923458 +vt 0.343400 0.880466 +vt 0.277434 0.670727 +vt 0.309383 0.823326 +vt 0.282786 0.758863 +vt 0.134433 0.753407 +vt 0.191449 0.629310 +vt 0.170706 0.710328 +vt 0.340360 0.963894 +vt 0.306821 0.908155 +vt 0.080936 0.869845 +vt 0.121888 0.838595 +vt 0.261973 0.679279 +vt 0.278931 0.840170 +vt 0.258891 0.767460 +vt 0.159750 0.791341 +vt 0.204303 0.648570 +vt 0.191416 0.735771 +vt 0.740657 0.500001 +vt 0.295842 0.988519 +vt 0.268261 0.922029 +vt 0.117947 0.925301 +vt 0.155308 0.879652 +vt 0.188149 0.819399 +vt 0.218721 0.662815 +vt 0.214129 0.753230 +vt 0.247405 0.845625 +vt 0.249754 0.996494 +vt 0.229033 0.921615 +vt 0.159463 0.966320 +vt 0.191961 0.907826 +vt 0.245966 0.682049 +vt 0.234581 0.767203 +vt 0.215879 0.839504 +vt 0.203666 0.987546 +vt 0.190473 0.906927 +vt 0.204071 0.991503 +vt 0.218662 0.836626 +vt 0.230598 0.922157 +vt 0.229960 0.678941 +vt 0.210686 0.758102 +vt 0.234214 0.671561 +vt 0.238073 0.762111 +vt 0.185427 0.822017 +vt 0.159148 0.961981 +vt 0.153895 0.878466 +vt 0.250252 0.999994 +vt 0.250252 0.842434 +vt 0.269905 0.922157 +vt 0.754985 0.500000 +vt 0.214499 0.670063 +vt 0.188018 0.740464 +vt 0.250252 0.674510 +vt 0.262431 0.762111 +vt 0.200110 0.655716 +vt 0.157085 0.793758 +vt 0.167350 0.714893 +vt 0.281841 0.836626 +vt 0.266290 0.671561 +vt 0.286375 0.753230 +vt 0.117715 0.920669 +vt 0.120542 0.837200 +vt 0.296433 0.991503 +vt 0.308543 0.907826 +vt 0.187282 0.636388 +vt 0.131819 0.755690 +vt 0.149385 0.682257 +vt 0.312355 0.819400 +vt 0.281783 0.662815 +vt 0.309088 0.735771 +vt 0.080779 0.865018 +vt 0.091553 0.784536 +vt 0.341041 0.966320 +vt 0.345196 0.879652 +vt 0.340754 0.791342 +vt 0.296201 0.648570 +vt 0.329798 0.710328 +vt 0.745015 0.500000 +vt 0.110489 0.709110 +vt 0.049597 0.796922 +vt 0.067912 0.722266 +vt 0.382557 0.925301 +vt 0.378616 0.838595 +vt 0.176453 0.612738 +vt 0.134736 0.643668 +vt 0.093822 0.655603 +vt 0.025231 0.718700 +vt 0.050427 0.652511 +vt 0.419568 0.869845 +vt 0.366071 0.753407 +vt 0.407664 0.786052 +vt 0.167990 0.585572 +vt 0.123900 0.600442 +vt 0.309055 0.629310 +vt 0.347799 0.677768 +vt 0.082385 0.596991 +vt 0.008511 0.633016 +vt 0.039692 0.577646 +vt 0.450813 0.801840 +vt 0.387444 0.706889 +vt 0.431352 0.723813 +vt 0.162184 0.555815 +vt 0.117248 0.554049 +vt 0.738227 0.500001 +vt 0.319906 0.605692 +vt 0.362478 0.639199 +vt 0.475228 0.723600 +vt 0.404145 0.653370 +vt 0.448872 0.653998 +vt 0.159230 0.524479 +vt 0.076567 0.535271 +vt 0.115005 0.506069 +vt 0.328385 0.578520 +vt 0.373335 0.595935 +vt 0.000006 0.542787 +vt 0.036072 0.500221 +vt 0.159230 0.492631 +vt 0.076567 0.472545 +vt 0.117248 0.458137 +vt 0.415605 0.594673 +vt 0.334204 0.548719 +vt 0.380001 0.549449 +vt 0.000006 0.451087 +vt 0.039692 0.422873 +vt 0.491982 0.637792 +vt 0.459629 0.578983 +vt 0.162184 0.461358 +vt 0.082385 0.410948 +vt 0.123900 0.411884 +vt 0.421434 0.532798 +vt 0.337163 0.517304 +vt 0.382249 0.501324 +vt 0.008511 0.361039 +vt 0.050427 0.348235 +vt 0.500504 0.547336 +vt 0.463256 0.501324 +vt 0.421434 0.469850 +vt 0.337163 0.485344 +vt 0.380002 0.453199 +vt 0.093822 0.352578 +vt 0.025231 0.275708 +vt 0.067912 0.278849 +vt 0.500504 0.455313 +vt 0.459629 0.423665 +vt 0.167990 0.431723 +vt 0.134736 0.368886 +vt 0.110489 0.299423 +vt 0.049597 0.198000 +vt 0.091552 0.217078 +vt 0.491982 0.364857 +vt 0.415605 0.407975 +vt 0.448872 0.348650 +vt 0.176453 0.404735 +vt 0.149385 0.330607 +vt 0.334204 0.453929 +vt 0.373336 0.406713 +vt 0.131819 0.253293 +vt 0.080779 0.130562 +vt 0.120542 0.165026 +vt 0.475228 0.279048 +vt 0.404145 0.349278 +vt 0.431352 0.278835 +vt 0.187282 0.381314 +vt 0.167350 0.298351 +vt 0.328385 0.424128 +vt 0.362478 0.363449 +vt 0.200110 0.362258 +vt 0.157085 0.215758 +vt 0.188018 0.273215 +vt 0.387444 0.295759 +vt 0.319906 0.396956 +vt 0.347799 0.324880 +vt 0.117715 0.075691 +vt 0.153894 0.124464 +vt 0.450813 0.200809 +vt 0.407664 0.216596 +vt 0.214499 0.348214 +vt 0.185427 0.188098 +vt 0.210686 0.256057 +vt 0.366071 0.249241 +vt 0.309055 0.373338 +vt 0.329798 0.292320 +vt 0.159148 0.035254 +vt 0.190473 0.096776 +vt 0.419568 0.132803 +vt 0.378616 0.164053 +vt 0.229960 0.339662 +vt 0.215879 0.171254 +vt 0.234581 0.247459 +vt 0.340754 0.211307 +vt 0.296201 0.354078 +vt 0.309088 0.266877 +vt 0.203666 0.010629 +vt 0.229033 0.082902 +vt 0.382557 0.077347 +vt 0.345196 0.122996 +vt 0.312355 0.183249 +vt 0.281783 0.339833 +vt 0.286375 0.249418 +vt 0.247405 0.165799 +vt 0.249754 0.002655 +vt 0.268261 0.083316 +vt 0.341041 0.036329 +vt 0.308543 0.094822 +vt 0.245966 0.336892 +vt 0.258891 0.247716 +vt 0.278931 0.171919 +vt 0.295842 0.011602 +vt 0.306821 0.098004 +vt 0.296433 0.011145 +vt 0.281841 0.166022 +vt 0.269906 0.080491 +vt 0.261973 0.340000 +vt 0.282786 0.256818 +vt 0.266290 0.331087 +vt 0.262431 0.240537 +vt 0.309383 0.189407 +vt 0.340360 0.037167 +vt 0.343400 0.126465 +vt 0.250252 0.160214 +vt 0.250252 0.328138 +vt 0.238073 0.240537 +vt 0.291823 0.363226 +vt 0.337725 0.217665 +vt 0.326122 0.300027 +vt 0.218663 0.166022 +vt 0.234214 0.331087 +vt 0.214129 0.249418 +vt 0.245482 0.510737 +vt 0.381793 0.078478 +vt 0.376753 0.167731 +vt 0.204071 0.011145 +vt 0.191961 0.094822 +vt 0.250252 0.501324 +vt 0.277434 0.348879 +vt 0.250252 0.002655 +vt 0.230599 0.080491 +vt 0.305454 0.274455 +vt 1.000000 1.000000 +vt 0.500000 1.000000 +usemtl None +s off +f 7/1 6/2 582/3 +f 5/1 4/2 583/4 +f 9/1 8/2 584/5 +f 6/1 5/2 585/6 +f 4/1 3/2 586/7 +f 20/1 19/2 587/6 +f 18/1 17/2 588/7 +f 27/8 26/9 589/10 +f 16/1 15/2 590/11 +f 14/1 13/2 591/12 +f 25/1 24/2 592/13 +f 12/14 11/15 593/16 +f 23/1 22/2 594/17 +f 21/1 20/2 595/3 +f 19/1 18/2 596/4 +f 17/1 16/2 597/18 +f 15/1 14/2 598/19 +f 26/9 25/20 599/21 +f 13/22 12/14 600/23 +f 24/1 23/2 601/5 +f 22/1 21/2 602/24 +f 45/25 44/26 603/27 +f 34/1 33/2 604/11 +f 32/1 31/2 605/28 +f 43/1 42/2 606/29 +f 30/30 29/31 607/32 +f 41/1 40/2 608/33 +f 39/1 38/2 609/3 +f 37/1 36/2 610/4 +f 35/1 34/2 611/18 +f 33/1 32/2 612/19 +f 44/26 43/34 613/35 +f 31/36 30/30 614/37 +f 42/1 41/2 615/5 +f 40/1 39/2 616/24 +f 38/1 37/2 617/6 +f 36/1 35/2 618/7 +f 47/38 46/39 619/40 +f 58/1 57/2 620/33 +f 56/1 55/2 621/3 +f 54/1 53/2 622/4 +f 52/1 51/2 623/18 +f 50/1 49/2 624/19 +f 61/41 60/42 625/43 +f 48/44 47/38 626/45 +f 59/1 58/2 627/46 +f 57/1 56/2 628/24 +f 55/1 54/2 629/6 +f 53/1 52/2 630/47 +f 62/48 61/41 631/49 +f 51/1 50/2 632/11 +f 49/1 48/2 633/28 +f 60/1 59/2 634/13 +f 71/1 70/2 635/4 +f 69/1 68/2 636/50 +f 67/1 66/2 637/19 +f 78/51 77/52 638/53 +f 65/54 64/55 639/56 +f 76/1 75/2 640/5 +f 74/1 73/2 641/24 +f 72/1 71/2 642/6 +f 70/1 69/2 643/47 +f 79/57 78/51 644/58 +f 68/1 67/2 645/11 +f 66/1 65/2 646/12 +f 77/1 76/2 647/13 +f 64/55 63/59 648/60 +f 75/1 74/2 649/33 +f 73/1 72/2 650/3 +f 84/1 83/2 651/19 +f 95/61 94/62 652/63 +f 82/64 81/65 653/66 +f 93/1 92/2 654/5 +f 91/1 90/2 655/67 +f 89/1 88/2 656/6 +f 87/1 86/2 657/7 +f 96/68 95/61 658/69 +f 85/1 84/2 659/70 +f 83/1 82/2 660/12 +f 94/1 93/2 661/13 +f 81/65 80/71 662/72 +f 92/1 91/2 663/33 +f 90/1 89/2 664/3 +f 88/1 87/2 665/4 +f 86/1 85/2 666/18 +f 108/1 107/2 667/24 +f 106/1 105/2 668/6 +f 104/1 103/2 669/7 +f 113/73 112/74 670/75 +f 102/1 101/2 671/11 +f 100/1 99/2 672/28 +f 111/1 110/2 673/13 +f 98/76 97/77 674/78 +f 109/1 108/2 675/33 +f 107/1 106/2 676/3 +f 105/1 104/2 677/4 +f 103/1 102/2 678/18 +f 101/1 100/2 679/19 +f 112/74 111/79 680/80 +f 99/81 98/76 681/82 +f 110/1 109/2 682/5 +f 121/1 120/2 683/7 +f 130/83 129/84 684/85 +f 119/1 118/2 685/11 +f 117/1 116/2 686/28 +f 128/1 127/2 687/29 +f 115/86 114/87 688/88 +f 126/1 125/2 689/33 +f 124/1 123/2 690/89 +f 122/1 121/2 691/4 +f 120/1 119/2 692/18 +f 118/1 117/2 693/19 +f 129/84 128/90 694/91 +f 116/92 115/86 695/93 +f 127/1 126/2 696/5 +f 125/1 124/2 697/24 +f 123/1 122/2 698/6 +f 134/1 133/2 699/12 +f 145/1 144/2 700/13 +f 132/94 131/95 701/96 +f 143/1 142/2 702/33 +f 141/1 140/2 703/3 +f 139/1 138/2 704/4 +f 137/1 136/2 705/18 +f 135/1 134/2 706/19 +f 146/97 145/98 707/99 +f 133/100 132/94 708/101 +f 144/1 143/2 709/5 +f 142/1 141/2 710/24 +f 140/1 139/2 711/6 +f 138/1 137/2 712/7 +f 147/102 146/97 713/103 +f 136/1 135/2 714/11 +f 158/1 157/2 715/3 +f 156/1 155/2 716/4 +f 154/1 153/2 717/18 +f 152/1 151/2 718/104 +f 163/105 162/106 719/107 +f 150/108 149/109 720/110 +f 161/1 160/2 721/5 +f 159/1 158/2 722/24 +f 157/1 156/2 723/6 +f 155/1 154/2 724/7 +f 164/111 163/105 725/112 +f 153/1 152/2 726/11 +f 151/1 150/2 727/28 +f 162/1 161/2 728/29 +f 149/109 148/113 729/114 +f 160/1 159/2 730/33 +f 171/1 170/2 731/18 +f 169/1 168/2 732/19 +f 180/115 179/116 733/117 +f 167/118 166/119 734/120 +f 178/1 177/2 735/5 +f 176/1 175/2 736/24 +f 174/1 173/2 737/6 +f 172/1 171/2 738/7 +f 181/121 180/115 739/122 +f 170/1 169/2 740/11 +f 168/1 167/2 741/28 +f 179/1 178/2 742/13 +f 166/119 165/123 743/124 +f 177/1 176/2 744/33 +f 175/1 174/2 745/89 +f 173/1 172/2 746/4 +f 184/125 183/126 747/127 +f 195/1 194/2 748/5 +f 193/1 192/2 749/24 +f 191/1 190/2 750/6 +f 189/1 188/2 751/7 +f 198/128 197/129 752/130 +f 187/1 186/2 753/11 +f 185/1 184/2 754/12 +f 196/1 195/2 755/29 +f 183/126 182/131 756/132 +f 194/1 193/2 757/33 +f 192/1 191/2 758/3 +f 190/1 189/2 759/4 +f 188/1 187/2 760/18 +f 186/1 185/2 761/19 +f 197/129 196/133 762/134 +f 208/1 207/2 763/6 +f 206/1 205/2 764/7 +f 215/135 214/136 765/137 +f 204/1 203/2 766/11 +f 202/1 201/2 767/28 +f 213/1 212/2 768/29 +f 200/138 199/139 769/140 +f 211/1 210/2 770/33 +f 209/1 208/2 771/3 +f 207/1 206/2 772/4 +f 205/1 204/2 773/18 +f 203/1 202/2 774/19 +f 214/136 213/141 775/142 +f 201/143 200/138 776/144 +f 212/1 211/2 777/5 +f 210/1 209/2 778/24 +f 232/145 231/146 779/147 +f 221/1 220/2 780/11 +f 219/1 218/2 781/12 +f 230/1 229/2 782/13 +f 217/148 216/149 783/150 +f 228/1 227/2 784/33 +f 226/1 225/2 785/89 +f 224/1 223/2 786/4 +f 222/1 221/2 787/18 +f 220/1 219/2 788/151 +f 231/146 230/152 789/153 +f 218/154 217/148 790/155 +f 229/1 228/2 791/5 +f 227/1 226/2 792/24 +f 225/1 224/2 793/6 +f 223/1 222/2 794/7 +f 235/156 234/157 795/158 +f 246/1 245/2 796/33 +f 244/1 243/2 797/3 +f 242/1 241/2 798/4 +f 240/1 239/2 799/18 +f 238/1 237/2 800/19 +f 249/159 248/160 801/161 +f 236/162 235/156 802/163 +f 247/1 246/2 803/5 +f 245/1 244/2 804/24 +f 243/1 242/2 805/6 +f 241/1 240/2 806/7 +f 250/164 249/159 807/165 +f 239/1 238/2 808/11 +f 237/1 236/2 809/12 +f 248/1 247/2 810/29 +f 259/1 258/2 811/4 +f 257/1 256/2 812/18 +f 255/1 254/2 813/19 +f 266/166 265/167 814/168 +f 253/169 252/170 815/171 +f 264/1 263/2 816/5 +f 262/1 261/2 817/24 +f 260/1 259/2 818/6 +f 258/1 257/2 819/47 +f 267/172 266/166 820/173 +f 256/1 255/2 821/11 +f 254/1 253/2 822/12 +f 265/1 264/2 823/29 +f 252/170 251/174 824/175 +f 263/1 262/2 825/33 +f 261/1 260/2 826/89 +f 272/1 271/2 827/19 +f 283/176 282/177 828/178 +f 270/179 269/180 829/181 +f 281/1 280/2 830/46 +f 279/1 278/2 831/182 +f 277/1 276/2 832/6 +f 275/1 274/2 833/7 +f 284/183 283/176 834/184 +f 273/1 272/2 835/11 +f 271/1 270/2 836/12 +f 282/1 281/2 837/29 +f 269/180 268/185 838/186 +f 280/1 279/2 839/33 +f 278/1 277/2 840/3 +f 276/1 275/2 841/4 +f 274/1 273/2 842/18 +f 296/1 295/2 843/24 +f 294/1 293/2 844/6 +f 292/1 291/2 845/7 +f 301/187 300/188 846/189 +f 290/1 289/2 847/11 +f 288/1 287/2 848/28 +f 299/1 298/2 849/29 +f 286/190 285/191 850/192 +f 297/1 296/2 851/33 +f 295/1 294/2 852/89 +f 293/1 292/2 853/4 +f 291/1 290/2 854/18 +f 289/1 288/2 855/19 +f 300/188 299/193 856/194 +f 287/195 286/190 857/196 +f 298/1 297/2 858/46 +f 309/1 308/2 859/47 +f 318/197 317/198 860/199 +f 307/1 306/2 861/11 +f 305/1 304/2 862/28 +f 316/1 315/2 863/13 +f 303/200 302/201 864/202 +f 314/1 313/2 865/33 +f 312/1 311/2 866/3 +f 310/1 309/2 867/4 +f 308/1 307/2 868/18 +f 306/1 305/2 869/19 +f 317/198 316/203 870/204 +f 304/205 303/200 871/206 +f 315/1 314/2 872/5 +f 313/1 312/2 873/24 +f 311/1 310/2 874/6 +f 322/1 321/2 875/28 +f 333/1 332/2 876/29 +f 320/207 319/208 877/209 +f 331/1 330/2 878/33 +f 329/1 328/2 879/3 +f 327/1 326/2 880/4 +f 325/1 324/2 881/210 +f 323/1 322/2 882/19 +f 334/211 333/212 883/213 +f 321/214 320/207 884/215 +f 332/1 331/2 885/5 +f 330/1 329/2 886/24 +f 328/1 327/2 887/6 +f 326/1 325/2 888/7 +f 335/216 334/211 889/217 +f 324/1 323/2 890/11 +f 346/1 345/2 891/3 +f 344/1 343/2 892/4 +f 342/1 341/2 893/18 +f 340/1 339/2 894/19 +f 351/218 350/219 895/220 +f 338/221 337/222 896/223 +f 349/1 348/2 897/5 +f 347/1 346/2 898/24 +f 345/1 344/2 899/6 +f 343/1 342/2 900/47 +f 352/224 351/218 901/225 +f 341/1 340/2 902/11 +f 339/1 338/2 903/28 +f 350/1 349/2 904/29 +f 337/222 336/226 905/227 +f 348/1 347/2 906/33 +f 359/1 358/2 907/18 +f 357/1 356/2 908/19 +f 368/228 367/229 909/230 +f 355/231 354/232 910/233 +f 366/1 365/2 911/5 +f 364/1 363/2 912/24 +f 362/1 361/2 913/6 +f 360/1 359/2 914/7 +f 369/234 368/228 915/235 +f 358/1 357/2 916/11 +f 356/1 355/2 917/236 +f 367/1 366/2 918/29 +f 354/232 353/237 919/238 +f 365/1 364/2 920/33 +f 363/1 362/2 921/3 +f 361/1 360/2 922/4 +f 372/239 371/240 923/241 +f 383/1 382/2 924/5 +f 381/1 380/2 925/24 +f 379/1 378/2 926/6 +f 377/1 376/2 927/7 +f 386/242 385/243 928/244 +f 375/1 374/2 929/11 +f 373/1 372/2 930/28 +f 384/1 383/2 931/13 +f 371/240 370/245 932/246 +f 382/1 381/2 933/33 +f 380/1 379/2 934/3 +f 378/1 377/2 935/4 +f 376/1 375/2 936/18 +f 374/1 373/2 937/19 +f 385/243 384/247 938/248 +f 396/1 395/2 939/6 +f 394/1 393/2 940/7 +f 403/249 402/250 941/251 +f 392/1 391/2 942/11 +f 390/1 389/2 943/28 +f 401/1 400/2 944/13 +f 388/252 387/253 945/254 +f 399/1 398/2 946/33 +f 397/1 396/2 947/89 +f 395/1 394/2 948/4 +f 393/1 392/2 949/18 +f 391/1 390/2 950/19 +f 402/250 401/255 951/256 +f 389/257 388/252 952/258 +f 400/1 399/2 953/5 +f 398/1 397/2 954/24 +f 420/259 419/260 955/261 +f 409/1 408/2 956/11 +f 407/1 406/2 957/12 +f 418/1 417/2 958/13 +f 405/262 404/263 959/264 +f 416/1 415/2 960/33 +f 414/1 413/2 961/3 +f 412/1 411/2 962/4 +f 410/1 409/2 963/18 +f 408/1 407/2 964/19 +f 419/260 418/265 965/266 +f 406/267 405/262 966/268 +f 417/1 416/2 967/5 +f 415/1 414/2 968/24 +f 413/1 412/2 969/6 +f 411/1 410/2 970/7 +f 422/269 421/270 971/271 +f 433/1 432/2 972/17 +f 431/1 430/2 973/3 +f 429/1 428/2 974/4 +f 427/1 426/2 975/18 +f 425/1 424/2 976/19 +f 436/272 435/273 977/274 +f 423/275 422/269 978/276 +f 434/1 433/2 979/5 +f 432/1 431/2 980/24 +f 430/1 429/2 981/6 +f 428/1 427/2 982/7 +f 437/277 436/272 983/278 +f 426/1 425/2 984/11 +f 424/1 423/2 985/28 +f 435/1 434/2 986/29 +f 446/1 445/2 987/4 +f 444/1 443/2 988/18 +f 442/1 441/2 989/19 +f 453/279 452/280 990/281 +f 440/282 439/283 991/284 +f 451/1 450/2 992/5 +f 449/1 448/2 993/24 +f 447/1 446/2 994/6 +f 445/1 444/2 995/7 +f 454/285 453/279 996/286 +f 443/1 442/2 997/70 +f 441/1 440/2 998/28 +f 452/1 451/2 999/13 +f 439/283 438/287 1000/288 +f 450/1 449/2 1001/33 +f 448/1 447/2 1002/3 +f 459/1 458/2 1003/19 +f 470/289 469/290 1004/291 +f 457/292 456/293 1005/294 +f 468/1 467/2 1006/5 +f 466/1 465/2 1007/24 +f 464/1 463/2 1008/6 +f 462/1 461/2 1009/7 +f 471/295 470/289 1010/296 +f 460/1 459/2 1011/11 +f 458/1 457/2 1012/28 +f 469/1 468/2 1013/29 +f 456/293 455/297 1014/298 +f 467/1 466/2 1015/33 +f 465/1 464/2 1016/3 +f 463/1 462/2 1017/4 +f 461/1 460/2 1018/18 +f 485/1 484/2 1019/5 +f 483/1 482/2 1020/24 +f 481/1 480/2 1021/6 +f 479/1 478/2 1022/7 +f 477/1 476/2 1023/11 +f 488/299 487/300 1024/301 +f 475/1 474/2 1025/28 +f 486/1 485/2 1026/29 +f 473/302 472/303 1027/304 +f 484/1 483/2 1028/33 +f 482/1 481/2 1029/3 +f 480/1 479/2 1030/4 +f 478/1 477/2 1031/18 +f 476/1 475/2 1032/19 +f 487/300 486/305 1033/306 +f 474/307 473/302 1034/308 +f 498/1 497/2 1035/6 +f 496/1 495/2 1036/7 +f 505/309 504/310 1037/311 +f 494/1 493/2 1038/11 +f 492/1 491/2 1039/28 +f 503/1 502/2 1040/29 +f 490/312 489/313 1041/314 +f 501/1 500/2 1042/33 +f 499/1 498/2 1043/3 +f 497/1 496/2 1044/4 +f 495/1 494/2 1045/18 +f 493/1 492/2 1046/19 +f 504/310 503/315 1047/316 +f 491/317 490/312 1048/318 +f 502/1 501/2 1049/5 +f 500/1 499/2 1050/24 +f 522/319 521/320 1051/321 +f 511/1 510/2 1052/11 +f 509/1 508/2 1053/12 +f 520/1 519/2 1054/13 +f 507/322 506/323 1055/324 +f 518/1 517/2 1056/33 +f 516/1 515/2 1057/3 +f 514/1 513/2 1058/4 +f 512/1 511/2 1059/18 +f 510/1 509/2 1060/19 +f 521/320 520/325 1061/326 +f 508/327 507/322 1062/328 +f 519/1 518/2 1063/5 +f 517/1 516/2 1064/24 +f 515/1 514/2 1065/6 +f 513/1 512/2 1066/47 +f 524/329 523/330 1067/331 +f 535/1 534/2 1068/17 +f 533/1 532/2 1069/3 +f 531/1 530/2 1070/4 +f 529/1 528/2 1071/18 +f 527/1 526/2 1072/19 +f 538/332 537/333 1073/334 +f 525/335 524/329 1074/336 +f 536/1 535/2 1075/5 +f 534/1 533/2 1076/24 +f 532/1 531/2 1077/6 +f 530/1 529/2 1078/7 +f 539/337 538/332 1079/338 +f 528/1 527/2 1080/11 +f 526/1 525/2 1081/28 +f 537/1 536/2 1082/29 +f 548/1 547/2 1083/4 +f 546/1 545/2 1084/18 +f 544/1 543/2 1085/19 +f 555/339 554/340 1086/341 +f 542/342 541/343 1087/344 +f 553/1 552/2 1088/5 +f 551/1 550/2 1089/24 +f 549/1 548/2 1090/6 +f 547/1 546/2 1091/7 +f 556/345 555/339 1092/346 +f 545/1 544/2 1093/11 +f 543/1 542/2 1094/12 +f 554/1 553/2 1095/29 +f 541/343 540/347 1096/348 +f 552/1 551/2 1097/33 +f 550/1 549/2 1098/3 +f 572/349 571/350 1099/351 +f 562/1 561/2 1100/11 +f 558/352 557/353 1101/354 +f 10/355 580/356 1102/357 +f 577/1 576/2 1103/11 +f 579/1 9/2 1104/13 +f 575/358 574/359 1105/360 +f 8/1 578/2 1106/33 +f 3/1 577/2 1107/18 +f 28/361 10/355 27/8 +f 576/1 2/2 1108/19 +f 580/356 579/362 1109/363 +f 1/364 575/358 1110/365 +f 578/1 7/2 1111/24 +f 574/359 233/366 11/15 +f 561/1 560/2 1112/19 +f 28/361 27/8 45/25 +f 11/15 233/366 29/31 +f 28/361 45/25 62/48 +f 29/31 233/366 46/39 +f 28/361 62/48 79/57 +f 46/39 233/366 63/59 +f 28/361 79/57 96/68 +f 63/59 233/366 80/71 +f 80/71 233/366 97/77 +f 28/361 96/68 113/73 +f 97/77 233/366 114/87 +f 28/361 113/73 130/83 +f 28/361 130/83 147/102 +f 114/87 233/366 131/95 +f 28/361 147/102 164/111 +f 131/95 233/366 148/113 +f 28/361 164/111 181/121 +f 148/113 233/366 165/123 +f 28/361 181/121 198/128 +f 165/123 233/366 182/131 +f 182/131 233/366 199/139 +f 28/361 198/128 215/135 +f 28/361 215/135 232/145 +f 199/139 233/366 216/149 +f 28/361 232/145 250/164 +f 216/149 233/366 234/157 +f 28/361 250/164 267/172 +f 234/157 233/366 251/174 +f 28/361 267/172 284/183 +f 251/174 233/366 268/185 +f 268/185 233/366 285/191 +f 28/361 284/183 301/187 +f 285/191 233/366 302/201 +f 28/361 301/187 318/197 +f 28/361 318/197 335/216 +f 302/201 233/366 319/208 +f 28/361 335/216 352/224 +f 319/208 233/366 336/226 +f 28/361 352/224 369/234 +f 336/226 233/366 353/237 +f 28/361 369/234 386/242 +f 353/237 233/366 370/245 +f 370/245 233/366 387/253 +f 28/361 386/242 403/249 +f 28/361 403/249 420/259 +f 387/253 233/366 404/263 +f 28/361 420/259 437/277 +f 404/263 233/366 421/270 +f 28/361 437/277 454/285 +f 421/270 233/366 438/287 +f 28/361 454/285 471/295 +f 438/287 233/366 455/297 +f 455/297 233/366 472/303 +f 28/361 471/295 488/299 +f 472/303 233/366 489/313 +f 28/361 488/299 505/309 +f 28/361 505/309 522/319 +f 489/313 233/366 506/323 +f 28/361 522/319 539/337 +f 506/323 233/366 523/330 +f 28/361 539/337 556/345 +f 523/330 233/366 540/347 +f 28/361 556/345 573/367 +f 540/347 233/366 557/353 +f 559/368 558/352 1113/369 +f 570/1 569/2 1114/5 +f 568/1 567/2 1115/24 +f 557/353 233/366 574/359 +f 566/1 565/2 1116/6 +f 564/1 563/2 1117/7 +f 573/367 572/349 1118/370 +f 560/1 559/2 1119/12 +f 571/1 570/2 1120/29 +f 569/1 568/2 1121/33 +f 567/1 566/2 1122/3 +f 565/1 564/2 1123/4 +f 563/1 562/2 1124/18 +f 28/361 573/367 10/355 +f 2/1 1/2 581/28 +f 1/2 13/371 581/28 +f 13/371 14/372 581/28 +f 14/372 2/1 581/28 +f 6/2 20/371 582/3 +f 20/371 21/372 582/3 +f 21/372 7/1 582/3 +f 4/2 18/371 583/4 +f 18/371 19/372 583/4 +f 19/372 5/1 583/4 +f 8/2 23/371 584/5 +f 23/371 24/372 584/5 +f 24/372 9/1 584/5 +f 5/2 19/371 585/6 +f 19/371 20/372 585/6 +f 20/372 6/1 585/6 +f 3/2 17/371 586/7 +f 17/371 18/372 586/7 +f 18/372 4/1 586/7 +f 19/2 37/371 587/6 +f 37/371 38/372 587/6 +f 38/372 20/1 587/6 +f 17/2 35/371 588/7 +f 35/371 36/372 588/7 +f 36/372 18/1 588/7 +f 26/9 44/26 589/10 +f 44/26 45/25 589/10 +f 45/25 27/8 589/10 +f 15/2 33/371 590/11 +f 33/371 34/372 590/11 +f 34/372 16/1 590/11 +f 13/2 31/371 591/12 +f 31/371 32/372 591/12 +f 32/372 14/1 591/12 +f 24/2 42/371 592/13 +f 42/371 43/372 592/13 +f 43/372 25/1 592/13 +f 11/15 29/31 593/16 +f 29/31 30/30 593/16 +f 30/30 12/14 593/16 +f 22/2 40/371 594/17 +f 40/371 41/372 594/17 +f 41/372 23/1 594/17 +f 20/2 38/371 595/3 +f 38/371 39/372 595/3 +f 39/372 21/1 595/3 +f 18/2 36/371 596/4 +f 36/371 37/372 596/4 +f 37/372 19/1 596/4 +f 16/2 34/371 597/18 +f 34/371 35/372 597/18 +f 35/372 17/1 597/18 +f 14/2 32/371 598/19 +f 32/371 33/372 598/19 +f 33/372 15/1 598/19 +f 25/20 43/34 599/21 +f 43/34 44/26 599/21 +f 44/26 26/9 599/21 +f 12/14 30/30 600/23 +f 30/30 31/36 600/23 +f 31/36 13/22 600/23 +f 23/2 41/371 601/5 +f 41/371 42/372 601/5 +f 42/372 24/1 601/5 +f 21/2 39/371 602/24 +f 39/371 40/372 602/24 +f 40/372 22/1 602/24 +f 44/26 61/41 603/27 +f 61/41 62/48 603/27 +f 62/48 45/25 603/27 +f 33/2 50/371 604/11 +f 50/371 51/372 604/11 +f 51/372 34/1 604/11 +f 31/2 48/371 605/28 +f 48/371 49/372 605/28 +f 49/372 32/1 605/28 +f 42/2 59/371 606/29 +f 59/371 60/372 606/29 +f 60/372 43/1 606/29 +f 29/31 46/39 607/32 +f 46/39 47/38 607/32 +f 47/38 30/30 607/32 +f 40/2 57/371 608/33 +f 57/371 58/372 608/33 +f 58/372 41/1 608/33 +f 38/2 55/371 609/3 +f 55/371 56/372 609/3 +f 56/372 39/1 609/3 +f 36/2 53/371 610/4 +f 53/371 54/372 610/4 +f 54/372 37/1 610/4 +f 34/2 51/371 611/18 +f 51/371 52/372 611/18 +f 52/372 35/1 611/18 +f 32/2 49/371 612/19 +f 49/371 50/372 612/19 +f 50/372 33/1 612/19 +f 43/34 60/42 613/35 +f 60/42 61/41 613/35 +f 61/41 44/26 613/35 +f 30/30 47/38 614/37 +f 47/38 48/44 614/37 +f 48/44 31/36 614/37 +f 41/2 58/371 615/5 +f 58/371 59/372 615/5 +f 59/372 42/1 615/5 +f 39/2 56/371 616/24 +f 56/371 57/372 616/24 +f 57/372 40/1 616/24 +f 37/2 54/371 617/6 +f 54/371 55/372 617/6 +f 55/372 38/1 617/6 +f 35/2 52/371 618/7 +f 52/371 53/372 618/7 +f 53/372 36/1 618/7 +f 46/39 63/59 619/40 +f 63/59 64/55 619/40 +f 64/55 47/38 619/40 +f 57/2 74/371 620/33 +f 74/371 75/372 620/33 +f 75/372 58/1 620/33 +f 55/2 72/371 621/3 +f 72/371 73/372 621/3 +f 73/372 56/1 621/3 +f 53/2 70/371 622/4 +f 70/371 71/372 622/4 +f 71/372 54/1 622/4 +f 51/2 68/371 623/18 +f 68/371 69/372 623/18 +f 69/372 52/1 623/18 +f 49/2 66/371 624/19 +f 66/371 67/372 624/19 +f 67/372 50/1 624/19 +f 60/42 77/52 625/43 +f 77/52 78/51 625/43 +f 78/51 61/41 625/43 +f 47/38 64/55 626/45 +f 64/55 65/54 626/45 +f 65/54 48/44 626/45 +f 58/2 75/371 627/46 +f 75/371 76/372 627/46 +f 76/372 59/1 627/46 +f 56/2 73/371 628/24 +f 73/371 74/372 628/24 +f 74/372 57/1 628/24 +f 54/2 71/371 629/6 +f 71/371 72/372 629/6 +f 72/372 55/1 629/6 +f 52/2 69/371 630/47 +f 69/371 70/372 630/47 +f 70/372 53/1 630/47 +f 61/41 78/51 631/49 +f 78/51 79/57 631/49 +f 79/57 62/48 631/49 +f 50/2 67/371 632/11 +f 67/371 68/372 632/11 +f 68/372 51/1 632/11 +f 48/2 65/371 633/28 +f 65/371 66/372 633/28 +f 66/372 49/1 633/28 +f 59/2 76/371 634/13 +f 76/371 77/372 634/13 +f 77/372 60/1 634/13 +f 70/2 87/371 635/4 +f 87/371 88/372 635/4 +f 88/372 71/1 635/4 +f 68/2 85/371 636/50 +f 85/371 86/372 636/50 +f 86/372 69/1 636/50 +f 66/2 83/371 637/19 +f 83/371 84/372 637/19 +f 84/372 67/1 637/19 +f 77/52 94/62 638/53 +f 94/62 95/61 638/53 +f 95/61 78/51 638/53 +f 64/55 81/65 639/56 +f 81/65 82/64 639/56 +f 82/64 65/54 639/56 +f 75/2 92/371 640/5 +f 92/371 93/372 640/5 +f 93/372 76/1 640/5 +f 73/2 90/371 641/24 +f 90/371 91/372 641/24 +f 91/372 74/1 641/24 +f 71/2 88/371 642/6 +f 88/371 89/372 642/6 +f 89/372 72/1 642/6 +f 69/2 86/371 643/47 +f 86/371 87/372 643/47 +f 87/372 70/1 643/47 +f 78/51 95/61 644/58 +f 95/61 96/68 644/58 +f 96/68 79/57 644/58 +f 67/2 84/371 645/11 +f 84/371 85/372 645/11 +f 85/372 68/1 645/11 +f 65/2 82/371 646/12 +f 82/371 83/372 646/12 +f 83/372 66/1 646/12 +f 76/2 93/371 647/13 +f 93/371 94/372 647/13 +f 94/372 77/1 647/13 +f 63/59 80/71 648/60 +f 80/71 81/65 648/60 +f 81/65 64/55 648/60 +f 74/2 91/371 649/33 +f 91/371 92/372 649/33 +f 92/372 75/1 649/33 +f 72/2 89/371 650/3 +f 89/371 90/372 650/3 +f 90/372 73/1 650/3 +f 83/2 100/371 651/19 +f 100/371 101/372 651/19 +f 101/372 84/1 651/19 +f 94/62 111/79 652/63 +f 111/79 112/74 652/63 +f 112/74 95/61 652/63 +f 81/65 98/76 653/66 +f 98/76 99/81 653/66 +f 99/81 82/64 653/66 +f 92/2 109/371 654/5 +f 109/371 110/372 654/5 +f 110/372 93/1 654/5 +f 90/2 107/371 655/67 +f 107/371 108/372 655/67 +f 108/372 91/1 655/67 +f 88/2 105/371 656/6 +f 105/371 106/372 656/6 +f 106/372 89/1 656/6 +f 86/2 103/371 657/7 +f 103/371 104/372 657/7 +f 104/372 87/1 657/7 +f 95/61 112/74 658/69 +f 112/74 113/73 658/69 +f 113/73 96/68 658/69 +f 84/2 101/371 659/70 +f 101/371 102/372 659/70 +f 102/372 85/1 659/70 +f 82/2 99/371 660/12 +f 99/371 100/372 660/12 +f 100/372 83/1 660/12 +f 93/2 110/371 661/13 +f 110/371 111/372 661/13 +f 111/372 94/1 661/13 +f 80/71 97/77 662/72 +f 97/77 98/76 662/72 +f 98/76 81/65 662/72 +f 91/2 108/371 663/33 +f 108/371 109/372 663/33 +f 109/372 92/1 663/33 +f 89/2 106/371 664/3 +f 106/371 107/372 664/3 +f 107/372 90/1 664/3 +f 87/2 104/371 665/4 +f 104/371 105/372 665/4 +f 105/372 88/1 665/4 +f 85/2 102/371 666/18 +f 102/371 103/372 666/18 +f 103/372 86/1 666/18 +f 107/2 124/371 667/24 +f 124/371 125/372 667/24 +f 125/372 108/1 667/24 +f 105/2 122/371 668/6 +f 122/371 123/372 668/6 +f 123/372 106/1 668/6 +f 103/2 120/371 669/7 +f 120/371 121/372 669/7 +f 121/372 104/1 669/7 +f 112/74 129/84 670/75 +f 129/84 130/83 670/75 +f 130/83 113/73 670/75 +f 101/2 118/371 671/11 +f 118/371 119/372 671/11 +f 119/372 102/1 671/11 +f 99/2 116/371 672/28 +f 116/371 117/372 672/28 +f 117/372 100/1 672/28 +f 110/2 127/371 673/13 +f 127/371 128/372 673/13 +f 128/372 111/1 673/13 +f 97/77 114/87 674/78 +f 114/87 115/86 674/78 +f 115/86 98/76 674/78 +f 108/2 125/371 675/33 +f 125/371 126/372 675/33 +f 126/372 109/1 675/33 +f 106/2 123/371 676/3 +f 123/371 124/372 676/3 +f 124/372 107/1 676/3 +f 104/2 121/371 677/4 +f 121/371 122/372 677/4 +f 122/372 105/1 677/4 +f 102/2 119/371 678/18 +f 119/371 120/372 678/18 +f 120/372 103/1 678/18 +f 100/2 117/371 679/19 +f 117/371 118/372 679/19 +f 118/372 101/1 679/19 +f 111/79 128/90 680/80 +f 128/90 129/84 680/80 +f 129/84 112/74 680/80 +f 98/76 115/86 681/82 +f 115/86 116/92 681/82 +f 116/92 99/81 681/82 +f 109/2 126/371 682/5 +f 126/371 127/372 682/5 +f 127/372 110/1 682/5 +f 120/2 137/371 683/7 +f 137/371 138/372 683/7 +f 138/372 121/1 683/7 +f 129/84 146/97 684/85 +f 146/97 147/102 684/85 +f 147/102 130/83 684/85 +f 118/2 135/371 685/11 +f 135/371 136/372 685/11 +f 136/372 119/1 685/11 +f 116/2 133/371 686/28 +f 133/371 134/372 686/28 +f 134/372 117/1 686/28 +f 127/2 144/371 687/29 +f 144/371 145/372 687/29 +f 145/372 128/1 687/29 +f 114/87 131/95 688/88 +f 131/95 132/94 688/88 +f 132/94 115/86 688/88 +f 125/2 142/371 689/33 +f 142/371 143/372 689/33 +f 143/372 126/1 689/33 +f 123/2 140/371 690/89 +f 140/371 141/372 690/89 +f 141/372 124/1 690/89 +f 121/2 138/371 691/4 +f 138/371 139/372 691/4 +f 139/372 122/1 691/4 +f 119/2 136/371 692/18 +f 136/371 137/372 692/18 +f 137/372 120/1 692/18 +f 117/2 134/371 693/19 +f 134/371 135/372 693/19 +f 135/372 118/1 693/19 +f 128/90 145/98 694/91 +f 145/98 146/97 694/91 +f 146/97 129/84 694/91 +f 115/86 132/94 695/93 +f 132/94 133/100 695/93 +f 133/100 116/92 695/93 +f 126/2 143/371 696/5 +f 143/371 144/372 696/5 +f 144/372 127/1 696/5 +f 124/2 141/371 697/24 +f 141/371 142/372 697/24 +f 142/372 125/1 697/24 +f 122/2 139/371 698/6 +f 139/371 140/372 698/6 +f 140/372 123/1 698/6 +f 133/2 150/371 699/12 +f 150/371 151/372 699/12 +f 151/372 134/1 699/12 +f 144/2 161/371 700/13 +f 161/371 162/372 700/13 +f 162/372 145/1 700/13 +f 131/95 148/113 701/96 +f 148/113 149/109 701/96 +f 149/109 132/94 701/96 +f 142/2 159/371 702/33 +f 159/371 160/372 702/33 +f 160/372 143/1 702/33 +f 140/2 157/371 703/3 +f 157/371 158/372 703/3 +f 158/372 141/1 703/3 +f 138/2 155/371 704/4 +f 155/371 156/372 704/4 +f 156/372 139/1 704/4 +f 136/2 153/371 705/18 +f 153/371 154/372 705/18 +f 154/372 137/1 705/18 +f 134/2 151/371 706/19 +f 151/371 152/372 706/19 +f 152/372 135/1 706/19 +f 145/98 162/106 707/99 +f 162/106 163/105 707/99 +f 163/105 146/97 707/99 +f 132/94 149/109 708/101 +f 149/109 150/108 708/101 +f 150/108 133/100 708/101 +f 143/2 160/371 709/5 +f 160/371 161/372 709/5 +f 161/372 144/1 709/5 +f 141/2 158/371 710/24 +f 158/371 159/372 710/24 +f 159/372 142/1 710/24 +f 139/2 156/371 711/6 +f 156/371 157/372 711/6 +f 157/372 140/1 711/6 +f 137/2 154/371 712/7 +f 154/371 155/372 712/7 +f 155/372 138/1 712/7 +f 146/97 163/105 713/103 +f 163/105 164/111 713/103 +f 164/111 147/102 713/103 +f 135/2 152/371 714/11 +f 152/371 153/372 714/11 +f 153/372 136/1 714/11 +f 157/2 174/371 715/3 +f 174/371 175/372 715/3 +f 175/372 158/1 715/3 +f 155/2 172/371 716/4 +f 172/371 173/372 716/4 +f 173/372 156/1 716/4 +f 153/2 170/371 717/18 +f 170/371 171/372 717/18 +f 171/372 154/1 717/18 +f 151/2 168/371 718/104 +f 168/371 169/372 718/104 +f 169/372 152/1 718/104 +f 162/106 179/116 719/107 +f 179/116 180/115 719/107 +f 180/115 163/105 719/107 +f 149/109 166/119 720/110 +f 166/119 167/118 720/110 +f 167/118 150/108 720/110 +f 160/2 177/371 721/5 +f 177/371 178/372 721/5 +f 178/372 161/1 721/5 +f 158/2 175/371 722/24 +f 175/371 176/372 722/24 +f 176/372 159/1 722/24 +f 156/2 173/371 723/6 +f 173/371 174/372 723/6 +f 174/372 157/1 723/6 +f 154/2 171/371 724/7 +f 171/371 172/372 724/7 +f 172/372 155/1 724/7 +f 163/105 180/115 725/112 +f 180/115 181/121 725/112 +f 181/121 164/111 725/112 +f 152/2 169/371 726/11 +f 169/371 170/372 726/11 +f 170/372 153/1 726/11 +f 150/2 167/371 727/28 +f 167/371 168/372 727/28 +f 168/372 151/1 727/28 +f 161/2 178/371 728/29 +f 178/371 179/372 728/29 +f 179/372 162/1 728/29 +f 148/113 165/123 729/114 +f 165/123 166/119 729/114 +f 166/119 149/109 729/114 +f 159/2 176/371 730/33 +f 176/371 177/372 730/33 +f 177/372 160/1 730/33 +f 170/2 187/371 731/18 +f 187/371 188/372 731/18 +f 188/372 171/1 731/18 +f 168/2 185/371 732/19 +f 185/371 186/372 732/19 +f 186/372 169/1 732/19 +f 179/116 196/133 733/117 +f 196/133 197/129 733/117 +f 197/129 180/115 733/117 +f 166/119 183/126 734/120 +f 183/126 184/125 734/120 +f 184/125 167/118 734/120 +f 177/2 194/371 735/5 +f 194/371 195/372 735/5 +f 195/372 178/1 735/5 +f 175/2 192/371 736/24 +f 192/371 193/372 736/24 +f 193/372 176/1 736/24 +f 173/2 190/371 737/6 +f 190/371 191/372 737/6 +f 191/372 174/1 737/6 +f 171/2 188/371 738/7 +f 188/371 189/372 738/7 +f 189/372 172/1 738/7 +f 180/115 197/129 739/122 +f 197/129 198/128 739/122 +f 198/128 181/121 739/122 +f 169/2 186/371 740/11 +f 186/371 187/372 740/11 +f 187/372 170/1 740/11 +f 167/2 184/371 741/28 +f 184/371 185/372 741/28 +f 185/372 168/1 741/28 +f 178/2 195/371 742/13 +f 195/371 196/372 742/13 +f 196/372 179/1 742/13 +f 165/123 182/131 743/124 +f 182/131 183/126 743/124 +f 183/126 166/119 743/124 +f 176/2 193/371 744/33 +f 193/371 194/372 744/33 +f 194/372 177/1 744/33 +f 174/2 191/371 745/89 +f 191/371 192/372 745/89 +f 192/372 175/1 745/89 +f 172/2 189/371 746/4 +f 189/371 190/372 746/4 +f 190/372 173/1 746/4 +f 183/126 200/138 747/127 +f 200/138 201/143 747/127 +f 201/143 184/125 747/127 +f 194/2 211/371 748/5 +f 211/371 212/372 748/5 +f 212/372 195/1 748/5 +f 192/2 209/371 749/24 +f 209/371 210/372 749/24 +f 210/372 193/1 749/24 +f 190/2 207/371 750/6 +f 207/371 208/372 750/6 +f 208/372 191/1 750/6 +f 188/2 205/371 751/7 +f 205/371 206/372 751/7 +f 206/372 189/1 751/7 +f 197/129 214/136 752/130 +f 214/136 215/135 752/130 +f 215/135 198/128 752/130 +f 186/2 203/371 753/11 +f 203/371 204/372 753/11 +f 204/372 187/1 753/11 +f 184/2 201/371 754/12 +f 201/371 202/372 754/12 +f 202/372 185/1 754/12 +f 195/2 212/371 755/29 +f 212/371 213/372 755/29 +f 213/372 196/1 755/29 +f 182/131 199/139 756/132 +f 199/139 200/138 756/132 +f 200/138 183/126 756/132 +f 193/2 210/371 757/33 +f 210/371 211/372 757/33 +f 211/372 194/1 757/33 +f 191/2 208/371 758/3 +f 208/371 209/372 758/3 +f 209/372 192/1 758/3 +f 189/2 206/371 759/4 +f 206/371 207/372 759/4 +f 207/372 190/1 759/4 +f 187/2 204/371 760/18 +f 204/371 205/372 760/18 +f 205/372 188/1 760/18 +f 185/2 202/371 761/19 +f 202/371 203/372 761/19 +f 203/372 186/1 761/19 +f 196/133 213/141 762/134 +f 213/141 214/136 762/134 +f 214/136 197/129 762/134 +f 207/2 224/371 763/6 +f 224/371 225/372 763/6 +f 225/372 208/1 763/6 +f 205/2 222/371 764/7 +f 222/371 223/372 764/7 +f 223/372 206/1 764/7 +f 214/136 231/146 765/137 +f 231/146 232/145 765/137 +f 232/145 215/135 765/137 +f 203/2 220/371 766/11 +f 220/371 221/372 766/11 +f 221/372 204/1 766/11 +f 201/2 218/371 767/28 +f 218/371 219/372 767/28 +f 219/372 202/1 767/28 +f 212/2 229/371 768/29 +f 229/371 230/372 768/29 +f 230/372 213/1 768/29 +f 199/139 216/149 769/140 +f 216/149 217/148 769/140 +f 217/148 200/138 769/140 +f 210/2 227/371 770/33 +f 227/371 228/372 770/33 +f 228/372 211/1 770/33 +f 208/2 225/371 771/3 +f 225/371 226/372 771/3 +f 226/372 209/1 771/3 +f 206/2 223/371 772/4 +f 223/371 224/372 772/4 +f 224/372 207/1 772/4 +f 204/2 221/371 773/18 +f 221/371 222/372 773/18 +f 222/372 205/1 773/18 +f 202/2 219/371 774/19 +f 219/371 220/372 774/19 +f 220/372 203/1 774/19 +f 213/141 230/152 775/142 +f 230/152 231/146 775/142 +f 231/146 214/136 775/142 +f 200/138 217/148 776/144 +f 217/148 218/154 776/144 +f 218/154 201/143 776/144 +f 211/2 228/371 777/5 +f 228/371 229/372 777/5 +f 229/372 212/1 777/5 +f 209/2 226/371 778/24 +f 226/371 227/372 778/24 +f 227/372 210/1 778/24 +f 231/146 249/159 779/147 +f 249/159 250/164 779/147 +f 250/164 232/145 779/147 +f 220/2 238/371 780/11 +f 238/371 239/372 780/11 +f 239/372 221/1 780/11 +f 218/2 236/371 781/12 +f 236/371 237/372 781/12 +f 237/372 219/1 781/12 +f 229/2 247/371 782/13 +f 247/371 248/372 782/13 +f 248/372 230/1 782/13 +f 216/149 234/157 783/150 +f 234/157 235/156 783/150 +f 235/156 217/148 783/150 +f 227/2 245/371 784/33 +f 245/371 246/372 784/33 +f 246/372 228/1 784/33 +f 225/2 243/371 785/89 +f 243/371 244/372 785/89 +f 244/372 226/1 785/89 +f 223/2 241/371 786/4 +f 241/371 242/372 786/4 +f 242/372 224/1 786/4 +f 221/2 239/371 787/18 +f 239/371 240/372 787/18 +f 240/372 222/1 787/18 +f 219/2 237/371 788/151 +f 237/371 238/372 788/151 +f 238/372 220/1 788/151 +f 230/152 248/160 789/153 +f 248/160 249/159 789/153 +f 249/159 231/146 789/153 +f 217/148 235/156 790/155 +f 235/156 236/162 790/155 +f 236/162 218/154 790/155 +f 228/2 246/371 791/5 +f 246/371 247/372 791/5 +f 247/372 229/1 791/5 +f 226/2 244/371 792/24 +f 244/371 245/372 792/24 +f 245/372 227/1 792/24 +f 224/2 242/371 793/6 +f 242/371 243/372 793/6 +f 243/372 225/1 793/6 +f 222/2 240/371 794/7 +f 240/371 241/372 794/7 +f 241/372 223/1 794/7 +f 234/157 251/174 795/158 +f 251/174 252/170 795/158 +f 252/170 235/156 795/158 +f 245/2 262/371 796/33 +f 262/371 263/372 796/33 +f 263/372 246/1 796/33 +f 243/2 260/371 797/3 +f 260/371 261/372 797/3 +f 261/372 244/1 797/3 +f 241/2 258/371 798/4 +f 258/371 259/372 798/4 +f 259/372 242/1 798/4 +f 239/2 256/371 799/18 +f 256/371 257/372 799/18 +f 257/372 240/1 799/18 +f 237/2 254/371 800/19 +f 254/371 255/372 800/19 +f 255/372 238/1 800/19 +f 248/160 265/167 801/161 +f 265/167 266/166 801/161 +f 266/166 249/159 801/161 +f 235/156 252/170 802/163 +f 252/170 253/169 802/163 +f 253/169 236/162 802/163 +f 246/2 263/371 803/5 +f 263/371 264/372 803/5 +f 264/372 247/1 803/5 +f 244/2 261/371 804/24 +f 261/371 262/372 804/24 +f 262/372 245/1 804/24 +f 242/2 259/371 805/6 +f 259/371 260/372 805/6 +f 260/372 243/1 805/6 +f 240/2 257/371 806/7 +f 257/371 258/372 806/7 +f 258/372 241/1 806/7 +f 249/159 266/166 807/165 +f 266/166 267/172 807/165 +f 267/172 250/164 807/165 +f 238/2 255/371 808/11 +f 255/371 256/372 808/11 +f 256/372 239/1 808/11 +f 236/2 253/371 809/12 +f 253/371 254/372 809/12 +f 254/372 237/1 809/12 +f 247/2 264/371 810/29 +f 264/371 265/372 810/29 +f 265/372 248/1 810/29 +f 258/2 275/371 811/4 +f 275/371 276/372 811/4 +f 276/372 259/1 811/4 +f 256/2 273/371 812/18 +f 273/371 274/372 812/18 +f 274/372 257/1 812/18 +f 254/2 271/371 813/19 +f 271/371 272/372 813/19 +f 272/372 255/1 813/19 +f 265/167 282/177 814/168 +f 282/177 283/176 814/168 +f 283/176 266/166 814/168 +f 252/170 269/180 815/171 +f 269/180 270/179 815/171 +f 270/179 253/169 815/171 +f 263/2 280/371 816/5 +f 280/371 281/372 816/5 +f 281/372 264/1 816/5 +f 261/2 278/371 817/24 +f 278/371 279/372 817/24 +f 279/372 262/1 817/24 +f 259/2 276/371 818/6 +f 276/371 277/372 818/6 +f 277/372 260/1 818/6 +f 257/2 274/371 819/47 +f 274/371 275/372 819/47 +f 275/372 258/1 819/47 +f 266/166 283/176 820/173 +f 283/176 284/183 820/173 +f 284/183 267/172 820/173 +f 255/2 272/371 821/11 +f 272/371 273/372 821/11 +f 273/372 256/1 821/11 +f 253/2 270/371 822/12 +f 270/371 271/372 822/12 +f 271/372 254/1 822/12 +f 264/2 281/371 823/29 +f 281/371 282/372 823/29 +f 282/372 265/1 823/29 +f 251/174 268/185 824/175 +f 268/185 269/180 824/175 +f 269/180 252/170 824/175 +f 262/2 279/371 825/33 +f 279/371 280/372 825/33 +f 280/372 263/1 825/33 +f 260/2 277/371 826/89 +f 277/371 278/372 826/89 +f 278/372 261/1 826/89 +f 271/2 288/371 827/19 +f 288/371 289/372 827/19 +f 289/372 272/1 827/19 +f 282/177 299/193 828/178 +f 299/193 300/188 828/178 +f 300/188 283/176 828/178 +f 269/180 286/190 829/181 +f 286/190 287/195 829/181 +f 287/195 270/179 829/181 +f 280/2 297/371 830/46 +f 297/371 298/372 830/46 +f 298/372 281/1 830/46 +f 278/2 295/371 831/182 +f 295/371 296/372 831/182 +f 296/372 279/1 831/182 +f 276/2 293/371 832/6 +f 293/371 294/372 832/6 +f 294/372 277/1 832/6 +f 274/2 291/371 833/7 +f 291/371 292/372 833/7 +f 292/372 275/1 833/7 +f 283/176 300/188 834/184 +f 300/188 301/187 834/184 +f 301/187 284/183 834/184 +f 272/2 289/371 835/11 +f 289/371 290/372 835/11 +f 290/372 273/1 835/11 +f 270/2 287/371 836/12 +f 287/371 288/372 836/12 +f 288/372 271/1 836/12 +f 281/2 298/371 837/29 +f 298/371 299/372 837/29 +f 299/372 282/1 837/29 +f 268/185 285/191 838/186 +f 285/191 286/190 838/186 +f 286/190 269/180 838/186 +f 279/2 296/371 839/33 +f 296/371 297/372 839/33 +f 297/372 280/1 839/33 +f 277/2 294/371 840/3 +f 294/371 295/372 840/3 +f 295/372 278/1 840/3 +f 275/2 292/371 841/4 +f 292/371 293/372 841/4 +f 293/372 276/1 841/4 +f 273/2 290/371 842/18 +f 290/371 291/372 842/18 +f 291/372 274/1 842/18 +f 295/2 312/371 843/24 +f 312/371 313/372 843/24 +f 313/372 296/1 843/24 +f 293/2 310/371 844/6 +f 310/371 311/372 844/6 +f 311/372 294/1 844/6 +f 291/2 308/371 845/7 +f 308/371 309/372 845/7 +f 309/372 292/1 845/7 +f 300/188 317/198 846/189 +f 317/198 318/197 846/189 +f 318/197 301/187 846/189 +f 289/2 306/371 847/11 +f 306/371 307/372 847/11 +f 307/372 290/1 847/11 +f 287/2 304/371 848/28 +f 304/371 305/372 848/28 +f 305/372 288/1 848/28 +f 298/2 315/371 849/29 +f 315/371 316/372 849/29 +f 316/372 299/1 849/29 +f 285/191 302/201 850/192 +f 302/201 303/200 850/192 +f 303/200 286/190 850/192 +f 296/2 313/371 851/33 +f 313/371 314/372 851/33 +f 314/372 297/1 851/33 +f 294/2 311/371 852/89 +f 311/371 312/372 852/89 +f 312/372 295/1 852/89 +f 292/2 309/371 853/4 +f 309/371 310/372 853/4 +f 310/372 293/1 853/4 +f 290/2 307/371 854/18 +f 307/371 308/372 854/18 +f 308/372 291/1 854/18 +f 288/2 305/371 855/19 +f 305/371 306/372 855/19 +f 306/372 289/1 855/19 +f 299/193 316/203 856/194 +f 316/203 317/198 856/194 +f 317/198 300/188 856/194 +f 286/190 303/200 857/196 +f 303/200 304/205 857/196 +f 304/205 287/195 857/196 +f 297/2 314/371 858/46 +f 314/371 315/372 858/46 +f 315/372 298/1 858/46 +f 308/2 325/371 859/47 +f 325/371 326/372 859/47 +f 326/372 309/1 859/47 +f 317/198 334/211 860/199 +f 334/211 335/216 860/199 +f 335/216 318/197 860/199 +f 306/2 323/371 861/11 +f 323/371 324/372 861/11 +f 324/372 307/1 861/11 +f 304/2 321/371 862/28 +f 321/371 322/372 862/28 +f 322/372 305/1 862/28 +f 315/2 332/371 863/13 +f 332/371 333/372 863/13 +f 333/372 316/1 863/13 +f 302/201 319/208 864/202 +f 319/208 320/207 864/202 +f 320/207 303/200 864/202 +f 313/2 330/371 865/33 +f 330/371 331/372 865/33 +f 331/372 314/1 865/33 +f 311/2 328/371 866/3 +f 328/371 329/372 866/3 +f 329/372 312/1 866/3 +f 309/2 326/371 867/4 +f 326/371 327/372 867/4 +f 327/372 310/1 867/4 +f 307/2 324/371 868/18 +f 324/371 325/372 868/18 +f 325/372 308/1 868/18 +f 305/2 322/371 869/19 +f 322/371 323/372 869/19 +f 323/372 306/1 869/19 +f 316/203 333/212 870/204 +f 333/212 334/211 870/204 +f 334/211 317/198 870/204 +f 303/200 320/207 871/206 +f 320/207 321/214 871/206 +f 321/214 304/205 871/206 +f 314/2 331/371 872/5 +f 331/371 332/372 872/5 +f 332/372 315/1 872/5 +f 312/2 329/371 873/24 +f 329/371 330/372 873/24 +f 330/372 313/1 873/24 +f 310/2 327/371 874/6 +f 327/371 328/372 874/6 +f 328/372 311/1 874/6 +f 321/2 338/371 875/28 +f 338/371 339/372 875/28 +f 339/372 322/1 875/28 +f 332/2 349/371 876/29 +f 349/371 350/372 876/29 +f 350/372 333/1 876/29 +f 319/208 336/226 877/209 +f 336/226 337/222 877/209 +f 337/222 320/207 877/209 +f 330/2 347/371 878/33 +f 347/371 348/372 878/33 +f 348/372 331/1 878/33 +f 328/2 345/371 879/3 +f 345/371 346/372 879/3 +f 346/372 329/1 879/3 +f 326/2 343/371 880/4 +f 343/371 344/372 880/4 +f 344/372 327/1 880/4 +f 324/2 341/371 881/210 +f 341/371 342/372 881/210 +f 342/372 325/1 881/210 +f 322/2 339/371 882/19 +f 339/371 340/372 882/19 +f 340/372 323/1 882/19 +f 333/212 350/219 883/213 +f 350/219 351/218 883/213 +f 351/218 334/211 883/213 +f 320/207 337/222 884/215 +f 337/222 338/221 884/215 +f 338/221 321/214 884/215 +f 331/2 348/371 885/5 +f 348/371 349/372 885/5 +f 349/372 332/1 885/5 +f 329/2 346/371 886/24 +f 346/371 347/372 886/24 +f 347/372 330/1 886/24 +f 327/2 344/371 887/6 +f 344/371 345/372 887/6 +f 345/372 328/1 887/6 +f 325/2 342/371 888/7 +f 342/371 343/372 888/7 +f 343/372 326/1 888/7 +f 334/211 351/218 889/217 +f 351/218 352/224 889/217 +f 352/224 335/216 889/217 +f 323/2 340/371 890/11 +f 340/371 341/372 890/11 +f 341/372 324/1 890/11 +f 345/2 362/371 891/3 +f 362/371 363/372 891/3 +f 363/372 346/1 891/3 +f 343/2 360/371 892/4 +f 360/371 361/372 892/4 +f 361/372 344/1 892/4 +f 341/2 358/371 893/18 +f 358/371 359/372 893/18 +f 359/372 342/1 893/18 +f 339/2 356/371 894/19 +f 356/371 357/372 894/19 +f 357/372 340/1 894/19 +f 350/219 367/229 895/220 +f 367/229 368/228 895/220 +f 368/228 351/218 895/220 +f 337/222 354/232 896/223 +f 354/232 355/231 896/223 +f 355/231 338/221 896/223 +f 348/2 365/371 897/5 +f 365/371 366/372 897/5 +f 366/372 349/1 897/5 +f 346/2 363/371 898/24 +f 363/371 364/372 898/24 +f 364/372 347/1 898/24 +f 344/2 361/371 899/6 +f 361/371 362/372 899/6 +f 362/372 345/1 899/6 +f 342/2 359/371 900/47 +f 359/371 360/372 900/47 +f 360/372 343/1 900/47 +f 351/218 368/228 901/225 +f 368/228 369/234 901/225 +f 369/234 352/224 901/225 +f 340/2 357/371 902/11 +f 357/371 358/372 902/11 +f 358/372 341/1 902/11 +f 338/2 355/371 903/28 +f 355/371 356/372 903/28 +f 356/372 339/1 903/28 +f 349/2 366/371 904/29 +f 366/371 367/372 904/29 +f 367/372 350/1 904/29 +f 336/226 353/237 905/227 +f 353/237 354/232 905/227 +f 354/232 337/222 905/227 +f 347/2 364/371 906/33 +f 364/371 365/372 906/33 +f 365/372 348/1 906/33 +f 358/2 375/371 907/18 +f 375/371 376/372 907/18 +f 376/372 359/1 907/18 +f 356/2 373/371 908/19 +f 373/371 374/372 908/19 +f 374/372 357/1 908/19 +f 367/229 384/247 909/230 +f 384/247 385/243 909/230 +f 385/243 368/228 909/230 +f 354/232 371/240 910/233 +f 371/240 372/239 910/233 +f 372/239 355/231 910/233 +f 365/2 382/371 911/5 +f 382/371 383/372 911/5 +f 383/372 366/1 911/5 +f 363/2 380/371 912/24 +f 380/371 381/372 912/24 +f 381/372 364/1 912/24 +f 361/2 378/371 913/6 +f 378/371 379/372 913/6 +f 379/372 362/1 913/6 +f 359/2 376/371 914/7 +f 376/371 377/372 914/7 +f 377/372 360/1 914/7 +f 368/228 385/243 915/235 +f 385/243 386/242 915/235 +f 386/242 369/234 915/235 +f 357/2 374/371 916/11 +f 374/371 375/372 916/11 +f 375/372 358/1 916/11 +f 355/2 372/371 917/236 +f 372/371 373/372 917/236 +f 373/372 356/1 917/236 +f 366/2 383/371 918/29 +f 383/371 384/372 918/29 +f 384/372 367/1 918/29 +f 353/237 370/245 919/238 +f 370/245 371/240 919/238 +f 371/240 354/232 919/238 +f 364/2 381/371 920/33 +f 381/371 382/372 920/33 +f 382/372 365/1 920/33 +f 362/2 379/371 921/3 +f 379/371 380/372 921/3 +f 380/372 363/1 921/3 +f 360/2 377/371 922/4 +f 377/371 378/372 922/4 +f 378/372 361/1 922/4 +f 371/240 388/252 923/241 +f 388/252 389/257 923/241 +f 389/257 372/239 923/241 +f 382/2 399/371 924/5 +f 399/371 400/372 924/5 +f 400/372 383/1 924/5 +f 380/2 397/371 925/24 +f 397/371 398/372 925/24 +f 398/372 381/1 925/24 +f 378/2 395/371 926/6 +f 395/371 396/372 926/6 +f 396/372 379/1 926/6 +f 376/2 393/371 927/7 +f 393/371 394/372 927/7 +f 394/372 377/1 927/7 +f 385/243 402/250 928/244 +f 402/250 403/249 928/244 +f 403/249 386/242 928/244 +f 374/2 391/371 929/11 +f 391/371 392/372 929/11 +f 392/372 375/1 929/11 +f 372/2 389/371 930/28 +f 389/371 390/372 930/28 +f 390/372 373/1 930/28 +f 383/2 400/371 931/13 +f 400/371 401/372 931/13 +f 401/372 384/1 931/13 +f 370/245 387/253 932/246 +f 387/253 388/252 932/246 +f 388/252 371/240 932/246 +f 381/2 398/371 933/33 +f 398/371 399/372 933/33 +f 399/372 382/1 933/33 +f 379/2 396/371 934/3 +f 396/371 397/372 934/3 +f 397/372 380/1 934/3 +f 377/2 394/371 935/4 +f 394/371 395/372 935/4 +f 395/372 378/1 935/4 +f 375/2 392/371 936/18 +f 392/371 393/372 936/18 +f 393/372 376/1 936/18 +f 373/2 390/371 937/19 +f 390/371 391/372 937/19 +f 391/372 374/1 937/19 +f 384/247 401/255 938/248 +f 401/255 402/250 938/248 +f 402/250 385/243 938/248 +f 395/2 412/371 939/6 +f 412/371 413/372 939/6 +f 413/372 396/1 939/6 +f 393/2 410/371 940/7 +f 410/371 411/372 940/7 +f 411/372 394/1 940/7 +f 402/250 419/260 941/251 +f 419/260 420/259 941/251 +f 420/259 403/249 941/251 +f 391/2 408/371 942/11 +f 408/371 409/372 942/11 +f 409/372 392/1 942/11 +f 389/2 406/371 943/28 +f 406/371 407/372 943/28 +f 407/372 390/1 943/28 +f 400/2 417/371 944/13 +f 417/371 418/372 944/13 +f 418/372 401/1 944/13 +f 387/253 404/263 945/254 +f 404/263 405/262 945/254 +f 405/262 388/252 945/254 +f 398/2 415/371 946/33 +f 415/371 416/372 946/33 +f 416/372 399/1 946/33 +f 396/2 413/371 947/89 +f 413/371 414/372 947/89 +f 414/372 397/1 947/89 +f 394/2 411/371 948/4 +f 411/371 412/372 948/4 +f 412/372 395/1 948/4 +f 392/2 409/371 949/18 +f 409/371 410/372 949/18 +f 410/372 393/1 949/18 +f 390/2 407/371 950/19 +f 407/371 408/372 950/19 +f 408/372 391/1 950/19 +f 401/255 418/265 951/256 +f 418/265 419/260 951/256 +f 419/260 402/250 951/256 +f 388/252 405/262 952/258 +f 405/262 406/267 952/258 +f 406/267 389/257 952/258 +f 399/2 416/371 953/5 +f 416/371 417/372 953/5 +f 417/372 400/1 953/5 +f 397/2 414/371 954/24 +f 414/371 415/372 954/24 +f 415/372 398/1 954/24 +f 419/260 436/272 955/261 +f 436/272 437/277 955/261 +f 437/277 420/259 955/261 +f 408/2 425/371 956/11 +f 425/371 426/372 956/11 +f 426/372 409/1 956/11 +f 406/2 423/371 957/12 +f 423/371 424/372 957/12 +f 424/372 407/1 957/12 +f 417/2 434/371 958/13 +f 434/371 435/372 958/13 +f 435/372 418/1 958/13 +f 404/263 421/270 959/264 +f 421/270 422/269 959/264 +f 422/269 405/262 959/264 +f 415/2 432/371 960/33 +f 432/371 433/372 960/33 +f 433/372 416/1 960/33 +f 413/2 430/371 961/3 +f 430/371 431/372 961/3 +f 431/372 414/1 961/3 +f 411/2 428/371 962/4 +f 428/371 429/372 962/4 +f 429/372 412/1 962/4 +f 409/2 426/371 963/18 +f 426/371 427/372 963/18 +f 427/372 410/1 963/18 +f 407/2 424/371 964/19 +f 424/371 425/372 964/19 +f 425/372 408/1 964/19 +f 418/265 435/273 965/266 +f 435/273 436/272 965/266 +f 436/272 419/260 965/266 +f 405/262 422/269 966/268 +f 422/269 423/275 966/268 +f 423/275 406/267 966/268 +f 416/2 433/371 967/5 +f 433/371 434/372 967/5 +f 434/372 417/1 967/5 +f 414/2 431/371 968/24 +f 431/371 432/372 968/24 +f 432/372 415/1 968/24 +f 412/2 429/371 969/6 +f 429/371 430/372 969/6 +f 430/372 413/1 969/6 +f 410/2 427/371 970/7 +f 427/371 428/372 970/7 +f 428/372 411/1 970/7 +f 421/270 438/287 971/271 +f 438/287 439/283 971/271 +f 439/283 422/269 971/271 +f 432/2 449/371 972/17 +f 449/371 450/372 972/17 +f 450/372 433/1 972/17 +f 430/2 447/371 973/3 +f 447/371 448/372 973/3 +f 448/372 431/1 973/3 +f 428/2 445/371 974/4 +f 445/371 446/372 974/4 +f 446/372 429/1 974/4 +f 426/2 443/371 975/18 +f 443/371 444/372 975/18 +f 444/372 427/1 975/18 +f 424/2 441/371 976/19 +f 441/371 442/372 976/19 +f 442/372 425/1 976/19 +f 435/273 452/280 977/274 +f 452/280 453/279 977/274 +f 453/279 436/272 977/274 +f 422/269 439/283 978/276 +f 439/283 440/282 978/276 +f 440/282 423/275 978/276 +f 433/2 450/371 979/5 +f 450/371 451/372 979/5 +f 451/372 434/1 979/5 +f 431/2 448/371 980/24 +f 448/371 449/372 980/24 +f 449/372 432/1 980/24 +f 429/2 446/371 981/6 +f 446/371 447/372 981/6 +f 447/372 430/1 981/6 +f 427/2 444/371 982/7 +f 444/371 445/372 982/7 +f 445/372 428/1 982/7 +f 436/272 453/279 983/278 +f 453/279 454/285 983/278 +f 454/285 437/277 983/278 +f 425/2 442/371 984/11 +f 442/371 443/372 984/11 +f 443/372 426/1 984/11 +f 423/2 440/371 985/28 +f 440/371 441/372 985/28 +f 441/372 424/1 985/28 +f 434/2 451/371 986/29 +f 451/371 452/372 986/29 +f 452/372 435/1 986/29 +f 445/2 462/371 987/4 +f 462/371 463/372 987/4 +f 463/372 446/1 987/4 +f 443/2 460/371 988/18 +f 460/371 461/372 988/18 +f 461/372 444/1 988/18 +f 441/2 458/371 989/19 +f 458/371 459/372 989/19 +f 459/372 442/1 989/19 +f 452/280 469/290 990/281 +f 469/290 470/289 990/281 +f 470/289 453/279 990/281 +f 439/283 456/293 991/284 +f 456/293 457/292 991/284 +f 457/292 440/282 991/284 +f 450/2 467/371 992/5 +f 467/371 468/372 992/5 +f 468/372 451/1 992/5 +f 448/2 465/371 993/24 +f 465/371 466/372 993/24 +f 466/372 449/1 993/24 +f 446/2 463/371 994/6 +f 463/371 464/372 994/6 +f 464/372 447/1 994/6 +f 444/2 461/371 995/7 +f 461/371 462/372 995/7 +f 462/372 445/1 995/7 +f 453/279 470/289 996/286 +f 470/289 471/295 996/286 +f 471/295 454/285 996/286 +f 442/2 459/371 997/70 +f 459/371 460/372 997/70 +f 460/372 443/1 997/70 +f 440/2 457/371 998/28 +f 457/371 458/372 998/28 +f 458/372 441/1 998/28 +f 451/2 468/371 999/13 +f 468/371 469/372 999/13 +f 469/372 452/1 999/13 +f 438/287 455/297 1000/288 +f 455/297 456/293 1000/288 +f 456/293 439/283 1000/288 +f 449/2 466/371 1001/33 +f 466/371 467/372 1001/33 +f 467/372 450/1 1001/33 +f 447/2 464/371 1002/3 +f 464/371 465/372 1002/3 +f 465/372 448/1 1002/3 +f 458/2 475/371 1003/19 +f 475/371 476/372 1003/19 +f 476/372 459/1 1003/19 +f 469/290 486/305 1004/291 +f 486/305 487/300 1004/291 +f 487/300 470/289 1004/291 +f 456/293 473/302 1005/294 +f 473/302 474/307 1005/294 +f 474/307 457/292 1005/294 +f 467/2 484/371 1006/5 +f 484/371 485/372 1006/5 +f 485/372 468/1 1006/5 +f 465/2 482/371 1007/24 +f 482/371 483/372 1007/24 +f 483/372 466/1 1007/24 +f 463/2 480/371 1008/6 +f 480/371 481/372 1008/6 +f 481/372 464/1 1008/6 +f 461/2 478/371 1009/7 +f 478/371 479/372 1009/7 +f 479/372 462/1 1009/7 +f 470/289 487/300 1010/296 +f 487/300 488/299 1010/296 +f 488/299 471/295 1010/296 +f 459/2 476/371 1011/11 +f 476/371 477/372 1011/11 +f 477/372 460/1 1011/11 +f 457/2 474/371 1012/28 +f 474/371 475/372 1012/28 +f 475/372 458/1 1012/28 +f 468/2 485/371 1013/29 +f 485/371 486/372 1013/29 +f 486/372 469/1 1013/29 +f 455/297 472/303 1014/298 +f 472/303 473/302 1014/298 +f 473/302 456/293 1014/298 +f 466/2 483/371 1015/33 +f 483/371 484/372 1015/33 +f 484/372 467/1 1015/33 +f 464/2 481/371 1016/3 +f 481/371 482/372 1016/3 +f 482/372 465/1 1016/3 +f 462/2 479/371 1017/4 +f 479/371 480/372 1017/4 +f 480/372 463/1 1017/4 +f 460/2 477/371 1018/18 +f 477/371 478/372 1018/18 +f 478/372 461/1 1018/18 +f 484/2 501/371 1019/5 +f 501/371 502/372 1019/5 +f 502/372 485/1 1019/5 +f 482/2 499/371 1020/24 +f 499/371 500/372 1020/24 +f 500/372 483/1 1020/24 +f 480/2 497/371 1021/6 +f 497/371 498/372 1021/6 +f 498/372 481/1 1021/6 +f 478/2 495/371 1022/7 +f 495/371 496/372 1022/7 +f 496/372 479/1 1022/7 +f 476/2 493/371 1023/11 +f 493/371 494/372 1023/11 +f 494/372 477/1 1023/11 +f 487/300 504/310 1024/301 +f 504/310 505/309 1024/301 +f 505/309 488/299 1024/301 +f 474/2 491/371 1025/28 +f 491/371 492/372 1025/28 +f 492/372 475/1 1025/28 +f 485/2 502/371 1026/29 +f 502/371 503/372 1026/29 +f 503/372 486/1 1026/29 +f 472/303 489/313 1027/304 +f 489/313 490/312 1027/304 +f 490/312 473/302 1027/304 +f 483/2 500/371 1028/33 +f 500/371 501/372 1028/33 +f 501/372 484/1 1028/33 +f 481/2 498/371 1029/3 +f 498/371 499/372 1029/3 +f 499/372 482/1 1029/3 +f 479/2 496/371 1030/4 +f 496/371 497/372 1030/4 +f 497/372 480/1 1030/4 +f 477/2 494/371 1031/18 +f 494/371 495/372 1031/18 +f 495/372 478/1 1031/18 +f 475/2 492/371 1032/19 +f 492/371 493/372 1032/19 +f 493/372 476/1 1032/19 +f 486/305 503/315 1033/306 +f 503/315 504/310 1033/306 +f 504/310 487/300 1033/306 +f 473/302 490/312 1034/308 +f 490/312 491/317 1034/308 +f 491/317 474/307 1034/308 +f 497/2 514/371 1035/6 +f 514/371 515/372 1035/6 +f 515/372 498/1 1035/6 +f 495/2 512/371 1036/7 +f 512/371 513/372 1036/7 +f 513/372 496/1 1036/7 +f 504/310 521/320 1037/311 +f 521/320 522/319 1037/311 +f 522/319 505/309 1037/311 +f 493/2 510/371 1038/11 +f 510/371 511/372 1038/11 +f 511/372 494/1 1038/11 +f 491/2 508/371 1039/28 +f 508/371 509/372 1039/28 +f 509/372 492/1 1039/28 +f 502/2 519/371 1040/29 +f 519/371 520/372 1040/29 +f 520/372 503/1 1040/29 +f 489/313 506/323 1041/314 +f 506/323 507/322 1041/314 +f 507/322 490/312 1041/314 +f 500/2 517/371 1042/33 +f 517/371 518/372 1042/33 +f 518/372 501/1 1042/33 +f 498/2 515/371 1043/3 +f 515/371 516/372 1043/3 +f 516/372 499/1 1043/3 +f 496/2 513/371 1044/4 +f 513/371 514/372 1044/4 +f 514/372 497/1 1044/4 +f 494/2 511/371 1045/18 +f 511/371 512/372 1045/18 +f 512/372 495/1 1045/18 +f 492/2 509/371 1046/19 +f 509/371 510/372 1046/19 +f 510/372 493/1 1046/19 +f 503/315 520/325 1047/316 +f 520/325 521/320 1047/316 +f 521/320 504/310 1047/316 +f 490/312 507/322 1048/318 +f 507/322 508/327 1048/318 +f 508/327 491/317 1048/318 +f 501/2 518/371 1049/5 +f 518/371 519/372 1049/5 +f 519/372 502/1 1049/5 +f 499/2 516/371 1050/24 +f 516/371 517/372 1050/24 +f 517/372 500/1 1050/24 +f 521/320 538/332 1051/321 +f 538/332 539/337 1051/321 +f 539/337 522/319 1051/321 +f 510/2 527/371 1052/11 +f 527/371 528/372 1052/11 +f 528/372 511/1 1052/11 +f 508/2 525/371 1053/12 +f 525/371 526/372 1053/12 +f 526/372 509/1 1053/12 +f 519/2 536/371 1054/13 +f 536/371 537/372 1054/13 +f 537/372 520/1 1054/13 +f 506/323 523/330 1055/324 +f 523/330 524/329 1055/324 +f 524/329 507/322 1055/324 +f 517/2 534/371 1056/33 +f 534/371 535/372 1056/33 +f 535/372 518/1 1056/33 +f 515/2 532/371 1057/3 +f 532/371 533/372 1057/3 +f 533/372 516/1 1057/3 +f 513/2 530/371 1058/4 +f 530/371 531/372 1058/4 +f 531/372 514/1 1058/4 +f 511/2 528/371 1059/18 +f 528/371 529/372 1059/18 +f 529/372 512/1 1059/18 +f 509/2 526/371 1060/19 +f 526/371 527/372 1060/19 +f 527/372 510/1 1060/19 +f 520/325 537/333 1061/326 +f 537/333 538/332 1061/326 +f 538/332 521/320 1061/326 +f 507/322 524/329 1062/328 +f 524/329 525/335 1062/328 +f 525/335 508/327 1062/328 +f 518/2 535/371 1063/5 +f 535/371 536/372 1063/5 +f 536/372 519/1 1063/5 +f 516/2 533/371 1064/24 +f 533/371 534/372 1064/24 +f 534/372 517/1 1064/24 +f 514/2 531/371 1065/6 +f 531/371 532/372 1065/6 +f 532/372 515/1 1065/6 +f 512/2 529/371 1066/47 +f 529/371 530/372 1066/47 +f 530/372 513/1 1066/47 +f 523/330 540/347 1067/331 +f 540/347 541/343 1067/331 +f 541/343 524/329 1067/331 +f 534/2 551/371 1068/17 +f 551/371 552/372 1068/17 +f 552/372 535/1 1068/17 +f 532/2 549/371 1069/3 +f 549/371 550/372 1069/3 +f 550/372 533/1 1069/3 +f 530/2 547/371 1070/4 +f 547/371 548/372 1070/4 +f 548/372 531/1 1070/4 +f 528/2 545/371 1071/18 +f 545/371 546/372 1071/18 +f 546/372 529/1 1071/18 +f 526/2 543/371 1072/19 +f 543/371 544/372 1072/19 +f 544/372 527/1 1072/19 +f 537/333 554/340 1073/334 +f 554/340 555/339 1073/334 +f 555/339 538/332 1073/334 +f 524/329 541/343 1074/336 +f 541/343 542/342 1074/336 +f 542/342 525/335 1074/336 +f 535/2 552/371 1075/5 +f 552/371 553/372 1075/5 +f 553/372 536/1 1075/5 +f 533/2 550/371 1076/24 +f 550/371 551/372 1076/24 +f 551/372 534/1 1076/24 +f 531/2 548/371 1077/6 +f 548/371 549/372 1077/6 +f 549/372 532/1 1077/6 +f 529/2 546/371 1078/7 +f 546/371 547/372 1078/7 +f 547/372 530/1 1078/7 +f 538/332 555/339 1079/338 +f 555/339 556/345 1079/338 +f 556/345 539/337 1079/338 +f 527/2 544/371 1080/11 +f 544/371 545/372 1080/11 +f 545/372 528/1 1080/11 +f 525/2 542/371 1081/28 +f 542/371 543/372 1081/28 +f 543/372 526/1 1081/28 +f 536/2 553/371 1082/29 +f 553/371 554/372 1082/29 +f 554/372 537/1 1082/29 +f 547/2 564/371 1083/4 +f 564/371 565/372 1083/4 +f 565/372 548/1 1083/4 +f 545/2 562/371 1084/18 +f 562/371 563/372 1084/18 +f 563/372 546/1 1084/18 +f 543/2 560/371 1085/19 +f 560/371 561/372 1085/19 +f 561/372 544/1 1085/19 +f 554/340 571/350 1086/341 +f 571/350 572/349 1086/341 +f 572/349 555/339 1086/341 +f 541/343 558/352 1087/344 +f 558/352 559/368 1087/344 +f 559/368 542/342 1087/344 +f 552/2 569/371 1088/5 +f 569/371 570/372 1088/5 +f 570/372 553/1 1088/5 +f 550/2 567/371 1089/24 +f 567/371 568/372 1089/24 +f 568/372 551/1 1089/24 +f 548/2 565/371 1090/6 +f 565/371 566/372 1090/6 +f 566/372 549/1 1090/6 +f 546/2 563/371 1091/7 +f 563/371 564/372 1091/7 +f 564/372 547/1 1091/7 +f 555/339 572/349 1092/346 +f 572/349 573/367 1092/346 +f 573/367 556/345 1092/346 +f 544/2 561/371 1093/11 +f 561/371 562/372 1093/11 +f 562/372 545/1 1093/11 +f 542/2 559/371 1094/12 +f 559/371 560/372 1094/12 +f 560/372 543/1 1094/12 +f 553/2 570/371 1095/29 +f 570/371 571/372 1095/29 +f 571/372 554/1 1095/29 +f 540/347 557/353 1096/348 +f 557/353 558/352 1096/348 +f 558/352 541/343 1096/348 +f 551/2 568/371 1097/33 +f 568/371 569/372 1097/33 +f 569/372 552/1 1097/33 +f 549/2 566/371 1098/3 +f 566/371 567/372 1098/3 +f 567/372 550/1 1098/3 +f 571/350 579/362 1099/351 +f 579/362 580/356 1099/351 +f 580/356 572/349 1099/351 +f 561/2 576/371 1100/11 +f 576/371 577/372 1100/11 +f 577/372 562/1 1100/11 +f 557/353 574/359 1101/354 +f 574/359 575/358 1101/354 +f 575/358 558/352 1101/354 +f 580/356 26/9 1102/357 +f 26/9 27/8 1102/357 +f 27/8 10/355 1102/357 +f 576/2 15/371 1103/11 +f 15/371 16/372 1103/11 +f 16/372 577/1 1103/11 +f 9/2 24/371 1104/13 +f 24/371 25/372 1104/13 +f 25/372 579/1 1104/13 +f 574/359 11/15 1105/360 +f 11/15 12/14 1105/360 +f 12/14 575/358 1105/360 +f 578/2 22/371 1106/33 +f 22/371 23/372 1106/33 +f 23/372 8/1 1106/33 +f 577/2 16/371 1107/18 +f 16/371 17/372 1107/18 +f 17/372 3/1 1107/18 +f 2/2 14/371 1108/19 +f 14/371 15/372 1108/19 +f 15/372 576/1 1108/19 +f 579/362 25/20 1109/363 +f 25/20 26/9 1109/363 +f 26/9 580/356 1109/363 +f 575/358 12/14 1110/365 +f 12/14 13/22 1110/365 +f 13/22 1/364 1110/365 +f 7/2 21/371 1111/24 +f 21/371 22/372 1111/24 +f 22/372 578/1 1111/24 +f 560/2 2/371 1112/19 +f 2/371 576/372 1112/19 +f 576/372 561/1 1112/19 +f 558/352 575/358 1113/369 +f 575/358 1/364 1113/369 +f 1/364 559/368 1113/369 +f 569/2 8/371 1114/5 +f 8/371 9/372 1114/5 +f 9/372 570/1 1114/5 +f 567/2 7/371 1115/24 +f 7/371 578/372 1115/24 +f 578/372 568/1 1115/24 +f 565/2 5/371 1116/6 +f 5/371 6/372 1116/6 +f 6/372 566/1 1116/6 +f 563/2 3/371 1117/7 +f 3/371 4/372 1117/7 +f 4/372 564/1 1117/7 +f 572/349 580/356 1118/370 +f 580/356 10/355 1118/370 +f 10/355 573/367 1118/370 +f 559/2 1/371 1119/12 +f 1/371 2/372 1119/12 +f 2/372 560/1 1119/12 +f 570/2 9/371 1120/29 +f 9/371 579/372 1120/29 +f 579/372 571/1 1120/29 +f 568/2 578/371 1121/33 +f 578/371 8/372 1121/33 +f 8/372 569/1 1121/33 +f 566/2 6/371 1122/3 +f 6/371 7/372 1122/3 +f 7/372 567/1 1122/3 +f 564/2 4/371 1123/4 +f 4/371 5/372 1123/4 +f 5/372 565/1 1123/4 +f 562/2 577/371 1124/18 +f 577/371 3/372 1124/18 +f 3/372 563/1 1124/18 diff --git a/src/main/resources/assets/draconicevolution/sounds.json b/src/main/resources/assets/draconicevolution/sounds.json index b257f088..147cf1a8 100644 --- a/src/main/resources/assets/draconicevolution/sounds.json +++ b/src/main/resources/assets/draconicevolution/sounds.json @@ -79,6 +79,15 @@ "stream": false } ] + }, + "shieldStrike": { + "category": "player", + "sounds": [ + { + "name": "shieldStrike", + "stream": false + } + ] } } diff --git a/src/main/resources/assets/draconicevolution/sounds/shieldStrike.ogg b/src/main/resources/assets/draconicevolution/sounds/shieldStrike.ogg new file mode 100644 index 00000000..9062118d Binary files /dev/null and b/src/main/resources/assets/draconicevolution/sounds/shieldStrike.ogg differ diff --git a/src/main/resources/assets/draconicevolution/textures/gui/HUD.png b/src/main/resources/assets/draconicevolution/textures/gui/HUD.png index 6c13605a..66c425b1 100644 Binary files a/src/main/resources/assets/draconicevolution/textures/gui/HUD.png and b/src/main/resources/assets/draconicevolution/textures/gui/HUD.png differ diff --git a/src/main/resources/assets/draconicevolution/textures/models/ShieldSphere.png b/src/main/resources/assets/draconicevolution/textures/models/ShieldSphere.png new file mode 100644 index 00000000..7dcb94aa Binary files /dev/null and b/src/main/resources/assets/draconicevolution/textures/models/ShieldSphere.png differ