From 1c751aca0e3a5ba1cc9043574b588c0ac125f0e4 Mon Sep 17 00:00:00 2001 From: Sollace Date: Fri, 5 Jan 2024 18:41:20 +0100 Subject: [PATCH] Rename ignominious bulb and vine --- .../unicopia/block/CuringJokeBlock.java | 4 ++-- .../minelittlepony/unicopia/client/URenderers.java | 2 +- ...yModel.java => IgnominiousBulbEntityModel.java} | 8 ++++---- ...rer.java => IgnominiousBulbEntityRenderer.java} | 14 +++++++------- ...sBulbEntity.java => IgnominiousBulbEntity.java} | 10 +++++----- .../unicopia/entity/mob/UEntities.java | 6 +++--- src/main/resources/assets/unicopia/lang/en_us.json | 4 ++-- src/main/resources/assets/unicopia/lang/zh_cn.json | 4 ++-- 8 files changed, 26 insertions(+), 26 deletions(-) rename src/main/java/com/minelittlepony/unicopia/client/render/entity/{IgnimeousBulbEntityModel.java => IgnominiousBulbEntityModel.java} (92%) rename src/main/java/com/minelittlepony/unicopia/client/render/entity/{IgnimeousBulbEntityRenderer.java => IgnominiousBulbEntityRenderer.java} (66%) rename src/main/java/com/minelittlepony/unicopia/entity/mob/{IgnimeousBulbEntity.java => IgnominiousBulbEntity.java} (94%) diff --git a/src/main/java/com/minelittlepony/unicopia/block/CuringJokeBlock.java b/src/main/java/com/minelittlepony/unicopia/block/CuringJokeBlock.java index 5f37ff82..8118b1d9 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/CuringJokeBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/CuringJokeBlock.java @@ -1,7 +1,7 @@ package com.minelittlepony.unicopia.block; import com.minelittlepony.unicopia.ability.EarthPonyGrowAbility.Growable; -import com.minelittlepony.unicopia.entity.mob.IgnimeousBulbEntity; +import com.minelittlepony.unicopia.entity.mob.IgnominiousBulbEntity; import com.minelittlepony.unicopia.entity.mob.TentacleEntity; import com.minelittlepony.unicopia.particle.MagicParticleEffect; @@ -34,7 +34,7 @@ public class CuringJokeBlock extends FlowerBlock implements Growable { .toList(); if (otherFlowers.size() >= 8) { - IgnimeousBulbEntity bulb = new IgnimeousBulbEntity(world); + IgnominiousBulbEntity bulb = new IgnominiousBulbEntity(world); bulb.updatePositionAndAngles(pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, 0, 0); if (Dismounting.canPlaceEntityAt(world, bulb, bulb.getBoundingBox())) { diff --git a/src/main/java/com/minelittlepony/unicopia/client/URenderers.java b/src/main/java/com/minelittlepony/unicopia/client/URenderers.java index 6de73e74..98046073 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/URenderers.java +++ b/src/main/java/com/minelittlepony/unicopia/client/URenderers.java @@ -98,7 +98,7 @@ public interface URenderers { EntityRendererRegistry.register(UEntities.FRIENDLY_CREEPER, FriendlyCreeperEntityRenderer::new); EntityRendererRegistry.register(UEntities.LOOT_BUG, LootBugEntityRenderer::new); EntityRendererRegistry.register(UEntities.TENTACLE, TentacleEntityRenderer::new); - EntityRendererRegistry.register(UEntities.IGNIMEOUS_BULB, IgnimeousBulbEntityRenderer::new); + EntityRendererRegistry.register(UEntities.IGNOMINIOUS_BULB, IgnominiousBulbEntityRenderer::new); BlockEntityRendererFactories.register(UBlockEntities.WEATHER_VANE, WeatherVaneBlockEntityRenderer::new); BlockEntityRendererFactories.register(UBlockEntities.FANCY_BED, CloudBedBlockEntityRenderer::new); diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/IgnimeousBulbEntityModel.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/IgnominiousBulbEntityModel.java similarity index 92% rename from src/main/java/com/minelittlepony/unicopia/client/render/entity/IgnimeousBulbEntityModel.java rename to src/main/java/com/minelittlepony/unicopia/client/render/entity/IgnominiousBulbEntityModel.java index 9f5e6e7a..186d2359 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/entity/IgnimeousBulbEntityModel.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/IgnominiousBulbEntityModel.java @@ -1,6 +1,6 @@ package com.minelittlepony.unicopia.client.render.entity; -import com.minelittlepony.unicopia.entity.mob.IgnimeousBulbEntity; +import com.minelittlepony.unicopia.entity.mob.IgnominiousBulbEntity; import net.minecraft.client.model.Dilation; import net.minecraft.client.model.ModelData; @@ -15,14 +15,14 @@ import net.minecraft.client.render.entity.model.EntityModel; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.MathHelper; -public class IgnimeousBulbEntityModel extends EntityModel { +public class IgnominiousBulbEntityModel extends EntityModel { private final ModelPart part; private final ModelPart head; private final ModelPart leaves; - public IgnimeousBulbEntityModel(ModelPart root) { + public IgnominiousBulbEntityModel(ModelPart root) { super(RenderLayer::getEntityTranslucent); this.part = root; head = root.getChild("head"); @@ -54,7 +54,7 @@ public class IgnimeousBulbEntityModel extends EntityModel { } @Override - public void setAngles(IgnimeousBulbEntity entity, float limbSwing, float limbSwingAmount, float tickDelta, float yaw, float pitch) { + public void setAngles(IgnominiousBulbEntity entity, float limbSwing, float limbSwingAmount, float tickDelta, float yaw, float pitch) { float age = entity.age + tickDelta; diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/IgnimeousBulbEntityRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/IgnominiousBulbEntityRenderer.java similarity index 66% rename from src/main/java/com/minelittlepony/unicopia/client/render/entity/IgnimeousBulbEntityRenderer.java rename to src/main/java/com/minelittlepony/unicopia/client/render/entity/IgnominiousBulbEntityRenderer.java index 8315cc12..4bcb9484 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/entity/IgnimeousBulbEntityRenderer.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/IgnominiousBulbEntityRenderer.java @@ -1,7 +1,7 @@ package com.minelittlepony.unicopia.client.render.entity; import com.minelittlepony.unicopia.Unicopia; -import com.minelittlepony.unicopia.entity.mob.IgnimeousBulbEntity; +import com.minelittlepony.unicopia.entity.mob.IgnominiousBulbEntity; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.entity.EntityRenderer; @@ -9,19 +9,19 @@ import net.minecraft.client.render.entity.EntityRendererFactory; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Identifier; -public class IgnimeousBulbEntityRenderer extends EntityRenderer { +public class IgnominiousBulbEntityRenderer extends EntityRenderer { private static final Identifier IDLE_TEXTURE = Unicopia.id("textures/entity/poison_joke/bulb_idle.png"); private static final Identifier ANGRY_TEXTURE = Unicopia.id("textures/entity/poison_joke/bulb_angry.png"); - private final IgnimeousBulbEntityModel model; + private final IgnominiousBulbEntityModel model; - public IgnimeousBulbEntityRenderer(EntityRendererFactory.Context context) { + public IgnominiousBulbEntityRenderer(EntityRendererFactory.Context context) { super(context); - model = new IgnimeousBulbEntityModel(IgnimeousBulbEntityModel.getTexturedModelData().createModel()); + model = new IgnominiousBulbEntityModel(IgnominiousBulbEntityModel.getTexturedModelData().createModel()); } @Override - public void render(IgnimeousBulbEntity entity, float yaw, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertices, int light) { + public void render(IgnominiousBulbEntity entity, float yaw, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertices, int light) { matrices.push(); matrices.scale(-1, -1, 1); matrices.translate(0, -1.5F, 0); @@ -33,7 +33,7 @@ public class IgnimeousBulbEntityRenderer extends EntityRenderer ANGRY = DataTracker.registerData(IgnimeousBulbEntity.class, TrackedDataHandlerRegistry.BOOLEAN); +public class IgnominiousBulbEntity extends MobEntity { + private static final TrackedData ANGRY = DataTracker.registerData(IgnominiousBulbEntity.class, TrackedDataHandlerRegistry.BOOLEAN); private static final List TENTACLE_OFFSETS = List.of( new BlockPos(-3, 0, -3), new BlockPos(0, 0, -4), new BlockPos(3, 0, -3), new BlockPos(-4, 0, 0), new BlockPos(4, 0, 0), @@ -40,12 +40,12 @@ public class IgnimeousBulbEntity extends MobEntity { @Nullable private Map tentacles; - public IgnimeousBulbEntity(EntityType type, World world) { + public IgnominiousBulbEntity(EntityType type, World world) { super(type, world); } - public IgnimeousBulbEntity(World world) { - super(UEntities.IGNIMEOUS_BULB, world); + public IgnominiousBulbEntity(World world) { + super(UEntities.IGNOMINIOUS_BULB, world); } @Override diff --git a/src/main/java/com/minelittlepony/unicopia/entity/mob/UEntities.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/UEntities.java index 92a8dab8..49904028 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/mob/UEntities.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/UEntities.java @@ -67,10 +67,10 @@ public interface UEntities { EntityType LOOT_BUG = register("loot_bug", FabricEntityTypeBuilder.create(SpawnGroup.MONSTER, LootBugEntity::new) .trackRangeChunks(8) .dimensions(EntityDimensions.fixed(0.8F, 0.6F))); - EntityType TENTACLE = register("ignimeous_vine", FabricEntityTypeBuilder.create(SpawnGroup.MISC, TentacleEntity::new) + EntityType TENTACLE = register("ignominious_vine", FabricEntityTypeBuilder.create(SpawnGroup.MISC, TentacleEntity::new) .trackRangeChunks(8) .dimensions(EntityDimensions.fixed(0.8F, 0.8F))); - EntityType IGNIMEOUS_BULB = register("ignimeous_bulb", FabricEntityTypeBuilder.create(SpawnGroup.MISC, IgnimeousBulbEntity::new) + EntityType IGNOMINIOUS_BULB = register("ignominious_bulb", FabricEntityTypeBuilder.create(SpawnGroup.MISC, IgnominiousBulbEntity::new) .trackRangeChunks(8) .dimensions(EntityDimensions.fixed(3, 2))); @@ -87,7 +87,7 @@ public interface UEntities { FabricDefaultAttributeRegistry.register(SOMBRA, SombraEntity.createMobAttributes()); FabricDefaultAttributeRegistry.register(FRIENDLY_CREEPER, FriendlyCreeperEntity.createCreeperAttributes()); FabricDefaultAttributeRegistry.register(LOOT_BUG, LootBugEntity.createSilverfishAttributes()); - FabricDefaultAttributeRegistry.register(IGNIMEOUS_BULB, IgnimeousBulbEntity.createMobAttributes()); + FabricDefaultAttributeRegistry.register(IGNOMINIOUS_BULB, IgnominiousBulbEntity.createMobAttributes()); if (!Unicopia.getConfig().disableButterflySpawning.get()) { final Predicate butterflySpawnable = BiomeSelectors.foundInOverworld() diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index 3dc63351..87ec41e1 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -328,8 +328,8 @@ "entity.unicopia.sombra.taunt": "That's not going to work on me!", "entity.unicopia.storm_cloud": "Storm Cloud", "entity.unicopia.crystal_shards": "Crystal Shards", - "entity.unicopia.ignimeous_vine": "Ignimeous Vine", - "entity.unicopia.ignimeous_bulb": "Ignimeous Bulb", + "entity.unicopia.ignominious_vine": "Ignominious Vine", + "entity.unicopia.ignominious_bulb": "Ignominious Bulb", "player.reachDistance": "Reach Distance", "player.miningSpeed": "Mining Speed", diff --git a/src/main/resources/assets/unicopia/lang/zh_cn.json b/src/main/resources/assets/unicopia/lang/zh_cn.json index 3df54786..0e5446b8 100644 --- a/src/main/resources/assets/unicopia/lang/zh_cn.json +++ b/src/main/resources/assets/unicopia/lang/zh_cn.json @@ -328,8 +328,8 @@ "entity.unicopia.sombra.taunt": "用在我身上不好使！", "entity.unicopia.storm_cloud": "暴风云", "entity.unicopia.crystal_shards": "水晶尖刺", - "entity.unicopia.ignimeous_vine": "无耻藤", - "entity.unicopia.ignimeous_bulb": "无耻球茎", + "entity.unicopia.ignominious_vine": "无耻藤", + "entity.unicopia.ignominious_bulb": "无耻球茎", "player.reachDistance": "可触距离", "player.miningSpeed": "挖掘速度",