From e68a812e570a1c7a2cb48e7c0c94263eaa040441 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Mon, 7 Dec 2020 10:52:34 +0300 Subject: [PATCH] Jello rename --- .../{EntityJello.java => EntityCubozoa.java} | 12 +++++------ ...tityJello.java => ModelEntityCubozoa.java} | 8 +++---- ...yJello.java => RendererEntityCubozoa.java} | 20 +++++++++--------- .../ru/betterend/registry/EndEntities.java | 6 +++--- .../registry/EndEntitiesRenders.java | 4 ++-- .../world/biome/BiomeFoggyMushroomland.java | 2 +- .../betterend/world/biome/BiomeMegalake.java | 2 +- .../world/biome/BiomeMegalakeGrove.java | 2 +- .../assets/betterend/lang/en_us.json | 4 ++-- .../assets/betterend/lang/ru_ru.json | 4 ++-- .../entity/{jello.png => cubozoa/cubozoa.png} | Bin .../cubozoa_glow.png} | Bin 12 files changed, 32 insertions(+), 32 deletions(-) rename src/main/java/ru/betterend/entity/{EntityJello.java => EntityCubozoa.java} (83%) rename src/main/java/ru/betterend/entity/model/{ModelEntityJello.java => ModelEntityCubozoa.java} (89%) rename src/main/java/ru/betterend/entity/render/{RendererEntityJello.java => RendererEntityCubozoa.java} (64%) rename src/main/resources/assets/betterend/textures/entity/{jello.png => cubozoa/cubozoa.png} (100%) rename src/main/resources/assets/betterend/textures/entity/{jello_glow.png => cubozoa/cubozoa_glow.png} (100%) diff --git a/src/main/java/ru/betterend/entity/EntityJello.java b/src/main/java/ru/betterend/entity/EntityCubozoa.java similarity index 83% rename from src/main/java/ru/betterend/entity/EntityJello.java rename to src/main/java/ru/betterend/entity/EntityCubozoa.java index f86b76d3..1d109287 100644 --- a/src/main/java/ru/betterend/entity/EntityJello.java +++ b/src/main/java/ru/betterend/entity/EntityCubozoa.java @@ -23,12 +23,12 @@ import net.minecraft.world.ServerWorldAccess; import net.minecraft.world.World; import ru.betterend.registry.EndBiomes; -public class EntityJello extends WaterCreatureEntity { +public class EntityCubozoa extends WaterCreatureEntity { public static final int VARIANTS = 2; - private static final TrackedData VARIANT = DataTracker.registerData(EntityJello.class, TrackedDataHandlerRegistry.BYTE); - private static final TrackedData SCALE = DataTracker.registerData(EntityJello.class, TrackedDataHandlerRegistry.BYTE); + private static final TrackedData VARIANT = DataTracker.registerData(EntityCubozoa.class, TrackedDataHandlerRegistry.BYTE); + private static final TrackedData SCALE = DataTracker.registerData(EntityCubozoa.class, TrackedDataHandlerRegistry.BYTE); - public EntityJello(EntityType entityType, World world) { + public EntityCubozoa(EntityType entityType, World world) { super(entityType, world); } @@ -85,9 +85,9 @@ public class EntityJello extends WaterCreatureEntity { return this.dataTracker.get(SCALE) / 32F + 0.75F; } - public static boolean canSpawn(EntityType type, ServerWorldAccess world, SpawnReason spawnReason, BlockPos pos, Random random) { + public static boolean canSpawn(EntityType type, ServerWorldAccess world, SpawnReason spawnReason, BlockPos pos, Random random) { Box box = new Box(pos).expand(16); - List list = world.getEntitiesByClass(EntityJello.class, box, (entity) -> { + List list = world.getEntitiesByClass(EntityCubozoa.class, box, (entity) -> { return true; }); return list.size() < 9; diff --git a/src/main/java/ru/betterend/entity/model/ModelEntityJello.java b/src/main/java/ru/betterend/entity/model/ModelEntityCubozoa.java similarity index 89% rename from src/main/java/ru/betterend/entity/model/ModelEntityJello.java rename to src/main/java/ru/betterend/entity/model/ModelEntityCubozoa.java index 98718938..5207fde6 100644 --- a/src/main/java/ru/betterend/entity/model/ModelEntityJello.java +++ b/src/main/java/ru/betterend/entity/model/ModelEntityCubozoa.java @@ -6,9 +6,9 @@ import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.MathHelper; import ru.betterend.entity.BlockBenchModel; -import ru.betterend.entity.EntityJello; +import ru.betterend.entity.EntityCubozoa; -public class ModelEntityJello extends BlockBenchModel { +public class ModelEntityCubozoa extends BlockBenchModel { private final ModelPart model; private final ModelPart main_cube_r1; private final ModelPart tentacle_center_1; @@ -22,7 +22,7 @@ public class ModelEntityJello extends BlockBenchModel { private float scaleY; private float scaleXZ; - public ModelEntityJello() { + public ModelEntityCubozoa() { super(RenderLayer::getEntityTranslucent); textureWidth = 48; @@ -83,7 +83,7 @@ public class ModelEntityJello extends BlockBenchModel { } @Override - public void setAngles(EntityJello entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) { + public void setAngles(EntityCubozoa entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) { float sin = MathHelper.sin(animationProgress * 0.13F); scaleY = sin * 0.1F + 0.9F; scaleXZ = MathHelper.sin(animationProgress * 0.13F + 3.14F) * 0.1F + 0.9F; diff --git a/src/main/java/ru/betterend/entity/render/RendererEntityJello.java b/src/main/java/ru/betterend/entity/render/RendererEntityCubozoa.java similarity index 64% rename from src/main/java/ru/betterend/entity/render/RendererEntityJello.java rename to src/main/java/ru/betterend/entity/render/RendererEntityCubozoa.java index 05d77f14..eb9e35cd 100644 --- a/src/main/java/ru/betterend/entity/render/RendererEntityJello.java +++ b/src/main/java/ru/betterend/entity/render/RendererEntityCubozoa.java @@ -7,16 +7,16 @@ import net.minecraft.client.render.entity.feature.EyesFeatureRenderer; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Identifier; import ru.betterend.BetterEnd; -import ru.betterend.entity.EntityJello; -import ru.betterend.entity.model.ModelEntityJello; +import ru.betterend.entity.EntityCubozoa; +import ru.betterend.entity.model.ModelEntityCubozoa; -public class RendererEntityJello extends MobEntityRenderer { - private static final Identifier TEXTURE = BetterEnd.makeID("textures/entity/jello.png"); - private static final RenderLayer GLOW = RenderLayer.getEyes(BetterEnd.makeID("textures/entity/jello_glow.png")); +public class RendererEntityCubozoa extends MobEntityRenderer { + private static final Identifier TEXTURE = BetterEnd.makeID("textures/entity/cubozoa/cubozoa.png"); + private static final RenderLayer GLOW = RenderLayer.getEyes(BetterEnd.makeID("textures/entity/cubozoa/cubozoa_glow.png")); - public RendererEntityJello(EntityRenderDispatcher entityRenderDispatcher) { - super(entityRenderDispatcher, new ModelEntityJello(), 0.5f); - this.addFeature(new EyesFeatureRenderer(this) { + public RendererEntityCubozoa(EntityRenderDispatcher entityRenderDispatcher) { + super(entityRenderDispatcher, new ModelEntityCubozoa(), 0.5f); + this.addFeature(new EyesFeatureRenderer(this) { @Override public RenderLayer getEyesTexture() { return GLOW; @@ -25,13 +25,13 @@ public class RendererEntityJello extends MobEntityRenderer END_SLIME = register("end_slime", SpawnGroup.MONSTER, 2F, 2F, EntityEndSlime::new, EntityEndSlime.createMobAttributes(), false, MHelper.color(28, 28, 28), MHelper.color(99, 11, 99)); public static final EntityType END_FISH = register("end_fish", SpawnGroup.WATER_AMBIENT, 0.5F, 0.5F, EntityEndFish::new, EntityEndFish.createMobAttributes(), true, MHelper.color(3, 50, 76), MHelper.color(120, 206, 255)); public static final EntityType SHADOW_WALKER = register("shadow_walker", SpawnGroup.MONSTER, 0.6F, 1.95F, EntityShadowWalker::new, EntityShadowWalker.createMobAttributes(), true, MHelper.color(30, 30, 30), MHelper.color(5, 5, 5)); - public static final EntityType JELLO = register("jello", SpawnGroup.WATER_AMBIENT, 0.6F, 1F, EntityJello::new, EntityJello.createMobAttributes(), true, MHelper.color(151, 77, 181), MHelper.color(93, 176, 238)); + public static final EntityType CUBOZOA = register("cubozoa", SpawnGroup.WATER_AMBIENT, 0.6F, 1F, EntityCubozoa::new, EntityCubozoa.createMobAttributes(), true, MHelper.color(151, 77, 181), MHelper.color(93, 176, 238)); public static void register() { SpawnHelper.restrictionLand(END_SLIME, EntityEndSlime::canSpawn); SpawnHelper.restrictionWater(END_FISH, EntityEndFish::canSpawn); SpawnHelper.restrictionLand(SHADOW_WALKER, HostileEntity::canSpawnInDark); - SpawnHelper.restrictionWater(JELLO, EntityJello::canSpawn); + SpawnHelper.restrictionWater(CUBOZOA, EntityCubozoa::canSpawn); } protected static EntityType register(String name, SpawnGroup group, float width, float height, EntityFactory entity) { diff --git a/src/main/java/ru/betterend/registry/EndEntitiesRenders.java b/src/main/java/ru/betterend/registry/EndEntitiesRenders.java index 0ae2f516..d2f6dade 100644 --- a/src/main/java/ru/betterend/registry/EndEntitiesRenders.java +++ b/src/main/java/ru/betterend/registry/EndEntitiesRenders.java @@ -9,7 +9,7 @@ import net.minecraft.entity.EntityType; import ru.betterend.entity.render.RendererEntityDragonfly; import ru.betterend.entity.render.RendererEntityEndFish; import ru.betterend.entity.render.RendererEntityEndSlime; -import ru.betterend.entity.render.RendererEntityJello; +import ru.betterend.entity.render.RendererEntityCubozoa; import ru.betterend.entity.render.RendererEntityShadowWalker; public class EndEntitiesRenders { @@ -19,7 +19,7 @@ public class EndEntitiesRenders { register(EndEntities.END_SLIME, RendererEntityEndSlime::new); register(EndEntities.END_FISH, RendererEntityEndFish::new); register(EndEntities.SHADOW_WALKER, RendererEntityShadowWalker::new); - register(EndEntities.JELLO, RendererEntityJello::new); + register(EndEntities.CUBOZOA, RendererEntityCubozoa::new); } private static void register(EntityType type, Function> render) { diff --git a/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java b/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java index 1a8d2386..ed9a0d88 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java +++ b/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java @@ -36,7 +36,7 @@ public class BiomeFoggyMushroomland extends EndBiome { .addStructureFeature(ConfiguredStructureFeatures.END_CITY) .addMobSpawn(EndEntities.DRAGONFLY, 80, 2, 5) .addMobSpawn(EndEntities.END_FISH, 20, 2, 5) - .addMobSpawn(EndEntities.JELLO, 10, 3, 8) + .addMobSpawn(EndEntities.CUBOZOA, 10, 3, 8) .addMobSpawn(EndEntities.END_SLIME, 10, 1, 2) .addMobSpawn(EntityType.ENDERMAN, 10, 1, 2)); } diff --git a/src/main/java/ru/betterend/world/biome/BiomeMegalake.java b/src/main/java/ru/betterend/world/biome/BiomeMegalake.java index 2ad59e09..3a8ede74 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeMegalake.java +++ b/src/main/java/ru/betterend/world/biome/BiomeMegalake.java @@ -29,7 +29,7 @@ public class BiomeMegalake extends EndBiome { .addFeature(EndFeatures.MENGER_SPONGE) .addMobSpawn(EndEntities.DRAGONFLY, 50, 1, 3) .addMobSpawn(EndEntities.END_FISH, 50, 3, 8) - .addMobSpawn(EndEntities.JELLO, 50, 3, 8) + .addMobSpawn(EndEntities.CUBOZOA, 50, 3, 8) .addMobSpawn(EntityType.ENDERMAN, 10, 1, 2)); } } diff --git a/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java b/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java index 25b74dde..b9f195f5 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java +++ b/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java @@ -32,7 +32,7 @@ public class BiomeMegalakeGrove extends EndBiome { .addFeature(EndFeatures.MENGER_SPONGE) .addMobSpawn(EndEntities.DRAGONFLY, 20, 1, 3) .addMobSpawn(EndEntities.END_FISH, 20, 3, 8) - .addMobSpawn(EndEntities.JELLO, 50, 3, 8) + .addMobSpawn(EndEntities.CUBOZOA, 50, 3, 8) .addMobSpawn(EntityType.ENDERMAN, 10, 1, 2)); } } diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index c9d8254e..1dae6876 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -423,6 +423,6 @@ "block.betterend.charnia_purple": "Purple Charnia", "block.betterend.charnia_red": "Red Charnia", - "entity.betterend.jello": "Jello", - "item.betterend.spawn_egg_jello": "Jello Spawn Egg" + "entity.betterend.cubozoa": "Cubozoa", + "item.betterend.spawn_egg_cubozoa": "Cubozoa Spawn Egg" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 5509f597..27bf1604 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -425,6 +425,6 @@ "block.betterend.charnia_purple": "Пурпурная чарния", "block.betterend.charnia_red": "Красная чарния", - "entity.betterend.jello": "Желе", - "item.betterend.spawn_egg_jello": "Яйцо призыва желе" + "entity.betterend.cubozoa": "Кубомедуза", + "item.betterend.spawn_egg_cubozoa": "Яйцо призыва кубомедузы" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/entity/jello.png b/src/main/resources/assets/betterend/textures/entity/cubozoa/cubozoa.png similarity index 100% rename from src/main/resources/assets/betterend/textures/entity/jello.png rename to src/main/resources/assets/betterend/textures/entity/cubozoa/cubozoa.png diff --git a/src/main/resources/assets/betterend/textures/entity/jello_glow.png b/src/main/resources/assets/betterend/textures/entity/cubozoa/cubozoa_glow.png similarity index 100% rename from src/main/resources/assets/betterend/textures/entity/jello_glow.png rename to src/main/resources/assets/betterend/textures/entity/cubozoa/cubozoa_glow.png