From 5699f8fd79c8f9448ed041410114a79249d162b7 Mon Sep 17 00:00:00 2001 From: brandon Date: Sun, 17 Apr 2016 16:15:17 +1000 Subject: [PATCH] 1.0.2b --- Change Log.txt | 5 +++ VERSION.txt | 4 +-- build.properties | 2 +- .../client/gui/GUIFlowGate.java | 8 +++++ .../blocks/multiblock/ReactorStabilizer.java | 2 -- .../common/entity/EntityCustomArrow.java | 31 +++++++++++-------- .../common/entity/EntityDraconicArrow.java | 1 + .../handler/MinecraftForgeEventHandler.java | 5 +++ .../items/armor/CustomArmorHandler.java | 4 --- .../common/items/weapons/BowHandler.java | 5 ++- .../common/lib/VersionHandler.java | 2 +- .../integration/ModHelper.java | 1 - 12 files changed, 45 insertions(+), 25 deletions(-) diff --git a/Change Log.txt b/Change Log.txt index e450cb10..b6c5deec 100644 --- a/Change Log.txt +++ b/Change Log.txt @@ -1,3 +1,8 @@ +######## 1.0.2b ######## +-fixed not being able to close the flow gate gui's by pressing the inventory key. +-fixed inability to pick up arrows fired by the bows. +-fixed conflict with the travellers gloves from Tinkers Construct (And other mods that do something similar) + ######## 1.0.2a ######## -updated manual-zh_CN.json (Thankyou https://github.com/sfmiyuki for that) -draconic sword and staff of power now have an unlimited hit rate. (that was supposed to be a thing from the beginning) diff --git a/VERSION.txt b/VERSION.txt index 8519e68f..00f17dca 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,3 +1,3 @@ -Version:1.0.2a +Version:1.0.2b Snapshot:0 -ReleaseNote:Just some minor tweaks. +ReleaseNote:Some more minor bug fixes. diff --git a/build.properties b/build.properties index 34aea76f..cf99cfb6 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ minecraft_version=1.7.10 -mod_version=1.0.2a +mod_version=1.0.2b forge_version=10.13.4.1558-1.7.10 CCLIB_version=1.1.3.140 NEI_version=1.0.3.74 diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIFlowGate.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIFlowGate.java index 086a02c1..1595292b 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIFlowGate.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIFlowGate.java @@ -138,4 +138,12 @@ public class GUIFlowGate extends GuiScreen { public boolean doesGuiPauseGame() { return false; } + + protected void keyTyped(char p_73869_1_, int key) { + if (key == 1 || key == this.mc.gameSettings.keyBindInventory.getKeyCode()){ + this.mc.displayGuiScreen(null); + this.mc.setIngameFocus(); + } + } + } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/ReactorStabilizer.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/ReactorStabilizer.java index 61ce643c..642d1ec7 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/ReactorStabilizer.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/multiblock/ReactorStabilizer.java @@ -26,8 +26,6 @@ public class ReactorStabilizer extends BlockDE { public ReactorStabilizer() { this.setCreativeTab(DraconicEvolution.tabBlocksItems); this.setBlockName("reactorStabilizer"); - this.setResistance(10F); - this.setHardness(10F); ModBlocks.register(this); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomArrow.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomArrow.java index 57a91a84..2c9fff09 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomArrow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomArrow.java @@ -1,5 +1,6 @@ package com.brandon3055.draconicevolution.common.entity; +import com.brandon3055.brandonscore.common.utills.LogHelper; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.handler.ParticleHandler; import com.brandon3055.draconicevolution.client.render.particle.Particles; @@ -19,6 +20,8 @@ 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.*; @@ -402,19 +405,21 @@ public class EntityCustomArrow extends EntityArrow { @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(); -// } -// } + + if (!this.worldObj.isRemote && this.inGround && this.arrowShake <= 0) { + LogHelper.info("collide "+ canBePickedUp); + 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(); + } + } } public void onHitEntityLiving(EntityLivingBase entityLivingBase){ diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDraconicArrow.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDraconicArrow.java index d66b3d31..68ed6359 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDraconicArrow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityDraconicArrow.java @@ -421,6 +421,7 @@ public class EntityDraconicArrow extends EntityArrow { 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))) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/handler/MinecraftForgeEventHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/MinecraftForgeEventHandler.java index bdfeac07..4bb48500 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/MinecraftForgeEventHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/MinecraftForgeEventHandler.java @@ -387,6 +387,11 @@ public class MinecraftForgeEventHandler { { if (summery.flight[0]) newDigSpeed *= 5f; } + + if (event.newSpeed > 1){ + newDigSpeed += event.newSpeed-1; + } + event.newSpeed = newDigSpeed; } } 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 fbd7af9b..cb8bba5e 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 @@ -23,7 +23,6 @@ import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import java.lang.reflect.Field; import java.util.*; /** @@ -34,7 +33,6 @@ public class CustomArmorHandler { 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; public static void onPlayerHurt(LivingHurtEvent event) { // EntityPlayer player = (EntityPlayer) event.entityLiving; @@ -93,8 +91,6 @@ public class CustomArmorHandler { } if ((float)player.hurtResistantTime > (float)player.maxHurtResistantTime / 2.0F) return; - com.brandon3055.brandonscore.common.utills.LogHelper.info(1 + (hitAmount / 10)); - float newEntropy = Math.min(summery.entropy + 1 + (hitAmount / 20), 100F); //Divide the damage between the armor peaces based on how many of the protection points each peace has 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 a335cfdf..ee1ef39e 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 @@ -89,7 +89,6 @@ public class BowHandler { world.playSoundAtEntity(player, "random.bow", 1.0F, (1.0F / (world.rand.nextFloat() * 0.4F + 1.2F) + (drawArrowSpeedModifier + (velocity / 40F)) * 0.5F)); } - public static void enderShot(ItemStack stack, World world, EntityPlayer player, int count, Random itemRand, float pullSpeedModifier, float speedModifier, float soundPitchModifier, int minRelease) { int j = 72000 - count; @@ -213,6 +212,10 @@ public class BowHandler { return Math.max(62 - (drawTimeReduction * 10), 1); } + /** + * Consumes energy for the shot and also consumes an arrow if the bow dose not have infinity + * Returns true if an arrow was consumed. + * */ public boolean consumeArrowAndEnergy(){ if (!player.capabilities.isCreativeMode)((IEnergyContainerItem)bow.getItem()).extractEnergy(bow, calculateEnergyCost(), false); 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 aa99cefd..f399ac72 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java @@ -5,7 +5,7 @@ package com.brandon3055.draconicevolution.common.lib; */ public class VersionHandler { - public static final String VERSION = "1.0.2a"; + public static final String VERSION = "1.0.2b"; public static final int SNAPSHOT = 0; public static final String MCVERSION = "1.7.10"; diff --git a/src/main/java/com/brandon3055/draconicevolution/integration/ModHelper.java b/src/main/java/com/brandon3055/draconicevolution/integration/ModHelper.java index 902dc46e..c9d8e5c9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/integration/ModHelper.java +++ b/src/main/java/com/brandon3055/draconicevolution/integration/ModHelper.java @@ -43,7 +43,6 @@ public class ModHelper { return 300F; } - return event.ammount; }