Skip to content

Commit bd116f6

Browse files
committed
Completetely removed config
1 parent 32925b4 commit bd116f6

9 files changed

Lines changed: 7 additions & 271 deletions

File tree

src/main/java/com/crowsofwar/avatar/common/command/AvatarCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected ICommandNode[] addCommands() {
4747
NodeBranch branchBending = new NodeBranch(AvatarChatMessages.MSG_BENDING_BRANCH_INFO, "bending",
4848
bendingList, bendingAdd, bendingRemove);
4949

50-
return new ICommandNode[] { branchBending, new NodeConfig() };
50+
return new ICommandNode[] { branchBending };
5151

5252
}
5353

src/main/java/com/crowsofwar/avatar/common/command/NodeConfig.java

Lines changed: 0 additions & 47 deletions
This file was deleted.

src/main/java/com/crowsofwar/avatar/common/config/AvatarConfig.java

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/main/java/com/crowsofwar/avatar/common/config/AvatarConfig2.java

Lines changed: 0 additions & 86 deletions
This file was deleted.

src/main/java/com/crowsofwar/avatar/common/config/DoubleProperty.java

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/main/java/com/crowsofwar/avatar/common/config/StrictProperty.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/main/java/com/crowsofwar/avatar/common/entity/EntityRavine.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package com.crowsofwar.avatar.common.entity;
22

3-
import static com.crowsofwar.avatar.common.config.AvatarConfig2.ravineDamage;
4-
import static com.crowsofwar.avatar.common.config.AvatarConfig2.ravinePush;
5-
63
import java.util.List;
74

85
import com.crowsofwar.avatar.common.AvatarDamageSource;
@@ -150,10 +147,9 @@ public void onEntityUpdate() {
150147
BendingManager.getBending(BendingType.EARTHBENDING)
151148
.post(new RavineEvent.HitEntity(this, entity));
152149

153-
Vector push = velocity.copy().setY(1).mul(ravinePush.currentValue());
150+
Vector push = velocity.copy().setY(1).mul(0.25);
154151
entity.addVelocity(push.x(), push.y(), push.z());
155-
entity.attackEntityFrom(AvatarDamageSource.causeRavineDamage(entity, owner),
156-
ravineDamage.currentValue());
152+
entity.attackEntityFrom(AvatarDamageSource.causeRavineDamage(entity, owner), 7);
157153
}
158154
}
159155
}

src/main/java/com/crowsofwar/avatar/common/entity/EntityWave.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package com.crowsofwar.avatar.common.entity;
22

3-
import static com.crowsofwar.avatar.common.config.AvatarConfig2.waveDamage;
4-
import static com.crowsofwar.avatar.common.config.AvatarConfig2.wavePush;
5-
63
import java.util.List;
74

85
import com.crowsofwar.avatar.common.AvatarDamageSource;
@@ -43,10 +40,10 @@ public void onUpdate() {
4340
if (!worldObj.isRemote) {
4441
List<Entity> collided = worldObj.getEntitiesInAABBexcluding(this, getEntityBoundingBox(), entity -> entity != owner);
4542
for (Entity entity : collided) {
46-
Vector motion = velocity().dividedBy(20).times(wavePush.currentValue());
43+
Vector motion = velocity().dividedBy(20).times(6);
4744
motion.setY(0.4);
4845
entity.addVelocity(motion.x(), motion.y(), motion.z());
49-
entity.attackEntityFrom(AvatarDamageSource.causeWaveDamage(entity, owner), waveDamage.currentValue());
46+
entity.attackEntityFrom(AvatarDamageSource.causeWaveDamage(entity, owner), 9);
5047
}
5148
if (!collided.isEmpty()) setDead();
5249
}

src/main/java/com/crowsofwar/avatar/common/entity/data/FloatingBlockBehavior.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package com.crowsofwar.avatar.common.entity.data;
22

3-
import static com.crowsofwar.avatar.common.config.AvatarConfig2.blockDamage;
4-
import static com.crowsofwar.avatar.common.config.AvatarConfig2.blockPush;
5-
63
import java.util.List;
74

85
import com.crowsofwar.avatar.common.AvatarDamageSource;
@@ -145,10 +142,10 @@ public FloatingBlockBehavior onUpdate() {
145142
double speed = entity.velocity().magnitude();
146143
collided.attackEntityFrom(
147144
AvatarDamageSource.causeFloatingBlockDamage(collided, entity.getOwner()),
148-
(float) (speed * blockDamage.currentValue()));
145+
(float) (speed * 0.25));
149146

150147
Vector motion = new Vector(collided).minus(new Vector(entity));
151-
motion.mul(blockPush.currentValue());
148+
motion.mul(1);
152149
motion.setY(0.08);
153150
collided.addVelocity(motion.x(), motion.y(), motion.z());
154151
if (!world.isRemote) entity.setDead();

0 commit comments

Comments
 (0)