From c822954e79e9da8268979664f5019925baf0f2f3 Mon Sep 17 00:00:00 2001 From: brandon3055 Date: Tue, 1 Mar 2016 21:19:09 +1100 Subject: [PATCH] Working on the bows --- Change Log.txt | 11 +- build.properties | 2 +- .../draconicevolution/DraconicEvolution.java | 2 +- .../client/gui/componentguis/GUIReactor.java | 4 +- .../gui/componentguis/GUIToolConfig.java | 22 +- .../client/handler/ClientEventHandler.java | 23 +- .../client/keybinding/KeyInputHandler.java | 2 +- .../special/ModelStaffOfTheGreatOne.java | 957 ++++++++++++++++++ .../client/render/item/RenderBowModel.java | 63 +- .../render/item/RenderChaosFragment.java | 3 + .../draconicevolution/common/CommonProxy.java | 5 +- .../container/ContainerUpgradeModifier.java | 8 +- .../common/entity/EntityCustomArrow.java | 496 +++++++++ .../common/entity/EntityDragonHeart.java | 14 +- .../common/entity/EntityEnderArrow.java | 155 +-- .../common/items/SunFocus.java | 3 +- .../items/armor/CustomArmorHandler.java | 20 +- .../common/items/armor/DraconicArmor.java | 9 +- .../common/items/armor/WyvernArmor.java | 2 +- .../common/items/tools/DraconicAxe.java | 4 +- .../items/tools/DraconicDistructionStaff.java | 1 + .../common/items/tools/DraconicPickaxe.java | 2 +- .../common/items/tools/DraconicShovel.java | 2 +- .../common/items/tools/WyvernPickaxe.java | 2 +- .../common/items/tools/WyvernShovel.java | 2 +- .../items/tools/baseclasses/MiningTool.java | 2 +- .../common/items/weapons/BowHandler.java | 217 +++- .../common/items/weapons/DraconicBow.java | 254 ++--- .../common/items/weapons/WyvernBow.java | 233 +++-- .../common/lib/VersionHandler.java | 2 +- .../common/network/ButtonPacket.java | 2 +- .../tileentities/TileParticleGenerator.java | 6 + .../TileInvisibleMultiblock.java | 5 + .../common/utills/IUpgradableItem.java | 16 +- .../integration/nei/DENEIGuiHandler.java | 2 + .../nei/NEIDraconicevolutionConfig.java | 1 + .../assets/draconicevolution/lang/en_US.lang | 10 +- .../manual/manual-en_US.json | 10 +- .../{wyvern_shovel.png => wyvernShovel.png} | Bin 39 files changed, 2171 insertions(+), 403 deletions(-) create mode 100644 src/main/java/com/brandon3055/draconicevolution/client/model/special/ModelStaffOfTheGreatOne.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomArrow.java rename src/main/resources/assets/draconicevolution/textures/items/{wyvern_shovel.png => wyvernShovel.png} (100%) diff --git a/Change Log.txt b/Change Log.txt index a1525f09..a7ffb8c4 100644 --- a/Change Log.txt +++ b/Change Log.txt @@ -1,4 +1,12 @@ -######## 1.0.2-Snapshot 10 ######## +######## 1.0.2-Snapshot 11 ######## +-the upgrade modifier can now hold any item FOR DISPLAY PURPOSES ONLY (this was requested by a user) +-added inertia cancellation to the draconic chestplate. +-change: an active dragon heart will now immediately drop as an item if a player comes into contact with it. + +######## 1.0.2-Snapshot 10-beta2 ######## +-fixed client unable to connect to a server while wearing draconic armor. + +######## 1.0.2-Snapshot 10-beta ######## -fixed hover text for stats in the reactor gui showing when the stats page is closed. -beacons can now pass through energy core. -fixed bug in old 2D armor models. @@ -12,6 +20,7 @@ -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. +-updated documentation. ######## 1.0.2-Snapshot 9 ######## -added config option to adjust the distance between chaos islands. diff --git a/build.properties b/build.properties index 50a1edac..8ec660b2 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ minecraft_version=1.7.10 -mod_version=1.0.2-Snapshot_10-beta_build2 +mod_version=1.0.2-Snapshot_10-beta2 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/DraconicEvolution.java b/src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java index 23d5fc0d..9eed6ca6 100644 --- a/src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java +++ b/src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java @@ -21,7 +21,7 @@ import java.util.Arrays; "after:NotEnoughItems;" + "after:ThermalExpansion;" + "after:ThermalFoundation;" + - "required-after:BrandonsCore@[1.0.0.10,);") + "required-after:BrandonsCore@[1.0.0.11,);") public class DraconicEvolution { @Mod.Instance(References.MODID) diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIReactor.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIReactor.java index 6e162650..556467bd 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIReactor.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIReactor.java @@ -42,7 +42,7 @@ public class GUIReactor extends GUIBase { } @Override - protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) {//todo tool tips + protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(f, mouseX, mouseY); //Draw I/O Slots if (reactor.reactorState == TileReactorCore.STATE_OFFLINE){ @@ -115,7 +115,7 @@ public class GUIReactor extends GUIBase { List text = new ArrayList(); if (GuiHelper.isInRect(9, 4, 18, 114, mouseX - guiLeft, mouseY - guiTop)){ text.add(StatCollector.translateToLocal("gui.de.reactionTemp.txt")); - text.add((int)reactor.reactionTemperature + "°C"); + text.add((int)reactor.reactionTemperature + "C"); drawHoveringText(text, mouseX, mouseY, fontRendererObj); } else if (GuiHelper.isInRect(33, 4, 18, 114, mouseX-guiLeft, mouseY-guiTop)){ 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 4e451c80..f50d1b55 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 @@ -8,6 +8,7 @@ import com.brandon3055.draconicevolution.client.gui.guicomponents.ComponentConfi 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.items.weapons.BowHandler; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.network.ItemConfigPacket; import com.brandon3055.draconicevolution.common.utills.IConfigurableItem; @@ -21,6 +22,9 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.util.StringUtils; +import java.util.ArrayList; +import java.util.List; + /** * Created by Brandon on 26/12/2014. */ @@ -175,7 +179,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; +// slot = -1; } else if (level == 3){//inventory screen @@ -216,4 +220,20 @@ public class GUIToolConfig extends GUIBase { } } } + + @Override + protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(f, mouseX, mouseY); + + if (slot > -1) editingItem = player.inventory.getStackInSlot(slot); + if (slot > -1 && editingItem != null && editingItem.getUnlocalizedName().toLowerCase().contains("bow")){ + BowHandler.BowProperties properties = new BowHandler.BowProperties(editingItem, player); + + List list = new ArrayList(); + list.add("RF/Shot: "+properties.calculateEnergyCost()); + drawHoveringText(list, guiLeft + xSize - 8, guiTop, fontRendererObj); + + if (!properties.canFire() && properties.cantFireMessage != null && !properties.cantFireMessage.equals("msg.de.outOfArrows.name")) fontRendererObj.drawSplitString(StatCollector.translateToLocal(properties.cantFireMessage), guiLeft, guiTop+ySize, xSize, 0xFF0000); + } + } } 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 8b7d7b95..cb1bdd3c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/handler/ClientEventHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/handler/ClientEventHandler.java @@ -108,24 +108,27 @@ public class ClientEventHandler { float zMax = 1f; + if (ItemNBTHelper.getString(event.entity.getItemInUse(), "mode", "").equals("sharpshooter")){ if (event.entity.getItemInUse().getItem() instanceof WyvernBow) zMax = 1.35f; else if (event.entity.getItemInUse().getItem() instanceof DraconicBow) zMax = 2.5f; bowZoom = true; tickSet = elapsedTicks; + + } - if (f1 < zMax) - { - f1 *= (f1*(zMax*2)); - } - else f1 = previousFOB; - - previousFOB = f1; - - f *= 1.0F - f1 * 0.15F; - event.newfov = f; +// if (f1 < zMax) +// { +// f1 *= (f1*(zMax*2)); +// } +// else f1 = previousFOB; +// +// previousFOB = f1; +// +// f *= 1.0F - f1 * 0.15F; +// event.newfov = f; } //endregion 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 1fb4b522..06cd8517 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java @@ -32,7 +32,7 @@ public class KeyInputHandler { else if(KeyBindings.toolConfig.isPressed()) { DraconicEvolution.network.sendToServer(new ButtonPacket(ButtonPacket.ID_TOOLCONFIG, false)); } - else if (KeyBindings.toolProfileChange.isPressed() && Minecraft.getMinecraft().thePlayer != null){ + else if (KeyBindings.toolProfileChange.isPressed() && Minecraft.getMinecraft().thePlayer != null && Minecraft.getMinecraft().thePlayer.getItemInUse() == null){ DraconicEvolution.network.sendToServer(new ButtonPacket(ButtonPacket.ID_TOOL_PROFILE_CHANGE, false)); ItemStack stack = Minecraft.getMinecraft().thePlayer.getHeldItem(); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/model/special/ModelStaffOfTheGreatOne.java b/src/main/java/com/brandon3055/draconicevolution/client/model/special/ModelStaffOfTheGreatOne.java new file mode 100644 index 00000000..6b44af21 --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/client/model/special/ModelStaffOfTheGreatOne.java @@ -0,0 +1,957 @@ +package com.brandon3055.draconicevolution.client.model.special; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; +import org.lwjgl.opengl.GL11; + +/** + * Staff of the Great One - brandon3055 + * Created using Tabula 5.0.0 + */ +public class ModelStaffOfTheGreatOne extends ModelBase { + public double[] modelScale = new double[] { 2.0D, 2.0D, 2.0D }; + public ModelRenderer staff; + public ModelRenderer edge1; + public ModelRenderer edge1_1; + public ModelRenderer edge1_2; + public ModelRenderer edge1_3; + public ModelRenderer edge2; + public ModelRenderer edge2_1; + public ModelRenderer edge2_2; + public ModelRenderer edge2_3; + public ModelRenderer edge3; + public ModelRenderer edge3_1; + public ModelRenderer edge3_2; + public ModelRenderer edge3_3; + public ModelRenderer edge4; + public ModelRenderer edge4_1; + public ModelRenderer edge4_2; + public ModelRenderer edge5; + public ModelRenderer edge5_1; + public ModelRenderer edge5_2; + public ModelRenderer edge5_3; + public ModelRenderer edge5_4; + public ModelRenderer topedge1; + public ModelRenderer topedge1_1; + public ModelRenderer topedge1_2; + public ModelRenderer topedge1_3; + public ModelRenderer topedge2; + public ModelRenderer topedge2_1; + public ModelRenderer topedge2_2; + public ModelRenderer topedge2_3; + public ModelRenderer topedge3; + public ModelRenderer topedge3_1; + public ModelRenderer topedge3_2; + public ModelRenderer topedge3_3; + public ModelRenderer topedge4; + public ModelRenderer topedge4_1; + public ModelRenderer topedge4_2; + public ModelRenderer topedge4_3; + public ModelRenderer topedge5; + public ModelRenderer topedge5_1; + public ModelRenderer topedge5_2; + public ModelRenderer topedge5_3; + public ModelRenderer tope1; + public ModelRenderer tope2; + public ModelRenderer shape2; + public ModelRenderer staffTopQ; + public ModelRenderer staffTopQ_1; + public ModelRenderer staffTopQ_2; + public ModelRenderer staffTopM; + public ModelRenderer staffTopM_1; + public ModelRenderer staffTopM_2; + public ModelRenderer staffTopM_3; + public ModelRenderer staffTopM_4; + public ModelRenderer shape2_1; + public ModelRenderer shape2_2; + public ModelRenderer staffTopQ_3; + public ModelRenderer shape2_3; + public ModelRenderer shape3; + public ModelRenderer shape3_1; + public ModelRenderer shape3_2; + public ModelRenderer shape3_3; + public ModelRenderer shape4; + public ModelRenderer shape4_1; + public ModelRenderer shape4_2; + public ModelRenderer shape4_3; + public ModelRenderer shape5; + public ModelRenderer shape5_1; + public ModelRenderer shape5_2; + public ModelRenderer shape5_3; + public ModelRenderer shape6; + public ModelRenderer shape6_1; + public ModelRenderer shape6_2; + public ModelRenderer shape6_3; + public ModelRenderer shape7; + public ModelRenderer shape7_1; + public ModelRenderer shape7_2; + public ModelRenderer shape7_3; + public ModelRenderer tope3; + + public ModelStaffOfTheGreatOne() { + this.textureWidth = 32; + this.textureHeight = 64; + this.edge1 = new ModelRenderer(this, 6, 0); + this.edge1.setRotationPoint(1.05F, -4.5F, -1.05F); + this.edge1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.staffTopM_3 = new ModelRenderer(this, 12, 19); + this.staffTopM_3.setRotationPoint(0.7F, 0.7F, 0.0F); + this.staffTopM_3.addBox(-0.5F, -4.0F, -0.5F, 1, 4, 1, 0.0F); + this.setRotateAngle(staffTopM_3, 0.0F, 0.0F, -0.2617993877991494F); + this.edge2_1 = new ModelRenderer(this, 26, 0); + this.edge2_1.setRotationPoint(-1.15F, -5.2F, -1.15F); + this.edge2_1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape5_1 = new ModelRenderer(this, 12, 26); + this.shape5_1.setRotationPoint(-0.85F, -2.4F, -0.85F); + this.shape5_1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape4_2 = new ModelRenderer(this, 19, 25); + this.shape4_2.setRotationPoint(-0.8F, -1.7F, 0.8F); + this.shape4_2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.tope2 = new ModelRenderer(this, 27, 13); + this.tope2.setRotationPoint(0.0F, -10.9F, 0.0F); + this.tope2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.tope1 = new ModelRenderer(this, 24, 12); + this.tope1.setRotationPoint(0.0F, -10.4F, 0.0F); + this.tope1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape7_2 = new ModelRenderer(this, 19, 29); + this.shape7_2.setRotationPoint(-0.95F, -3.8F, 0.95F); + this.shape7_2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape4 = new ModelRenderer(this, 16, 24); + this.shape4.setRotationPoint(0.8F, -1.7F, 0.8F); + this.shape4.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape2_2 = new ModelRenderer(this, 23, 20); + this.shape2_2.setRotationPoint(0.7F, -0.3F, 0.7F); + this.shape2_2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.topedge2_2 = new ModelRenderer(this, 16, 8); + this.topedge2_2.setRotationPoint(1.15F, -8.4F, 1.15F); + this.topedge2_2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.topedge4_1 = new ModelRenderer(this, 20, 10); + this.topedge4_1.setRotationPoint(0.73F, -9.4F, 0.73F); + this.topedge4_1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.topedge5 = new ModelRenderer(this, 8, 12); + this.topedge5.setRotationPoint(-0.5F, -9.9F, 0.5F); + this.topedge5.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.topedge4_2 = new ModelRenderer(this, 24, 10); + this.topedge4_2.setRotationPoint(0.73F, -9.4F, -0.73F); + this.topedge4_2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape6_2 = new ModelRenderer(this, 8, 28); + this.shape6_2.setRotationPoint(-0.9F, -3.1F, -0.9F); + this.shape6_2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.edge3 = new ModelRenderer(this, 16, 2); + this.edge3.setRotationPoint(1.25F, -5.9F, 1.25F); + this.edge3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.topedge4_3 = new ModelRenderer(this, 27, 11); + this.topedge4_3.setRotationPoint(-0.77F, -9.4F, -0.73F); + this.topedge4_3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape5_3 = new ModelRenderer(this, 22, 26); + this.shape5_3.setRotationPoint(0.85F, -2.4F, -0.85F); + this.shape5_3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape4_3 = new ModelRenderer(this, 25, 25); + this.shape4_3.setRotationPoint(0.8F, -1.7F, -0.8F); + this.shape4_3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.topedge3 = new ModelRenderer(this, 24, 8); + this.topedge3.setRotationPoint(-0.95F, -8.9F, 0.95F); + this.topedge3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.topedge4 = new ModelRenderer(this, 16, 10); + this.topedge4.setRotationPoint(-0.73F, -9.4F, 0.73F); + this.topedge4.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.edge5_2 = new ModelRenderer(this, 27, 5); + this.edge5_2.setRotationPoint(1.45F, -7.3F, 1.45F); + this.edge5_2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.edge5 = new ModelRenderer(this, 20, 4); + this.edge5.setRotationPoint(-1.35F, -6.6F, 1.35F); + this.edge5.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.topedge2_3 = new ModelRenderer(this, 20, 8); + this.topedge2_3.setRotationPoint(1.15F, -8.4F, -1.15F); + this.topedge2_3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape6_3 = new ModelRenderer(this, 12, 28); + this.shape6_3.setRotationPoint(-0.9F, -3.1F, 0.9F); + this.shape6_3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.edge1_1 = new ModelRenderer(this, 10, 0); + this.edge1_1.setRotationPoint(-1.05F, -4.5F, -1.05F); + this.edge1_1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape5_2 = new ModelRenderer(this, 16, 26); + this.shape5_2.setRotationPoint(-0.85F, -2.4F, 0.85F); + this.shape5_2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.topedge5_2 = new ModelRenderer(this, 16, 12); + this.topedge5_2.setRotationPoint(0.5F, -9.9F, -0.5F); + this.topedge5_2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.topedge2 = new ModelRenderer(this, 8, 8); + this.topedge2.setRotationPoint(-1.15F, -8.4F, -1.15F); + this.topedge2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.staffTopQ_3 = new ModelRenderer(this, 8, 21); + this.staffTopQ_3.setRotationPoint(0.65F, -0.3F, 0.65F); + this.staffTopQ_3.addBox(-0.5F, -3.2F, -0.5F, 1, 4, 1, 0.0F); + this.edge4_2 = new ModelRenderer(this, 16, 4); + this.edge4_2.setRotationPoint(-1.35F, -6.6F, -1.35F); + this.edge4_2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.staffTopQ_1 = new ModelRenderer(this, 16, 14); + this.staffTopQ_1.setRotationPoint(-0.65F, -0.3F, -0.65F); + this.staffTopQ_1.addBox(-0.5F, -3.2F, -0.5F, 1, 4, 1, 0.0F); + this.edge3_3 = new ModelRenderer(this, 27, 3); + this.edge3_3.setRotationPoint(-1.25F, -5.9F, 1.25F); + this.edge3_3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape3 = new ModelRenderer(this, 23, 22); + this.shape3.setRotationPoint(0.75F, -1.0F, 0.75F); + this.shape3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape2_3 = new ModelRenderer(this, 20, 21); + this.shape2_3.setRotationPoint(0.7F, -0.3F, -0.7F); + this.shape2_3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.topedge1 = new ModelRenderer(this, 16, 6); + this.topedge1.setRotationPoint(-1.35F, -7.9F, 1.35F); + this.topedge1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.topedge5_1 = new ModelRenderer(this, 12, 12); + this.topedge5_1.setRotationPoint(0.5F, -9.9F, 0.5F); + this.topedge5_1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape7_3 = new ModelRenderer(this, 25, 29); + this.shape7_3.setRotationPoint(-0.95F, -3.8F, -0.95F); + this.shape7_3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.staffTopM_2 = new ModelRenderer(this, 27, 18); + this.staffTopM_2.setRotationPoint(0.0F, 0.7F, 0.7F); + this.staffTopM_2.addBox(-0.5F, -4.0F, -0.5F, 1, 4, 1, 0.0F); + this.setRotateAngle(staffTopM_2, 0.2617993877991494F, 0.0F, 0.0F); + this.shape3_3 = new ModelRenderer(this, 12, 24); + this.shape3_3.setRotationPoint(0.75F, -1.0F, -0.75F); + this.shape3_3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape3_1 = new ModelRenderer(this, 19, 23); + this.shape3_1.setRotationPoint(-0.75F, -1.0F, -0.75F); + this.shape3_1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape6_1 = new ModelRenderer(this, 25, 27); + this.shape6_1.setRotationPoint(0.9F, -3.1F, -0.9F); + this.shape6_1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape7_1 = new ModelRenderer(this, 22, 28); + this.shape7_1.setRotationPoint(0.95F, -3.8F, -0.95F); + this.shape7_1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.topedge1_3 = new ModelRenderer(this, 27, 7); + this.topedge1_3.setRotationPoint(1.35F, -7.9F, 1.35F); + this.topedge1_3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.tope3 = new ModelRenderer(this, 8, 30); + this.tope3.setRotationPoint(0.0F, -11.4F, 0.0F); + this.tope3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape5 = new ModelRenderer(this, 8, 26); + this.shape5.setRotationPoint(0.85F, -2.4F, 0.85F); + this.shape5.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.topedge3_1 = new ModelRenderer(this, 27, 9); + this.topedge3_1.setRotationPoint(0.95F, -8.9F, -0.95F); + this.topedge3_1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.topedge5_3 = new ModelRenderer(this, 20, 12); + this.topedge5_3.setRotationPoint(-0.5F, -9.9F, -0.5F); + this.topedge5_3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.edge5_3 = new ModelRenderer(this, 8, 6); + this.edge5_3.setRotationPoint(-1.45F, -7.3F, 1.45F); + this.edge5_3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.edge3_1 = new ModelRenderer(this, 20, 2); + this.edge3_1.setRotationPoint(1.25F, -5.9F, -1.25F); + this.edge3_1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape7 = new ModelRenderer(this, 16, 28); + this.shape7.setRotationPoint(0.95F, -3.8F, 0.95F); + this.shape7.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.topedge1_1 = new ModelRenderer(this, 20, 6); + this.topedge1_1.setRotationPoint(-1.35F, -7.9F, -1.35F); + this.topedge1_1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape2_1 = new ModelRenderer(this, 20, 19); + this.shape2_1.setRotationPoint(-0.7F, -0.3F, -0.7F); + this.shape2_1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.edge2_3 = new ModelRenderer(this, 12, 2); + this.edge2_3.setRotationPoint(-1.15F, -5.2F, 1.15F); + this.edge2_3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.topedge3_2 = new ModelRenderer(this, 8, 10); + this.topedge3_2.setRotationPoint(-0.95F, -8.9F, -0.95F); + this.topedge3_2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.edge1_2 = new ModelRenderer(this, 14, 0); + this.edge1_2.setRotationPoint(1.05F, -4.5F, 1.05F); + this.edge1_2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.edge2_2 = new ModelRenderer(this, 8, 2); + this.edge2_2.setRotationPoint(1.15F, -5.2F, 1.15F); + this.edge2_2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.edge2 = new ModelRenderer(this, 22, 0); + this.edge2.setRotationPoint(1.15F, -5.2F, -1.15F); + this.edge2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.staffTopM = new ModelRenderer(this, 24, 14); + this.staffTopM.setRotationPoint(-0.7F, 0.7F, 0.0F); + this.staffTopM.addBox(-0.5F, -4.0F, -0.5F, 1, 4, 1, 0.0F); + this.setRotateAngle(staffTopM, 0.0F, 0.0F, 0.2617993877991494F); + this.edge5_1 = new ModelRenderer(this, 24, 4); + this.edge5_1.setRotationPoint(-1.45F, -7.3F, -1.45F); + this.edge5_1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.staffTopQ = new ModelRenderer(this, 12, 14); + this.staffTopQ.setRotationPoint(-0.65F, -0.3F, 0.65F); + this.staffTopQ.addBox(-0.5F, -3.2F, -0.5F, 1, 4, 1, 0.0F); + this.edge4_1 = new ModelRenderer(this, 12, 4); + this.edge4_1.setRotationPoint(1.35F, -6.6F, -1.35F); + this.edge4_1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.staffTopM_1 = new ModelRenderer(this, 8, 16); + this.staffTopM_1.setRotationPoint(0.7F, 0.7F, 0.0F); + this.staffTopM_1.addBox(-0.5F, -4.0F, -0.5F, 1, 4, 1, 0.0F); + this.setRotateAngle(staffTopM_1, 0.006283185307179587F, 0.0F, -0.2617993877991494F); + this.edge3_2 = new ModelRenderer(this, 24, 2); + this.edge3_2.setRotationPoint(-1.25F, -5.9F, -1.25F); + this.edge3_2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.staffTopQ_2 = new ModelRenderer(this, 20, 14); + this.staffTopQ_2.setRotationPoint(0.65F, -0.3F, -0.65F); + this.staffTopQ_2.addBox(-0.5F, -3.2F, -0.5F, 1, 4, 1, 0.0F); + this.staffTopM_4 = new ModelRenderer(this, 16, 19); + this.staffTopM_4.setRotationPoint(0.0F, 0.7F, -0.7F); + this.staffTopM_4.addBox(-0.5F, -4.0F, -0.5F, 1, 4, 1, 0.0F); + this.setRotateAngle(staffTopM_4, -0.2617993877991494F, 0.0F, 0.0F); + this.topedge3_3 = new ModelRenderer(this, 12, 10); + this.topedge3_3.setRotationPoint(0.95F, -8.9F, 0.95F); + this.topedge3_3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape3_2 = new ModelRenderer(this, 26, 23); + this.shape3_2.setRotationPoint(-0.75F, -1.0F, 0.75F); + this.shape3_2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.edge1_3 = new ModelRenderer(this, 18, 0); + this.edge1_3.setRotationPoint(-1.05F, -4.5F, 1.05F); + this.edge1_3.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.topedge2_1 = new ModelRenderer(this, 12, 8); + this.topedge2_1.setRotationPoint(-1.15F, -8.4F, 1.15F); + this.topedge2_1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape2 = new ModelRenderer(this, 8, 14); + this.shape2.setRotationPoint(-0.7F, -0.3F, 0.7F); + this.shape2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.staff = new ModelRenderer(this, 0, 0); + this.staff.setRotationPoint(0.0F, 0.5F, 0.0F); + this.staff.addBox(-1.0F, 0.0F, -1.0F, 2, 40, 2, 0.0F); + this.shape6 = new ModelRenderer(this, 19, 27); + this.shape6.setRotationPoint(0.9F, -3.1F, 0.9F); + this.shape6.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.edge4 = new ModelRenderer(this, 8, 4); + this.edge4.setRotationPoint(1.35F, -6.6F, 1.35F); + this.edge4.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.topedge1_2 = new ModelRenderer(this, 24, 6); + this.topedge1_2.setRotationPoint(1.35F, -7.9F, -1.35F); + this.topedge1_2.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.shape4_1 = new ModelRenderer(this, 22, 24); + this.shape4_1.setRotationPoint(-0.8F, -1.7F, -0.8F); + this.shape4_1.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.edge5_4 = new ModelRenderer(this, 12, 6); + this.edge5_4.setRotationPoint(1.45F, -7.3F, -1.45F); + this.edge5_4.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + GL11.glPushMatrix(); + GL11.glScaled(1D / modelScale[0], 1D / modelScale[1], 1D / modelScale[2]); + GL11.glPushMatrix(); + GL11.glTranslated(this.edge1.offsetX, this.edge1.offsetY, this.edge1.offsetZ); + GL11.glTranslated(this.edge1.rotationPointX * f5, this.edge1.rotationPointY * f5, this.edge1.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.edge1.offsetX, -this.edge1.offsetY, -this.edge1.offsetZ); + GL11.glTranslated(-this.edge1.rotationPointX * f5, -this.edge1.rotationPointY * f5, -this.edge1.rotationPointZ * f5); + this.edge1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.staffTopM_3.offsetX, this.staffTopM_3.offsetY, this.staffTopM_3.offsetZ); + GL11.glTranslated(this.staffTopM_3.rotationPointX * f5, this.staffTopM_3.rotationPointY * f5, this.staffTopM_3.rotationPointZ * f5); + GL11.glScaled(0.6D, 1.06D, 0.6D); + GL11.glTranslated(-this.staffTopM_3.offsetX, -this.staffTopM_3.offsetY, -this.staffTopM_3.offsetZ); + GL11.glTranslated(-this.staffTopM_3.rotationPointX * f5, -this.staffTopM_3.rotationPointY * f5, -this.staffTopM_3.rotationPointZ * f5); + this.staffTopM_3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.edge2_1.offsetX, this.edge2_1.offsetY, this.edge2_1.offsetZ); + GL11.glTranslated(this.edge2_1.rotationPointX * f5, this.edge2_1.rotationPointY * f5, this.edge2_1.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.edge2_1.offsetX, -this.edge2_1.offsetY, -this.edge2_1.offsetZ); + GL11.glTranslated(-this.edge2_1.rotationPointX * f5, -this.edge2_1.rotationPointY * f5, -this.edge2_1.rotationPointZ * f5); + this.edge2_1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape5_1.offsetX, this.shape5_1.offsetY, this.shape5_1.offsetZ); + GL11.glTranslated(this.shape5_1.rotationPointX * f5, this.shape5_1.rotationPointY * f5, this.shape5_1.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape5_1.offsetX, -this.shape5_1.offsetY, -this.shape5_1.offsetZ); + GL11.glTranslated(-this.shape5_1.rotationPointX * f5, -this.shape5_1.rotationPointY * f5, -this.shape5_1.rotationPointZ * f5); + this.shape5_1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape4_2.offsetX, this.shape4_2.offsetY, this.shape4_2.offsetZ); + GL11.glTranslated(this.shape4_2.rotationPointX * f5, this.shape4_2.rotationPointY * f5, this.shape4_2.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape4_2.offsetX, -this.shape4_2.offsetY, -this.shape4_2.offsetZ); + GL11.glTranslated(-this.shape4_2.rotationPointX * f5, -this.shape4_2.rotationPointY * f5, -this.shape4_2.rotationPointZ * f5); + this.shape4_2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.tope2.offsetX, this.tope2.offsetY, this.tope2.offsetZ); + GL11.glTranslated(this.tope2.rotationPointX * f5, this.tope2.rotationPointY * f5, this.tope2.rotationPointZ * f5); + GL11.glScaled(0.9D, 0.5D, 0.9D); + GL11.glTranslated(-this.tope2.offsetX, -this.tope2.offsetY, -this.tope2.offsetZ); + GL11.glTranslated(-this.tope2.rotationPointX * f5, -this.tope2.rotationPointY * f5, -this.tope2.rotationPointZ * f5); + this.tope2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.tope1.offsetX, this.tope1.offsetY, this.tope1.offsetZ); + GL11.glTranslated(this.tope1.rotationPointX * f5, this.tope1.rotationPointY * f5, this.tope1.rotationPointZ * f5); + GL11.glScaled(1.2D, 0.5D, 1.2D); + GL11.glTranslated(-this.tope1.offsetX, -this.tope1.offsetY, -this.tope1.offsetZ); + GL11.glTranslated(-this.tope1.rotationPointX * f5, -this.tope1.rotationPointY * f5, -this.tope1.rotationPointZ * f5); + this.tope1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape7_2.offsetX, this.shape7_2.offsetY, this.shape7_2.offsetZ); + GL11.glTranslated(this.shape7_2.rotationPointX * f5, this.shape7_2.rotationPointY * f5, this.shape7_2.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape7_2.offsetX, -this.shape7_2.offsetY, -this.shape7_2.offsetZ); + GL11.glTranslated(-this.shape7_2.rotationPointX * f5, -this.shape7_2.rotationPointY * f5, -this.shape7_2.rotationPointZ * f5); + this.shape7_2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape4.offsetX, this.shape4.offsetY, this.shape4.offsetZ); + GL11.glTranslated(this.shape4.rotationPointX * f5, this.shape4.rotationPointY * f5, this.shape4.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape4.offsetX, -this.shape4.offsetY, -this.shape4.offsetZ); + GL11.glTranslated(-this.shape4.rotationPointX * f5, -this.shape4.rotationPointY * f5, -this.shape4.rotationPointZ * f5); + this.shape4.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape2_2.offsetX, this.shape2_2.offsetY, this.shape2_2.offsetZ); + GL11.glTranslated(this.shape2_2.rotationPointX * f5, this.shape2_2.rotationPointY * f5, this.shape2_2.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape2_2.offsetX, -this.shape2_2.offsetY, -this.shape2_2.offsetZ); + GL11.glTranslated(-this.shape2_2.rotationPointX * f5, -this.shape2_2.rotationPointY * f5, -this.shape2_2.rotationPointZ * f5); + this.shape2_2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.topedge2_2.offsetX, this.topedge2_2.offsetY, this.topedge2_2.offsetZ); + GL11.glTranslated(this.topedge2_2.rotationPointX * f5, this.topedge2_2.rotationPointY * f5, this.topedge2_2.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.5D, 0.6D); + GL11.glTranslated(-this.topedge2_2.offsetX, -this.topedge2_2.offsetY, -this.topedge2_2.offsetZ); + GL11.glTranslated(-this.topedge2_2.rotationPointX * f5, -this.topedge2_2.rotationPointY * f5, -this.topedge2_2.rotationPointZ * f5); + this.topedge2_2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.topedge4_1.offsetX, this.topedge4_1.offsetY, this.topedge4_1.offsetZ); + GL11.glTranslated(this.topedge4_1.rotationPointX * f5, this.topedge4_1.rotationPointY * f5, this.topedge4_1.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.5D, 0.6D); + GL11.glTranslated(-this.topedge4_1.offsetX, -this.topedge4_1.offsetY, -this.topedge4_1.offsetZ); + GL11.glTranslated(-this.topedge4_1.rotationPointX * f5, -this.topedge4_1.rotationPointY * f5, -this.topedge4_1.rotationPointZ * f5); + this.topedge4_1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.topedge5.offsetX, this.topedge5.offsetY, this.topedge5.offsetZ); + GL11.glTranslated(this.topedge5.rotationPointX * f5, this.topedge5.rotationPointY * f5, this.topedge5.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.5D, 0.6D); + GL11.glTranslated(-this.topedge5.offsetX, -this.topedge5.offsetY, -this.topedge5.offsetZ); + GL11.glTranslated(-this.topedge5.rotationPointX * f5, -this.topedge5.rotationPointY * f5, -this.topedge5.rotationPointZ * f5); + this.topedge5.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.topedge4_2.offsetX, this.topedge4_2.offsetY, this.topedge4_2.offsetZ); + GL11.glTranslated(this.topedge4_2.rotationPointX * f5, this.topedge4_2.rotationPointY * f5, this.topedge4_2.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.5D, 0.6D); + GL11.glTranslated(-this.topedge4_2.offsetX, -this.topedge4_2.offsetY, -this.topedge4_2.offsetZ); + GL11.glTranslated(-this.topedge4_2.rotationPointX * f5, -this.topedge4_2.rotationPointY * f5, -this.topedge4_2.rotationPointZ * f5); + this.topedge4_2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape6_2.offsetX, this.shape6_2.offsetY, this.shape6_2.offsetZ); + GL11.glTranslated(this.shape6_2.rotationPointX * f5, this.shape6_2.rotationPointY * f5, this.shape6_2.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape6_2.offsetX, -this.shape6_2.offsetY, -this.shape6_2.offsetZ); + GL11.glTranslated(-this.shape6_2.rotationPointX * f5, -this.shape6_2.rotationPointY * f5, -this.shape6_2.rotationPointZ * f5); + this.shape6_2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.edge3.offsetX, this.edge3.offsetY, this.edge3.offsetZ); + GL11.glTranslated(this.edge3.rotationPointX * f5, this.edge3.rotationPointY * f5, this.edge3.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.edge3.offsetX, -this.edge3.offsetY, -this.edge3.offsetZ); + GL11.glTranslated(-this.edge3.rotationPointX * f5, -this.edge3.rotationPointY * f5, -this.edge3.rotationPointZ * f5); + this.edge3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.topedge4_3.offsetX, this.topedge4_3.offsetY, this.topedge4_3.offsetZ); + GL11.glTranslated(this.topedge4_3.rotationPointX * f5, this.topedge4_3.rotationPointY * f5, this.topedge4_3.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.5D, 0.6D); + GL11.glTranslated(-this.topedge4_3.offsetX, -this.topedge4_3.offsetY, -this.topedge4_3.offsetZ); + GL11.glTranslated(-this.topedge4_3.rotationPointX * f5, -this.topedge4_3.rotationPointY * f5, -this.topedge4_3.rotationPointZ * f5); + this.topedge4_3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape5_3.offsetX, this.shape5_3.offsetY, this.shape5_3.offsetZ); + GL11.glTranslated(this.shape5_3.rotationPointX * f5, this.shape5_3.rotationPointY * f5, this.shape5_3.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape5_3.offsetX, -this.shape5_3.offsetY, -this.shape5_3.offsetZ); + GL11.glTranslated(-this.shape5_3.rotationPointX * f5, -this.shape5_3.rotationPointY * f5, -this.shape5_3.rotationPointZ * f5); + this.shape5_3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape4_3.offsetX, this.shape4_3.offsetY, this.shape4_3.offsetZ); + GL11.glTranslated(this.shape4_3.rotationPointX * f5, this.shape4_3.rotationPointY * f5, this.shape4_3.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape4_3.offsetX, -this.shape4_3.offsetY, -this.shape4_3.offsetZ); + GL11.glTranslated(-this.shape4_3.rotationPointX * f5, -this.shape4_3.rotationPointY * f5, -this.shape4_3.rotationPointZ * f5); + this.shape4_3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.topedge3.offsetX, this.topedge3.offsetY, this.topedge3.offsetZ); + GL11.glTranslated(this.topedge3.rotationPointX * f5, this.topedge3.rotationPointY * f5, this.topedge3.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.5D, 0.6D); + GL11.glTranslated(-this.topedge3.offsetX, -this.topedge3.offsetY, -this.topedge3.offsetZ); + GL11.glTranslated(-this.topedge3.rotationPointX * f5, -this.topedge3.rotationPointY * f5, -this.topedge3.rotationPointZ * f5); + this.topedge3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.topedge4.offsetX, this.topedge4.offsetY, this.topedge4.offsetZ); + GL11.glTranslated(this.topedge4.rotationPointX * f5, this.topedge4.rotationPointY * f5, this.topedge4.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.5D, 0.6D); + GL11.glTranslated(-this.topedge4.offsetX, -this.topedge4.offsetY, -this.topedge4.offsetZ); + GL11.glTranslated(-this.topedge4.rotationPointX * f5, -this.topedge4.rotationPointY * f5, -this.topedge4.rotationPointZ * f5); + this.topedge4.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.edge5_2.offsetX, this.edge5_2.offsetY, this.edge5_2.offsetZ); + GL11.glTranslated(this.edge5_2.rotationPointX * f5, this.edge5_2.rotationPointY * f5, this.edge5_2.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.edge5_2.offsetX, -this.edge5_2.offsetY, -this.edge5_2.offsetZ); + GL11.glTranslated(-this.edge5_2.rotationPointX * f5, -this.edge5_2.rotationPointY * f5, -this.edge5_2.rotationPointZ * f5); + this.edge5_2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.edge5.offsetX, this.edge5.offsetY, this.edge5.offsetZ); + GL11.glTranslated(this.edge5.rotationPointX * f5, this.edge5.rotationPointY * f5, this.edge5.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.edge5.offsetX, -this.edge5.offsetY, -this.edge5.offsetZ); + GL11.glTranslated(-this.edge5.rotationPointX * f5, -this.edge5.rotationPointY * f5, -this.edge5.rotationPointZ * f5); + this.edge5.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.topedge2_3.offsetX, this.topedge2_3.offsetY, this.topedge2_3.offsetZ); + GL11.glTranslated(this.topedge2_3.rotationPointX * f5, this.topedge2_3.rotationPointY * f5, this.topedge2_3.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.5D, 0.6D); + GL11.glTranslated(-this.topedge2_3.offsetX, -this.topedge2_3.offsetY, -this.topedge2_3.offsetZ); + GL11.glTranslated(-this.topedge2_3.rotationPointX * f5, -this.topedge2_3.rotationPointY * f5, -this.topedge2_3.rotationPointZ * f5); + this.topedge2_3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape6_3.offsetX, this.shape6_3.offsetY, this.shape6_3.offsetZ); + GL11.glTranslated(this.shape6_3.rotationPointX * f5, this.shape6_3.rotationPointY * f5, this.shape6_3.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape6_3.offsetX, -this.shape6_3.offsetY, -this.shape6_3.offsetZ); + GL11.glTranslated(-this.shape6_3.rotationPointX * f5, -this.shape6_3.rotationPointY * f5, -this.shape6_3.rotationPointZ * f5); + this.shape6_3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.edge1_1.offsetX, this.edge1_1.offsetY, this.edge1_1.offsetZ); + GL11.glTranslated(this.edge1_1.rotationPointX * f5, this.edge1_1.rotationPointY * f5, this.edge1_1.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.edge1_1.offsetX, -this.edge1_1.offsetY, -this.edge1_1.offsetZ); + GL11.glTranslated(-this.edge1_1.rotationPointX * f5, -this.edge1_1.rotationPointY * f5, -this.edge1_1.rotationPointZ * f5); + this.edge1_1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape5_2.offsetX, this.shape5_2.offsetY, this.shape5_2.offsetZ); + GL11.glTranslated(this.shape5_2.rotationPointX * f5, this.shape5_2.rotationPointY * f5, this.shape5_2.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape5_2.offsetX, -this.shape5_2.offsetY, -this.shape5_2.offsetZ); + GL11.glTranslated(-this.shape5_2.rotationPointX * f5, -this.shape5_2.rotationPointY * f5, -this.shape5_2.rotationPointZ * f5); + this.shape5_2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.topedge5_2.offsetX, this.topedge5_2.offsetY, this.topedge5_2.offsetZ); + GL11.glTranslated(this.topedge5_2.rotationPointX * f5, this.topedge5_2.rotationPointY * f5, this.topedge5_2.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.5D, 0.6D); + GL11.glTranslated(-this.topedge5_2.offsetX, -this.topedge5_2.offsetY, -this.topedge5_2.offsetZ); + GL11.glTranslated(-this.topedge5_2.rotationPointX * f5, -this.topedge5_2.rotationPointY * f5, -this.topedge5_2.rotationPointZ * f5); + this.topedge5_2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.topedge2.offsetX, this.topedge2.offsetY, this.topedge2.offsetZ); + GL11.glTranslated(this.topedge2.rotationPointX * f5, this.topedge2.rotationPointY * f5, this.topedge2.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.5D, 0.6D); + GL11.glTranslated(-this.topedge2.offsetX, -this.topedge2.offsetY, -this.topedge2.offsetZ); + GL11.glTranslated(-this.topedge2.rotationPointX * f5, -this.topedge2.rotationPointY * f5, -this.topedge2.rotationPointZ * f5); + this.topedge2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.staffTopQ_3.offsetX, this.staffTopQ_3.offsetY, this.staffTopQ_3.offsetZ); + GL11.glTranslated(this.staffTopQ_3.rotationPointX * f5, this.staffTopQ_3.rotationPointY * f5, this.staffTopQ_3.rotationPointZ * f5); + GL11.glScaled(0.7D, 1.0D, 0.7D); + GL11.glTranslated(-this.staffTopQ_3.offsetX, -this.staffTopQ_3.offsetY, -this.staffTopQ_3.offsetZ); + GL11.glTranslated(-this.staffTopQ_3.rotationPointX * f5, -this.staffTopQ_3.rotationPointY * f5, -this.staffTopQ_3.rotationPointZ * f5); + this.staffTopQ_3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.edge4_2.offsetX, this.edge4_2.offsetY, this.edge4_2.offsetZ); + GL11.glTranslated(this.edge4_2.rotationPointX * f5, this.edge4_2.rotationPointY * f5, this.edge4_2.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.edge4_2.offsetX, -this.edge4_2.offsetY, -this.edge4_2.offsetZ); + GL11.glTranslated(-this.edge4_2.rotationPointX * f5, -this.edge4_2.rotationPointY * f5, -this.edge4_2.rotationPointZ * f5); + this.edge4_2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.staffTopQ_1.offsetX, this.staffTopQ_1.offsetY, this.staffTopQ_1.offsetZ); + GL11.glTranslated(this.staffTopQ_1.rotationPointX * f5, this.staffTopQ_1.rotationPointY * f5, this.staffTopQ_1.rotationPointZ * f5); + GL11.glScaled(0.7D, 1.0D, 0.7D); + GL11.glTranslated(-this.staffTopQ_1.offsetX, -this.staffTopQ_1.offsetY, -this.staffTopQ_1.offsetZ); + GL11.glTranslated(-this.staffTopQ_1.rotationPointX * f5, -this.staffTopQ_1.rotationPointY * f5, -this.staffTopQ_1.rotationPointZ * f5); + this.staffTopQ_1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.edge3_3.offsetX, this.edge3_3.offsetY, this.edge3_3.offsetZ); + GL11.glTranslated(this.edge3_3.rotationPointX * f5, this.edge3_3.rotationPointY * f5, this.edge3_3.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.edge3_3.offsetX, -this.edge3_3.offsetY, -this.edge3_3.offsetZ); + GL11.glTranslated(-this.edge3_3.rotationPointX * f5, -this.edge3_3.rotationPointY * f5, -this.edge3_3.rotationPointZ * f5); + this.edge3_3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape3.offsetX, this.shape3.offsetY, this.shape3.offsetZ); + GL11.glTranslated(this.shape3.rotationPointX * f5, this.shape3.rotationPointY * f5, this.shape3.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape3.offsetX, -this.shape3.offsetY, -this.shape3.offsetZ); + GL11.glTranslated(-this.shape3.rotationPointX * f5, -this.shape3.rotationPointY * f5, -this.shape3.rotationPointZ * f5); + this.shape3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape2_3.offsetX, this.shape2_3.offsetY, this.shape2_3.offsetZ); + GL11.glTranslated(this.shape2_3.rotationPointX * f5, this.shape2_3.rotationPointY * f5, this.shape2_3.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape2_3.offsetX, -this.shape2_3.offsetY, -this.shape2_3.offsetZ); + GL11.glTranslated(-this.shape2_3.rotationPointX * f5, -this.shape2_3.rotationPointY * f5, -this.shape2_3.rotationPointZ * f5); + this.shape2_3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.topedge1.offsetX, this.topedge1.offsetY, this.topedge1.offsetZ); + GL11.glTranslated(this.topedge1.rotationPointX * f5, this.topedge1.rotationPointY * f5, this.topedge1.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.5D, 0.6D); + GL11.glTranslated(-this.topedge1.offsetX, -this.topedge1.offsetY, -this.topedge1.offsetZ); + GL11.glTranslated(-this.topedge1.rotationPointX * f5, -this.topedge1.rotationPointY * f5, -this.topedge1.rotationPointZ * f5); + this.topedge1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.topedge5_1.offsetX, this.topedge5_1.offsetY, this.topedge5_1.offsetZ); + GL11.glTranslated(this.topedge5_1.rotationPointX * f5, this.topedge5_1.rotationPointY * f5, this.topedge5_1.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.5D, 0.6D); + GL11.glTranslated(-this.topedge5_1.offsetX, -this.topedge5_1.offsetY, -this.topedge5_1.offsetZ); + GL11.glTranslated(-this.topedge5_1.rotationPointX * f5, -this.topedge5_1.rotationPointY * f5, -this.topedge5_1.rotationPointZ * f5); + this.topedge5_1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape7_3.offsetX, this.shape7_3.offsetY, this.shape7_3.offsetZ); + GL11.glTranslated(this.shape7_3.rotationPointX * f5, this.shape7_3.rotationPointY * f5, this.shape7_3.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape7_3.offsetX, -this.shape7_3.offsetY, -this.shape7_3.offsetZ); + GL11.glTranslated(-this.shape7_3.rotationPointX * f5, -this.shape7_3.rotationPointY * f5, -this.shape7_3.rotationPointZ * f5); + this.shape7_3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.staffTopM_2.offsetX, this.staffTopM_2.offsetY, this.staffTopM_2.offsetZ); + GL11.glTranslated(this.staffTopM_2.rotationPointX * f5, this.staffTopM_2.rotationPointY * f5, this.staffTopM_2.rotationPointZ * f5); + GL11.glScaled(0.6D, 1.06D, 0.6D); + GL11.glTranslated(-this.staffTopM_2.offsetX, -this.staffTopM_2.offsetY, -this.staffTopM_2.offsetZ); + GL11.glTranslated(-this.staffTopM_2.rotationPointX * f5, -this.staffTopM_2.rotationPointY * f5, -this.staffTopM_2.rotationPointZ * f5); + this.staffTopM_2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape3_3.offsetX, this.shape3_3.offsetY, this.shape3_3.offsetZ); + GL11.glTranslated(this.shape3_3.rotationPointX * f5, this.shape3_3.rotationPointY * f5, this.shape3_3.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape3_3.offsetX, -this.shape3_3.offsetY, -this.shape3_3.offsetZ); + GL11.glTranslated(-this.shape3_3.rotationPointX * f5, -this.shape3_3.rotationPointY * f5, -this.shape3_3.rotationPointZ * f5); + this.shape3_3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape3_1.offsetX, this.shape3_1.offsetY, this.shape3_1.offsetZ); + GL11.glTranslated(this.shape3_1.rotationPointX * f5, this.shape3_1.rotationPointY * f5, this.shape3_1.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape3_1.offsetX, -this.shape3_1.offsetY, -this.shape3_1.offsetZ); + GL11.glTranslated(-this.shape3_1.rotationPointX * f5, -this.shape3_1.rotationPointY * f5, -this.shape3_1.rotationPointZ * f5); + this.shape3_1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape6_1.offsetX, this.shape6_1.offsetY, this.shape6_1.offsetZ); + GL11.glTranslated(this.shape6_1.rotationPointX * f5, this.shape6_1.rotationPointY * f5, this.shape6_1.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape6_1.offsetX, -this.shape6_1.offsetY, -this.shape6_1.offsetZ); + GL11.glTranslated(-this.shape6_1.rotationPointX * f5, -this.shape6_1.rotationPointY * f5, -this.shape6_1.rotationPointZ * f5); + this.shape6_1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape7_1.offsetX, this.shape7_1.offsetY, this.shape7_1.offsetZ); + GL11.glTranslated(this.shape7_1.rotationPointX * f5, this.shape7_1.rotationPointY * f5, this.shape7_1.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape7_1.offsetX, -this.shape7_1.offsetY, -this.shape7_1.offsetZ); + GL11.glTranslated(-this.shape7_1.rotationPointX * f5, -this.shape7_1.rotationPointY * f5, -this.shape7_1.rotationPointZ * f5); + this.shape7_1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.topedge1_3.offsetX, this.topedge1_3.offsetY, this.topedge1_3.offsetZ); + GL11.glTranslated(this.topedge1_3.rotationPointX * f5, this.topedge1_3.rotationPointY * f5, this.topedge1_3.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.5D, 0.6D); + GL11.glTranslated(-this.topedge1_3.offsetX, -this.topedge1_3.offsetY, -this.topedge1_3.offsetZ); + GL11.glTranslated(-this.topedge1_3.rotationPointX * f5, -this.topedge1_3.rotationPointY * f5, -this.topedge1_3.rotationPointZ * f5); + this.topedge1_3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.tope3.offsetX, this.tope3.offsetY, this.tope3.offsetZ); + GL11.glTranslated(this.tope3.rotationPointX * f5, this.tope3.rotationPointY * f5, this.tope3.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.6D, 0.6D); + GL11.glTranslated(-this.tope3.offsetX, -this.tope3.offsetY, -this.tope3.offsetZ); + GL11.glTranslated(-this.tope3.rotationPointX * f5, -this.tope3.rotationPointY * f5, -this.tope3.rotationPointZ * f5); + this.tope3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape5.offsetX, this.shape5.offsetY, this.shape5.offsetZ); + GL11.glTranslated(this.shape5.rotationPointX * f5, this.shape5.rotationPointY * f5, this.shape5.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape5.offsetX, -this.shape5.offsetY, -this.shape5.offsetZ); + GL11.glTranslated(-this.shape5.rotationPointX * f5, -this.shape5.rotationPointY * f5, -this.shape5.rotationPointZ * f5); + this.shape5.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.topedge3_1.offsetX, this.topedge3_1.offsetY, this.topedge3_1.offsetZ); + GL11.glTranslated(this.topedge3_1.rotationPointX * f5, this.topedge3_1.rotationPointY * f5, this.topedge3_1.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.5D, 0.6D); + GL11.glTranslated(-this.topedge3_1.offsetX, -this.topedge3_1.offsetY, -this.topedge3_1.offsetZ); + GL11.glTranslated(-this.topedge3_1.rotationPointX * f5, -this.topedge3_1.rotationPointY * f5, -this.topedge3_1.rotationPointZ * f5); + this.topedge3_1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.topedge5_3.offsetX, this.topedge5_3.offsetY, this.topedge5_3.offsetZ); + GL11.glTranslated(this.topedge5_3.rotationPointX * f5, this.topedge5_3.rotationPointY * f5, this.topedge5_3.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.5D, 0.6D); + GL11.glTranslated(-this.topedge5_3.offsetX, -this.topedge5_3.offsetY, -this.topedge5_3.offsetZ); + GL11.glTranslated(-this.topedge5_3.rotationPointX * f5, -this.topedge5_3.rotationPointY * f5, -this.topedge5_3.rotationPointZ * f5); + this.topedge5_3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.edge5_3.offsetX, this.edge5_3.offsetY, this.edge5_3.offsetZ); + GL11.glTranslated(this.edge5_3.rotationPointX * f5, this.edge5_3.rotationPointY * f5, this.edge5_3.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.edge5_3.offsetX, -this.edge5_3.offsetY, -this.edge5_3.offsetZ); + GL11.glTranslated(-this.edge5_3.rotationPointX * f5, -this.edge5_3.rotationPointY * f5, -this.edge5_3.rotationPointZ * f5); + this.edge5_3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.edge3_1.offsetX, this.edge3_1.offsetY, this.edge3_1.offsetZ); + GL11.glTranslated(this.edge3_1.rotationPointX * f5, this.edge3_1.rotationPointY * f5, this.edge3_1.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.edge3_1.offsetX, -this.edge3_1.offsetY, -this.edge3_1.offsetZ); + GL11.glTranslated(-this.edge3_1.rotationPointX * f5, -this.edge3_1.rotationPointY * f5, -this.edge3_1.rotationPointZ * f5); + this.edge3_1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape7.offsetX, this.shape7.offsetY, this.shape7.offsetZ); + GL11.glTranslated(this.shape7.rotationPointX * f5, this.shape7.rotationPointY * f5, this.shape7.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape7.offsetX, -this.shape7.offsetY, -this.shape7.offsetZ); + GL11.glTranslated(-this.shape7.rotationPointX * f5, -this.shape7.rotationPointY * f5, -this.shape7.rotationPointZ * f5); + this.shape7.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.topedge1_1.offsetX, this.topedge1_1.offsetY, this.topedge1_1.offsetZ); + GL11.glTranslated(this.topedge1_1.rotationPointX * f5, this.topedge1_1.rotationPointY * f5, this.topedge1_1.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.5D, 0.6D); + GL11.glTranslated(-this.topedge1_1.offsetX, -this.topedge1_1.offsetY, -this.topedge1_1.offsetZ); + GL11.glTranslated(-this.topedge1_1.rotationPointX * f5, -this.topedge1_1.rotationPointY * f5, -this.topedge1_1.rotationPointZ * f5); + this.topedge1_1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape2_1.offsetX, this.shape2_1.offsetY, this.shape2_1.offsetZ); + GL11.glTranslated(this.shape2_1.rotationPointX * f5, this.shape2_1.rotationPointY * f5, this.shape2_1.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape2_1.offsetX, -this.shape2_1.offsetY, -this.shape2_1.offsetZ); + GL11.glTranslated(-this.shape2_1.rotationPointX * f5, -this.shape2_1.rotationPointY * f5, -this.shape2_1.rotationPointZ * f5); + this.shape2_1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.edge2_3.offsetX, this.edge2_3.offsetY, this.edge2_3.offsetZ); + GL11.glTranslated(this.edge2_3.rotationPointX * f5, this.edge2_3.rotationPointY * f5, this.edge2_3.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.edge2_3.offsetX, -this.edge2_3.offsetY, -this.edge2_3.offsetZ); + GL11.glTranslated(-this.edge2_3.rotationPointX * f5, -this.edge2_3.rotationPointY * f5, -this.edge2_3.rotationPointZ * f5); + this.edge2_3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.topedge3_2.offsetX, this.topedge3_2.offsetY, this.topedge3_2.offsetZ); + GL11.glTranslated(this.topedge3_2.rotationPointX * f5, this.topedge3_2.rotationPointY * f5, this.topedge3_2.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.5D, 0.6D); + GL11.glTranslated(-this.topedge3_2.offsetX, -this.topedge3_2.offsetY, -this.topedge3_2.offsetZ); + GL11.glTranslated(-this.topedge3_2.rotationPointX * f5, -this.topedge3_2.rotationPointY * f5, -this.topedge3_2.rotationPointZ * f5); + this.topedge3_2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.edge1_2.offsetX, this.edge1_2.offsetY, this.edge1_2.offsetZ); + GL11.glTranslated(this.edge1_2.rotationPointX * f5, this.edge1_2.rotationPointY * f5, this.edge1_2.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.edge1_2.offsetX, -this.edge1_2.offsetY, -this.edge1_2.offsetZ); + GL11.glTranslated(-this.edge1_2.rotationPointX * f5, -this.edge1_2.rotationPointY * f5, -this.edge1_2.rotationPointZ * f5); + this.edge1_2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.edge2_2.offsetX, this.edge2_2.offsetY, this.edge2_2.offsetZ); + GL11.glTranslated(this.edge2_2.rotationPointX * f5, this.edge2_2.rotationPointY * f5, this.edge2_2.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.edge2_2.offsetX, -this.edge2_2.offsetY, -this.edge2_2.offsetZ); + GL11.glTranslated(-this.edge2_2.rotationPointX * f5, -this.edge2_2.rotationPointY * f5, -this.edge2_2.rotationPointZ * f5); + this.edge2_2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.edge2.offsetX, this.edge2.offsetY, this.edge2.offsetZ); + GL11.glTranslated(this.edge2.rotationPointX * f5, this.edge2.rotationPointY * f5, this.edge2.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.edge2.offsetX, -this.edge2.offsetY, -this.edge2.offsetZ); + GL11.glTranslated(-this.edge2.rotationPointX * f5, -this.edge2.rotationPointY * f5, -this.edge2.rotationPointZ * f5); + this.edge2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.staffTopM.offsetX, this.staffTopM.offsetY, this.staffTopM.offsetZ); + GL11.glTranslated(this.staffTopM.rotationPointX * f5, this.staffTopM.rotationPointY * f5, this.staffTopM.rotationPointZ * f5); + GL11.glScaled(0.6D, 1.06D, 0.6D); + GL11.glTranslated(-this.staffTopM.offsetX, -this.staffTopM.offsetY, -this.staffTopM.offsetZ); + GL11.glTranslated(-this.staffTopM.rotationPointX * f5, -this.staffTopM.rotationPointY * f5, -this.staffTopM.rotationPointZ * f5); + this.staffTopM.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.edge5_1.offsetX, this.edge5_1.offsetY, this.edge5_1.offsetZ); + GL11.glTranslated(this.edge5_1.rotationPointX * f5, this.edge5_1.rotationPointY * f5, this.edge5_1.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.edge5_1.offsetX, -this.edge5_1.offsetY, -this.edge5_1.offsetZ); + GL11.glTranslated(-this.edge5_1.rotationPointX * f5, -this.edge5_1.rotationPointY * f5, -this.edge5_1.rotationPointZ * f5); + this.edge5_1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.staffTopQ.offsetX, this.staffTopQ.offsetY, this.staffTopQ.offsetZ); + GL11.glTranslated(this.staffTopQ.rotationPointX * f5, this.staffTopQ.rotationPointY * f5, this.staffTopQ.rotationPointZ * f5); + GL11.glScaled(0.7D, 1.0D, 0.7D); + GL11.glTranslated(-this.staffTopQ.offsetX, -this.staffTopQ.offsetY, -this.staffTopQ.offsetZ); + GL11.glTranslated(-this.staffTopQ.rotationPointX * f5, -this.staffTopQ.rotationPointY * f5, -this.staffTopQ.rotationPointZ * f5); + this.staffTopQ.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.edge4_1.offsetX, this.edge4_1.offsetY, this.edge4_1.offsetZ); + GL11.glTranslated(this.edge4_1.rotationPointX * f5, this.edge4_1.rotationPointY * f5, this.edge4_1.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.edge4_1.offsetX, -this.edge4_1.offsetY, -this.edge4_1.offsetZ); + GL11.glTranslated(-this.edge4_1.rotationPointX * f5, -this.edge4_1.rotationPointY * f5, -this.edge4_1.rotationPointZ * f5); + this.edge4_1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.staffTopM_1.offsetX, this.staffTopM_1.offsetY, this.staffTopM_1.offsetZ); + GL11.glTranslated(this.staffTopM_1.rotationPointX * f5, this.staffTopM_1.rotationPointY * f5, this.staffTopM_1.rotationPointZ * f5); + GL11.glScaled(0.6D, 1.0D, 0.6D); + GL11.glTranslated(-this.staffTopM_1.offsetX, -this.staffTopM_1.offsetY, -this.staffTopM_1.offsetZ); + GL11.glTranslated(-this.staffTopM_1.rotationPointX * f5, -this.staffTopM_1.rotationPointY * f5, -this.staffTopM_1.rotationPointZ * f5); + this.staffTopM_1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.edge3_2.offsetX, this.edge3_2.offsetY, this.edge3_2.offsetZ); + GL11.glTranslated(this.edge3_2.rotationPointX * f5, this.edge3_2.rotationPointY * f5, this.edge3_2.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.edge3_2.offsetX, -this.edge3_2.offsetY, -this.edge3_2.offsetZ); + GL11.glTranslated(-this.edge3_2.rotationPointX * f5, -this.edge3_2.rotationPointY * f5, -this.edge3_2.rotationPointZ * f5); + this.edge3_2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.staffTopQ_2.offsetX, this.staffTopQ_2.offsetY, this.staffTopQ_2.offsetZ); + GL11.glTranslated(this.staffTopQ_2.rotationPointX * f5, this.staffTopQ_2.rotationPointY * f5, this.staffTopQ_2.rotationPointZ * f5); + GL11.glScaled(0.7D, 1.0D, 0.7D); + GL11.glTranslated(-this.staffTopQ_2.offsetX, -this.staffTopQ_2.offsetY, -this.staffTopQ_2.offsetZ); + GL11.glTranslated(-this.staffTopQ_2.rotationPointX * f5, -this.staffTopQ_2.rotationPointY * f5, -this.staffTopQ_2.rotationPointZ * f5); + this.staffTopQ_2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.staffTopM_4.offsetX, this.staffTopM_4.offsetY, this.staffTopM_4.offsetZ); + GL11.glTranslated(this.staffTopM_4.rotationPointX * f5, this.staffTopM_4.rotationPointY * f5, this.staffTopM_4.rotationPointZ * f5); + GL11.glScaled(0.6D, 1.06D, 0.6D); + GL11.glTranslated(-this.staffTopM_4.offsetX, -this.staffTopM_4.offsetY, -this.staffTopM_4.offsetZ); + GL11.glTranslated(-this.staffTopM_4.rotationPointX * f5, -this.staffTopM_4.rotationPointY * f5, -this.staffTopM_4.rotationPointZ * f5); + this.staffTopM_4.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.topedge3_3.offsetX, this.topedge3_3.offsetY, this.topedge3_3.offsetZ); + GL11.glTranslated(this.topedge3_3.rotationPointX * f5, this.topedge3_3.rotationPointY * f5, this.topedge3_3.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.5D, 0.6D); + GL11.glTranslated(-this.topedge3_3.offsetX, -this.topedge3_3.offsetY, -this.topedge3_3.offsetZ); + GL11.glTranslated(-this.topedge3_3.rotationPointX * f5, -this.topedge3_3.rotationPointY * f5, -this.topedge3_3.rotationPointZ * f5); + this.topedge3_3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape3_2.offsetX, this.shape3_2.offsetY, this.shape3_2.offsetZ); + GL11.glTranslated(this.shape3_2.rotationPointX * f5, this.shape3_2.rotationPointY * f5, this.shape3_2.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape3_2.offsetX, -this.shape3_2.offsetY, -this.shape3_2.offsetZ); + GL11.glTranslated(-this.shape3_2.rotationPointX * f5, -this.shape3_2.rotationPointY * f5, -this.shape3_2.rotationPointZ * f5); + this.shape3_2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.edge1_3.offsetX, this.edge1_3.offsetY, this.edge1_3.offsetZ); + GL11.glTranslated(this.edge1_3.rotationPointX * f5, this.edge1_3.rotationPointY * f5, this.edge1_3.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.edge1_3.offsetX, -this.edge1_3.offsetY, -this.edge1_3.offsetZ); + GL11.glTranslated(-this.edge1_3.rotationPointX * f5, -this.edge1_3.rotationPointY * f5, -this.edge1_3.rotationPointZ * f5); + this.edge1_3.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.topedge2_1.offsetX, this.topedge2_1.offsetY, this.topedge2_1.offsetZ); + GL11.glTranslated(this.topedge2_1.rotationPointX * f5, this.topedge2_1.rotationPointY * f5, this.topedge2_1.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.5D, 0.6D); + GL11.glTranslated(-this.topedge2_1.offsetX, -this.topedge2_1.offsetY, -this.topedge2_1.offsetZ); + GL11.glTranslated(-this.topedge2_1.rotationPointX * f5, -this.topedge2_1.rotationPointY * f5, -this.topedge2_1.rotationPointZ * f5); + this.topedge2_1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape2.offsetX, this.shape2.offsetY, this.shape2.offsetZ); + GL11.glTranslated(this.shape2.rotationPointX * f5, this.shape2.rotationPointY * f5, this.shape2.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape2.offsetX, -this.shape2.offsetY, -this.shape2.offsetZ); + GL11.glTranslated(-this.shape2.rotationPointX * f5, -this.shape2.rotationPointY * f5, -this.shape2.rotationPointZ * f5); + this.shape2.render(f5); + GL11.glPopMatrix(); + this.staff.render(f5); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape6.offsetX, this.shape6.offsetY, this.shape6.offsetZ); + GL11.glTranslated(this.shape6.rotationPointX * f5, this.shape6.rotationPointY * f5, this.shape6.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape6.offsetX, -this.shape6.offsetY, -this.shape6.offsetZ); + GL11.glTranslated(-this.shape6.rotationPointX * f5, -this.shape6.rotationPointY * f5, -this.shape6.rotationPointZ * f5); + this.shape6.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.edge4.offsetX, this.edge4.offsetY, this.edge4.offsetZ); + GL11.glTranslated(this.edge4.rotationPointX * f5, this.edge4.rotationPointY * f5, this.edge4.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.edge4.offsetX, -this.edge4.offsetY, -this.edge4.offsetZ); + GL11.glTranslated(-this.edge4.rotationPointX * f5, -this.edge4.rotationPointY * f5, -this.edge4.rotationPointZ * f5); + this.edge4.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.topedge1_2.offsetX, this.topedge1_2.offsetY, this.topedge1_2.offsetZ); + GL11.glTranslated(this.topedge1_2.rotationPointX * f5, this.topedge1_2.rotationPointY * f5, this.topedge1_2.rotationPointZ * f5); + GL11.glScaled(0.6D, 0.5D, 0.6D); + GL11.glTranslated(-this.topedge1_2.offsetX, -this.topedge1_2.offsetY, -this.topedge1_2.offsetZ); + GL11.glTranslated(-this.topedge1_2.rotationPointX * f5, -this.topedge1_2.rotationPointY * f5, -this.topedge1_2.rotationPointZ * f5); + this.topedge1_2.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.shape4_1.offsetX, this.shape4_1.offsetY, this.shape4_1.offsetZ); + GL11.glTranslated(this.shape4_1.rotationPointX * f5, this.shape4_1.rotationPointY * f5, this.shape4_1.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.shape4_1.offsetX, -this.shape4_1.offsetY, -this.shape4_1.offsetZ); + GL11.glTranslated(-this.shape4_1.rotationPointX * f5, -this.shape4_1.rotationPointY * f5, -this.shape4_1.rotationPointZ * f5); + this.shape4_1.render(f5); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(this.edge5_4.offsetX, this.edge5_4.offsetY, this.edge5_4.offsetZ); + GL11.glTranslated(this.edge5_4.rotationPointX * f5, this.edge5_4.rotationPointY * f5, this.edge5_4.rotationPointZ * f5); + GL11.glScaled(0.7D, 0.7D, 0.7D); + GL11.glTranslated(-this.edge5_4.offsetX, -this.edge5_4.offsetY, -this.edge5_4.offsetZ); + GL11.glTranslated(-this.edge5_4.rotationPointX * f5, -this.edge5_4.rotationPointY * f5, -this.edge5_4.rotationPointZ * f5); + this.edge5_4.render(f5); + GL11.glPopMatrix(); + GL11.glPopMatrix(); + } + + /** + * This is a helper function from Tabula to set the rotation of model parts + */ + public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { + modelRenderer.rotateAngleX = x; + modelRenderer.rotateAngleY = y; + modelRenderer.rotateAngleZ = z; + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/item/RenderBowModel.java b/src/main/java/com/brandon3055/draconicevolution/client/render/item/RenderBowModel.java index 302820e6..cd411bf4 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/item/RenderBowModel.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/item/RenderBowModel.java @@ -1,8 +1,7 @@ package com.brandon3055.draconicevolution.client.render.item; -import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.client.handler.ResourceHandler; -import com.brandon3055.draconicevolution.common.ModItems; +import com.brandon3055.draconicevolution.common.items.weapons.BowHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; @@ -42,66 +41,40 @@ public class RenderBowModel implements IItemRenderer public void renderItem(ItemRenderType type, ItemStack item, Object... data) { GL11.glPushMatrix(); - String currentMode = ItemNBTHelper.getString(item, "mode", "rapidfire"); - int j = 0; + //String currentMode = ItemNBTHelper.getString(item, "mode", "rapidfire"); + float j = 0F; + int selection = 0; if (data.length >= 2 && (data[1] instanceof EntityPlayer)) { EntityPlayer player = (EntityPlayer) data[1]; - if (player.inventory.hasItem(ModItems.enderArrow)) currentMode = "sharpshooter"; - j = player.getItemInUseDuration(); + j = (float)player.getItemInUseDuration(); + if (j > 0) { + BowHandler.BowProperties properties = new BowHandler.BowProperties(item, player); + if (j > properties.getDrawTicks()) j = properties.getDrawTicks(); + j /= (float) properties.getDrawTicks(); + int j2 = (int) (j * 3F); + + if (j2 < 0) j2 = 0; + else if (j2 > 3) j2 = 3; + + selection = j2; + } } - IModelCustom activeModel = null; - int selection = 0; + IModelCustom activeModel; + if (draconic) { - - if (currentMode.equals("rapidfire")) - { - if (j >= 4) selection = 3; - else if (j > 2) selection = 2; - else if (j > 0) selection = 1; - } else if (currentMode.equals("devistation")) - { - if (j >= 2) selection = 3; - else if (j > 1) selection = 2; - else if (j > 0) selection = 1; - } else if (currentMode.equals("sharpshooter")) - { - if (j >= 20) selection = 3; - else if (j > 10) selection = 2; - else if (j > 0) selection = 1; - } else - { - if (j >= 80) selection = 3; - else if (j > 40) selection = 2; - else if (j > 0) selection = 1; - } - activeModel = draconicModels[selection]; ResourceHandler.bindResource("textures/models/tools/DraconicBow0" + selection + ".png"); }else { - - if (currentMode.equals("rapidfire")) - { - if (j >= 13) selection = 2; - else if (j > 7) selection = 1; - else if (j > 0) selection = 0; - } else if (currentMode.equals("sharpshooter")) - { - if (j >= 30) selection = 2; - else if (j > 15) selection = 1; - else if (j > 0) selection = 0; - } - activeModel = draconicModels[selection]; ResourceHandler.bindResource("textures/models/tools/WyvernBow0"+selection+".png"); } - if (activeModel != null) doRender(activeModel, type, j > 0 ? selection : -1); GL11.glPopMatrix(); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/item/RenderChaosFragment.java b/src/main/java/com/brandon3055/draconicevolution/client/render/item/RenderChaosFragment.java index c25277a0..aedb7790 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/item/RenderChaosFragment.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/item/RenderChaosFragment.java @@ -1,6 +1,7 @@ package com.brandon3055.draconicevolution.client.render.item; import com.brandon3055.draconicevolution.client.handler.ResourceHandler; +import com.brandon3055.draconicevolution.client.model.special.ModelStaffOfTheGreatOne; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.model.AdvancedModelLoader; @@ -13,6 +14,8 @@ import org.lwjgl.opengl.GL11; public class RenderChaosFragment implements IItemRenderer { private static IModelCustom model = AdvancedModelLoader.loadModel(ResourceHandler.getResource("models/chaosCrystalShard.obj")); + private static ModelStaffOfTheGreatOne staff = new ModelStaffOfTheGreatOne(); + @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { 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 cd489eef..9035357d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java @@ -40,7 +40,6 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; -import li.cil.oc.api.machine.Callback; import net.minecraft.client.audio.ISound; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -196,7 +195,7 @@ public class CommonProxy { } } - @Callback + //@Callback public void registerEntities() { EntityRegistry.registerModEntity(EntityCustomDragon.class, "EnderDragon", 0, DraconicEvolution.instance, 256, 3, true); EntityRegistry.registerModEntity(EntityPersistentItem.class, "Persistent Item", 1, DraconicEvolution.instance, 32, 5, true); @@ -209,6 +208,8 @@ public class CommonProxy { EntityRegistry.registerModEntity(EntityChaosCrystal.class, "ChaosCrystal", 8, DraconicEvolution.instance, 256, 5, false); EntityRegistry.registerModEntity(EntityChaosBolt.class, "ChaosBolt", 9, DraconicEvolution.instance, 32, 5, true); EntityRegistry.registerModEntity(EntityChaosVortex.class, "EntityChaosEnergyVortex", 10, DraconicEvolution.instance, 512, 5, true); + EntityRegistry.registerModEntity(EntityCustomArrow.class, "CustomArrow", 11, DraconicEvolution.instance, 32, 1, true); + } public ParticleEnergyBeam energyBeam(World worldObj, double x, double y, double z, double tx, double ty, double tz, int powerFlow, boolean advanced, ParticleEnergyBeam oldBeam, boolean render, int beamType) diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerUpgradeModifier.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerUpgradeModifier.java index 374dfc49..eedae076 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerUpgradeModifier.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerUpgradeModifier.java @@ -56,13 +56,13 @@ public class ContainerUpgradeModifier extends ContainerDataSync } private void updateSlotState(){ - if (tile.getStackInSlot(0) != null && slotsActive) { + if (tile.getStackInSlot(0) != null && tile.getStackInSlot(0).getItem() instanceof IUpgradableItem && slotsActive) { for (Object o : inventorySlots) { if (o instanceof Slot && !(o instanceof SlotUpgradable)) ((Slot)o).xDisplayPosition += 1000; } slotsActive = false; } - else if (tile.getStackInSlot(0) == null && !slotsActive) { + else if ((tile.getStackInSlot(0) == null || !(tile.getStackInSlot(0).getItem() instanceof IUpgradableItem)) && !slotsActive) { for (Object o : inventorySlots) { if (o instanceof Slot && !(o instanceof SlotUpgradable)) ((Slot)o).xDisplayPosition -= 1000; } @@ -157,9 +157,11 @@ public class ContainerUpgradeModifier extends ContainerDataSync super(inventory1, slot, x, y); } + //Some people think this block makes a nice display stand... And i cant disagree. @Override public boolean isItemValid(ItemStack stack) { - return stack != null && stack.getItem() instanceof IUpgradableItem; + return super.isItemValid(stack); + //return stack != null && stack.getItem() instanceof IUpgradableItem; } } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomArrow.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomArrow.java new file mode 100644 index 00000000..4950700a --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomArrow.java @@ -0,0 +1,496 @@ +package com.brandon3055.draconicevolution.common.entity; + +import com.brandon3055.draconicevolution.common.handler.ConfigHandler; +import com.brandon3055.draconicevolution.common.items.weapons.BowHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.boss.EntityDragon; +import net.minecraft.entity.boss.EntityDragonPart; +import net.minecraft.entity.monster.EntityEnderman; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.play.server.S2BPacketChangeGameState; +import net.minecraft.util.*; +import net.minecraft.world.World; + +import java.util.List; + +public class EntityCustomArrow extends EntityArrow { + private int blockX = -1; + private int blockY = -1; + private int blockZ = -1; + private Block blockHit; + private int inData; + private boolean inGround; + private int ticksInGround; + private int ticksInAir; + + //Arrow Properties + private double damageO = 2.0D; //old + public boolean ignorSpeed = false; //old + public boolean explosive = false; //old + public int knockbackStrength = 0; + + public BowHandler.BowProperties bowProperties = new BowHandler.BowProperties(); + + public EntityCustomArrow(World p_i1753_1_) { + super(p_i1753_1_); + } + + public EntityCustomArrow(World p_i1754_1_, double p_i1754_2_, double p_i1754_4_, double p_i1754_6_) { + super(p_i1754_1_, p_i1754_2_, p_i1754_4_, p_i1754_6_); + } + + public EntityCustomArrow(BowHandler.BowProperties bowProperties, World p_i1755_1_, EntityLivingBase p_i1755_2_, EntityLivingBase p_i1755_3_, float p_i1755_4_, float p_i1755_5_) { + super(p_i1755_1_, p_i1755_2_, p_i1755_3_, p_i1755_4_, p_i1755_5_); + this.bowProperties = bowProperties; + } + + public EntityCustomArrow(BowHandler.BowProperties bowProperties, World par1World, EntityLivingBase par2EntityLivingBase, float velocity) { + super(par1World, par2EntityLivingBase, velocity); + this.bowProperties = bowProperties; + } + + @Override + protected void entityInit() + { + super.entityInit(); + //this.dataWatcher.addObject(16, Byte.valueOf((byte) 0)); + } + + @Override + public void setThrowableHeading(double par1, double par3, double par5, float par7, float par8) + { + float f2 = MathHelper.sqrt_double(par1 * par1 + par3 * par3 + par5 * par5); + par1 /= f2; + par3 /= f2; + par5 /= f2; + par1 += this.rand.nextGaussian() * (this.rand.nextBoolean() ? -1 : 1) * 0.0007499999832361937D * par8; + par3 += this.rand.nextGaussian() * (this.rand.nextBoolean() ? -1 : 1) * 0.0007499999832361937D * par8; + par5 += this.rand.nextGaussian() * (this.rand.nextBoolean() ? -1 : 1) * 0.0007499999832361937D * par8; + par1 *= par7; + par3 *= par7; + par5 *= par7; + this.motionX = par1; + this.motionY = par3; + this.motionZ = par5; + float f3 = MathHelper.sqrt_double(par1 * par1 + par5 * par5); + this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(par1, par5) * 180.0D / Math.PI); + this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(par3, f3) * 180.0D / Math.PI); + this.ticksInGround = 0; + } + + @Override + @SideOnly(Side.CLIENT) + public void setPositionAndRotation2(double par1, double par3, double par5, float par7, float par8, int par9) + { + this.setPosition(par1, par3, par5); + this.setRotation(par7, par8); + } + + @Override + @SideOnly(Side.CLIENT) + public void setVelocity(double par1, double par3, double par5) + { + this.motionX = par1; + this.motionY = par3; + this.motionZ = par5; + + if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { + float f = MathHelper.sqrt_double(par1 * par1 + par5 * par5); + this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(par1, par5) * 180.0D / Math.PI); + this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(par3, f) * 180.0D / Math.PI); + this.prevRotationPitch = this.rotationPitch; + this.prevRotationYaw = this.rotationYaw; + this.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, this.rotationPitch); + this.ticksInGround = 0; + } + } + + @SuppressWarnings("rawtypes") + @Override + public void onUpdate() + { + //super.onUpdate(); + super.onEntityUpdate(); + if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { + float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); + this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(this.motionY, f) * 180.0D / Math.PI); + } + + Block block = this.worldObj.getBlock(this.blockX, this.blockY, this.blockZ); + + if (block.getMaterial() != Material.air) { + if (explosive) { + worldObj.createExplosion(this.shootingEntity, this.prevPosX, this.prevPosY, this.prevPosZ, 4, ConfigHandler.bowBlockDamage); + this.setDead(); + return; + } + block.setBlockBoundsBasedOnState(this.worldObj, this.blockX, this.blockY, this.blockZ); + AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool(this.worldObj, this.blockX, this.blockY, this.blockZ); + + if (axisalignedbb != null && axisalignedbb.isVecInside(Vec3.createVectorHelper(this.posX, this.posY, this.posZ))) { + this.inGround = true; + } + } + + if (this.arrowShake > 0) { + --this.arrowShake; + } + + if (this.inGround) { + int j = this.worldObj.getBlockMetadata(this.blockX, this.blockY, this.blockZ); + + if (block == this.blockHit && j == this.inData) { + ++this.ticksInGround; + + if (this.ticksInGround == 1200) { + this.setDead(); + } + } else { + this.inGround = false; + this.motionX *= this.rand.nextFloat() * 0.2F; + this.motionY *= this.rand.nextFloat() * 0.2F; + this.motionZ *= this.rand.nextFloat() * 0.2F; + this.ticksInGround = 0; + this.ticksInAir = 0; + } + } else { + ++this.ticksInAir; + Vec3 vec31 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); + Vec3 vec3 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + MovingObjectPosition movingobjectposition = this.worldObj.func_147447_a(vec31, vec3, false, true, false); + vec31 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); + vec3 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + + if (movingobjectposition != null) { + vec3 = Vec3.createVectorHelper(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord); + + } + + Entity entity = null; + List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); + double d0 = 0.0D; + int i; + float f1; + + for (i = 0; i < list.size(); ++i) { + Entity entity1 = (Entity) list.get(i); + + if (entity1.canBeCollidedWith() && (entity1 != this.shootingEntity || this.ticksInAir >= 5)) { + f1 = 0.3F; + AxisAlignedBB axisalignedbb1 = entity1.boundingBox.expand(f1, f1, f1); + MovingObjectPosition movingobjectposition1 = axisalignedbb1.calculateIntercept(vec31, vec3); + + if (movingobjectposition1 != null) { + double d1 = vec31.distanceTo(movingobjectposition1.hitVec); + + if (d1 < d0 || d0 == 0.0D) { + entity = entity1; + d0 = d1; + } + } + } + } + + if (entity != null) { + movingobjectposition = new MovingObjectPosition(entity); + } + + if (movingobjectposition != null && movingobjectposition.entityHit != null && movingobjectposition.entityHit instanceof EntityPlayer) { + EntityPlayer entityplayer = (EntityPlayer) movingobjectposition.entityHit; + + if (entityplayer.capabilities.disableDamage || this.shootingEntity instanceof EntityPlayer && !((EntityPlayer) this.shootingEntity).canAttackPlayer(entityplayer)) { + movingobjectposition = null; + } + } + + float f2; + float f4; + + if (movingobjectposition != null) { + if (movingobjectposition.entityHit != null) { + if (explosive) { + //world.createExplosion(this.shootingEntity, movingobjectposition.entityHit.posX, movingobjectposition.entityHit.posY, movingobjectposition.entityHit.posZ, 6, false); + //movingobjectposition.entityHit.hurtResistantTime = 0; + worldObj.createExplosion(this.shootingEntity, movingobjectposition.entityHit.posX, movingobjectposition.entityHit.posY, movingobjectposition.entityHit.posZ, 4, ConfigHandler.bowBlockDamage); + this.setDead(); + } + int k; + if (!ignorSpeed) { + f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); + k = MathHelper.ceiling_double_int(f2 * this.damageO); + + if (this.getIsCritical()) { + k += this.rand.nextInt(k / 2 + 2); + } + } else { + k = (int) this.damageO; + if (this.getIsCritical()) { + k += this.rand.nextInt(k / 2 + 2); + } + } + + DamageSource damagesource = null; + + if (this.shootingEntity == null) { + damagesource = DamageSource.causeArrowDamage(this, this); + } else { + damagesource = DamageSource.causeArrowDamage(this, this.shootingEntity); + } + if (movingobjectposition.entityHit instanceof EntityEnderman) + damagesource = DamageSource.magic; + + if (this.isBurning() && !(movingobjectposition.entityHit instanceof EntityEnderman)) { + movingobjectposition.entityHit.setFire(5); + } + + movingobjectposition.entityHit.hurtResistantTime = 0; + if (movingobjectposition.entityHit instanceof EntityDragonPart && ((EntityDragonPart)movingobjectposition.entityHit).entityDragonObj instanceof EntityDragon) + { + ((EntityDragon)((EntityDragonPart)movingobjectposition.entityHit).entityDragonObj).hurtResistantTime = 0; + } + + if (movingobjectposition.entityHit.attackEntityFrom(damagesource, k)) { + if (movingobjectposition.entityHit instanceof EntityLivingBase) { + EntityLivingBase entitylivingbase = (EntityLivingBase) movingobjectposition.entityHit; + + if (!this.worldObj.isRemote) { + entitylivingbase.setArrowCountInEntity(entitylivingbase.getArrowCountInEntity() + 1); + } + + if (this.knockbackStrength > 0) { + f4 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + + if (f4 > 0.0F) { + movingobjectposition.entityHit.addVelocity(this.motionX * this.knockbackStrength * 0.6000000238418579D / f4, 0.1D, this.motionZ * this.knockbackStrength * 0.6000000238418579D / f4); + } + } + + if (this.shootingEntity != null && this.shootingEntity instanceof EntityLivingBase) { + EnchantmentHelper.func_151384_a(entitylivingbase, this.shootingEntity); + EnchantmentHelper.func_151385_b((EntityLivingBase) this.shootingEntity, entitylivingbase); + } + + if (this.shootingEntity != null && movingobjectposition.entityHit != this.shootingEntity && movingobjectposition.entityHit instanceof EntityPlayer && this.shootingEntity instanceof EntityPlayerMP) { + ((EntityPlayerMP) this.shootingEntity).playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(6, 0.0F)); + } + } + + this.playSound("random.bowhit", 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F)); + + // if (!(movingobjectposition.entityHit instanceof EntityEnderman)) + //{ + this.setDead(); + //} + } else { + this.motionX *= -0.10000000149011612D; + this.motionY *= -0.10000000149011612D; + this.motionZ *= -0.10000000149011612D; + this.rotationYaw += 180.0F; + this.prevRotationYaw += 180.0F; + this.ticksInAir = 0; + } + } else { + this.blockX = movingobjectposition.blockX; + this.blockY = movingobjectposition.blockY; + this.blockZ = movingobjectposition.blockZ; + block = this.worldObj.getBlock(this.blockX, this.blockY, this.blockZ); + this.blockHit = block; + this.inData = this.worldObj.getBlockMetadata(this.blockX, this.blockY, this.blockZ); + this.motionX = ((float) (movingobjectposition.hitVec.xCoord - this.posX)); + this.motionY = ((float) (movingobjectposition.hitVec.yCoord - this.posY)); + this.motionZ = ((float) (movingobjectposition.hitVec.zCoord - this.posZ)); + f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); + this.posX -= this.motionX / f2 * 0.05000000074505806D; + this.posY -= this.motionY / f2 * 0.05000000074505806D; + this.posZ -= this.motionZ / f2 * 0.05000000074505806D; + this.playSound("random.bowhit", 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F)); + this.inGround = true; + this.arrowShake = 7; + + if (this.blockHit.getMaterial() != Material.air) { + this.blockHit.onEntityCollidedWithBlock(this.worldObj, this.blockX, this.blockY, this.blockZ, this); + } + } + } + + if (this.getIsCritical()) { + for (i = 0; i < 4; ++i) { + this.worldObj.spawnParticle("crit", this.posX + this.motionX * i / 4.0D, this.posY + this.motionY * i / 4.0D, this.posZ + this.motionZ * i / 4.0D, -this.motionX, -this.motionY + 0.2D, -this.motionZ); + } + } + + this.posX += this.motionX; + this.posY += this.motionY; + this.posZ += this.motionZ; + f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); + + for (this.rotationPitch = (float) (Math.atan2(this.motionY, f2) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { + ; + } + + while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { + this.prevRotationPitch += 360.0F; + } + + while (this.rotationYaw - this.prevRotationYaw < -180.0F) { + this.prevRotationYaw -= 360.0F; + } + + while (this.rotationYaw - this.prevRotationYaw >= 180.0F) { + this.prevRotationYaw += 360.0F; + } + + this.rotationPitch = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * 0.2F; + this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F; + float f3 = 0.99F; + f1 = 0.05F; + + if (this.isInWater()) { + for (int l = 0; l < 4; ++l) { + f4 = 0.25F; + this.worldObj.spawnParticle("bubble", this.posX - this.motionX * f4, this.posY - this.motionY * f4, this.posZ - this.motionZ * f4, this.motionX, this.motionY, this.motionZ); + } + + f3 = 0.8F; + } + + if (this.isWet()) { + this.extinguish(); + } + + this.motionX *= f3; + this.motionY *= f3; + this.motionZ *= f3; + this.motionY -= f1; + this.setPosition(this.posX, this.posY, this.posZ); + this.func_145775_I(); + } + } + + @Override + public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) + { + par1NBTTagCompound.setShort("xTile", (short) this.blockX); + par1NBTTagCompound.setShort("yTile", (short) this.blockY); + par1NBTTagCompound.setShort("zTile", (short) this.blockZ); + par1NBTTagCompound.setShort("life", (short) this.ticksInGround); + par1NBTTagCompound.setByte("inTile", (byte) Block.getIdFromBlock(this.blockHit)); + par1NBTTagCompound.setByte("inData", (byte) this.inData); + par1NBTTagCompound.setByte("shake", (byte) this.arrowShake); + par1NBTTagCompound.setByte("inGround", (byte) (this.inGround ? 1 : 0)); + par1NBTTagCompound.setByte("pickup", (byte) this.canBePickedUp); + par1NBTTagCompound.setDouble("damageO", this.damageO); + //par1NBTTagCompound.setString("shooter", getShooter() instanceof EntityPlayer ? ((EntityPlayer) getShooter()).getCommandSenderName() : ""); + } + + @Override + public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) + { + this.blockX = par1NBTTagCompound.getShort("xTile"); + this.blockY = par1NBTTagCompound.getShort("yTile"); + this.blockZ = par1NBTTagCompound.getShort("zTile"); + this.ticksInGround = par1NBTTagCompound.getShort("life"); + this.blockHit = Block.getBlockById(par1NBTTagCompound.getByte("inTile") & 255); + this.inData = par1NBTTagCompound.getByte("inData") & 255; + this.arrowShake = par1NBTTagCompound.getByte("shake") & 255; + this.inGround = par1NBTTagCompound.getByte("inGround") == 1; + //dataWatcher.updateObject(SHOOTER_DATAWATCHER_INDEX, par1NBTTagCompound.hasKey("shooter") ? par1NBTTagCompound.getString("shooter") : ""); + + if (par1NBTTagCompound.hasKey("damageO", 99)) { + this.damageO = par1NBTTagCompound.getDouble("damageO"); + } + + if (par1NBTTagCompound.hasKey("pickup", 99)) { + this.canBePickedUp = par1NBTTagCompound.getByte("pickup"); + } else if (par1NBTTagCompound.hasKey("player", 99)) { + this.canBePickedUp = par1NBTTagCompound.getBoolean("player") ? 1 : 0; + } + } + + @Override + public void onCollideWithPlayer(EntityPlayer par1EntityPlayer) + { + if (!this.worldObj.isRemote && this.inGround && this.arrowShake <= 0) { + boolean flag = this.canBePickedUp == 1 || this.canBePickedUp == 2 && par1EntityPlayer.capabilities.isCreativeMode; + + if (this.canBePickedUp == 1 && !par1EntityPlayer.inventory.addItemStackToInventory(new ItemStack(Items.arrow, 1))) { + flag = false; + } + + if (flag) { + this.playSound("random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + par1EntityPlayer.onItemPickup(this, 1); + this.setDead(); + } + } + } + + @Override + protected boolean canTriggerWalking() + { + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public float getShadowSize() + { + return 0.0F; + } + + @Override + public void setDamage(double par1) + { + this.damageO = par1; + } + + @Override + public double getDamage() + { + return this.damageO; + } + + @Override + public void setKnockbackStrength(int par1) + { + this.knockbackStrength = par1; + } + + @Override + public boolean canAttackWithItem() + { + return false; + } + + @Override + public void setIsCritical(boolean par1) + { + byte b0 = this.dataWatcher.getWatchableObjectByte(16); + + if (par1) { + this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 1))); + } else { + this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -2))); + } + } + + @Override + public boolean getIsCritical() + { + byte b0 = this.dataWatcher.getWatchableObjectByte(16); + return (b0 & 1) != 0; + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDragonHeart.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDragonHeart.java index 66caca0e..a916068f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDragonHeart.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDragonHeart.java @@ -108,6 +108,7 @@ public class EntityDragonHeart extends Entity { item.motionX = 0; item.motionY = 0; item.motionZ = 0; + item.delayBeforeCanPickup = 0; if (!worldObj.isRemote) worldObj.spawnEntityInWorld(item); this.worldObj.playSoundAtEntity(this, "random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); this.setDead(); @@ -166,7 +167,14 @@ public class EntityDragonHeart extends Entity { } case 4:{ if (blocks.size() == 0){ - if (!worldObj.isRemote) worldObj.spawnEntityInWorld(new EntityItem(worldObj, posX, posY, posZ, new ItemStack(ModItems.dragonHeart))); + if (!worldObj.isRemote) { + EntityPersistentItem item = new EntityPersistentItem(worldObj, posX, posY, posZ, new ItemStack(ModItems.dragonHeart)); + item.motionX = 0; + item.motionY = 0; + item.motionZ = 0; + item.delayBeforeCanPickup = 0; + worldObj.spawnEntityInWorld(item); + } this.worldObj.playSoundAtEntity(this, "random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); this.setDead(); break; @@ -240,6 +248,10 @@ public class EntityDragonHeart extends Entity { @Override public void onCollideWithPlayer(EntityPlayer player) { + if (age < 2000) { + age = 2000; + opPhase = 2; + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityEnderArrow.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityEnderArrow.java index 690c975e..291600b2 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityEnderArrow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityEnderArrow.java @@ -5,14 +5,11 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.play.server.S2BPacketChangeGameState; import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -178,10 +175,13 @@ public class EntityEnderArrow extends EntityDraconicArrow { } } + if (entity == shootingEntity) entity = null; + if (entity != null) { movingobjectposition = new MovingObjectPosition(entity); } + if (movingobjectposition != null && movingobjectposition.entityHit != null && movingobjectposition.entityHit instanceof EntityPlayer) { EntityPlayer entityplayer = (EntityPlayer) movingobjectposition.entityHit; @@ -194,80 +194,81 @@ public class EntityEnderArrow extends EntityDraconicArrow { float f4; if (movingobjectposition != null) { - if (movingobjectposition.entityHit != null) { - onImpact(movingobjectposition.entityHit); - int k; - if (!ignorSpeed) { - f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); - k = MathHelper.ceiling_double_int(f2 * this.damage); - - if (this.getIsCritical()) { - k += this.rand.nextInt(k / 2 + 2); - } - } else { - k = (int) this.damage; - if (this.getIsCritical()) { - k += this.rand.nextInt(k / 2 + 2); - } - } - - DamageSource damagesource = null; - - if (this.shootingEntity == null) { - damagesource = DamageSource.causeArrowDamage(this, this); - } else { - damagesource = DamageSource.causeArrowDamage(this, this.shootingEntity); - } - if (movingobjectposition.entityHit instanceof EntityEnderman) - damagesource = DamageSource.magic; - - if (this.isBurning() && !(movingobjectposition.entityHit instanceof EntityEnderman)) { - movingobjectposition.entityHit.setFire(5); - } - - movingobjectposition.entityHit.hurtResistantTime = 0; - - if (movingobjectposition.entityHit.attackEntityFrom(damagesource, k)) { - if (movingobjectposition.entityHit instanceof EntityLivingBase) { - EntityLivingBase entitylivingbase = (EntityLivingBase) movingobjectposition.entityHit; - - if (!this.worldObj.isRemote) { - entitylivingbase.setArrowCountInEntity(entitylivingbase.getArrowCountInEntity() + 1); - } - - if (this.knockbackStrength > 0) { - f4 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - - if (f4 > 0.0F) { - movingobjectposition.entityHit.addVelocity(this.motionX * this.knockbackStrength * 0.6000000238418579D / f4, 0.1D, this.motionZ * this.knockbackStrength * 0.6000000238418579D / f4); - } - } - - if (this.shootingEntity != null && this.shootingEntity instanceof EntityLivingBase) { - EnchantmentHelper.func_151384_a(entitylivingbase, this.shootingEntity); - EnchantmentHelper.func_151385_b((EntityLivingBase) this.shootingEntity, entitylivingbase); - } - - if (this.shootingEntity != null && movingobjectposition.entityHit != this.shootingEntity && movingobjectposition.entityHit instanceof EntityPlayer && this.shootingEntity instanceof EntityPlayerMP) { - ((EntityPlayerMP) this.shootingEntity).playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(6, 0.0F)); - } - } - - this.playSound("random.bowhit", 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F)); - - // if (!(movingobjectposition.entityHit instanceof EntityEnderman)) - //{ - this.setDead(); - //} - } else { - this.motionX *= -0.10000000149011612D; - this.motionY *= -0.10000000149011612D; - this.motionZ *= -0.10000000149011612D; - this.rotationYaw += 180.0F; - this.prevRotationYaw += 180.0F; - this.ticksInAir = 0; - } - } else { +// if (movingobjectposition.entityHit != null && movingobjectposition.entityHit != shootingEntity) { +// onImpact(movingobjectposition.entityHit); +// int k; +// if (!ignorSpeed) { +// f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); +// k = MathHelper.ceiling_double_int(f2 * this.damage); +// +// if (this.getIsCritical()) { +// k += this.rand.nextInt(k / 2 + 2); +// } +// } else { +// k = (int) this.damage; +// if (this.getIsCritical()) { +// k += this.rand.nextInt(k / 2 + 2); +// } +// } +// +// DamageSource damagesource = null; +// +// if (this.shootingEntity == null) { +// damagesource = DamageSource.causeArrowDamage(this, this); +// } else { +// damagesource = DamageSource.causeArrowDamage(this, this.shootingEntity); +// } +// if (movingobjectposition.entityHit instanceof EntityEnderman) +// damagesource = DamageSource.magic; +// +// if (this.isBurning() && !(movingobjectposition.entityHit instanceof EntityEnderman)) { +// movingobjectposition.entityHit.setFire(5); +// } +// +// movingobjectposition.entityHit.hurtResistantTime = 0; +// +// if (movingobjectposition.entityHit.attackEntityFrom(damagesource, k)) { +// if (movingobjectposition.entityHit instanceof EntityLivingBase) { +// EntityLivingBase entitylivingbase = (EntityLivingBase) movingobjectposition.entityHit; +// +// if (!this.worldObj.isRemote) { +// entitylivingbase.setArrowCountInEntity(entitylivingbase.getArrowCountInEntity() + 1); +// } +// +// if (this.knockbackStrength > 0) { +// f4 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); +// +// if (f4 > 0.0F) { +// movingobjectposition.entityHit.addVelocity(this.motionX * this.knockbackStrength * 0.6000000238418579D / f4, 0.1D, this.motionZ * this.knockbackStrength * 0.6000000238418579D / f4); +// } +// } +// +// if (this.shootingEntity != null && this.shootingEntity instanceof EntityLivingBase) { +// EnchantmentHelper.func_151384_a(entitylivingbase, this.shootingEntity); +// EnchantmentHelper.func_151385_b((EntityLivingBase) this.shootingEntity, entitylivingbase); +// } +// +// if (this.shootingEntity != null && movingobjectposition.entityHit != this.shootingEntity && movingobjectposition.entityHit instanceof EntityPlayer && this.shootingEntity instanceof EntityPlayerMP) { +// ((EntityPlayerMP) this.shootingEntity).playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(6, 0.0F)); +// } +// } +// +// this.playSound("random.bowhit", 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F)); +// +// // if (!(movingobjectposition.entityHit instanceof EntityEnderman)) +// //{ +// this.setDead(); +// //} +// } else { +// this.motionX *= -0.10000000149011612D; +// this.motionY *= -0.10000000149011612D; +// this.motionZ *= -0.10000000149011612D; +// this.rotationYaw += 180.0F; +// this.prevRotationYaw += 180.0F; +// this.ticksInAir = 0; +// } +// } else + if (movingobjectposition.entityHit == null){ this.field_145791_d = movingobjectposition.blockX; this.field_145792_e = movingobjectposition.blockY; this.field_145789_f = movingobjectposition.blockZ; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/SunFocus.java b/src/main/java/com/brandon3055/draconicevolution/common/items/SunFocus.java index 67b7a126..3eeab08b 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/SunFocus.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/SunFocus.java @@ -1,13 +1,12 @@ package com.brandon3055.draconicevolution.common.items; -import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.lib.Strings; public class SunFocus extends ItemDE { public SunFocus() { this.setUnlocalizedName(Strings.sunFocusName); - this.setCreativeTab(DraconicEvolution.tabBlocksItems); + //this.setCreativeTab(DraconicEvolution.tabBlocksItems); ModItems.register(this); } 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 18431b2e..6e1e10e0 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 @@ -30,7 +30,7 @@ import java.util.*; */ 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"); + private static final DamageSource ADMIN_KILL = new DamageSource("administrative.kill").setDamageAllowedInCreativeMode().setDamageBypassesArmor().setDamageIsAbsolute(); public static Map playersWithFlight = new WeakHashMap(); public static List playersWithUphillStep = new ArrayList(); public static Field walkSpeed; @@ -161,6 +161,7 @@ public class CustomArmorHandler { } public static void onPlayerTick(TickEvent.PlayerTickEvent event) { + EntityPlayer player = event.player; ArmorSummery summery = new ArmorSummery().getSummery(player); @@ -201,11 +202,11 @@ public class CustomArmorHandler { player.capabilities.allowFlying = true; if (summery.flight[1]) player.capabilities.isFlying = true; - player.capabilities.setFlySpeed(0.05F + (0.05F * summery.flightSpeedModifier)); + if (player.worldObj.isRemote) setPlayerFlySpeed(player, 0.05F + (0.05F * summery.flightSpeedModifier)); if ((!player.onGround && player.capabilities.isFlying) && player.motionY != 0 && summery.flightVModifier > 0) { - float percentIncrease = summery.flightVModifier; +// float percentIncrease = summery.flightVModifier; if (BrandonsCore.proxy.isSpaceDown() && !BrandonsCore.proxy.isShiftDown()) { @@ -219,6 +220,11 @@ public class CustomArmorHandler { } } + if (summery.flight[2] && player.moveForward == 0 && player.moveStrafing == 0 && player.capabilities.isFlying){ + player.motionX *= 0.5; + player.motionZ *= 0.5; + } + } else { if (!playersWithFlight.containsKey(player)) { @@ -280,7 +286,9 @@ public class CustomArmorHandler { //endregion } - + private static void setPlayerFlySpeed(EntityPlayer player, float speed) { + player.capabilities.setFlySpeed(speed); + } private static boolean applyArmorDamageBlocking(LivingAttackEvent event, ArmorSummery summery){ if (summery == null) return false; @@ -332,7 +340,7 @@ public class CustomArmorHandler { /**RF stored in each armor peace*/ public int[] energyAllocation; /*---- Effects ----*/ - public boolean[] flight = new boolean[] {false, false}; + public boolean[] flight = new boolean[] {false, false, false}; public float flightVModifier = 0F; public float speedModifier = 0F; public float jumpModifier = 0F; @@ -381,9 +389,9 @@ public class CustomArmorHandler { break; case 1: speedModifier = armor.getSpeedModifier(stack, player); - hasHillStep = armor.hasHillStep(stack, player); break; case 0: + hasHillStep = armor.hasHillStep(stack, player); jumpModifier = armor.getJumpModifier(stack, player); break; } 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 cbadc433..f88c8d76 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 @@ -187,10 +187,10 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IConfigur 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 && IConfigurableItem.ProfileHelper.getBoolean(stack, "ArmorNVActive", false)) { - player.addPotionEffect(new PotionEffect(16, 419, 0, true)); + player.addPotionEffect(new PotionEffect(Potion.nightVision.id, 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); + else if ( IConfigurableItem.ProfileHelper.getBoolean(stack, "ArmorNVActive", false) && IConfigurableItem.ProfileHelper.getBoolean(stack, "ArmorNVLock", true)) player.addPotionEffect(new PotionEffect(Potion.nightVision.id, 419, 0, true)); + else if (player.isPotionActive(Potion.nightVision.id)) player.removePotionEffect(Potion.nightVision.id); } } @@ -294,6 +294,7 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IConfigur 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)); + list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorInertiaCancellation").readFromItem(stack, false)); } else if (armorType == 2) { @@ -492,7 +493,7 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IConfigur @Override public boolean[] hasFlight(ItemStack stack) { - return new boolean[] {true, IConfigurableItem.ProfileHelper.getBoolean(stack, "ArmorFlightLock", false)}; + return new boolean[] {true, IConfigurableItem.ProfileHelper.getBoolean(stack, "ArmorFlightLock", false), IConfigurableItem.ProfileHelper.getBoolean(stack, "ArmorInertiaCancellation", false)}; } @Override 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 0ea48c09..6fb87781 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 @@ -411,7 +411,7 @@ public class WyvernArmor extends ItemArmor implements ISpecialArmor, IConfigurab @Override public boolean[] hasFlight(ItemStack stack) { - return new boolean[] {false, false}; + return new boolean[] {false, false, false}; } @Override 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 0b7a3a81..1c465dbb 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 @@ -21,7 +21,7 @@ import org.lwjgl.opengl.GL11; import java.util.List; -public class DraconicAxe extends MiningTool implements IInventoryTool, IRenderTweak {//todo axe & fields +public class DraconicAxe extends MiningTool implements IInventoryTool, IRenderTweak { public DraconicAxe() { super(ModItems.WYVERN); @@ -83,7 +83,7 @@ public class DraconicAxe extends MiningTool implements IInventoryTool, IRenderTw } @Override - public List getUpgradeStats(ItemStack stack) {//todo List Upgrades + public List getUpgradeStats(ItemStack stack) { return super.getUpgradeStats(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 5311ae53..2269137c 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 @@ -152,6 +152,7 @@ public class DraconicDistructionStaff extends MiningTool implements IInventoryTo list.add(EnumUpgrade.ATTACK_AOE); list.add(EnumUpgrade.ATTACK_DAMAGE); list.remove(EnumUpgrade.DIG_SPEED); + 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 ae94f3e5..136977ee 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 @@ -85,7 +85,7 @@ public class DraconicPickaxe extends MiningTool implements IInventoryTool, IRend } @Override - public List getUpgradeStats(ItemStack stack) {//todo List Upgrades + public List getUpgradeStats(ItemStack stack) { return super.getUpgradeStats(stack); } 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 62fdaab1..00954601 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 @@ -92,7 +92,7 @@ public class DraconicShovel extends MiningTool implements IInventoryTool, IRende } @Override - public List getUpgradeStats(ItemStack stack) {//todo List Upgrades + public List getUpgradeStats(ItemStack stack) { return super.getUpgradeStats(stack); } 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 9bef6ac9..8f874925 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 @@ -84,7 +84,7 @@ public class WyvernPickaxe extends MiningTool implements IInventoryTool, IRender } @Override - public List getUpgradeStats(ItemStack stack) {//todo List Upgrades + public List getUpgradeStats(ItemStack stack) { return super.getUpgradeStats(stack); } 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 f4afe316..3cb9ee01 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 @@ -86,7 +86,7 @@ public class WyvernShovel extends MiningTool implements IInventoryTool, IRenderT } @Override - public List getUpgradeStats(ItemStack stack) {//todo List Upgrades + public List getUpgradeStats(ItemStack stack) { return super.getUpgradeStats(stack); } 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 bf1568a4..23148fa3 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 @@ -38,7 +38,7 @@ import java.util.Map; /** * Created by Brandon on 2/01/2015. */ -public abstract class MiningTool extends ToolBase implements IUpgradableItem {//todo add custom information to sub classes, Update documentation and add doc for hud +public abstract class MiningTool extends ToolBase implements IUpgradableItem { public MiningTool(ToolMaterial material) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/BowHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/BowHandler.java index 7cb99b42..5ab5b881 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/BowHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/BowHandler.java @@ -1,21 +1,136 @@ package com.brandon3055.draconicevolution.common.items.weapons; +import cofh.api.energy.IEnergyContainerItem; +import com.brandon3055.draconicevolution.common.ModItems; +import com.brandon3055.draconicevolution.common.entity.EntityCustomArrow; import com.brandon3055.draconicevolution.common.entity.EntityDraconicArrow; import com.brandon3055.draconicevolution.common.entity.EntityEnderArrow; -import com.brandon3055.draconicevolution.common.ModItems; +import com.brandon3055.draconicevolution.common.utills.IConfigurableItem; +import com.brandon3055.draconicevolution.common.utills.IUpgradableItem; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowLooseEvent; +import net.minecraftforge.event.entity.player.ArrowNockEvent; import java.util.Random; public class BowHandler { + + public static ItemStack onBowRightClick(Item bow, ItemStack stack, World world, EntityPlayer player){ + BowHandler.BowProperties properties = new BowHandler.BowProperties(stack, player); + if (properties.canFire()){ + ArrowNockEvent event = new ArrowNockEvent(player, stack); + MinecraftForge.EVENT_BUS.post(event); + if (event.isCanceled()) { + return event.result; + } + + player.setItemInUse(stack, bow.getMaxItemUseDuration(stack)); + } + else if (!properties.canFire() && properties.cantFireMessage != null) player.addChatComponentMessage(new ChatComponentTranslation(properties.cantFireMessage)); + + return stack; + } + + public static void onBowUsingTick(ItemStack stack, EntityPlayer player, int count){ + BowHandler.BowProperties properties = new BowHandler.BowProperties(stack, player); + int j = 72000 - count; + if (properties.autoFire && j >= properties.getDrawTicks()) player.stopUsingItem(); + } + + public static void onPlayerStoppedUsingBow(ItemStack stack, World world, EntityPlayer player, int count){ + BowHandler.BowProperties properties = new BowHandler.BowProperties(stack, player); + if (!properties.canFire()) return; + + int j = 72000 - count; + ArrowLooseEvent event = new ArrowLooseEvent(player, stack, j); + MinecraftForge.EVENT_BUS.post(event); + if (event.isCanceled()) { + return; + } + j = event.charge; + + float drawArrowSpeedModifier = Math.min((float) j / (float) properties.getDrawTicks(), 1F); + if (drawArrowSpeedModifier < 0.1) return; + float velocity = properties.arrowSpeed * drawArrowSpeedModifier * 2F; //2F is the speed of a vanilla arrow + + LogHelper.info(velocity); + + EntityCustomArrow customArrow = new EntityCustomArrow(properties, world, player, velocity); + + if (properties.consumeArrow()) customArrow.canBePickedUp = 1; + else customArrow.canBePickedUp = 2; + + + + + if (!world.isRemote) world.spawnEntityInWorld(customArrow); + + world.playSoundAtEntity(player, "random.bow", 1.0F, (1.0F / (world.rand.nextFloat() * 0.4F + 1.2F) + (drawArrowSpeedModifier + (velocity / 40F)) * 0.5F)); + +// boolean flag = player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0; +// +// if (flag || player.inventory.hasItem(Items.arrow)) { +// float f = j / pullSpeedModifier; +// f = (f * f + f * 2.0F) / 3.0F; +// +// if ((j < minRelease) || f < 0.1D) return; +// +// if (f > 1.0F) f = 1.0F; +// +// f *= speedModifier; +// +// EntityDraconicArrow entityArrow = new EntityDraconicArrow(world, player, f * 2.0F);//.setShooter(player); +// +// if (f >= 1.0F) entityArrow.setIsCritical(true); +// +// int k = EnchantmentHelper.getEnchantmentLevel(Enchantment.power.effectId, stack); +// +// if (k > 0) // +// entityArrow.setDamage(entityArrow.getDamage() + k + 0.5D); +// +// int l = EnchantmentHelper.getEnchantmentLevel(Enchantment.punch.effectId, stack); +// +// if (l > 0) entityArrow.setKnockbackStrength(l * 2); +// +// if (EnchantmentHelper.getEnchantmentLevel(Enchantment.flame.effectId, stack) > 0) entityArrow.setFire(200); +// +// if (ignorSpeedWhenCalculatingDamage) { +// entityArrow.ignorSpeed = true; +// entityArrow.setDamage(entityArrow.getDamage() + ignorSpeedCompensation); +// } +// if (isExplosive) { +// if ((player.inventory.hasItemStack(new ItemStack(Items.gunpowder, 4)) || player.capabilities.isCreativeMode)) { +// entityArrow.explosive = isExplosive; +// for (int i = 0; i < 4; ++i) +// player.inventory.consumeInventoryItem(Items.gunpowder); +// } else { +// if (player.worldObj.isRemote) +// player.addChatMessage(new ChatComponentTranslation("msg.bowoutofgunpowder.txt")); +// } +// } +// +// stack.damageItem(1, player); // +// world.playSoundAtEntity(player, "random.bow", 1.0F, soundPitchModifier * (1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.3F)); +// +// if (flag) entityArrow.canBePickedUp = 2; +// else { +// entityArrow.canBePickedUp = 1; +// player.inventory.consumeInventoryItem(Items.arrow); +// } +// +// if (!world.isRemote) world.spawnEntityInWorld(entityArrow); +// } + } + public static void standerdShot(ItemStack stack, World world, EntityPlayer player, int count, Random itemRand, float pullSpeedModifier, float speedModifier, boolean ignorSpeedWhenCalculatingDamage, double ignorSpeedCompensation, float soundPitchModifier, boolean isExplosive, int minRelease) { int j = 72000 - count; @@ -118,8 +233,11 @@ public class BowHandler { if (player.inventory.hasItem(ModItems.enderArrow)) player.inventory.consumeInventoryItem(ModItems.enderArrow); - //if (!world.isRemote) + if (!world.isRemote) { world.spawnEntityInWorld(entityArrow); + player.mountEntity(entityArrow); + } + } } @@ -131,4 +249,99 @@ public class BowHandler { player.stopUsingItem(); } } + + public static class BowProperties { + public ItemStack bow; + public EntityPlayer player; + + public float arrowDamage = 0F; + public float arrowSpeed = 0F; + public float explosionPower = 0F; + public float shockWavePower = 0F; + public float zoomModifier = 0F; + private int drawTimeReduction = 0; + public boolean autoFire = false; + public boolean energyBolt = false; + + public String cantFireMessage = null; + + public BowProperties(){ + this.bow = new ItemStack(ModItems.wyvernBow); + this.player = null; + } + + public BowProperties(ItemStack bow, EntityPlayer player){ + this.bow = bow; + this.player = player; + updateValues(); + } + + public int calculateEnergyCost(){ + updateValues(); + double rfCost = 80; + + rfCost *= 1 + arrowDamage; + rfCost *= 1 + arrowSpeed; + rfCost *= 1 + explosionPower * 10; + rfCost *= 1 + shockWavePower * 10; + if (energyBolt) rfCost *= 30; + + return (int)rfCost; + } + + public boolean canFire(){ + updateValues(); + + if (player == null) return false; + if (!(bow.getItem() instanceof IEnergyContainerItem)){ + cantFireMessage = "[Error] This bow is not a valid energy container (This is a bug, Please report on the Draconic Evolution github)"; + return false; + } + else if (!energyBolt && shockWavePower > 0){ + cantFireMessage = "msg.de.shockWaveForEnergyBoltsOnly.name"; + return false; + } + else if (energyBolt && explosionPower > 0){ + cantFireMessage = "msg.de.explosiveNotForEnergyBolts.name"; + return false; + } + else if (calculateEnergyCost() > ((IEnergyContainerItem)bow.getItem()).getEnergyStored(bow)){ + cantFireMessage = "msg.de.insufficientPowerToFire.name"; + return false; + } + else if (!energyBolt && !player.inventory.hasItem(Items.arrow) && EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, bow) == 0 && !player.capabilities.isCreativeMode){ + cantFireMessage = "msg.de.outOfArrows.name"; + return false; + } + + + cantFireMessage = null; + return true; + } + + private void updateValues(){ + arrowDamage = (float)IUpgradableItem.EnumUpgrade.ARROW_DAMAGE.getUpgradePoints(bow); + arrowSpeed = 1F + IConfigurableItem.ProfileHelper.getFloat(bow, "BowArrowSpeedModifier", 0F); + explosionPower = IConfigurableItem.ProfileHelper.getFloat(bow, "BowExplosionPower", 0F); + shockWavePower = IConfigurableItem.ProfileHelper.getFloat(bow, "BowShockWavePower", 0F); + drawTimeReduction = IUpgradableItem.EnumUpgrade.DRAW_SPEED.getUpgradePoints(bow); + zoomModifier = IConfigurableItem.ProfileHelper.getFloat(bow, "BowZoomModifier", 0F); + autoFire = IConfigurableItem.ProfileHelper.getBoolean(bow, "BowAutoFire", false); + energyBolt = IConfigurableItem.ProfileHelper.getBoolean(bow, "BowEnergyBolt", false); + } + + public int getDrawTicks(){ + return Math.max(62 - (drawTimeReduction * 10), 1); + } + + public boolean consumeArrow(){ + if (!energyBolt && EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, bow) == 0 && !player.capabilities.isCreativeMode) { + player.inventory.consumeInventoryItem(Items.arrow); + return true; + } + + return false; + } + } } +//lot, "BowArrowSpeedModifier").setMinMaxAndIncromente(0F, (float)EnumUpgrade.ARROW_SPEED.getUpgradePoints(stack), 0.01F).readFromItem(stack, 0F)todo dont forget the speed needs to be "Calibrated" for the upgrade system 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 b500e018..5e5089ce 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 @@ -1,7 +1,9 @@ package com.brandon3055.draconicevolution.common.items.weapons; +import cofh.api.energy.IEnergyContainerItem; 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.common.ModItems; import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem; @@ -15,25 +17,22 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnumEnchantmentType; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemBow; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.ArrowNockEvent; import java.util.ArrayList; import java.util.List; -public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableItem +public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableItem, IEnergyContainerItem { public static final String[] bowPullIconNameArray = new String[] { "pulling_0", "pulling_1", "pulling_2" }; @SideOnly(Side.CLIENT) @@ -47,6 +46,8 @@ public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableI if (ModItems.isEnabled(this)) GameRegistry.registerItem(this, Strings.draconicBowName); } + //region Regular Item Stuff + @Override public boolean isItemTool(ItemStack p_77616_1_) { return true; @@ -63,79 +64,6 @@ public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableI return getUnlocalizedName(); } - /* ======================================== CUSTOMEBOW START =====================================*/ - @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) - { - if (!player.isSneaking()) - { - ArrowNockEvent event = new ArrowNockEvent(player, stack); - MinecraftForge.EVENT_BUS.post(event); - if (event.isCanceled()) - { - return event.result; - } - - if (player.capabilities.isCreativeMode || player.inventory.hasItem(Items.arrow) || player.inventory.hasItem(ModItems.enderArrow) || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0) - { - player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); - } - } else - changeMode(stack, player); - return stack; - } - - @Override - public void onUsingTick(ItemStack stack, EntityPlayer player, int count) - { - String currentMode = ItemNBTHelper.getString(stack, "mode", "rapidfire"); - if (player.inventory.hasItem(ModItems.enderArrow)) currentMode = "ender"; - if (currentMode.equals("rapidfire")) - BowHandler.rapidFire(player, count, 4); -// else if (currentMode.equals("sharpshooter")) -// player.addPotionEffect(new PotionEffect(2, 2, 10, true)); - else if (currentMode.equals("devistation")) - BowHandler.rapidFire(player, count, 2); - - } - - @Override - public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int count) - { - String currentMode = ItemNBTHelper.getString(stack, "mode", "rapidfire"); - if (player.inventory.hasItem(ModItems.enderArrow)) currentMode = "ender"; - if (currentMode.equals("rapidfire")) - BowHandler.standerdShot(stack, world, player, count, itemRand, 5F, 1.5F, true, 9D, 1F, false, 0); - else if (currentMode.equals("sharpshooter")) - BowHandler.standerdShot(stack, world, player, count, itemRand, 21F, 5F, true, 30D, 0.7F, false, 20); - else if (currentMode.equals("explosive")) - BowHandler.standerdShot(stack, world, player, count, itemRand, 5F, 0.5F, true, 0D, 1F, true, 80); - else if (currentMode.equals("devistation")) - BowHandler.standerdShot(stack, world, player, count, itemRand, 2F, 2.0F, true, 0D, 1F, true, 0); - else if (currentMode.equals("ender")) - BowHandler.enderShot(stack, world, player, count, itemRand, 21F, 1.5F, 1F, 0); - } - - public void changeMode(ItemStack stack, EntityPlayer player) - { - String currentMode = ItemNBTHelper.getString(stack, "mode", "rapidfire"); - - if (currentMode.equals("rapidfire")) - ItemNBTHelper.setString(stack, "mode", "sharpshooter"); - else if (currentMode.equals("sharpshooter")) - ItemNBTHelper.setString(stack, "mode", "explosive"); - else if (currentMode.equals("explosive") && player.capabilities.isCreativeMode) - ItemNBTHelper.setString(stack, "mode", "devistation"); - else - ItemNBTHelper.setString(stack, "mode", "rapidfire"); - - - if (player.worldObj.isRemote) - player.addChatMessage(new ChatComponentTranslation("msg.bowmode" + ItemNBTHelper.getString(stack, "mode", "rapidfire") + ".txt")); - } - - /* ======================================== TEXTURE START =====================================*/ - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) @@ -153,46 +81,22 @@ public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableI @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - String currentMode = ItemNBTHelper.getString(stack, "mode", "rapidfire"); - if (player.inventory.hasItem(ModItems.enderArrow)) currentMode = "sharpshooter"; - int j = stack.getMaxItemUseDuration() - useRemaining; - if (usingItem == null) + float j = (float)stack.getMaxItemUseDuration() - (float)useRemaining; + if (usingItem == null) { return this.itemIcon; - if (currentMode.equals("rapidfire")) - { - if (j >= 4) - return getItemIconForUseDuration(2); - else if (j > 2) - return getItemIconForUseDuration(1); - else if (j > 0) - return getItemIconForUseDuration(0); - } else if (currentMode.equals("devistation")) - { - if (j >= 2) - return getItemIconForUseDuration(2); - else if (j > 1) - return getItemIconForUseDuration(1); - else if (j > 0) - return getItemIconForUseDuration(0); - } else if (currentMode.equals("sharpshooter")) - { - if (j >= 20) - return getItemIconForUseDuration(2); - else if (j > 10) - return getItemIconForUseDuration(1); - else if (j > 0) - return getItemIconForUseDuration(0); - } else - { - if (j >= 80) - return getItemIconForUseDuration(2); - else if (j > 40) - return getItemIconForUseDuration(1); - else if (j > 0) - return getItemIconForUseDuration(0); } - return this.itemIcon; + BowHandler.BowProperties properties = new BowHandler.BowProperties(stack, player); + + if (j > properties.getDrawTicks()) j = properties.getDrawTicks(); + + j /= (float)properties.getDrawTicks(); + int j2 = (int)(j * 2F); + + if (j2 < 0) j2 = 0; + else if (j2 > 2) j2 = 2; + + return getItemIconForUseDuration(j2); } @Override @@ -202,20 +106,42 @@ public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableI return this.iconArray[par1]; } - /* ======================================== TEXTURE END =====================================*/ @Override @SideOnly(Side.CLIENT) @SuppressWarnings({ "unchecked", "rawtypes" }) public void addInformation(final ItemStack stack, final EntityPlayer player, final List list, final boolean extraInformation) { if (InfoHelper.holdShiftForDetails(list)) { - list.add(StatCollector.translateToLocal("msg.bowmode" + ItemNBTHelper.getString(stack, "mode", "rapidfire") + ".txt")); list.add(InfoHelper.ITC() + StatCollector.translateToLocal("info.de.bowEnchants.txt")); InfoHelper.addLore(stack, list); } ToolBase.holdCTRLForUpgrades(list, stack); } + @SideOnly(Side.CLIENT) + @SuppressWarnings("unchecked") + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) { + list.add(ItemNBTHelper.setInteger(new ItemStack(item, 1, 0), "Energy", 0)); + list.add(ItemNBTHelper.setInteger(new ItemStack(item, 1, 0), "Energy", 10000000)); + } + + @Override + public boolean getHasSubtypes() { + return true; + } + + @Override + public boolean showDurabilityBar(ItemStack stack) { + return !(getEnergyStored(stack) == getMaxEnergyStored(stack)); + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) { + return 1D - ((double) getEnergyStored(stack) / (double) getMaxEnergyStored(stack)); + } + + @Override public boolean hasCustomEntity(ItemStack stack) { return true; @@ -226,6 +152,28 @@ public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableI return new EntityPersistentItem(world, location, itemstack); } + //endregion + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) + { + return BowHandler.onBowRightClick(this, stack, world, player); + } + + @Override + public void onUsingTick(ItemStack stack, EntityPlayer player, int count) + { + BowHandler.onBowUsingTick(stack, player, count); + } + + @Override + public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int count) + { + BowHandler.onPlayerStoppedUsingBow(stack, world, player, count); + } + + //region Interfaces + @Override public String getInventoryName() { return StatCollector.translateToLocal("info.de.toolInventoryEnch.txt"); @@ -242,8 +190,17 @@ public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableI } @Override - public List getFields(ItemStack stack, int slot) { - return new ArrayList(); + public List getFields(ItemStack stack, int slot) {//todo balance floaty upgrade things + List list = new ArrayList(); + + list.add(new ItemConfigField(References.FLOAT_ID, slot, "BowArrowSpeedModifier").setMinMaxAndIncromente(0F, (float)EnumUpgrade.ARROW_SPEED.getUpgradePoints(stack), 0.01F).readFromItem(stack, 0F).setModifier("PLUSPERCENT")); + list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "BowAutoFire").readFromItem(stack, false)); + list.add(new ItemConfigField(References.FLOAT_ID, slot, "BowExplosionPower").setMinMaxAndIncromente(0F, 4F, 0.1F).readFromItem(stack, 0F)); + list.add(new ItemConfigField(References.FLOAT_ID, slot, "BowShockWavePower").setMinMaxAndIncromente(0F, 4F, 0.1F).readFromItem(stack, 0F)); + list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "BowEnergyBolt").readFromItem(stack, false)); + list.add(new ItemConfigField(References.FLOAT_ID, slot, "BowZoomModifier").setMinMaxAndIncromente(0F, 3F, 0.01F).readFromItem(stack, 0F).setModifier("PLUSPERCENT")); + + return list; } @Override @@ -268,26 +225,73 @@ public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableI @Override public int getMaxUpgradePoints(int upgradeIndex) { + if (upgradeIndex == EnumUpgrade.DRAW_SPEED.index) return 6; + else if (upgradeIndex == EnumUpgrade.ARROW_SPEED.index) return 10; return 50; } @Override public int getBaseUpgradePoints(int upgradeIndex) { if (upgradeIndex == EnumUpgrade.RF_CAPACITY.index) return 2; + else if (upgradeIndex == EnumUpgrade.DRAW_SPEED.index) return 4; + else if (upgradeIndex == EnumUpgrade.ARROW_SPEED.index) return 2; + else if (upgradeIndex == EnumUpgrade.ARROW_DAMAGE.index) return 1; return 0; } @Override - public List getUpgradeStats(ItemStack itemstack) { - List strings = new ArrayList(); + public List getUpgradeStats(ItemStack stack) { + BowHandler.BowProperties properties = new BowHandler.BowProperties(stack, null); + List list = new ArrayList(); + list.add(InfoHelper.ITC() + StatCollector.translateToLocal("gui.de.RFCapacity.txt") + ": " + InfoHelper.HITC() + Utills.formatNumber(getMaxEnergyStored(stack))); + list.add(InfoHelper.ITC() + StatCollector.translateToLocal("gui.de.max.txt") + " " + StatCollector.translateToLocal("gui.de.ArrowSpeed.txt") + ": " + InfoHelper.HITC() + "+"+EnumUpgrade.ARROW_SPEED.getUpgradePoints(stack)*100+"%"); + list.add(InfoHelper.ITC() + StatCollector.translateToLocal("gui.de.ArrowDamage.txt") + ": " + InfoHelper.HITC() + properties.arrowDamage + ""); + list.add(InfoHelper.ITC() + StatCollector.translateToLocal("gui.de.DrawSpeed.txt") + ": " + InfoHelper.HITC() + properties.getDrawTicks()/20D + "s"); - // strings.add(StatCollector.translateToLocal("gui.de.RFCapacity.txt")+": "+ Utills.formatNumber(getMaxEnergyStored(itemstack))); - - return strings; + return list; } @Override public boolean hasProfiles() { return true; } + + @Override + public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + + int energy = ItemNBTHelper.getInteger(container, "Energy", 0); + int energyReceived = Math.min(getMaxEnergyStored(container) - energy, Math.min(References.WYVERNTRANSFER, maxReceive)); + + if (!simulate) { + energy += energyReceived; + ItemNBTHelper.setInteger(container, "Energy", energy); + } + return energyReceived; + } + + @Override + public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + + int energy = ItemNBTHelper.getInteger(container, "Energy", 0); + int energyExtracted = Math.min(energy, Math.min(References.WYVERNTRANSFER, maxExtract)); + + if (!simulate) { + energy -= energyExtracted; + ItemNBTHelper.setInteger(container, "Energy", energy); + } + return energyExtracted; + } + + @Override + public int getEnergyStored(ItemStack container) { + return ItemNBTHelper.getInteger(container, "Energy", 0); + } + + @Override + public int getMaxEnergyStored(ItemStack stack) { + int i = IUpgradableItem.EnumUpgrade.RF_CAPACITY.getUpgradePoints(stack); + return i * 5000000; + } + + //endregion } 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 1433cd4d..d18c20fb 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 @@ -1,5 +1,6 @@ package com.brandon3055.draconicevolution.common.items.weapons; +import cofh.api.energy.IEnergyContainerItem; import com.brandon3055.brandonscore.common.utills.InfoHelper; import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; import com.brandon3055.draconicevolution.DraconicEvolution; @@ -11,29 +12,27 @@ import com.brandon3055.draconicevolution.common.lib.Strings; 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.LogHelper; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnumEnchantmentType; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemBow; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.ArrowNockEvent; import java.util.ArrayList; import java.util.List; -public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableItem { +public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableItem, IEnergyContainerItem { public static final String[] bowPullIconNameArray = new String[] { "pulling_0", "pulling_1", "pulling_2" }; @SideOnly(Side.CLIENT) @@ -47,6 +46,7 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte if (ModItems.isEnabled(this)) GameRegistry.registerItem(this, Strings.wyvernBowName); } + //region Regular Item Stuff @Override public boolean isItemTool(ItemStack p_77616_1_) { return true; @@ -63,64 +63,6 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte return getUnlocalizedName(); } - /* ======================================== CUSTOMEBOW START ===================================== */ - @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) - { - if (!player.isSneaking()) { - ArrowNockEvent event = new ArrowNockEvent(player, stack); - MinecraftForge.EVENT_BUS.post(event); - if (event.isCanceled()) { - return event.result; - } - - if (player.capabilities.isCreativeMode || player.inventory.hasItem(Items.arrow) || player.inventory.hasItem(ModItems.enderArrow) || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0) { - player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); - } - } else - changeMode(stack, player); - return stack; - } - - @Override - public void onUsingTick(ItemStack stack, EntityPlayer player, int count) - { - String currentMode = ItemNBTHelper.getString(stack, "mode", "rapidfire"); - if (player.inventory.hasItem(ModItems.enderArrow)) currentMode = "ender"; - if (currentMode.equals("rapidfire")) - BowHandler.rapidFire(player, count, 18); -// else if (currentMode.equals("sharpshooter")) -// player.addPotionEffect(new PotionEffect(2, 2, 10, true)); - } - - @Override - public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int count) - { - String currentMode = ItemNBTHelper.getString(stack, "mode", "rapidfire"); - if (player.inventory.hasItem(ModItems.enderArrow)) currentMode = "ender"; - if (currentMode.equals("rapidfire")) - BowHandler.standerdShot(stack, world, player, count, itemRand, 19F, 1F, false, 0D, 1F, false, 0); - else if (currentMode.equals("sharpshooter")) - BowHandler.standerdShot(stack, world, player, count, itemRand, 30F, 5F, true, 20D, 0.7F, false, 30); - else if (currentMode.equals("ender")) - BowHandler.enderShot(stack, world, player, count, itemRand, 30, 1F, 1F, 0); - } - - public void changeMode(ItemStack stack, EntityPlayer player) - { - String currentMode = ItemNBTHelper.getString(stack, "mode", "rapidfire"); - - if (currentMode.equals("rapidfire")) - ItemNBTHelper.setString(stack, "mode", "sharpshooter"); - else - ItemNBTHelper.setString(stack, "mode", "rapidfire"); - - if (player.worldObj.isRemote) - player.addChatMessage(new ChatComponentTranslation("msg.bowmode" + ItemNBTHelper.getString(stack, "mode", "rapidfire") + ".txt")); - } - - /* ======================================== TEXTURE START =====================================*/ - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) @@ -137,28 +79,24 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - String currentMode = ItemNBTHelper.getString(stack, "mode", "rapidfire"); - if (player.inventory.hasItem(ModItems.enderArrow)) currentMode = "sharpshooter"; - int j = stack.getMaxItemUseDuration() - useRemaining; + float j = (float)stack.getMaxItemUseDuration() - (float)useRemaining; if (usingItem == null) { return this.itemIcon; } - if (currentMode.equals("rapidfire")) { - if (j >= 13) - return getItemIconForUseDuration(2); - else if (j > 7) - return getItemIconForUseDuration(1); - else if (j > 0) - return getItemIconForUseDuration(0); - } else if (currentMode.equals("sharpshooter")) { - if (j >= 30) - return getItemIconForUseDuration(2); - else if (j > 15) - return getItemIconForUseDuration(1); - else if (j > 0) - return getItemIconForUseDuration(0); - } - return this.itemIcon; + + BowHandler.BowProperties properties = new BowHandler.BowProperties(stack, player); + + if (j > properties.getDrawTicks()) j = properties.getDrawTicks(); + + j /= (float)properties.getDrawTicks(); + int j2 = (int)(j * 2F); + + if (j2 < 0) j2 = 0; + else if (j2 > 2) j2 = 2; + + LogHelper.info(j2); + + return getItemIconForUseDuration(j2); } @Override @@ -168,20 +106,6 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte return this.iconArray[par1]; } - /* ======================================== TEXTURE END =====================================*/ - @Override - @SideOnly(Side.CLIENT) - @SuppressWarnings({ "unchecked", "rawtypes" }) - public void addInformation(final ItemStack stack, final EntityPlayer player, final List list, final boolean extraInformation) - { - if (InfoHelper.holdShiftForDetails(list)) { - list.add(StatCollector.translateToLocal("msg.bowmode" + ItemNBTHelper.getString(stack, "mode", "rapidfire") + ".txt")); - list.add(InfoHelper.ITC() + StatCollector.translateToLocal("info.de.bowEnchants.txt")); - InfoHelper.addLore(stack, list); - } - ToolBase.holdCTRLForUpgrades(list, stack); - } - @Override public boolean hasCustomEntity(ItemStack stack) { return true; @@ -192,6 +116,61 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte return new EntityPersistentItem(world, location, itemstack); } + @Override + @SideOnly(Side.CLIENT) + @SuppressWarnings({ "unchecked", "rawtypes" }) + public void addInformation(final ItemStack stack, final EntityPlayer player, final List list, final boolean extraInformation) + { + if (InfoHelper.holdShiftForDetails(list)) { + list.add(InfoHelper.ITC() + StatCollector.translateToLocal("info.de.bowEnchants.txt")); + InfoHelper.addLore(stack, list); + } + ToolBase.holdCTRLForUpgrades(list, stack); + } + + @SideOnly(Side.CLIENT) + @SuppressWarnings("unchecked") + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) { + list.add(ItemNBTHelper.setInteger(new ItemStack(item, 1, 0), "Energy", 0)); + list.add(ItemNBTHelper.setInteger(new ItemStack(item, 1, 0), "Energy", 1000000)); + } + + @Override + public boolean getHasSubtypes() { + return true; + } + + @Override + public boolean showDurabilityBar(ItemStack stack) { + return !(getEnergyStored(stack) == getMaxEnergyStored(stack)); + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) { + return 1D - ((double) getEnergyStored(stack) / (double) getMaxEnergyStored(stack)); + } + //endregion + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) + { + return BowHandler.onBowRightClick(this, stack, world, player); + } + + @Override + public void onUsingTick(ItemStack stack, EntityPlayer player, int count) + { + BowHandler.onBowUsingTick(stack, player, count); + } + + @Override + public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int count) + { + BowHandler.onPlayerStoppedUsingBow(stack, world, player, count); + } + + //region Interfaces @Override public String getInventoryName() { return StatCollector.translateToLocal("info.de.toolInventoryEnch.txt"); @@ -208,8 +187,17 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte } @Override - public List getFields(ItemStack stack, int slot) { - return new ArrayList(); + public List getFields(ItemStack stack, int slot) {//todo balance floaty upgrade things + List list = new ArrayList(); + + list.add(new ItemConfigField(References.FLOAT_ID, slot, "BowArrowSpeedModifier").setMinMaxAndIncromente(0F, (float)EnumUpgrade.ARROW_SPEED.getUpgradePoints(stack), 0.01F).readFromItem(stack, 0F).setModifier("PLUSPERCENT")); + list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "BowAutoFire").readFromItem(stack, false)); + list.add(new ItemConfigField(References.FLOAT_ID, slot, "BowExplosionPower").setMinMaxAndIncromente(0F, 4F, 0.1F).readFromItem(stack, 0F)); + list.add(new ItemConfigField(References.FLOAT_ID, slot, "BowShockWavePower").setMinMaxAndIncromente(0F, 4F, 0.1F).readFromItem(stack, 0F)); + list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "BowEnergyBolt").readFromItem(stack, false)); + list.add(new ItemConfigField(References.FLOAT_ID, slot, "BowZoomModifier").setMinMaxAndIncromente(0F, 3F, 0.01F).readFromItem(stack, 0F).setModifier("PLUSPERCENT")); + + return list; } @Override @@ -220,7 +208,7 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte @Override public List getUpgrades(ItemStack itemstack) { return new ArrayList(){{ - // add(EnumUpgrade.RF_CAPACITY); + // add(EnumUpgrade.RF_CAPACITY); add(EnumUpgrade.DRAW_SPEED); add(EnumUpgrade.ARROW_SPEED); add(EnumUpgrade.ARROW_DAMAGE); @@ -239,12 +227,17 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte @Override public int getMaxUpgradePoints(int upgradeIndex) { + if (upgradeIndex == EnumUpgrade.DRAW_SPEED.index) return 5; + else if (upgradeIndex == EnumUpgrade.ARROW_SPEED.index) return 10; return 50; } @Override public int getBaseUpgradePoints(int upgradeIndex) { if (upgradeIndex == EnumUpgrade.RF_CAPACITY.index) return 2; + else if (upgradeIndex == EnumUpgrade.DRAW_SPEED.index) return 3; + else if (upgradeIndex == EnumUpgrade.ARROW_SPEED.index) return 1; + else if (upgradeIndex == EnumUpgrade.ARROW_DAMAGE.index) return 1; return 0; } @@ -252,9 +245,47 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte public List getUpgradeStats(ItemStack itemstack) { List strings = new ArrayList(); - // strings.add(StatCollector.translateToLocal("gui.de.RFCapacity.txt")+": "+ Utills.formatNumber(getMaxEnergyStored(itemstack))); + // strings.add(StatCollector.translateToLocal("gui.de.RFCapacity.txt")+": "+ Utills.formatNumber(getMaxEnergyStored(itemstack))); return strings; } + + @Override + public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + + int energy = ItemNBTHelper.getInteger(container, "Energy", 0); + int energyReceived = Math.min(getMaxEnergyStored(container) - energy, Math.min(References.WYVERNTRANSFER, maxReceive)); + + if (!simulate) { + energy += energyReceived; + ItemNBTHelper.setInteger(container, "Energy", energy); + } + return energyReceived; + } + + @Override + public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + + int energy = ItemNBTHelper.getInteger(container, "Energy", 0); + int energyExtracted = Math.min(energy, Math.min(References.WYVERNTRANSFER, maxExtract)); + + if (!simulate) { + energy -= energyExtracted; + ItemNBTHelper.setInteger(container, "Energy", energy); + } + return energyExtracted; + } + + @Override + public int getEnergyStored(ItemStack container) { + return ItemNBTHelper.getInteger(container, "Energy", 0); + } + + @Override + public int getMaxEnergyStored(ItemStack stack) { + int i = IUpgradableItem.EnumUpgrade.RF_CAPACITY.getUpgradePoints(stack); + return i * 500000; + } + //endregion } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java index 7a1f0abc..93a0bf05 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java @@ -6,7 +6,7 @@ package com.brandon3055.draconicevolution.common.lib; public class VersionHandler { public static final String VERSION = "1.0.2"; - public static final int SNAPSHOT = 9; + public static final int SNAPSHOT = 10; public static final String MCVERSION = "1.7.10"; public static final String FULL_VERSION = VERSION + (SNAPSHOT > 0 ? "-snapshot_" + SNAPSHOT : ""); 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 9a3ab13a..42cae8de 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/network/ButtonPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/ButtonPacket.java @@ -126,7 +126,7 @@ public class ButtonPacket implements IMessage case ID_TOOL_PROFILE_CHANGE: { ItemStack stack = ctx.getServerHandler().playerEntity.getHeldItem(); - if (stack != null && stack.getItem() instanceof IConfigurableItem && ((IConfigurableItem)stack.getItem()).hasProfiles()){ + if (stack != null && stack.getItem() instanceof IConfigurableItem && ((IConfigurableItem)stack.getItem()).hasProfiles() && ctx.getServerHandler().playerEntity.getItemInUse() == null){ int preset = ItemNBTHelper.getInteger(stack, "ConfigProfile", 0); if (++preset >= 5) preset = 0; ItemNBTHelper.setInteger(stack, "ConfigProfile", preset); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileParticleGenerator.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileParticleGenerator.java index dbb7f24e..28a535b1 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileParticleGenerator.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileParticleGenerator.java @@ -69,6 +69,12 @@ public class TileParticleGenerator extends TileEntity { private int tick = 0; + @SideOnly(Side.SERVER) + @Override + public boolean canUpdate() { + return false; + } + @SideOnly(Side.CLIENT) @Override public void updateEntity() { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileInvisibleMultiblock.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileInvisibleMultiblock.java index 855cb880..73fcbd40 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileInvisibleMultiblock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileInvisibleMultiblock.java @@ -16,6 +16,11 @@ import net.minecraft.tileentity.TileEntity; public class TileInvisibleMultiblock extends TileEntity { public TileLocation master = new TileLocation(); + @Override + public boolean canUpdate() { + return false; + } + public boolean isMasterOnline() { TileEnergyStorageCore tile = (worldObj.getTileEntity(master.getXCoord(), master.getYCoord(), master.getZCoord()) != null && worldObj.getTileEntity(master.getXCoord(), master.getYCoord(), master.getZCoord()) instanceof TileEnergyStorageCore) ? (TileEnergyStorageCore) worldObj.getTileEntity(master.getXCoord(), master.getYCoord(), master.getZCoord()) : null; if (tile == null) { 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 a0c22a9e..81d89f00 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/utills/IUpgradableItem.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/IUpgradableItem.java @@ -87,8 +87,20 @@ public interface IUpgradableItem { } }, ARROW_DAMAGE (6, 1, "ArrowDamage"), - DRAW_SPEED (7, 1, "DrawSpeed"), - ARROW_SPEED (8, 1, "ArrowSpeed"), + DRAW_SPEED (7, 2, "DrawSpeed"), + ARROW_SPEED (8, 2, "ArrowSpeed"){ + @Override + public void onRemovedFromItem(ItemStack 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, "BowArrowSpeedModifier", 0) > getUpgradePoints(itemStack)) IConfigurableItem.ProfileHelper.setInteger(itemStack, "BowArrowSpeedModifier", getUpgradePoints(itemStack)); + } + + ItemNBTHelper.setInteger(itemStack, "ConfigProfile", profile); + } + }, SHIELD_CAPACITY (9, 1, "ShieldCapacity"), SHIELD_RECOVERY (10, 1, "ShieldRecovery"), MOVE_SPEED (11, 1, "MoveSpeed"), diff --git a/src/main/java/com/brandon3055/draconicevolution/integration/nei/DENEIGuiHandler.java b/src/main/java/com/brandon3055/draconicevolution/integration/nei/DENEIGuiHandler.java index 9f81f26c..dc9ebfcf 100644 --- a/src/main/java/com/brandon3055/draconicevolution/integration/nei/DENEIGuiHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/integration/nei/DENEIGuiHandler.java @@ -4,6 +4,7 @@ import codechicken.nei.VisiblityData; import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.TaggedInventoryArea; import com.brandon3055.draconicevolution.client.gui.GUIUpgradeModifier; +import com.brandon3055.draconicevolution.client.gui.componentguis.GUIToolConfig; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; @@ -17,6 +18,7 @@ public class DENEIGuiHandler implements INEIGuiHandler { public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) { if (gui instanceof GUIUpgradeModifier && ((GUIUpgradeModifier)gui).inUse) currentVisibility.showNEI = false; + else if (gui instanceof GUIToolConfig) currentVisibility.showNEI = false; return currentVisibility; } diff --git a/src/main/java/com/brandon3055/draconicevolution/integration/nei/NEIDraconicevolutionConfig.java b/src/main/java/com/brandon3055/draconicevolution/integration/nei/NEIDraconicevolutionConfig.java index bb33f190..5c65e15d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/integration/nei/NEIDraconicevolutionConfig.java +++ b/src/main/java/com/brandon3055/draconicevolution/integration/nei/NEIDraconicevolutionConfig.java @@ -26,6 +26,7 @@ public class NEIDraconicevolutionConfig implements IConfigureNEI API.hideItem(new ItemStack(ModItems.creativeStructureSpawner)); API.hideItem(new ItemStack(ModItems.dezilsMarshmallow)); API.hideItem(new ItemStack(ModItems.creativeStructureSpawner, 1, 1)); + API.hideItem(new ItemStack(ModItems.sunFocus)); API.hideItem(new ItemStack(ModBlocks.portal)); API.hideItem(new ItemStack(ModBlocks.chaosShardAtmos)); API.hideItem(new ItemStack(ModBlocks.chaosCrystal)); diff --git a/src/main/resources/assets/draconicevolution/lang/en_US.lang b/src/main/resources/assets/draconicevolution/lang/en_US.lang index 28b47569..5d3d12ab 100644 --- a/src/main/resources/assets/draconicevolution/lang/en_US.lang +++ b/src/main/resources/assets/draconicevolution/lang/en_US.lang @@ -458,6 +458,7 @@ 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.ArmorInertiaCancellation.name=Inertia Cancellation button.de.ArmorSpeedMult.name=Move Speed Modifier button.de.ArmorJumpMult.name=Jump Height Modifier button.de.ArmorHillStep.name=Hill Step @@ -473,6 +474,13 @@ button.de.BaseSafeAOE.name=AOE Safe Mode button.de.VerticalAcceleration.name=Vertical Acceleration button.de.EffectiveOnSprint.name=Effective while sprinting button.de.GogglesOfRevealing.name=Magical Sense +button.de.BowArrowSpeedModifier.name=Arrow Velocity Modifier +button.de.BowAutoFire.name=Auto Fire +button.de.BowExplosionPower.name=Explosive Power +button.de.BowShockWavePower.name=Shock Wave Power +button.de.BowEnergyBolt.name=Arrow of Draconic Fire +button.de.BowZoomModifier.name=Magnification + button.de.reactorCharge.txt=Charge Reactor button.de.reactorStart.txt=Activate button.de.reactorStop.txt=Initiate Shutdown @@ -562,7 +570,7 @@ gui.de.AttackDamage.txt=Attack Damage gui.de.AttackAOE.txt=Attack A.O.E gui.de.ArrowDamage.txt=Arrow Damage gui.de.DrawSpeed.txt=Draw Speed -gui.de.ArrowSpeed.txt=Arrow Speed +gui.de.ArrowSpeed.txt=Arrow Velocity gui.de.ShieldCapacity.txt=Shield Capacity gui.de.ShieldRecovery.txt=Shield Recovery gui.de.MoveSpeed.txt=Move Speed diff --git a/src/main/resources/assets/draconicevolution/manual/manual-en_US.json b/src/main/resources/assets/draconicevolution/manual/manual-en_US.json index ae14ebb6..d6765229 100644 --- a/src/main/resources/assets/draconicevolution/manual/manual-en_US.json +++ b/src/main/resources/assets/draconicevolution/manual/manual-en_US.json @@ -928,13 +928,13 @@ "images":[], "content": [ - "Both Wyvern and Draconic armor have a shield which is capable of absorbing damage. ", - "Wearing any peace of Draconic or Wyvern armor will give you this shield but the more peaces you have the more damage the shield will be able to absorb and Draconic armor peaces give more absorption then Wyvern.", + "Both Wyvern and Draconic armor have a shield which is capable of absorbing damage.", + "Wearing any piece of Draconic or Wyvern armor will give you this shield but the more pieces you have the more damage the shield will be able to absorb and Draconic armor pieces give more absorption than Wyvern.", "When your shield is active you will see its stats in a HUD that will by default be displayed to the left of your hot-bar (This can be configured in the HUD config screen which is accessed via the tool config gui)", "The HUD shows three stats. Shield points (Large Red-Green bar), Entropy (Small Green bar) and the total remaining RF stored in your armor (Small Blue bar). The Numerical values for these stats will also be shown if enabled in the HUD config.", - "The Shield Points or Capacity is the number of damage points (Half a heart) the armor can absorb and this will drop when you take damage. As long as any peace of armor has power your shield points will regenerate at the cost of RF. The base regeneration rate is the equivalent of the entire capacity every 3 seconds.", - "Entropy ranges from 0 to 100%. It will increase each time toy receive damage and will slowly decrease when you are not taking damage. Entropy reduces the rate at which your shield points regenerate. If your entropy reaches 100% your shield will not regenerate at all.", - "The shield can by upgraded using an Upgrade Modifier. Upgrading Shield Capacity will increase your shield points and upgrading Shield Recovery will increase the rate at which Entropy recovers. Note that the recovery rate is calculated by averaging the Recovery Points of all equipped armor peaces." + "The Shield Points or Capacity is the number of damage points (Half a heart) the armor can absorb and this will drop when you take damage. As long as any piece of armor has power your shield points will regenerate at the cost of RF. The base regeneration rate is the equivalent of the entire capacity every 3 seconds.", + "Entropy ranges from 0 to 100%. It will increase each time you receive damage and will slowly decrease when you are not taking damage. Entropy reduces the rate at which your shield points regenerate. If your entropy reaches 100% your shield will not regenerate at all.", + "The shield can be upgraded using Upgrade Modifiers. Upgrading Shield Capacity will increase your shield points and upgrading Shield Recovery will increase the rate at which Entropy recovers. Note that the recovery rate is calculated by averaging the Recovery Points of all equipped armor pieces." ] }, { diff --git a/src/main/resources/assets/draconicevolution/textures/items/wyvern_shovel.png b/src/main/resources/assets/draconicevolution/textures/items/wyvernShovel.png similarity index 100% rename from src/main/resources/assets/draconicevolution/textures/items/wyvern_shovel.png rename to src/main/resources/assets/draconicevolution/textures/items/wyvernShovel.png