PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-12 16:14:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename ignominious bulb and vine

Browse source
This commit is contained in:
Sollace 2024-01-05 18:41:20 +01:00
parent 0e40c10c43
commit 1c751aca0e
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
8 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/minelittlepony/unicopia/block/CuringJokeBlock.java
View file

@ -1,7 +1,7 @@
package com.minelittlepony.unicopia.block; package com.minelittlepony.unicopia.block;
import com.minelittlepony.unicopia.ability.EarthPonyGrowAbility.Growable; 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.entity.mob.TentacleEntity;
import com.minelittlepony.unicopia.particle.MagicParticleEffect; import com.minelittlepony.unicopia.particle.MagicParticleEffect;
@ -34,7 +34,7 @@ public class CuringJokeBlock extends FlowerBlock implements Growable {
.toList(); .toList();
if (otherFlowers.size() >= 8) { 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); bulb.updatePositionAndAngles(pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, 0, 0);
if (Dismounting.canPlaceEntityAt(world, bulb, bulb.getBoundingBox())) { if (Dismounting.canPlaceEntityAt(world, bulb, bulb.getBoundingBox())) {

2
src/main/java/com/minelittlepony/unicopia/client/URenderers.java
View file

@ -98,7 +98,7 @@ public interface URenderers {
EntityRendererRegistry.register(UEntities.FRIENDLY_CREEPER, FriendlyCreeperEntityRenderer::new); EntityRendererRegistry.register(UEntities.FRIENDLY_CREEPER, FriendlyCreeperEntityRenderer::new);
EntityRendererRegistry.register(UEntities.LOOT_BUG, LootBugEntityRenderer::new); EntityRendererRegistry.register(UEntities.LOOT_BUG, LootBugEntityRenderer::new);
EntityRendererRegistry.register(UEntities.TENTACLE, TentacleEntityRenderer::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.WEATHER_VANE, WeatherVaneBlockEntityRenderer::new);
BlockEntityRendererFactories.register(UBlockEntities.FANCY_BED, CloudBedBlockEntityRenderer::new); BlockEntityRendererFactories.register(UBlockEntities.FANCY_BED, CloudBedBlockEntityRenderer::new);

8
src/main/java/com/minelittlepony/unicopia/client/render/entity/IgnimeousBulbEntityModel.java → src/main/java/com/minelittlepony/unicopia/client/render/entity/IgnominiousBulbEntityModel.java
View file

@ -1,6 +1,6 @@
package com.minelittlepony.unicopia.client.render.entity; 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.Dilation;
import net.minecraft.client.model.ModelData; 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.client.util.math.MatrixStack;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
public class IgnimeousBulbEntityModel extends EntityModel<IgnimeousBulbEntity> { public class IgnominiousBulbEntityModel extends EntityModel<IgnominiousBulbEntity> {
private final ModelPart part; private final ModelPart part;
private final ModelPart head; private final ModelPart head;
private final ModelPart leaves; private final ModelPart leaves;
public IgnimeousBulbEntityModel(ModelPart root) { public IgnominiousBulbEntityModel(ModelPart root) {
super(RenderLayer::getEntityTranslucent); super(RenderLayer::getEntityTranslucent);
this.part = root; this.part = root;
head = root.getChild("head"); head = root.getChild("head");
@ -54,7 +54,7 @@ public class IgnimeousBulbEntityModel extends EntityModel<IgnimeousBulbEntity> {
} }
@Override @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; float age = entity.age + tickDelta;

14
src/main/java/com/minelittlepony/unicopia/client/render/entity/IgnimeousBulbEntityRenderer.java → src/main/java/com/minelittlepony/unicopia/client/render/entity/IgnominiousBulbEntityRenderer.java
View file

@ -1,7 +1,7 @@
package com.minelittlepony.unicopia.client.render.entity; package com.minelittlepony.unicopia.client.render.entity;
import com.minelittlepony.unicopia.Unicopia; 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.OverlayTexture;
import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.entity.EntityRenderer; 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.client.util.math.MatrixStack;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
public class IgnimeousBulbEntityRenderer extends EntityRenderer<IgnimeousBulbEntity> { public class IgnominiousBulbEntityRenderer extends EntityRenderer<IgnominiousBulbEntity> {
private static final Identifier IDLE_TEXTURE = Unicopia.id("textures/entity/poison_joke/bulb_idle.png"); 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 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); super(context);
model = new IgnimeousBulbEntityModel(IgnimeousBulbEntityModel.getTexturedModelData().createModel()); model = new IgnominiousBulbEntityModel(IgnominiousBulbEntityModel.getTexturedModelData().createModel());
} }
@Override @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.push();
matrices.scale(-1, -1, 1); matrices.scale(-1, -1, 1);
matrices.translate(0, -1.5F, 0); matrices.translate(0, -1.5F, 0);
@ -33,7 +33,7 @@ public class IgnimeousBulbEntityRenderer extends EntityRenderer<IgnimeousBulbEnt
} }
@Override @Override
public Identifier getTexture(IgnimeousBulbEntity entity) { public Identifier getTexture(IgnominiousBulbEntity entity) {
return entity.isAngry() ? ANGRY_TEXTURE : IDLE_TEXTURE; return entity.isAngry() ? ANGRY_TEXTURE : IDLE_TEXTURE;
} }
} }

10
src/main/java/com/minelittlepony/unicopia/entity/mob/IgnimeousBulbEntity.java → src/main/java/com/minelittlepony/unicopia/entity/mob/IgnominiousBulbEntity.java
View file

@ -29,8 +29,8 @@ import net.minecraft.util.math.Direction;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World; import net.minecraft.world.World;
public class IgnimeousBulbEntity extends MobEntity { public class IgnominiousBulbEntity extends MobEntity {
private static final TrackedData<Boolean> ANGRY = DataTracker.registerData(IgnimeousBulbEntity.class, TrackedDataHandlerRegistry.BOOLEAN); private static final TrackedData<Boolean> ANGRY = DataTracker.registerData(IgnominiousBulbEntity.class, TrackedDataHandlerRegistry.BOOLEAN);
private static final List<BlockPos> TENTACLE_OFFSETS = List.of( private static final List<BlockPos> TENTACLE_OFFSETS = List.of(
new BlockPos(-3, 0, -3), new BlockPos(0, 0, -4), new BlockPos(3, 0, -3), 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), new BlockPos(-4, 0, 0), new BlockPos(4, 0, 0),
@ -40,12 +40,12 @@ public class IgnimeousBulbEntity extends MobEntity {
@Nullable @Nullable
private Map<BlockPos, TentacleEntity> tentacles; private Map<BlockPos, TentacleEntity> tentacles;
public IgnimeousBulbEntity(EntityType<? extends IgnimeousBulbEntity> type, World world) { public IgnominiousBulbEntity(EntityType<? extends IgnominiousBulbEntity> type, World world) {
super(type, world); super(type, world);
} }
public IgnimeousBulbEntity(World world) { public IgnominiousBulbEntity(World world) {
super(UEntities.IGNIMEOUS_BULB, world); super(UEntities.IGNOMINIOUS_BULB, world);
} }
@Override @Override

6
src/main/java/com/minelittlepony/unicopia/entity/mob/UEntities.java
View file

@ -67,10 +67,10 @@ public interface UEntities {
EntityType<LootBugEntity> LOOT_BUG = register("loot_bug", FabricEntityTypeBuilder.create(SpawnGroup.MONSTER, LootBugEntity::new) EntityType<LootBugEntity> LOOT_BUG = register("loot_bug", FabricEntityTypeBuilder.create(SpawnGroup.MONSTER, LootBugEntity::new)
.trackRangeChunks(8) .trackRangeChunks(8)
.dimensions(EntityDimensions.fixed(0.8F, 0.6F))); .dimensions(EntityDimensions.fixed(0.8F, 0.6F)));
EntityType<TentacleEntity> TENTACLE = register("ignimeous_vine", FabricEntityTypeBuilder.<TentacleEntity>create(SpawnGroup.MISC, TentacleEntity::new) EntityType<TentacleEntity> TENTACLE = register("ignominious_vine", FabricEntityTypeBuilder.<TentacleEntity>create(SpawnGroup.MISC, TentacleEntity::new)
.trackRangeChunks(8) .trackRangeChunks(8)
.dimensions(EntityDimensions.fixed(0.8F, 0.8F))); .dimensions(EntityDimensions.fixed(0.8F, 0.8F)));
EntityType<IgnimeousBulbEntity> IGNIMEOUS_BULB = register("ignimeous_bulb", FabricEntityTypeBuilder.<IgnimeousBulbEntity>create(SpawnGroup.MISC, IgnimeousBulbEntity::new) EntityType<IgnominiousBulbEntity> IGNOMINIOUS_BULB = register("ignominious_bulb", FabricEntityTypeBuilder.<IgnominiousBulbEntity>create(SpawnGroup.MISC, IgnominiousBulbEntity::new)
.trackRangeChunks(8) .trackRangeChunks(8)
.dimensions(EntityDimensions.fixed(3, 2))); .dimensions(EntityDimensions.fixed(3, 2)));
@ -87,7 +87,7 @@ public interface UEntities {
FabricDefaultAttributeRegistry.register(SOMBRA, SombraEntity.createMobAttributes()); FabricDefaultAttributeRegistry.register(SOMBRA, SombraEntity.createMobAttributes());
FabricDefaultAttributeRegistry.register(FRIENDLY_CREEPER, FriendlyCreeperEntity.createCreeperAttributes()); FabricDefaultAttributeRegistry.register(FRIENDLY_CREEPER, FriendlyCreeperEntity.createCreeperAttributes());
FabricDefaultAttributeRegistry.register(LOOT_BUG, LootBugEntity.createSilverfishAttributes()); FabricDefaultAttributeRegistry.register(LOOT_BUG, LootBugEntity.createSilverfishAttributes());
FabricDefaultAttributeRegistry.register(IGNIMEOUS_BULB, IgnimeousBulbEntity.createMobAttributes()); FabricDefaultAttributeRegistry.register(IGNOMINIOUS_BULB, IgnominiousBulbEntity.createMobAttributes());
if (!Unicopia.getConfig().disableButterflySpawning.get()) { if (!Unicopia.getConfig().disableButterflySpawning.get()) {
final Predicate<BiomeSelectionContext> butterflySpawnable = BiomeSelectors.foundInOverworld() final Predicate<BiomeSelectionContext> butterflySpawnable = BiomeSelectors.foundInOverworld()

4
src/main/resources/assets/unicopia/lang/en_us.json
View file

@ -328,8 +328,8 @@
"entity.unicopia.sombra.taunt": "That's not going to work on me!", "entity.unicopia.sombra.taunt": "That's not going to work on me!",
"entity.unicopia.storm_cloud": "Storm Cloud", "entity.unicopia.storm_cloud": "Storm Cloud",
"entity.unicopia.crystal_shards": "Crystal Shards", "entity.unicopia.crystal_shards": "Crystal Shards",
"entity.unicopia.ignimeous_vine": "Ignimeous Vine", "entity.unicopia.ignominious_vine": "Ignominious Vine",
"entity.unicopia.ignimeous_bulb": "Ignimeous Bulb", "entity.unicopia.ignominious_bulb": "Ignominious Bulb",
"player.reachDistance": "Reach Distance", "player.reachDistance": "Reach Distance",
"player.miningSpeed": "Mining Speed", "player.miningSpeed": "Mining Speed",

4
src/main/resources/assets/unicopia/lang/zh_cn.json
View file

@ -328,8 +328,8 @@
"entity.unicopia.sombra.taunt": "用在我身上不好使！", "entity.unicopia.sombra.taunt": "用在我身上不好使！",
"entity.unicopia.storm_cloud": "暴风云", "entity.unicopia.storm_cloud": "暴风云",
"entity.unicopia.crystal_shards": "水晶尖刺", "entity.unicopia.crystal_shards": "水晶尖刺",
"entity.unicopia.ignimeous_vine": "无耻藤", "entity.unicopia.ignominious_vine": "无耻藤",
"entity.unicopia.ignimeous_bulb": "无耻球茎", "entity.unicopia.ignominious_bulb": "无耻球茎",
"player.reachDistance": "可触距离", "player.reachDistance": "可触距离",
"player.miningSpeed": "挖掘速度", "player.miningSpeed": "挖掘速度",