MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Fixes] Disabling end entities result in crashes (by Necrontyrr)

Browse source 
Merge pull request #112 from Necrontyrr/disable-spawn
This commit is contained in:
Frank 2022-11-18 19:24:59 +01:00 • committed by GitHub
commit d15d2e86ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/betterx/betterend/blocks/SilkMothHiveBlock.java
View file

@ -82,13 +82,13 @@ public class SilkMothHiveBlock extends BaseBlock {
if (!world.getBlockState(spawn).isAir()) { if (!world.getBlockState(spawn).isAir()) {
return; return;
} }
int count = world.getEntities(EndEntities.SILK_MOTH, new AABB(pos).inflate(16), (entity) -> { int count = world.getEntities(EndEntities.SILK_MOTH.type(), new AABB(pos).inflate(16), (entity) -> {
return true; return true;
}).size(); }).size();
if (count > 6) { if (count > 6) {
return; return;
} }
SilkMothEntity moth = new SilkMothEntity(EndEntities.SILK_MOTH, world); SilkMothEntity moth = new SilkMothEntity(EndEntities.SILK_MOTH.type(), world);
moth.moveTo(spawn.getX() + 0.5, spawn.getY() + 0.5, spawn.getZ() + 0.5, dir.toYRot(), 0); moth.moveTo(spawn.getX() + 0.5, spawn.getY() + 0.5, spawn.getZ() + 0.5, dir.toYRot(), 0);
moth.setDeltaMovement(new Vec3(dir.getStepX() * 0.4, 0, dir.getStepZ() * 0.4)); moth.setDeltaMovement(new Vec3(dir.getStepX() * 0.4, 0, dir.getStepZ() * 0.4));
moth.setHive(world, pos); moth.setHive(world, pos);

4
src/main/java/org/betterx/betterend/blocks/SilkMothNestBlock.java
View file

@ -149,13 +149,13 @@ public class SilkMothNestBlock extends BaseBlock implements RenderLayerProvider
if (!world.getBlockState(spawn).isAir()) { if (!world.getBlockState(spawn).isAir()) {
return; return;
} }
int count = world.getEntities(EndEntities.SILK_MOTH, new AABB(pos).inflate(16), (entity) -> { int count = world.getEntities(EndEntities.SILK_MOTH.type(), new AABB(pos).inflate(16), (entity) -> {
return true; return true;
}).size(); }).size();
if (count > 6) { if (count > 6) {
return; return;
} }
SilkMothEntity moth = new SilkMothEntity(EndEntities.SILK_MOTH, world); SilkMothEntity moth = new SilkMothEntity(EndEntities.SILK_MOTH.type(), world);
moth.moveTo(spawn.getX() + 0.5, spawn.getY() + 0.5, spawn.getZ() + 0.5, dir.toYRot(), 0); moth.moveTo(spawn.getX() + 0.5, spawn.getY() + 0.5, spawn.getZ() + 0.5, dir.toYRot(), 0);
moth.setDeltaMovement(new Vec3(dir.getStepX() * 0.4, 0, dir.getStepZ() * 0.4)); moth.setDeltaMovement(new Vec3(dir.getStepX() * 0.4, 0, dir.getStepZ() * 0.4));
moth.setHive(world, pos); moth.setHive(world, pos);

2
src/main/java/org/betterx/betterend/entity/DragonflyEntity.java
View file

@ -209,6 +209,6 @@ public class DragonflyEntity extends DespawnableAnimal implements FlyingAnimal {
@Override @Override
public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) { public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) {
return EndEntities.DRAGONFLY.create(world); return EndEntities.DRAGONFLY.type().create(world);
} }
} }

2
src/main/java/org/betterx/betterend/entity/SilkMothEntity.java
View file

@ -155,7 +155,7 @@ public class SilkMothEntity extends DespawnableAnimal implements FlyingAnimal {
@Override @Override
public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) { public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) {
return EndEntities.SILK_MOTH.create(world); return EndEntities.SILK_MOTH.type().create(world);
} }
@Override @Override

22
src/main/java/org/betterx/betterend/registry/EndEntities.java
View file

@ -1,6 +1,7 @@
package org.betterx.betterend.registry; package org.betterx.betterend.registry;
import org.betterx.bclib.api.v2.spawning.SpawnRuleBuilder; import org.betterx.bclib.api.v2.spawning.SpawnRuleBuilder;
import org.betterx.bclib.entity.BCLEntityWrapper;
import org.betterx.betterend.BetterEnd; import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.config.Configs; import org.betterx.betterend.config.Configs;
import org.betterx.betterend.entity.*; import org.betterx.betterend.entity.*;
@ -17,7 +18,7 @@ import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRe
import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder; import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder;
public class EndEntities { public class EndEntities {
public static final EntityType<DragonflyEntity> DRAGONFLY = register( public static final BCLEntityWrapper<DragonflyEntity> DRAGONFLY = register(
"dragonfly", "dragonfly",
MobCategory.AMBIENT, MobCategory.AMBIENT,
0.6F, 0.6F,
@ -28,7 +29,7 @@ public class EndEntities {
ColorUtil.color(32, 42, 176), ColorUtil.color(32, 42, 176),
ColorUtil.color(115, 225, 249) ColorUtil.color(115, 225, 249)
); );
public static final EntityType<EndSlimeEntity> END_SLIME = register( public static final BCLEntityWrapper<EndSlimeEntity> END_SLIME = register(
"end_slime", "end_slime",
MobCategory.MONSTER, MobCategory.MONSTER,
2F, 2F,
@ -39,7 +40,7 @@ public class EndEntities {
ColorUtil.color(28, 28, 28), ColorUtil.color(28, 28, 28),
ColorUtil.color(99, 11, 99) ColorUtil.color(99, 11, 99)
); );
public static final EntityType<EndFishEntity> END_FISH = register( public static final BCLEntityWrapper<EndFishEntity> END_FISH = register(
"end_fish", "end_fish",
MobCategory.WATER_AMBIENT, MobCategory.WATER_AMBIENT,
0.5F, 0.5F,
@ -50,7 +51,7 @@ public class EndEntities {
ColorUtil.color(3, 50, 76), ColorUtil.color(3, 50, 76),
ColorUtil.color(120, 206, 255) ColorUtil.color(120, 206, 255)
); );
public static final EntityType<ShadowWalkerEntity> SHADOW_WALKER = register( public static final BCLEntityWrapper<ShadowWalkerEntity> SHADOW_WALKER = register(
"shadow_walker", "shadow_walker",
MobCategory.MONSTER, MobCategory.MONSTER,
0.6F, 0.6F,
@ -61,7 +62,7 @@ public class EndEntities {
ColorUtil.color(30, 30, 30), ColorUtil.color(30, 30, 30),
ColorUtil.color(5, 5, 5) ColorUtil.color(5, 5, 5)
); );
public static final EntityType<CubozoaEntity> CUBOZOA = register( public static final BCLEntityWrapper<CubozoaEntity> CUBOZOA = register(
"cubozoa", "cubozoa",
MobCategory.WATER_AMBIENT, MobCategory.WATER_AMBIENT,
0.6F, 0.6F,
@ -72,7 +73,7 @@ public class EndEntities {
ColorUtil.color(151, 77, 181), ColorUtil.color(151, 77, 181),
ColorUtil.color(93, 176, 238) ColorUtil.color(93, 176, 238)
); );
public static final EntityType<SilkMothEntity> SILK_MOTH = register( public static final BCLEntityWrapper<SilkMothEntity> SILK_MOTH = register(
"silk_moth", "silk_moth",
MobCategory.AMBIENT, MobCategory.AMBIENT,
0.6F, 0.6F,
@ -127,7 +128,7 @@ public class EndEntities {
return type; return type;
} }
private static <T extends Mob> EntityType<T> register( private static <T extends Mob> BCLEntityWrapper<T> register(
String name, String name,
MobCategory group, MobCategory group,
float width, float width,
@ -145,11 +146,10 @@ public class EndEntities {
? EntityDimensions.fixed(width, height) ? EntityDimensions.fixed(width, height)
: EntityDimensions.scalable(width, height)) : EntityDimensions.scalable(width, height))
.build(); .build();
if (Configs.ENTITY_CONFIG.getBooleanRoot(id.getPath(), true)) {
FabricDefaultAttributeRegistry.register(type, attributes); FabricDefaultAttributeRegistry.register(type, attributes);
EndItems.registerEndEgg("spawn_egg_" + name, type, eggColor, dotsColor); EndItems.registerEndEgg("spawn_egg_" + name, type, eggColor, dotsColor);
return Registry.register(Registry.ENTITY_TYPE, BetterEnd.makeID(name), type); Registry.register(Registry.ENTITY_TYPE, BetterEnd.makeID(name), type);
}
return type; return new BCLEntityWrapper<>(type, Configs.ENTITY_CONFIG.getBooleanRoot(id.getPath(), true));
} }
} }

12
src/main/java/org/betterx/betterend/registry/EndEntitiesRenders.java
View file

@ -32,12 +32,12 @@ public class EndEntitiesRenders {
public static final ModelLayerLocation CRYSTALITE_BOOTS = registerMain("crystalite_boots"); public static final ModelLayerLocation CRYSTALITE_BOOTS = registerMain("crystalite_boots");
public static void register() { public static void register() {
register(EndEntities.DRAGONFLY, RendererEntityDragonfly::new); register(EndEntities.DRAGONFLY.type(), RendererEntityDragonfly::new);
register(EndEntities.END_SLIME, RendererEntityEndSlime::new); register(EndEntities.END_SLIME.type(), RendererEntityEndSlime::new);
register(EndEntities.END_FISH, RendererEntityEndFish::new); register(EndEntities.END_FISH.type(), RendererEntityEndFish::new);
register(EndEntities.SHADOW_WALKER, RendererEntityShadowWalker::new); register(EndEntities.SHADOW_WALKER.type(), RendererEntityShadowWalker::new);
register(EndEntities.CUBOZOA, RendererEntityCubozoa::new); register(EndEntities.CUBOZOA.type(), RendererEntityCubozoa::new);
register(EndEntities.SILK_MOTH, SilkMothEntityRenderer::new); register(EndEntities.SILK_MOTH.type(), SilkMothEntityRenderer::new);
EntityModelLayerRegistry.registerModelLayer(DRAGONFLY_MODEL, DragonflyEntityModel::getTexturedModelData); EntityModelLayerRegistry.registerModelLayer(DRAGONFLY_MODEL, DragonflyEntityModel::getTexturedModelData);
EntityModelLayerRegistry.registerModelLayer( EntityModelLayerRegistry.registerModelLayer(

4
src/main/java/org/betterx/betterend/registry/EndItems.java
View file

@ -277,9 +277,9 @@ public class EndItems {
public final static Item END_FISH_COOKED = registerEndFood("end_fish_cooked", Foods.COOKED_SALMON); public final static Item END_FISH_COOKED = registerEndFood("end_fish_cooked", Foods.COOKED_SALMON);
public final static Item BUCKET_END_FISH = registerEndItem( public final static Item BUCKET_END_FISH = registerEndItem(
"bucket_end_fish", "bucket_end_fish",
new EndBucketItem(EndEntities.END_FISH) new EndBucketItem(EndEntities.END_FISH.type())
); );
public final static Item BUCKET_CUBOZOA = registerEndItem("bucket_cubozoa", new EndBucketItem(EndEntities.CUBOZOA)); public final static Item BUCKET_CUBOZOA = registerEndItem("bucket_cubozoa", new EndBucketItem(EndEntities.CUBOZOA.type()));
public final static Item SWEET_BERRY_JELLY = registerEndFood("sweet_berry_jelly", 8, 0.7F); public final static Item SWEET_BERRY_JELLY = registerEndFood("sweet_berry_jelly", 8, 0.7F);
public final static Item SHADOW_BERRY_JELLY = registerEndFood( public final static Item SHADOW_BERRY_JELLY = registerEndFood(
"shadow_berry_jelly", "shadow_berry_jelly",