mirror of
https://github.com/GTNewHorizons/Draconic-Evolution.git
synced 2026-11-20 20:22:10 +00:00
Some more fixes for 1.0.2b before release
This commit is contained in:
1 parent
5699f8fd79
commit
2e4000189b
847 files changed
+107735
-21
No files matched your search
@@ -16,6 +16,7 @@ public class EntityChaosBolt extends Entity {
|
||||
public double shardY;
|
||||
public double shardZ;
|
||||
public boolean burst;
|
||||
public int ticks = 0;
|
||||
private static DamageSource chaosBurst = new DamageSource("chaosBurst").setDamageBypassesArmor().setDamageIsAbsolute();
|
||||
|
||||
public EntityChaosBolt(World world) {
|
||||
@@ -47,7 +48,6 @@ public class EntityChaosBolt extends Entity {
|
||||
@Override
|
||||
public void onUpdate() {
|
||||
super.onUpdate();
|
||||
burst = true;
|
||||
if (worldObj.isRemote) {
|
||||
shardX = dataWatcher.getWatchableObjectFloat(20);
|
||||
shardZ = dataWatcher.getWatchableObjectFloat(21);
|
||||
@@ -58,18 +58,20 @@ public class EntityChaosBolt extends Entity {
|
||||
dataWatcher.updateObject(22, burst ? (byte)1 : (byte)0);
|
||||
}
|
||||
|
||||
if (ticksExisted == 10 && !burst) {
|
||||
if (worldObj.isRemote) DraconicEvolution.proxy.spawnParticle(new Particles.ChaosBoltParticle(worldObj, posX, posY, posZ, shardX, shardY, shardZ, 10), 32);
|
||||
if (ticks == 10 && !burst) {
|
||||
if (worldObj.isRemote) {
|
||||
DraconicEvolution.proxy.spawnParticle(new Particles.ChaosBoltParticle(worldObj, posX, posY, posZ, shardX, shardY, shardZ, 10), 32);
|
||||
}
|
||||
setDead();
|
||||
}
|
||||
else if (ticksExisted > 10){
|
||||
if (ticksExisted < 25){
|
||||
else if (ticks > 10){
|
||||
if (ticks < 25){
|
||||
for (int i = 0; i < 20; i++){
|
||||
if (worldObj.isRemote) DraconicEvolution.proxy.spawnParticle(new Particles.ChaosBoltParticle(worldObj, posX, posY, posZ, shardX, shardY, shardZ, 0), 32);
|
||||
}
|
||||
}
|
||||
if (ticksExisted > 40 && !worldObj.isRemote) {
|
||||
// if (ticksExisted % 5 == 0)
|
||||
if (ticks > 40 && !worldObj.isRemote) {
|
||||
// if (ticks % 5 == 0)
|
||||
// {
|
||||
// double dist = Utills.getDistanceAtoB(posX, posY, posZ, shardX, shardY, shardZ);
|
||||
// Vec3 dir = Vec3.createVectorHelper((shardX - posX) / dist, (shardY - posY) / dist, (shardZ - posZ) / dist);
|
||||
@@ -82,9 +84,14 @@ public class EntityChaosBolt extends Entity {
|
||||
// entity.attackEntityFrom(chaosBurst, 50F);
|
||||
// }
|
||||
// }
|
||||
if (ticksExisted > 60)setDead();
|
||||
}
|
||||
}
|
||||
|
||||
if (ticks > 60) {
|
||||
setDead();
|
||||
}
|
||||
|
||||
ticks++;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+5
-3
@@ -75,11 +75,11 @@ public class CustomArmorHandler {
|
||||
}
|
||||
|
||||
public static void onPlayerAttacked(LivingAttackEvent event){
|
||||
float hitAmount = ModHelper.applyModDamageAdjustments(event);
|
||||
|
||||
EntityPlayer player = (EntityPlayer)event.entityLiving;
|
||||
ArmorSummery summery = new ArmorSummery().getSummery(player);
|
||||
|
||||
float hitAmount = ModHelper.applyModDamageAdjustments(summery, event);
|
||||
|
||||
if (applyArmorDamageBlocking(event, summery)) return;
|
||||
|
||||
if (summery == null || summery.protectionPoints <= 0 || event.source == ADMIN_KILL) return;
|
||||
@@ -91,7 +91,9 @@ public class CustomArmorHandler {
|
||||
}
|
||||
if ((float)player.hurtResistantTime > (float)player.maxHurtResistantTime / 2.0F) return;
|
||||
|
||||
float newEntropy = Math.min(summery.entropy + 1 + (hitAmount / 20), 100F);
|
||||
if (summery.protectionPoints <= 0) return;
|
||||
|
||||
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
|
||||
float totalAbsorbed = 0;
|
||||
|
||||
@@ -76,9 +76,9 @@ public class Magnet extends ItemDE {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public void onUpdate(ItemStack stack, World world, Entity entity, int damage, boolean hotbar) {
|
||||
public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean hotbar) {
|
||||
if (!entity.isSneaking() && entity.ticksExisted % 5 == 0 && ItemNBTHelper.getBoolean(stack, "MagnetEnabled", false) && entity instanceof EntityPlayer){
|
||||
int range = damage == 0 ? 8 : 32;
|
||||
int range = stack.getItemDamage() == 0 ? 8 : 32;
|
||||
|
||||
List<EntityItem> items = world.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(entity.posX, entity.posY, entity.posZ, entity.posX, entity.posY, entity.posZ).expand(range, range, range));
|
||||
|
||||
|
||||
@@ -243,4 +243,3 @@ public class BowHandler {
|
||||
}
|
||||
}
|
||||
}
|
||||
//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
|
||||
+1
-1
@@ -199,7 +199,7 @@ public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableI
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ItemConfigField> getFields(ItemStack stack, int slot) {//todo balance floaty upgrade things
|
||||
public List<ItemConfigField> getFields(ItemStack stack, int slot) {
|
||||
List<ItemConfigField> list = new ArrayList<ItemConfigField>();
|
||||
|
||||
list.add(new ItemConfigField(References.FLOAT_ID, slot, "BowArrowDamage").setMinMaxAndIncromente((float)getBaseUpgradePoints(EnumUpgrade.ARROW_DAMAGE.index), (float)EnumUpgrade.ARROW_DAMAGE.getUpgradePoints(stack), 0.1F).readFromItem(stack, (float) EnumUpgrade.ARROW_DAMAGE.getUpgradePoints(stack)));
|
||||
|
||||
@@ -195,7 +195,7 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ItemConfigField> getFields(ItemStack stack, int slot) {//todo balance floaty upgrade things
|
||||
public List<ItemConfigField> getFields(ItemStack stack, int slot) {
|
||||
List<ItemConfigField> list = new ArrayList<ItemConfigField>();
|
||||
|
||||
list.add(new ItemConfigField(References.FLOAT_ID, slot, "BowArrowDamage").setMinMaxAndIncromente((float)getBaseUpgradePoints(EnumUpgrade.ARROW_DAMAGE.index), (float)EnumUpgrade.ARROW_DAMAGE.getUpgradePoints(stack), 0.1F).readFromItem(stack, (float)EnumUpgrade.ARROW_DAMAGE.getUpgradePoints(stack)));
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.brandon3055.draconicevolution.integration;
|
||||
|
||||
import com.brandon3055.draconicevolution.common.items.armor.CustomArmorHandler.ArmorSummery;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -13,12 +14,15 @@ public class ModHelper {
|
||||
|
||||
public static boolean isTConInstalled;
|
||||
public static boolean isAvaritiaInstalled;
|
||||
public static boolean isRotaryCraftInstalled;
|
||||
private static Item cleaver;
|
||||
private static Item avaritiaSword;
|
||||
private static Item bedrockSword;
|
||||
|
||||
public static void init(){
|
||||
isTConInstalled = Loader.isModLoaded("TConstruct");
|
||||
isAvaritiaInstalled = Loader.isModLoaded("Avaritia");
|
||||
isRotaryCraftInstalled = Loader.isModLoaded("RotaryCraft");
|
||||
}
|
||||
|
||||
public static boolean isHoldingCleaver(EntityPlayer player){
|
||||
@@ -35,14 +39,35 @@ public class ModHelper {
|
||||
return avaritiaSword != null && player.getHeldItem() != null && player.getHeldItem().getItem().equals(avaritiaSword);
|
||||
}
|
||||
|
||||
public static float applyModDamageAdjustments(LivingAttackEvent event){
|
||||
public static boolean isHoldingBedrockSword(EntityPlayer player){
|
||||
if (!isRotaryCraftInstalled) return false;
|
||||
else if (bedrockSword == null) bedrockSword = GameRegistry.findItem("RotaryCraft", "rotarycraft_item_bedsword");
|
||||
|
||||
return bedrockSword != null && player.getHeldItem() != null && player.getHeldItem().getItem().equals(bedrockSword);
|
||||
}
|
||||
|
||||
public static float applyModDamageAdjustments(ArmorSummery summery, LivingAttackEvent event){
|
||||
EntityPlayer attacker = event.source.getEntity() instanceof EntityPlayer ? (EntityPlayer) event.source.getEntity() : null;
|
||||
|
||||
if (attacker != null && isHoldingAvaritiaSword(attacker)){
|
||||
if (attacker == null){
|
||||
return event.ammount;
|
||||
}
|
||||
|
||||
if (isHoldingAvaritiaSword(attacker)){
|
||||
event.entityLiving.hurtResistantTime = 0;
|
||||
return 300F;
|
||||
}
|
||||
|
||||
if (isHoldingBedrockSword(attacker)){
|
||||
summery.entropy += 10;
|
||||
|
||||
if (summery.entropy > 100){
|
||||
summery.entropy = 100;
|
||||
}
|
||||
|
||||
return Math.max(event.ammount, Math.min(50F, summery.protectionPoints));
|
||||
}
|
||||
|
||||
return event.ammount;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user