Skip to content

Commit ba79ca8

Browse files
committed
fix: Incorrect default entity attributes
Fixes #44
1 parent 96c9514 commit ba79ca8

File tree

1 file changed

+14
-35
lines changed
  • fabric/src/main/java/gay/pridecraft/joy/fabric

1 file changed

+14
-35
lines changed

fabric/src/main/java/gay/pridecraft/joy/fabric/Joy.java

Lines changed: 14 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
import gay.pridecraft.joy.registry.JoyEntities;
88
import net.fabricmc.api.ModInitializer;
99
import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry;
10-
import net.minecraft.entity.attribute.EntityAttributes;
11-
import net.minecraft.entity.mob.MobEntity;
10+
import net.minecraft.entity.passive.BeeEntity;
11+
import net.minecraft.entity.passive.FoxEntity;
12+
import net.minecraft.entity.passive.FrogEntity;
13+
import net.minecraft.entity.passive.SnifferEntity;
1214

1315
public class Joy implements ModInitializer {
1416
public static final String MOD_ID = "joy";
@@ -26,38 +28,15 @@ public void onInitialize() {
2628

2729
private void registerEntityAttributes() {
2830
// TODO: move to common
29-
FabricDefaultAttributeRegistry.register(JoyEntities.SOCK_FOX, MobEntity.createMobAttributes()
30-
.add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 2.0)
31-
.add(EntityAttributes.GENERIC_FOLLOW_RANGE, 32.0)
32-
.add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.3));
33-
34-
FabricDefaultAttributeRegistry.register(JoyEntities.BII, MobEntity.createMobAttributes()
35-
.add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 2.0)
36-
.add(EntityAttributes.GENERIC_FLYING_SPEED, 0.6)
37-
.add(EntityAttributes.GENERIC_FOLLOW_RANGE, 48.0));
38-
39-
FabricDefaultAttributeRegistry.register(JoyEntities.ENBEE, MobEntity.createMobAttributes()
40-
.add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 2.0)
41-
.add(EntityAttributes.GENERIC_FLYING_SPEED, 0.6)
42-
.add(EntityAttributes.GENERIC_FOLLOW_RANGE, 48.0));
43-
44-
//Tree == Trans Bee :moyai:
45-
FabricDefaultAttributeRegistry.register(JoyEntities.TRANS_BEE, MobEntity.createMobAttributes()
46-
.add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 2.0)
47-
.add(EntityAttributes.GENERIC_FLYING_SPEED, 0.6)
48-
.add(EntityAttributes.GENERIC_FOLLOW_RANGE, 48.0));
49-
50-
FabricDefaultAttributeRegistry.register(JoyEntities.TREE, MobEntity.createMobAttributes()
51-
.add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 2.0)
52-
.add(EntityAttributes.GENERIC_FLYING_SPEED, 0.6)
53-
.add(EntityAttributes.GENERIC_FOLLOW_RANGE, 48.0));
54-
55-
56-
FabricDefaultAttributeRegistry.register(JoyEntities.FROG, MobEntity.createMobAttributes()
57-
.add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 10.0)
58-
.add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 1.0));
59-
60-
FabricDefaultAttributeRegistry.register(JoyEntities.SNIFFER, MobEntity.createMobAttributes()
61-
.add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.1));
31+
FabricDefaultAttributeRegistry.register(JoyEntities.SOCK_FOX, FoxEntity.createFoxAttributes());
32+
33+
FabricDefaultAttributeRegistry.register(JoyEntities.BII, BeeEntity.createBeeAttributes());
34+
FabricDefaultAttributeRegistry.register(JoyEntities.ENBEE, BeeEntity.createBeeAttributes());
35+
FabricDefaultAttributeRegistry.register(JoyEntities.TRANS_BEE, BeeEntity.createBeeAttributes());
36+
FabricDefaultAttributeRegistry.register(JoyEntities.TREE, BeeEntity.createBeeAttributes());
37+
38+
FabricDefaultAttributeRegistry.register(JoyEntities.FROG, FrogEntity.createFrogAttributes());
39+
40+
FabricDefaultAttributeRegistry.register(JoyEntities.SNIFFER, SnifferEntity.createSnifferAttributes());
6241
}
6342
}

0 commit comments

Comments
 (0)