From 2218be75a93eb7c08f58b42911dd0ae83ab107cb Mon Sep 17 00:00:00 2001 From: Necrontyr Date: Wed, 2 Nov 2022 01:40:09 +0100 Subject: [PATCH] Disabling end entities fix. --- .../betterend/blocks/SilkMothHiveBlock.java | 4 +-- .../betterend/blocks/SilkMothNestBlock.java | 4 +-- .../betterend/entity/DragonflyEntity.java | 2 +- .../betterend/entity/SilkMothEntity.java | 2 +- .../betterend/registry/EndEntities.java | 26 +++++++++---------- .../registry/EndEntitiesRenders.java | 12 ++++----- .../betterx/betterend/registry/EndItems.java | 4 +-- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/main/java/org/betterx/betterend/blocks/SilkMothHiveBlock.java b/src/main/java/org/betterx/betterend/blocks/SilkMothHiveBlock.java index 5b0ace24..dbe47b65 100644 --- a/src/main/java/org/betterx/betterend/blocks/SilkMothHiveBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/SilkMothHiveBlock.java @@ -82,13 +82,13 @@ public class SilkMothHiveBlock extends BaseBlock { if (!world.getBlockState(spawn).isAir()) { 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; }).size(); if (count > 6) { 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.setDeltaMovement(new Vec3(dir.getStepX() * 0.4, 0, dir.getStepZ() * 0.4)); moth.setHive(world, pos); diff --git a/src/main/java/org/betterx/betterend/blocks/SilkMothNestBlock.java b/src/main/java/org/betterx/betterend/blocks/SilkMothNestBlock.java index 76d79fa4..8be202b5 100644 --- a/src/main/java/org/betterx/betterend/blocks/SilkMothNestBlock.java +++ b/src/main/java/org/betterx/betterend/blocks/SilkMothNestBlock.java @@ -149,13 +149,13 @@ public class SilkMothNestBlock extends BaseBlock implements RenderLayerProvider if (!world.getBlockState(spawn).isAir()) { 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; }).size(); if (count > 6) { 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.setDeltaMovement(new Vec3(dir.getStepX() * 0.4, 0, dir.getStepZ() * 0.4)); moth.setHive(world, pos); diff --git a/src/main/java/org/betterx/betterend/entity/DragonflyEntity.java b/src/main/java/org/betterx/betterend/entity/DragonflyEntity.java index cbd5a882..f7f52894 100644 --- a/src/main/java/org/betterx/betterend/entity/DragonflyEntity.java +++ b/src/main/java/org/betterx/betterend/entity/DragonflyEntity.java @@ -209,6 +209,6 @@ public class DragonflyEntity extends DespawnableAnimal implements FlyingAnimal { @Override public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) { - return EndEntities.DRAGONFLY.create(world); + return EndEntities.DRAGONFLY.type().create(world); } } diff --git a/src/main/java/org/betterx/betterend/entity/SilkMothEntity.java b/src/main/java/org/betterx/betterend/entity/SilkMothEntity.java index 6e58e229..ca0f964b 100644 --- a/src/main/java/org/betterx/betterend/entity/SilkMothEntity.java +++ b/src/main/java/org/betterx/betterend/entity/SilkMothEntity.java @@ -155,7 +155,7 @@ public class SilkMothEntity extends DespawnableAnimal implements FlyingAnimal { @Override public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) { - return EndEntities.SILK_MOTH.create(world); + return EndEntities.SILK_MOTH.type().create(world); } @Override diff --git a/src/main/java/org/betterx/betterend/registry/EndEntities.java b/src/main/java/org/betterx/betterend/registry/EndEntities.java index e101d79a..3f2de03f 100644 --- a/src/main/java/org/betterx/betterend/registry/EndEntities.java +++ b/src/main/java/org/betterx/betterend/registry/EndEntities.java @@ -1,6 +1,7 @@ package org.betterx.betterend.registry; import org.betterx.bclib.api.v2.spawning.SpawnRuleBuilder; +import org.betterx.bclib.entity.BCLEntityWrapper; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.config.Configs; 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; public class EndEntities { - public static final EntityType DRAGONFLY = register( + public static final BCLEntityWrapper DRAGONFLY = register( "dragonfly", MobCategory.AMBIENT, 0.6F, @@ -28,7 +29,7 @@ public class EndEntities { ColorUtil.color(32, 42, 176), ColorUtil.color(115, 225, 249) ); - public static final EntityType END_SLIME = register( + public static final BCLEntityWrapper END_SLIME = register( "end_slime", MobCategory.MONSTER, 2F, @@ -39,7 +40,7 @@ public class EndEntities { ColorUtil.color(28, 28, 28), ColorUtil.color(99, 11, 99) ); - public static final EntityType END_FISH = register( + public static final BCLEntityWrapper END_FISH = register( "end_fish", MobCategory.WATER_AMBIENT, 0.5F, @@ -50,7 +51,7 @@ public class EndEntities { ColorUtil.color(3, 50, 76), ColorUtil.color(120, 206, 255) ); - public static final EntityType SHADOW_WALKER = register( + public static final BCLEntityWrapper SHADOW_WALKER = register( "shadow_walker", MobCategory.MONSTER, 0.6F, @@ -61,7 +62,7 @@ public class EndEntities { ColorUtil.color(30, 30, 30), ColorUtil.color(5, 5, 5) ); - public static final EntityType CUBOZOA = register( + public static final BCLEntityWrapper CUBOZOA = register( "cubozoa", MobCategory.WATER_AMBIENT, 0.6F, @@ -72,7 +73,7 @@ public class EndEntities { ColorUtil.color(151, 77, 181), ColorUtil.color(93, 176, 238) ); - public static final EntityType SILK_MOTH = register( + public static final BCLEntityWrapper SILK_MOTH = register( "silk_moth", MobCategory.AMBIENT, 0.6F, @@ -127,7 +128,7 @@ public class EndEntities { return type; } - private static EntityType register( + private static BCLEntityWrapper register( String name, MobCategory group, float width, @@ -145,11 +146,10 @@ public class EndEntities { ? EntityDimensions.fixed(width, height) : EntityDimensions.scalable(width, height)) .build(); - if (Configs.ENTITY_CONFIG.getBooleanRoot(id.getPath(), true)) { - FabricDefaultAttributeRegistry.register(type, attributes); - EndItems.registerEndEgg("spawn_egg_" + name, type, eggColor, dotsColor); - return Registry.register(Registry.ENTITY_TYPE, BetterEnd.makeID(name), type); - } - return type; + FabricDefaultAttributeRegistry.register(type, attributes); + EndItems.registerEndEgg("spawn_egg_" + name, type, eggColor, dotsColor); + Registry.register(Registry.ENTITY_TYPE, BetterEnd.makeID(name), type); + + return new BCLEntityWrapper<>(type, Configs.ENTITY_CONFIG.getBooleanRoot(id.getPath(), true)); } } diff --git a/src/main/java/org/betterx/betterend/registry/EndEntitiesRenders.java b/src/main/java/org/betterx/betterend/registry/EndEntitiesRenders.java index e168eac2..67bd552d 100644 --- a/src/main/java/org/betterx/betterend/registry/EndEntitiesRenders.java +++ b/src/main/java/org/betterx/betterend/registry/EndEntitiesRenders.java @@ -32,12 +32,12 @@ public class EndEntitiesRenders { public static final ModelLayerLocation CRYSTALITE_BOOTS = registerMain("crystalite_boots"); public static void register() { - register(EndEntities.DRAGONFLY, RendererEntityDragonfly::new); - register(EndEntities.END_SLIME, RendererEntityEndSlime::new); - register(EndEntities.END_FISH, RendererEntityEndFish::new); - register(EndEntities.SHADOW_WALKER, RendererEntityShadowWalker::new); - register(EndEntities.CUBOZOA, RendererEntityCubozoa::new); - register(EndEntities.SILK_MOTH, SilkMothEntityRenderer::new); + register(EndEntities.DRAGONFLY.type(), RendererEntityDragonfly::new); + register(EndEntities.END_SLIME.type(), RendererEntityEndSlime::new); + register(EndEntities.END_FISH.type(), RendererEntityEndFish::new); + register(EndEntities.SHADOW_WALKER.type(), RendererEntityShadowWalker::new); + register(EndEntities.CUBOZOA.type(), RendererEntityCubozoa::new); + register(EndEntities.SILK_MOTH.type(), SilkMothEntityRenderer::new); EntityModelLayerRegistry.registerModelLayer(DRAGONFLY_MODEL, DragonflyEntityModel::getTexturedModelData); EntityModelLayerRegistry.registerModelLayer( diff --git a/src/main/java/org/betterx/betterend/registry/EndItems.java b/src/main/java/org/betterx/betterend/registry/EndItems.java index 3104d525..7d36db19 100644 --- a/src/main/java/org/betterx/betterend/registry/EndItems.java +++ b/src/main/java/org/betterx/betterend/registry/EndItems.java @@ -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 BUCKET_END_FISH = registerEndItem( "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 SHADOW_BERRY_JELLY = registerEndFood( "shadow_berry_jelly",