From 869f2af28854d33bdc05494cb7495df0e817a621 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 2 Jun 2020 15:47:35 +0200 Subject: [PATCH] Curse my blursed spelling --- .../unicopia/block/HiveWallBlock.java | 4 ++-- ...limeDropBlock.java => SlimeDripBlock.java} | 16 +++++++------- .../unicopia/block/UBlocks.java | 2 +- .../unicopia/client/URenderers.java | 6 +++--- ...enderer.java => CucoonEntityRenderer.java} | 18 ++++++++-------- ...ntityModel.java => CucoonEntityModel.java} | 10 ++++----- .../{CuccoonEntity.java => CucoonEntity.java} | 8 +++---- .../unicopia/entity/UEntities.java | 2 +- .../minelittlepony/unicopia/item/UItems.java | 2 +- .../magic/spell/ChangelingTrapSpell.java | 8 +++---- .../unicopia/blockstates/slime_drip.json | 20 ++++++++++++++++++ .../unicopia/blockstates/slime_drop.json | 20 ------------------ .../resources/assets/unicopia/lang/en_us.json | 5 +++-- .../bulb_stage0.json | 6 +++--- .../bulb_stage1.json | 6 +++--- .../bulb_stage2.json | 6 +++--- .../bulb_stage3.json | 6 +++--- .../tail_stage0.json} | 4 ++-- .../tail_stage1.json} | 4 ++-- .../tail_stage2.json} | 4 ++-- .../tail_stage3.json} | 4 ++-- .../item/{slime_drop.json => cucoon.json} | 2 +- .../{cuccoon_bulb.png => slime_bulb.png} | Bin .../{cuccoon_tail.png => slime_tail.png} | Bin .../entity/{cuccoon.png => cucoon.png} | Bin .../unicopia/textures/gui/ability/carry.png | Bin 0 -> 793 bytes .../unicopia/textures/gui/ability/cloud.png | Bin 0 -> 690 bytes .../textures/gui/ability/disguise.png | Bin 0 -> 701 bytes .../unicopia/textures/gui/ability/feed.png | Bin 0 -> 701 bytes .../item/{slime_drop.png => cucoon.png} | Bin .../{slime_drop.json => slime_drip.json} | 4 ++-- .../data/unicopia/recipes/chitin_shell.json | 2 +- .../recipes/{slime_drop.json => cucoon.json} | 4 ++-- .../unicopia/tags/items/dark_elementals.json | 4 +++- .../unicopia/tags/items/life_elementals.json | 3 ++- 35 files changed, 92 insertions(+), 88 deletions(-) rename src/main/java/com/minelittlepony/unicopia/block/{SlimeDropBlock.java => SlimeDripBlock.java} (95%) rename src/main/java/com/minelittlepony/unicopia/client/render/{CuccoonEntityRenderer.java => CucoonEntityRenderer.java} (50%) rename src/main/java/com/minelittlepony/unicopia/client/render/model/{CuccoonEntityModel.java => CucoonEntityModel.java} (83%) rename src/main/java/com/minelittlepony/unicopia/entity/{CuccoonEntity.java => CucoonEntity.java} (97%) create mode 100644 src/main/resources/assets/unicopia/blockstates/slime_drip.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/slime_drop.json rename src/main/resources/assets/unicopia/models/block/{slime_drop => slime_drip}/bulb_stage0.json (88%) rename src/main/resources/assets/unicopia/models/block/{slime_drop => slime_drip}/bulb_stage1.json (88%) rename src/main/resources/assets/unicopia/models/block/{slime_drop => slime_drip}/bulb_stage2.json (88%) rename src/main/resources/assets/unicopia/models/block/{slime_drop => slime_drip}/bulb_stage3.json (88%) rename src/main/resources/assets/unicopia/models/block/{slime_drop/string_stage0.json => slime_drip/tail_stage0.json} (87%) rename src/main/resources/assets/unicopia/models/block/{slime_drop/string_stage1.json => slime_drip/tail_stage1.json} (87%) rename src/main/resources/assets/unicopia/models/block/{slime_drop/string_stage2.json => slime_drip/tail_stage2.json} (87%) rename src/main/resources/assets/unicopia/models/block/{slime_drop/string_stage3.json => slime_drip/tail_stage3.json} (87%) rename src/main/resources/assets/unicopia/models/item/{slime_drop.json => cucoon.json} (57%) rename src/main/resources/assets/unicopia/textures/blocks/{cuccoon_bulb.png => slime_bulb.png} (100%) rename src/main/resources/assets/unicopia/textures/blocks/{cuccoon_tail.png => slime_tail.png} (100%) rename src/main/resources/assets/unicopia/textures/entity/{cuccoon.png => cucoon.png} (100%) create mode 100644 src/main/resources/assets/unicopia/textures/gui/ability/carry.png create mode 100644 src/main/resources/assets/unicopia/textures/gui/ability/cloud.png create mode 100644 src/main/resources/assets/unicopia/textures/gui/ability/disguise.png create mode 100644 src/main/resources/assets/unicopia/textures/gui/ability/feed.png rename src/main/resources/assets/unicopia/textures/item/{slime_drop.png => cucoon.png} (100%) rename src/main/resources/data/unicopia/loot_tables/blocks/{slime_drop.json => slime_drip.json} (94%) rename src/main/resources/data/unicopia/recipes/{slime_drop.json => cucoon.json} (64%) diff --git a/src/main/java/com/minelittlepony/unicopia/block/HiveWallBlock.java b/src/main/java/com/minelittlepony/unicopia/block/HiveWallBlock.java index 7ce8d36e..e99a3646 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/HiveWallBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/HiveWallBlock.java @@ -103,8 +103,8 @@ public class HiveWallBlock extends FallingBlock { } } else { - if (pos.getX() % 3 == 0 && pos.getZ() % 4 == 0 && isEmptySpace(world, pos.down()) && UBlocks.SLIME_DROP.getDefaultState().canPlaceAt(world, pos.down())) { - world.setBlockState(pos.down(), UBlocks.SLIME_DROP.getDefaultState()); + if (pos.getX() % 3 == 0 && pos.getZ() % 4 == 0 && isEmptySpace(world, pos.down()) && UBlocks.SLIME_DRIP.getDefaultState().canPlaceAt(world, pos.down())) { + world.setBlockState(pos.down(), UBlocks.SLIME_DRIP.getDefaultState()); } else if (!testForAxis(world, pos, axis)) { world.setBlockState(pos, state.with(STATE, State.GROWING)); } else if (matchedNeighbours >= 27) { diff --git a/src/main/java/com/minelittlepony/unicopia/block/SlimeDropBlock.java b/src/main/java/com/minelittlepony/unicopia/block/SlimeDripBlock.java similarity index 95% rename from src/main/java/com/minelittlepony/unicopia/block/SlimeDropBlock.java rename to src/main/java/com/minelittlepony/unicopia/block/SlimeDripBlock.java index 76b84627..1ff858b2 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/SlimeDropBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/SlimeDripBlock.java @@ -34,7 +34,7 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldView; -public class SlimeDropBlock extends Block implements Climbable { +public class SlimeDripBlock extends Block implements Climbable { public static final IntProperty AGE = IntProperty.of("age", 0, 7); public static final EnumProperty SHAPE = EnumProperty.of("shape", Shape.class); @@ -52,7 +52,7 @@ public class SlimeDropBlock extends Block implements Climbable { Block.createCuboidShape(2, 0, 2, 14, 12, 14), }; - public SlimeDropBlock(Settings settings) { + public SlimeDripBlock(Settings settings) { super(settings); setDefaultState(stateManager.getDefaultState() .with(AGE, 0) @@ -80,14 +80,14 @@ public class SlimeDropBlock extends Block implements Climbable { Shape shape = state.get(SHAPE); - if (shape == Shape.STRING && spaceBelow) { + if (shape == Shape.TAIL && spaceBelow) { world.setBlockState(pos, state.with(SHAPE, Shape.BULB).with(AGE, age / 2)); } else if (shape == Shape.BULB && !spaceBelow) { - world.setBlockState(pos, state.with(SHAPE, Shape.STRING).with(AGE, age / 2)); + world.setBlockState(pos, state.with(SHAPE, Shape.TAIL).with(AGE, age / 2)); } else if (age >= 7) { if (rand.nextInt(12) == 0 && spaceBelow) { world.setBlockState(below, state.with(AGE, age / 2)); - world.setBlockState(pos, getDefaultState().with(AGE, age / 2).with(SHAPE, Shape.STRING)); + world.setBlockState(pos, getDefaultState().with(AGE, age / 2).with(SHAPE, Shape.TAIL)); world.playSound(null, pos, USounds.SLIME_ADVANCE, SoundCategory.BLOCKS, 1, 1); } } else { @@ -108,7 +108,7 @@ public class SlimeDropBlock extends Block implements Climbable { } protected int getMaximumAge(World world, BlockPos pos, BlockState state, boolean spaceBelow) { - if (state.get(SHAPE) == Shape.STRING) { + if (state.get(SHAPE) == Shape.TAIL) { BlockState higher = world.getBlockState(pos.up()); if (higher.getBlock() != this) { @@ -116,7 +116,7 @@ public class SlimeDropBlock extends Block implements Climbable { } return Math.min(higher.get(AGE), - ((SlimeDropBlock)higher.getBlock()).getMaximumAge(world, pos.up(), higher, false) - 1 + ((SlimeDripBlock)higher.getBlock()).getMaximumAge(world, pos.up(), higher, false) - 1 ); } @@ -228,7 +228,7 @@ public class SlimeDropBlock extends Block implements Climbable { enum Shape implements StringIdentifiable { BULB, - STRING; + TAIL; static final Shape[] VALUES = values(); diff --git a/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java b/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java index 7bdbb6ad..a329ae24 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java +++ b/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java @@ -138,7 +138,7 @@ public interface UBlocks { .breakByTool(FabricToolTags.PICKAXES, 2) .build())); - SlimeDropBlock SLIME_DROP = register("slime_drop", new SlimeDropBlock(FabricBlockSettings.of(UMaterials.HIVE, MaterialColor.GRASS) + SlimeDripBlock SLIME_DRIP = register("slime_drip", new SlimeDripBlock(FabricBlockSettings.of(UMaterials.HIVE, MaterialColor.GRASS) .ticksRandomly() .breakInstantly() .lightLevel(9) diff --git a/src/main/java/com/minelittlepony/unicopia/client/URenderers.java b/src/main/java/com/minelittlepony/unicopia/client/URenderers.java index cd0698ca..7f010312 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/URenderers.java +++ b/src/main/java/com/minelittlepony/unicopia/client/URenderers.java @@ -9,7 +9,7 @@ import com.minelittlepony.unicopia.client.particle.RaindropsParticle; import com.minelittlepony.unicopia.client.particle.SphereParticle; import com.minelittlepony.unicopia.client.render.ButterflyEntityRenderer; import com.minelittlepony.unicopia.client.render.CloudEntityRenderer; -import com.minelittlepony.unicopia.client.render.CuccoonEntityRenderer; +import com.minelittlepony.unicopia.client.render.CucoonEntityRenderer; import com.minelittlepony.unicopia.client.render.RainbowEntityRenderer; import com.minelittlepony.unicopia.client.render.SpearEntityRenderer; import com.minelittlepony.unicopia.client.render.SpellbookEntityRender; @@ -34,7 +34,7 @@ public interface URenderers { EntityRendererRegistry.INSTANCE.register(UEntities.SPELLBOOK, SpellbookEntityRender::new); EntityRendererRegistry.INSTANCE.register(UEntities.RAINBOW, RainbowEntityRenderer::new); EntityRendererRegistry.INSTANCE.register(UEntities.BUTTERFLY, ButterflyEntityRenderer::new); - EntityRendererRegistry.INSTANCE.register(UEntities.CUCCOON, CuccoonEntityRenderer::new); + EntityRendererRegistry.INSTANCE.register(UEntities.CUCOON, CucoonEntityRenderer::new); EntityRendererRegistry.INSTANCE.register(UEntities.THROWN_SPEAR, SpearEntityRenderer::new); ParticleFactoryRegistry.getInstance().register(UParticles.UNICORN_MAGIC, MagicParticle.Factory::new); @@ -54,7 +54,7 @@ public interface URenderers { UBlocks.CLOUD_BLOCK, UBlocks.CLOUD_SLAB, UBlocks.CLOUD_STAIRS, UBlocks.ENCHANTED_CLOUD_BLOCK, UBlocks.ENCHANTED_CLOUD_SLAB, UBlocks.ENCHANTED_CLOUD_STAIRS, - UBlocks.SLIME_DROP, UBlocks.SLIME_LAYER + UBlocks.SLIME_DRIP, UBlocks.SLIME_LAYER ); BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutoutMipped(), UBlocks.APPLE_LEAVES diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/CuccoonEntityRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/render/CucoonEntityRenderer.java similarity index 50% rename from src/main/java/com/minelittlepony/unicopia/client/render/CuccoonEntityRenderer.java rename to src/main/java/com/minelittlepony/unicopia/client/render/CucoonEntityRenderer.java index 2803de1a..8556f740 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/CuccoonEntityRenderer.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/CucoonEntityRenderer.java @@ -1,32 +1,32 @@ package com.minelittlepony.unicopia.client.render; -import com.minelittlepony.unicopia.client.render.model.CuccoonEntityModel; -import com.minelittlepony.unicopia.entity.CuccoonEntity; +import com.minelittlepony.unicopia.client.render.model.CucoonEntityModel; +import com.minelittlepony.unicopia.entity.CucoonEntity; import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.client.render.entity.LivingEntityRenderer; import net.minecraft.util.Identifier; -public class CuccoonEntityRenderer extends LivingEntityRenderer { +public class CucoonEntityRenderer extends LivingEntityRenderer { - private static final Identifier TEXTURE = new Identifier("unicopia", "textures/entity/cuccoon.png"); + private static final Identifier TEXTURE = new Identifier("unicopia", "textures/entity/cucoon.png"); - public CuccoonEntityRenderer(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) { - super(manager, new CuccoonEntityModel(), 1); + public CucoonEntityRenderer(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) { + super(manager, new CucoonEntityModel(), 1); } @Override - public Identifier getTexture(CuccoonEntity entity) { + public Identifier getTexture(CucoonEntity entity) { return TEXTURE; } @Override - protected float getLyingAngle(CuccoonEntity entity) { + protected float getLyingAngle(CucoonEntity entity) { return 0; } @Override - protected boolean hasLabel(CuccoonEntity mobEntity) { + protected boolean hasLabel(CucoonEntity mobEntity) { return super.hasLabel(mobEntity) && (mobEntity.shouldRenderName() || mobEntity.hasCustomName() && mobEntity == renderManager.targetedEntity); } } diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/model/CuccoonEntityModel.java b/src/main/java/com/minelittlepony/unicopia/client/render/model/CucoonEntityModel.java similarity index 83% rename from src/main/java/com/minelittlepony/unicopia/client/render/model/CuccoonEntityModel.java rename to src/main/java/com/minelittlepony/unicopia/client/render/model/CucoonEntityModel.java index 6f67773b..ae64c691 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/model/CuccoonEntityModel.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/model/CucoonEntityModel.java @@ -1,26 +1,26 @@ package com.minelittlepony.unicopia.client.render.model; -import com.minelittlepony.unicopia.entity.CuccoonEntity; +import com.minelittlepony.unicopia.entity.CucoonEntity; import net.minecraft.client.model.ModelPart; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.entity.model.EntityModel; import net.minecraft.client.util.math.MatrixStack; -public class CuccoonEntityModel extends EntityModel { +public class CucoonEntityModel extends EntityModel { private final ModelPart body; private float breatheAmount; - public CuccoonEntityModel() { + public CucoonEntityModel() { super(RenderLayer::getEntityTranslucentCull); body = new ModelPart(this, 0, 0); body.setTextureSize(250, 250); body.setTextureOffset(0, 0); - // cuccoon shape + // cucoon shape body.addCuboid(-4, -2, -4, 8, 2, 8); body.addCuboid(-7.5F, 0, -7.5F, 15, 6, 15); body.addCuboid(-10, 4, -10, 20, 6, 20); @@ -47,7 +47,7 @@ public class CuccoonEntityModel extends EntityModel { } @Override - public void setAngles(CuccoonEntity entity, float limbAngle, float limbDistance, float customAngle, float headYaw, float headPitch) { + public void setAngles(CucoonEntity entity, float limbAngle, float limbDistance, float customAngle, float headYaw, float headPitch) { breatheAmount = entity.getBreatheAmount(customAngle) / 8; } } diff --git a/src/main/java/com/minelittlepony/unicopia/entity/CuccoonEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/CucoonEntity.java similarity index 97% rename from src/main/java/com/minelittlepony/unicopia/entity/CuccoonEntity.java rename to src/main/java/com/minelittlepony/unicopia/entity/CucoonEntity.java index 2f329555..635ecb0a 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/CuccoonEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/CucoonEntity.java @@ -40,13 +40,13 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.GameRules; import net.minecraft.world.World; -public class CuccoonEntity extends LivingEntity implements IMagicals, InAnimate, Trap { +public class CucoonEntity extends LivingEntity implements IMagicals, InAnimate, Trap { - private static final TrackedData STRUGGLE_COUNT = DataTracker.registerData(CuccoonEntity.class, TrackedDataHandlerRegistry.INTEGER); + private static final TrackedData STRUGGLE_COUNT = DataTracker.registerData(CucoonEntity.class, TrackedDataHandlerRegistry.INTEGER); private boolean captiveLastSneakState; - public CuccoonEntity(EntityType type, World world) { + public CucoonEntity(EntityType type, World world) { super(type, world); } @@ -96,7 +96,7 @@ public class CuccoonEntity extends LivingEntity implements IMagicals, InAnimate, && !hasPassengers() && entity instanceof LivingEntity && !entity.hasVehicle() - && !(entity instanceof CuccoonEntity) + && !(entity instanceof CucoonEntity) && !EquinePredicates.PLAYER_CHANGELING.test(entity); } diff --git a/src/main/java/com/minelittlepony/unicopia/entity/UEntities.java b/src/main/java/com/minelittlepony/unicopia/entity/UEntities.java index 69b2b1ab..e21c481b 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/UEntities.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/UEntities.java @@ -34,7 +34,7 @@ public interface UEntities { EntityType RAINBOW = register("rainbow", FabricEntityTypeBuilder.create(EntityCategory.AMBIENT, RainbowEntity::new) .size(EntityDimensions.fixed(1, 1))); - EntityType CUCCOON = register("cuccoon", FabricEntityTypeBuilder.create(EntityCategory.MISC, CuccoonEntity::new) + EntityType CUCOON = register("cucoon", FabricEntityTypeBuilder.create(EntityCategory.MISC, CucoonEntity::new) .size(EntityDimensions.changing(1.5F, 1.6F))); EntityType BUTTERFLY = register("butterfly", FabricEntityTypeBuilder.create(EntityCategory.AMBIENT, ButterflyEntity::new) diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItems.java b/src/main/java/com/minelittlepony/unicopia/item/UItems.java index 563ebedb..3c48ee21 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/UItems.java +++ b/src/main/java/com/minelittlepony/unicopia/item/UItems.java @@ -71,7 +71,7 @@ public interface UItems { Item CHITIN_SHELL_STAIRS = register("chitin_shell_stairs", new BlockItem(UBlocks.CHITIN_SHELL_STAIRS, new Settings().group(ItemGroup.BUILDING_BLOCKS))); Item CHISELED_CHITIN_SHELL_BLOCK = register("chiseled_chitin_shell_block", new BlockItem(UBlocks.CHISELED_CHITIN_SHELL_BLOCK, new Settings().group(ItemGroup.BUILDING_BLOCKS))); - Item SLIME_DROP = register("slime_drop", new BlockItem(UBlocks.SLIME_DROP, new Settings().group(ItemGroup.MATERIALS))); + Item CUCOON = register("cucoon", new AliasedBlockItem(UBlocks.SLIME_DRIP, new Settings().group(ItemGroup.MATERIALS))); Item SLIME_LAYER = register("slime_layer", new BlockItem(UBlocks.SLIME_LAYER, new Settings().group(ItemGroup.DECORATIONS))); Item MISTED_GLASS_DOOR = register("misted_glass_door", new TallBlockItem(UBlocks.MISTED_GLASS_DOOR, new Settings().group(ItemGroup.REDSTONE))); diff --git a/src/main/java/com/minelittlepony/unicopia/magic/spell/ChangelingTrapSpell.java b/src/main/java/com/minelittlepony/unicopia/magic/spell/ChangelingTrapSpell.java index db8e90db..cb8780b9 100644 --- a/src/main/java/com/minelittlepony/unicopia/magic/spell/ChangelingTrapSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/magic/spell/ChangelingTrapSpell.java @@ -4,7 +4,7 @@ import java.util.Optional; import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.block.UBlocks; -import com.minelittlepony.unicopia.entity.CuccoonEntity; +import com.minelittlepony.unicopia.entity.CucoonEntity; import com.minelittlepony.unicopia.entity.IMagicals; import com.minelittlepony.unicopia.entity.UEntities; import com.minelittlepony.unicopia.magic.Affinity; @@ -168,10 +168,10 @@ public class ChangelingTrapSpell extends AbstractSpell implements ThrowableSpell if (caster.isLocal() && caster.getWorld().random.nextInt(3) == 0) { onDestroyed(caster); - CuccoonEntity cuccoon = UEntities.CUCCOON.create(caster.getWorld()); - cuccoon.copyPositionAndRotation(caster.getEntity()); + CucoonEntity cucoon = UEntities.CUCOON.create(caster.getWorld()); + cucoon.copyPositionAndRotation(caster.getEntity()); - caster.getWorld().spawnEntity(cuccoon); + caster.getWorld().spawnEntity(cucoon); } setDirty(true); diff --git a/src/main/resources/assets/unicopia/blockstates/slime_drip.json b/src/main/resources/assets/unicopia/blockstates/slime_drip.json new file mode 100644 index 00000000..1330929a --- /dev/null +++ b/src/main/resources/assets/unicopia/blockstates/slime_drip.json @@ -0,0 +1,20 @@ +{ + "variants": { + "age=0,shape=bulb": { "model": "unicopia:block/slime_drip/bulb_stage0" }, + "age=1,shape=bulb": { "model": "unicopia:block/slime_drip/bulb_stage0" }, + "age=2,shape=bulb": { "model": "unicopia:block/slime_drip/bulb_stage1" }, + "age=3,shape=bulb": { "model": "unicopia:block/slime_drip/bulb_stage1" }, + "age=4,shape=bulb": { "model": "unicopia:block/slime_drip/bulb_stage2" }, + "age=5,shape=bulb": { "model": "unicopia:block/slime_drip/bulb_stage2" }, + "age=6,shape=bulb": { "model": "unicopia:block/slime_drip/bulb_stage3" }, + "age=7,shape=bulb": { "model": "unicopia:block/slime_drip/bulb_stage3" }, + "age=0,shape=tail": { "model": "unicopia:block/slime_drip/tail_stage0" }, + "age=1,shape=tail": { "model": "unicopia:block/slime_drip/tail_stage0" }, + "age=2,shape=tail": { "model": "unicopia:block/slime_drip/tail_stage1" }, + "age=3,shape=tail": { "model": "unicopia:block/slime_drip/tail_stage1" }, + "age=4,shape=tail": { "model": "unicopia:block/slime_drip/tail_stage2" }, + "age=5,shape=tail": { "model": "unicopia:block/slime_drip/tail_stage2" }, + "age=6,shape=tail": { "model": "unicopia:block/slime_drip/tail_stage3" }, + "age=7,shape=tail": { "model": "unicopia:block/slime_drip/tail_stage3" } + } +} diff --git a/src/main/resources/assets/unicopia/blockstates/slime_drop.json b/src/main/resources/assets/unicopia/blockstates/slime_drop.json deleted file mode 100644 index 5d4c80c0..00000000 --- a/src/main/resources/assets/unicopia/blockstates/slime_drop.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "age=0,shape=bulb": { "model": "unicopia:block/slime_drop/bulb_stage0" }, - "age=1,shape=bulb": { "model": "unicopia:block/slime_drop/bulb_stage0" }, - "age=2,shape=bulb": { "model": "unicopia:block/slime_drop/bulb_stage1" }, - "age=3,shape=bulb": { "model": "unicopia:block/slime_drop/bulb_stage1" }, - "age=4,shape=bulb": { "model": "unicopia:block/slime_drop/bulb_stage2" }, - "age=5,shape=bulb": { "model": "unicopia:block/slime_drop/bulb_stage2" }, - "age=6,shape=bulb": { "model": "unicopia:block/slime_drop/bulb_stage3" }, - "age=7,shape=bulb": { "model": "unicopia:block/slime_drop/bulb_stage3" }, - "age=0,shape=string": { "model": "unicopia:block/slime_drop/string_stage0" }, - "age=1,shape=string": { "model": "unicopia:block/slime_drop/string_stage0" }, - "age=2,shape=string": { "model": "unicopia:block/slime_drop/string_stage1" }, - "age=3,shape=string": { "model": "unicopia:block/slime_drop/string_stage1" }, - "age=4,shape=string": { "model": "unicopia:block/slime_drop/string_stage2" }, - "age=5,shape=string": { "model": "unicopia:block/slime_drop/string_stage2" }, - "age=6,shape=string": { "model": "unicopia:block/slime_drop/string_stage3" }, - "age=7,shape=string": { "model": "unicopia:block/slime_drop/string_stage3" } - } -} diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index 05346437..4c51a6ce 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -23,7 +23,7 @@ "block.unicopia.chitin_shell_slab": "Chitin Shell Slab", "block.unicopia.chiseled_chitin_shell_block": "Chiseled Chitin Shell Block", "block.unicopia.chitin_shell": "Chitin Shell", - "block.unicopia.slime_drop": "Slime Droplet", + "block.unicopia.slime_drop": "Slimey Plant", "block.unicopia.slime_layer": "Slime", "block.unicopia.chiseled_marble_block": "Chiseled Marble Block", @@ -53,6 +53,7 @@ "item.unicopia.dew_drop": "Dew Drop", "item.unicopia.chitin_shell": "Chitinous Shell", + "item.unicopia.cucoon": "Cucoon", "item.unicopia.moss": "Moss", "item.unicopia.meadow_brook_staff": "Meadow Brook's Staff", "item.unicopia.meadow_brook_staff.tagline": "It's a big stick", @@ -180,7 +181,7 @@ "entity.unicopia.spellbook": "Spellbook", "entity.unicopia.butterfly": "Butterfly", "entity.unicopia.spear": "Spear", - "entity.unicopia.cuccoon": "Cuccoon", + "entity.unicopia.cucoon": "Cucoon", "toxicity.safe.name": "Safe", "toxicity.mild.name": "Mildly Toxic", diff --git a/src/main/resources/assets/unicopia/models/block/slime_drop/bulb_stage0.json b/src/main/resources/assets/unicopia/models/block/slime_drip/bulb_stage0.json similarity index 88% rename from src/main/resources/assets/unicopia/models/block/slime_drop/bulb_stage0.json rename to src/main/resources/assets/unicopia/models/block/slime_drip/bulb_stage0.json index 1df558d4..bc9a35be 100644 --- a/src/main/resources/assets/unicopia/models/block/slime_drop/bulb_stage0.json +++ b/src/main/resources/assets/unicopia/models/block/slime_drip/bulb_stage0.json @@ -1,8 +1,8 @@ { "textures": { - "bulb": "unicopia:blocks/cuccoon_bulb", - "tail": "unicopia:blocks/cuccoon_tail", - "particle": "unicopia:blocks/cuccoon_bulb" + "bulb": "unicopia:blocks/slime_bulb", + "tail": "unicopia:blocks/slime_tail", + "particle": "unicopia:blocks/slime_bulb" }, "elements": [ { "from": [ 7, 8, 7 ], diff --git a/src/main/resources/assets/unicopia/models/block/slime_drop/bulb_stage1.json b/src/main/resources/assets/unicopia/models/block/slime_drip/bulb_stage1.json similarity index 88% rename from src/main/resources/assets/unicopia/models/block/slime_drop/bulb_stage1.json rename to src/main/resources/assets/unicopia/models/block/slime_drip/bulb_stage1.json index dda83343..4f21c21d 100644 --- a/src/main/resources/assets/unicopia/models/block/slime_drop/bulb_stage1.json +++ b/src/main/resources/assets/unicopia/models/block/slime_drip/bulb_stage1.json @@ -1,8 +1,8 @@ { "textures": { - "bulb": "unicopia:blocks/cuccoon_bulb", - "tail": "unicopia:blocks/cuccoon_tail", - "particle": "unicopia:blocks/cuccoon_bulb" + "bulb": "unicopia:blocks/slime_bulb", + "tail": "unicopia:blocks/slime_tail", + "particle": "unicopia:blocks/slime_bulb" }, "elements": [ { "from": [ 6, 8, 6 ], diff --git a/src/main/resources/assets/unicopia/models/block/slime_drop/bulb_stage2.json b/src/main/resources/assets/unicopia/models/block/slime_drip/bulb_stage2.json similarity index 88% rename from src/main/resources/assets/unicopia/models/block/slime_drop/bulb_stage2.json rename to src/main/resources/assets/unicopia/models/block/slime_drip/bulb_stage2.json index d2c76aea..6c9da095 100644 --- a/src/main/resources/assets/unicopia/models/block/slime_drop/bulb_stage2.json +++ b/src/main/resources/assets/unicopia/models/block/slime_drip/bulb_stage2.json @@ -1,8 +1,8 @@ { "textures": { - "bulb": "unicopia:blocks/cuccoon_bulb", - "tail": "unicopia:blocks/cuccoon_tail", - "particle": "unicopia:blocks/cuccoon_bulb" + "bulb": "unicopia:blocks/slime_bulb", + "tail": "unicopia:blocks/slime_tail", + "particle": "unicopia:blocks/slime_bulb" }, "elements": [ { "from": [ 5, 8, 5 ], diff --git a/src/main/resources/assets/unicopia/models/block/slime_drop/bulb_stage3.json b/src/main/resources/assets/unicopia/models/block/slime_drip/bulb_stage3.json similarity index 88% rename from src/main/resources/assets/unicopia/models/block/slime_drop/bulb_stage3.json rename to src/main/resources/assets/unicopia/models/block/slime_drip/bulb_stage3.json index 99b767c9..ab89631e 100644 --- a/src/main/resources/assets/unicopia/models/block/slime_drop/bulb_stage3.json +++ b/src/main/resources/assets/unicopia/models/block/slime_drip/bulb_stage3.json @@ -1,8 +1,8 @@ { "textures": { - "bulb": "unicopia:blocks/cuccoon_bulb", - "tail": "unicopia:blocks/cuccoon_tail", - "particle": "unicopia:blocks/cuccoon_bulb" + "bulb": "unicopia:blocks/slime_bulb", + "tail": "unicopia:blocks/slime_tail", + "particle": "unicopia:blocks/slime_bulb" }, "elements": [ { "from": [ 4, 8, 4 ], diff --git a/src/main/resources/assets/unicopia/models/block/slime_drop/string_stage0.json b/src/main/resources/assets/unicopia/models/block/slime_drip/tail_stage0.json similarity index 87% rename from src/main/resources/assets/unicopia/models/block/slime_drop/string_stage0.json rename to src/main/resources/assets/unicopia/models/block/slime_drip/tail_stage0.json index 5834ec3d..02950255 100644 --- a/src/main/resources/assets/unicopia/models/block/slime_drop/string_stage0.json +++ b/src/main/resources/assets/unicopia/models/block/slime_drip/tail_stage0.json @@ -1,7 +1,7 @@ { "textures": { - "tail": "unicopia:blocks/cuccoon_tail", - "particle": "unicopia:blocks/cuccoon_tail" + "tail": "unicopia:blocks/slime_tail", + "particle": "unicopia:blocks/slime_tail" }, "elements": [ { "from": [ 7, 0, 7 ], diff --git a/src/main/resources/assets/unicopia/models/block/slime_drop/string_stage1.json b/src/main/resources/assets/unicopia/models/block/slime_drip/tail_stage1.json similarity index 87% rename from src/main/resources/assets/unicopia/models/block/slime_drop/string_stage1.json rename to src/main/resources/assets/unicopia/models/block/slime_drip/tail_stage1.json index a2b5cf8e..49bcbe69 100644 --- a/src/main/resources/assets/unicopia/models/block/slime_drop/string_stage1.json +++ b/src/main/resources/assets/unicopia/models/block/slime_drip/tail_stage1.json @@ -1,7 +1,7 @@ { "textures": { - "tail": "unicopia:blocks/cuccoon_tail", - "particle": "unicopia:blocks/cuccoon_tail" + "tail": "unicopia:blocks/slime_tail", + "particle": "unicopia:blocks/slime_tail" }, "elements": [ { "from": [ 6, 0, 6 ], diff --git a/src/main/resources/assets/unicopia/models/block/slime_drop/string_stage2.json b/src/main/resources/assets/unicopia/models/block/slime_drip/tail_stage2.json similarity index 87% rename from src/main/resources/assets/unicopia/models/block/slime_drop/string_stage2.json rename to src/main/resources/assets/unicopia/models/block/slime_drip/tail_stage2.json index 3f7ce072..525e65f7 100644 --- a/src/main/resources/assets/unicopia/models/block/slime_drop/string_stage2.json +++ b/src/main/resources/assets/unicopia/models/block/slime_drip/tail_stage2.json @@ -1,7 +1,7 @@ { "textures": { - "tail": "unicopia:blocks/cuccoon_tail", - "particle": "unicopia:blocks/cuccoon_tail" + "tail": "unicopia:blocks/slime_tail", + "particle": "unicopia:blocks/slime_tail" }, "elements": [ { "from": [ 5, 0, 5 ], diff --git a/src/main/resources/assets/unicopia/models/block/slime_drop/string_stage3.json b/src/main/resources/assets/unicopia/models/block/slime_drip/tail_stage3.json similarity index 87% rename from src/main/resources/assets/unicopia/models/block/slime_drop/string_stage3.json rename to src/main/resources/assets/unicopia/models/block/slime_drip/tail_stage3.json index 531f88d9..a05b652f 100644 --- a/src/main/resources/assets/unicopia/models/block/slime_drop/string_stage3.json +++ b/src/main/resources/assets/unicopia/models/block/slime_drip/tail_stage3.json @@ -1,7 +1,7 @@ { "textures": { - "tail": "unicopia:blocks/cuccoon_tail", - "particle": "unicopia:blocks/cuccoon_tail" + "tail": "unicopia:blocks/slime_tail", + "particle": "unicopia:blocks/slime_tail" }, "elements": [ { "from": [ 4, 0, 4 ], diff --git a/src/main/resources/assets/unicopia/models/item/slime_drop.json b/src/main/resources/assets/unicopia/models/item/cucoon.json similarity index 57% rename from src/main/resources/assets/unicopia/models/item/slime_drop.json rename to src/main/resources/assets/unicopia/models/item/cucoon.json index 23eec786..864da648 100644 --- a/src/main/resources/assets/unicopia/models/item/slime_drop.json +++ b/src/main/resources/assets/unicopia/models/item/cucoon.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "unicopia:item/slime_drop" + "layer0": "unicopia:item/cucoon" } } diff --git a/src/main/resources/assets/unicopia/textures/blocks/cuccoon_bulb.png b/src/main/resources/assets/unicopia/textures/blocks/slime_bulb.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/blocks/cuccoon_bulb.png rename to src/main/resources/assets/unicopia/textures/blocks/slime_bulb.png diff --git a/src/main/resources/assets/unicopia/textures/blocks/cuccoon_tail.png b/src/main/resources/assets/unicopia/textures/blocks/slime_tail.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/blocks/cuccoon_tail.png rename to src/main/resources/assets/unicopia/textures/blocks/slime_tail.png diff --git a/src/main/resources/assets/unicopia/textures/entity/cuccoon.png b/src/main/resources/assets/unicopia/textures/entity/cucoon.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/entity/cuccoon.png rename to src/main/resources/assets/unicopia/textures/entity/cucoon.png diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/carry.png b/src/main/resources/assets/unicopia/textures/gui/ability/carry.png new file mode 100644 index 0000000000000000000000000000000000000000..3bd33fbe1c234554c1a09ce1a2af95a23700586a GIT binary patch literal 793 zcmV+!1LpjRP)bAl)x1HS^+FmhaFIk>h4XN46wY_9qwN>(le@;qFb4f-^o) zT9W;t>~jIoh5`Z-to`c_Zq`9st=I7S^ehIUus1@0GS3iDY$n?Xwvzp!?6nB!)^IV0 ziTyF$p+tZjt-kycBmlfju2Np|LCE$4yA5VlltHA)76ZF&b{X}rJ2|$CXQS-B$%RJ8 zQ<5R3N}t*R!M>4vW@lf=w8_*CSg+Z_%{ma+ZvEp^$`>OA zP10MAwZ}lTUpiE1$FO6s*%Ht@7XDtdB?dreDW54hP_bRLUdwbOd(BqHm_*0ARW9oB z$Z-K142#`HE9)W0c4W&rVv!RlTahGB`v<$gTaLvn^lTT>WVHWJ$d7F*QmWQ#?+AQf zPXxGmr@12HobPQ_xTr`=Ws)+;n3M7ju6fe7Nbx zzTDpQOh>2f0v(U5*ikOz$Z@gh#{S2jeWjj!RO>Y{06GSe2GemEIj&Ezs&3ZdVh)ww zh>9<8nPW$O9;D5Q9shVEl%r18*0TPj4-=jpW%MXZ6_*h7vYwd+kS5#R0J;k#tN6%q zg^`XfsdzSmw;V&KH%5Rf&X8FZAAnEqC_Da!BAL(MNZ^#O{f10 XumR$0~_HQ8;Qk%Sf}tG?E;_ zKD?a-WZZ2!@TX${fIl5e?`i#J07i?M^q7p&ShCAfnlqUt=Z2NmFE%fW%UDVeImx0@7QM zlJX|Hy|GfKC<9T3bU?O@V;d)7s3i-?htIj^T;FQ|e%e^B)t}AwDP;S!5?)P20#6z6 zv^gNZ%LaFG>Vf4NpxZeH2LJ+IRneO2B1NnzVrQ*t&hTs~LYO6xor-9+(Fmw-^(rSl zPl1e@+;KBsl(8zKb4k^LlO%kr2h-*NRvQh<1f!Az!UgJ=zhsJJDi&N+@$awil?LW2 z(Cq*!qePW~1j&?@cu)F{D7Yg9!mX~{2F?MVBVe@>2)83WkfG%o+O#>yZ^Lk_!*YF4!)hhux@qc&p0c1EJ4KG2qQG;JsGDL!IRaKI0n!6-Teu-a%a-lYJ|0U$#I)`rQIE3bs@Mtrm=Jy}A$ zAyR@S;#)m=DQ1C8Q&$3~l^gF~ik}DQ-cAF`q-TNgc>k!A_3-E9$|bE_+6&(9???pi zA9W!K`WjCmY=vW|xn_oB(UUYcGzhmkv>P!XL&H5kqicz(HGy|XzEOV&@#hyHnFVa| zptmJen2-uMO@Ka0adQ9}S`HlVjCLc2xBI)?!YcW3{WyV}`2uF)A7VkNL+Qi+g%CtW zl0n-emD=MshReE=x00G*upJO0GcJ-t4Y2*FE%fW%UDVeImx0@7QM zlJX|Hy|GfKC<9T3bU?O@V;d)7s3i-?htIj^T;FQ|e%e^B)t}AwDP;S!5?)P20#6z6 zv^gNZ%LaFG>Vf4NpxZeH2LJ+IRneO2B1NnzVrQ*t&hTs~LYO6xor-9+(Fmw-^(rSl zPl1e@+;KBsl(8zKb4k^LlO%kr2h-*NRvQh<1f!Az!UgJ=zhsJJDi&N+@$awil?LW2 z(Cq*!qePW~1j&?@cu)F{D7Yg9!mX~{2F?MVBVe@>2)83WkfG%o+O#>yZ^Lk_!*YF4!)hhux@qc&p0c1EJ4KG2qQG;JsGDL!IRaKI0n!6-Teu-a%a-lYJ|0U$#I)`rQIE3bs@Mtrm=Jy}A$ zAyR@S;#)m=DQ1C8Q&$3~l^gF~ik}DQ-cAF`q-TNgc>k!A_3-E9$|bE_+6&(9???pi zA9W!K`WjCmY=vW|xn_oB(UUYcGzhmkv>P!XL&H5kqicz(HGy|XzEOV&@#hyHnFVa| zptmJen2-uMO@Ka0adQ9}S`HlVjCLc2xBI)?!YcW3{WyV}`2uF)A7VkNL+Qi+g%CtW zl0n-emD=MshReE=x00G*upJO0GcJ-t4Y2*